Merge conflicts between ARM and mainline U-Boot trees

U-Boot Albert ARIBAUD 6 participants 6 messages Apr 8, 2014

lore

Share & tools

lore

Albert ARIBAUD

author

2014-04-08 07:49 UTC #0 lore raw

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,

Signature · 1 line

Albert.

Marek Vasut

2014-04-08 08:19 UTC #1 lore raw

Quoted 13 lines · Albert ARIBAUD

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'

Quoted 7 lines

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

Lukasz Majewski

Acked-by Tested-by

2014-04-08 08:34 UTC #2 lore raw

In reply to Albert ARIBAUD

Hi Albert,

Quoted 7 lines

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 <[email protected]>

Tested-by Lukasz Majewski <[email protected]>

Signature · 5 lines

Best regards,

Lukasz Majewski

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

Piotr Wilczek

Acked-by Tested-by

2014-04-08 08:54 UTC #3 lore raw

In reply to Albert ARIBAUD

Hi Albert,

Quoted 10 lines

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

Quoted 4 lines

Thanks in advance!
Amicalement,

Acked-by Piotr Wilczek <[email protected]>

Tested-by Piotr Wilczek <[email protected]>

Tested on Trats2.

Best regards,
Piotr Wilczek

Pantelis Antoniou

Acked-by

2014-04-08 09:01 UTC #4 lore raw

In reply to Albert ARIBAUD

Hi Albert,

Quoted 16 lines · Albert ARIBAUD

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

Quoted 8 lines

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.

Quoted 9 lines

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

Quoted 5 lines

Thanks in advance!
Amicalement,
Signature · 1 line
Albert.

Acked-by Pantelis Antoniou <[email protected]>

Przemyslaw Marczak

Tested-by

2014-04-08 11:03 UTC #5 lore raw

In reply to Albert ARIBAUD

Hi Albert,

Quoted 33 lines · Albert ARIBAUD

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

Quoted 4 lines

Thanks in advance!
Amicalement,

I also tested this on Trats2.

Tested-by Przemyslaw Marczak <[email protected]>

Thank you,

Signature · 4 lines

Przemyslaw Marczak
Samsung R&D Institute Poland
Samsung Electronics
p.marczak at samsung.com