Re: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees

Hi Albert,

include/configs/trats2.h:

• commits 4d6c9671 (Piotr) and aafd2c5d (Przemyslaw)

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

Thanks in advance!

Amicalement,

Acked-by: Piotr Wilczek p.wilczek@samsung.com Tested-by: Piotr Wilczek p.wilczek@samsung.com

Tested on Trats2.

Best regards, Piotr Wilczek