diff options
| author | Lucas Stach <dev@lynxeye.de> | 2015-03-06 21:22:01 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-03-09 11:52:58 +0100 |
| commit | 2a2522eb8d5b1d358e78f40888d96f34a00898c6 (patch) | |
| tree | c1aaade9b8cfff0f341d75d099f2ca486221a52f | |
| parent | 60a4277b3e1f6da921f0d84c262a22da02c50c58 (diff) | |
| download | barebox-2a2522eb8d5b1d358e78f40888d96f34a00898c6.tar.gz barebox-2a2522eb8d5b1d358e78f40888d96f34a00898c6.tar.xz | |
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>
| -rw-r--r-- | images/Makefile | 2 | ||||
| -rw-r--r-- | images/Makefile.imx | 2 | ||||
| -rw-r--r-- | images/Makefile.mvebu | 2 | ||||
| -rw-r--r-- | images/Makefile.mxs | 1 | ||||
| -rw-r--r-- | images/Makefile.rockchip | 2 | ||||
| -rw-r--r-- | images/Makefile.tegra | 2 |
6 files changed, 2 insertions, 9 deletions
diff --git a/images/Makefile b/images/Makefile index f7e978cde1..f40de7bc23 100644 --- a/images/Makefile +++ b/images/Makefile @@ -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 diff --git a/images/Makefile.imx b/images/Makefile.imx index eacc76eaa2..cc9fdfc78c 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx @@ -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 diff --git a/images/Makefile.mvebu b/images/Makefile.mvebu index 5e90855d2b..c3923e4ecc 100644 --- a/images/Makefile.mvebu +++ b/images/Makefile.mvebu @@ -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 --------------------------- diff --git a/images/Makefile.mxs b/images/Makefile.mxs index 733f83bd1f..c93fb571f2 100644 --- a/images/Makefile.mxs +++ b/images/Makefile.mxs @@ -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 diff --git a/images/Makefile.rockchip b/images/Makefile.rockchip index 2444433013..9715b92084 100644 --- a/images/Makefile.rockchip +++ b/images/Makefile.rockchip @@ -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 diff --git a/images/Makefile.tegra b/images/Makefile.tegra index 4f876e4b59..b5782ca8c2 100644 --- a/images/Makefile.tegra +++ b/images/Makefile.tegra @@ -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 |