images: move board variable to parent makefile
A lot of the image makefiles define an equal board variable, which gives the impression that this variable is unique for this makefile. As those files aren't freestanding makefiles but get included into a parent makefile this is not actually true. Attempts to override this variable will not work reliable as make is picking up a random instance. Fix this confusion by moving this variable out of the individual makefiles. Signed-off-by: Lucas Stach <dev@lynxeye.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
60a4277b3e
commit
2a2522eb8d
|
@ -97,6 +97,8 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F))
|
|||
$(Q)if [ -z $(FILE_$(@F)) ]; then echo "FILE_$(@F) empty!"; false; fi
|
||||
$(call if_changed,shipped)
|
||||
|
||||
board = $(srctree)/arch/$(ARCH)/boards
|
||||
|
||||
include $(srctree)/images/Makefile.am33xx
|
||||
include $(srctree)/images/Makefile.imx
|
||||
include $(srctree)/images/Makefile.mvebu
|
||||
|
|
|
@ -7,8 +7,6 @@
|
|||
$(obj)/%.imximg: $(obj)/% FORCE
|
||||
$(call if_changed,imx_image)
|
||||
|
||||
board = $(srctree)/arch/$(ARCH)/boards
|
||||
|
||||
# ----------------------- i.MX25 based boards ---------------------------
|
||||
pblx-$(CONFIG_MACH_TX25) += start_imx25_karo_tx25
|
||||
FILE_barebox-karo-tx25.img = start_imx25_karo_tx25.pblx
|
||||
|
|
|
@ -9,8 +9,6 @@ $(obj)/%.kwbimg: $(obj)/% FORCE
|
|||
$(obj)/%.kwbuartimg: $(obj)/% FORCE
|
||||
$(call if_changed,kwb_image)
|
||||
|
||||
board = $(srctree)/arch/$(ARCH)/boards
|
||||
|
||||
KWBOPTS = -c -d 0x1000000 -e 0x1000000
|
||||
|
||||
# ----------------------- Armada 370 based boards ---------------------------
|
||||
|
|
|
@ -18,7 +18,6 @@ quiet_cmd_mxs_sd = MXS-SD $@
|
|||
$(obj)/%.mxssd: $(obj)/%
|
||||
$(call if_changed,mxs_sd)
|
||||
|
||||
board = $(srctree)/arch/$(ARCH)/boards
|
||||
mxs23cfg = $(srctree)/arch/arm/mach-mxs/mxs23img.cfg
|
||||
mxs28cfg = $(srctree)/arch/arm/mach-mxs/mxs28img.cfg
|
||||
|
||||
|
|
|
@ -2,8 +2,6 @@
|
|||
# barebox image generation Makefile for Rockchip images
|
||||
#
|
||||
|
||||
board = $(srctree)/arch/$(ARCH)/boards
|
||||
|
||||
pblx-$(CONFIG_MACH_RADXA_ROCK) += start_radxa_rock
|
||||
FILE_barebox-radxa-rock.img = start_radxa_rock.pblx
|
||||
image-$(CONFIG_MACH_RADXA_ROCK) += barebox-radxa-rock.img
|
||||
|
|
|
@ -28,8 +28,6 @@ quiet_cmd_tegra124_image = T124IMG $@
|
|||
$(obj)/%.t124img: $(obj)/% FORCE
|
||||
$(call if_changed,tegra124_image)
|
||||
|
||||
board = $(srctree)/arch/$(ARCH)/boards
|
||||
|
||||
# ----------------------- Tegra20 based boards ---------------------------
|
||||
pblx-$(CONFIG_MACH_TOSHIBA_AC100) += start_toshiba_ac100
|
||||
FILE_barebox-tegra20-toshiba-ac100-usbloader.img = start_toshiba_ac100.pblx
|
||||
|
|
Loading…
Reference in New Issue