From mboxrd@z Thu Jan  1 00:00:00 1970
From: Lukasz Majewski <l.majewski@samsung.com>
Date: Tue, 08 Apr 2014 10:34:09 +0200
Subject: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
In-Reply-To: <E1WXQmU-0003ZN-Pm@janus>
References: <E1WXQmU-0003ZN-Pm@janus>
Message-ID: <20140408103409.14669e93@amdc2363>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Albert,


> 
> 	include/configs/trats.h:
> 	- commits fe601647 (Piotr) and 9960d9a8 (Lukasz)
> 	- note: I manually removed CONFIG_EFI_PARTITION and
> 	  CONFIG_PARTITION_UUIDS which are already defined in
> 	  include/configs/exynos4-dt.h
> 

I can confirm that Albert's solution provided at u-boot-denx-arm/merged
works at Samsung's Trats device.

Acked-by:  Lukasz Majewski <l.majewski@samsung.com>
Tested-by: Lukasz Majewski <l.majewski@samsung.com>

-- 
Best regards,

Lukasz Majewski

Samsung R&D Institute Poland (SRPOL) | Linux Platform Group