mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <dev@lynxeye.de>
To: barebox@lists.infradead.org
Subject: [PATCH 1/2] images: move board variable to parent makefile
Date: Fri,  6 Mar 2015 21:22:01 +0100	[thread overview]
Message-ID: <1425673322-31946-1-git-send-email-dev@lynxeye.de> (raw)

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>
---
 images/Makefile          | 2 ++
 images/Makefile.imx      | 2 --
 images/Makefile.mvebu    | 2 --
 images/Makefile.mxs      | 1 -
 images/Makefile.rockchip | 2 --
 images/Makefile.tegra    | 2 --
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/images/Makefile b/images/Makefile
index 7c3aaf7..2ed7464 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 eacc76e..cc9fdfc 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 5e90855..c3923e4 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 733f83b..c93fb57 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 2444433..9715b92 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 4f876e4..b5782ca 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
-- 
2.1.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2015-03-06 20:23 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-06 20:22 Lucas Stach [this message]
2015-03-06 20:22 ` [PATCH 2/2] images: fix Tegra out-of-tree build Lucas Stach
2015-03-09 10:53 ` [PATCH 1/2] images: move board variable to parent makefile Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1425673322-31946-1-git-send-email-dev@lynxeye.de \
    --to=dev@lynxeye.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox