[U-Boot] Merge conflicts between ARM and mainline U-Boot trees
Hello all,
There are four merge conflicts currently between ARM and mainline.
I have created a 'merged' branch on the ARM repository with what I think the resolutions should be. Some are trivial, others, less.
Could commit authors and/or custodians (CC:ed) please confirm or indicate correct resolutions?
Overall resolutions can be seen (assuming your remote for the ARM tree is 'u-boot-arm'
git fetch git://git.denx.de/u-boot-arm merged:arm-merged git show arm-merged
Resolutions, from the most to the least trivial:
arch/arm/cpu/arm926ejs/mxs/Makefile: - commits 1a9df13d and b97241b3 (both Marek)
include/mmc.h: - commits 3c7ca967 (Fabio) and 93bfd616 (Pantelis)
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,
On Tuesday, April 08, 2014 at 09:49:17 AM, Albert ARIBAUD wrote:
Hello all,
There are four merge conflicts currently between ARM and mainline.
I have created a 'merged' branch on the ARM repository with what I think the resolutions should be. Some are trivial, others, less.
Could commit authors and/or custodians (CC:ed) please confirm or indicate correct resolutions?
Overall resolutions can be seen (assuming your remote for the ARM tree is 'u-boot-arm'
git fetch git://git.denx.de/u-boot-arm merged:arm-merged git show arm-merged
Resolutions, from the most to the least trivial:
arch/arm/cpu/arm926ejs/mxs/Makefile:
- commits 1a9df13d and b97241b3 (both Marek)
What was the problem here ... the MKIMAGE/UIMAGE change, right? Looks correct. Best regards, Marek Vasut
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
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
Hi Albert,
On Apr 8, 2014, at 10:49 AM, Albert ARIBAUD wrote:
Hello all,
There are four merge conflicts currently between ARM and mainline.
I have created a 'merged' branch on the ARM repository with what I think the resolutions should be. Some are trivial, others, less.
Could commit authors and/or custodians (CC:ed) please confirm or indicate correct resolutions?
Overall resolutions can be seen (assuming your remote for the ARM tree is 'u-boot-arm'
git fetch git://git.denx.de/u-boot-arm merged:arm-merged git show arm-merged
Resolutions, from the most to the least trivial:
arch/arm/cpu/arm926ejs/mxs/Makefile:
- commits 1a9df13d and b97241b3 (both Marek)
include/mmc.h:
- commits 3c7ca967 (Fabio) and 93bfd616 (Pantelis)
Looks fine to me.
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,
Albert.
Acked-by: Pantelis Antoniou panto@antoniou-consulting.com
Hi Albert,
On 04/08/2014 09:49 AM, Albert ARIBAUD wrote:
Hello all,
There are four merge conflicts currently between ARM and mainline.
I have created a 'merged' branch on the ARM repository with what I think the resolutions should be. Some are trivial, others, less.
Could commit authors and/or custodians (CC:ed) please confirm or indicate correct resolutions?
Overall resolutions can be seen (assuming your remote for the ARM tree is 'u-boot-arm'
git fetch git://git.denx.de/u-boot-arm merged:arm-merged git show arm-merged
Resolutions, from the most to the least trivial:
arch/arm/cpu/arm926ejs/mxs/Makefile:
- commits 1a9df13d and b97241b3 (both Marek)
include/mmc.h:
- commits 3c7ca967 (Fabio) and 93bfd616 (Pantelis)
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,
I also tested this on Trats2.
Tested-by: Przemyslaw Marczak p.marczak@samsung.com
Thank you,
participants (6)
-
Albert ARIBAUD -
Lukasz Majewski -
Marek Vasut -
Pantelis Antoniou -
Piotr Wilczek -
Przemyslaw Marczak