Commit "ARM: Turn most board directories into regular build directories" break kwb images

[Sascha Hauer]

Hi Thomas,

On Tue, Aug 06, 2013 at 11:49:45AM +0200, Thomas Petazzoni wrote:
> Hello Sascha,
> 
> Your commit 6bbb24cf8d0b0a060c57d9c07610210cdf2dcc96 ('ARM: Turn most
> board directories into regular build directories') apparently breaks
> the build of kwbimage for Marvell EBU platforms.
> 
> The kwbimage is built as follows:
> 
> KWBIMAGE_OPTS = \
>         -c -i $(srctree)/$(BOARD)/kwbimage.cfg -d $(TEXT_BASE) -e $(TEXT_BASE)
> 
> quiet_cmd_kwbimage = KWB     $@
>       cmd_kwbimage = scripts/kwbimage -p $< $(KWBIMAGE_OPTS) -o $@ || \
>         echo "WARNING: Couldn't create KWB image due to previous errors."
> 
> quiet_cmd_kwbimage_uart = KWBUART $@
>       cmd_kwbimage_uart = scripts/kwbimage -m uart -p $< $(KWBIMAGE_OPTS) -o $@ || \
>         echo "WARNING Couldn't create KWB image due to previous errors."
> 
> so we rely on the $(BOARD) variable to contain
> arch/arm/boards/<theboard>/. Unfortunately, with your commit, this is
> no longer the case.
> 
> Your commit made the assumption that only those boards that have a
> config.h should stay in board-y, but the Marvell EBU boards should also
> stay in board-y, or another solution needs to be found.
> 
> I've temporarily worked around the problem by re-adding:
> 
> +board-$(CONFIG_MACH_GLOBALSCALE_GURUPLUG)      += globalscale-guruplug
> 
> into arch/arm/Makefile.
> 
> Since I haven't yet grasped the entire philosophy of the Barebox build
> system, I'm not sure what the correct fix is.

The best fix for this would be to switch the mvebu boards over to
multiboard support. I already created an initial patch for the cubox,
but got distracted somewhere in between.

However, I think for now we should just partly revert 6bbb24cf8d0b0a06
for mvebu.

Sascha


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |