[PATCH 04/11] arm: mvebu: convert Dove to common init

Sebastian Hesselbarth sebastian.hesselbarth at gmail.com
Tue May 21 11:24:21 EDT 2013


On 05/21/13 15:49, Sascha Hauer wrote:
> On Sun, May 19, 2013 at 08:23:48PM +0200, Sebastian Hesselbarth wrote:
>> This patch converts Marvell Dove SoC init to make use of common lowlevel
>> and init functions. Postcore initcall will now setup memory controller
>> base registers to match internal registers base, probe real memory size,
>> and setup UART console by config option.
>>
>> Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com>
>
> This patch breaks bisectibility:
>
>   config:     arm              globalscale_guruplug_defconfig
> arch/arm/mach-mvebu/built-in.o: In function `barebox_arm_reset_vector':
> lowlevel.c:(.text.barebox_arm_reset_vector+0x0): multiple definition of `barebox_arm_reset_vector'
> arch/arm/boards/globalscale-guruplug/built-in.o:lowlevel.c:(.text.barebox_arm_reset_vector+0x0): first defined here
> make: *** [barebox] Error 1
> ------------------------------------------------------------
>   config:     arm              globalscale_mirabox_defconfig
> arch/arm/mach-mvebu/armada-370-xp.o: In function `mvebu_barebox_entry':
> armada-370-xp.c:(.text.mvebu_barebox_entry+0x0): multiple definition of `mvebu_barebox_entry'
> arch/arm/mach-mvebu/common.o:common.c:(.text.mvebu_barebox_entry+0x0): first defined here
> make[1]: *** [arch/arm/mach-mvebu/built-in.o] Error 1
> make: *** [arch/arm/mach-mvebu] Error 2
> make: *** Waiting for unfinished jobs....
>
> I'm fine with squashing the rest of this series together in a single
> patch. Is this ok with you or do you want to look for a better solution?

Yeah, Thomas already mentioned it will break bisectibility. IIRC,
Thomas agreed on squashing if you are fine with it.

Sebastian




More information about the barebox mailing list