From: Roland Hieber <rhi@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Roland Hieber <rhi@pengutronix.de>
Subject: [DistroKit] [PATCH v2 4/9] v7a: bareboxes: use shared settings from the barebox-common package
Date: Wed, 5 Jun 2019 20:52:08 +0200 [thread overview]
Message-ID: <20190605185213.26698-4-rhi@pengutronix.de> (raw)
In-Reply-To: <20190605185213.26698-1-rhi@pengutronix.de>
As implemented in the previous commit, the barebox version and MD5
can be reduced to one entry in the menu. Also do the same for the
host-lzop dependency, which will be needed for every barebox package
when using the common reference config. Be sure to depend on the new
barebox-common package so the barebox packages are rebuilt when the
version and MD5 variables change.
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
Notes:
Changes in v1 -> v2: none
configs/platform-v7a/platformconfig | 2 --
.../platform-v7a/platforms/barebox-am335x-mlo.in | 1 +
configs/platform-v7a/platforms/barebox-am335x.in | 14 +-------------
configs/platform-v7a/platforms/barebox-mx6.in | 1 +
configs/platform-v7a/platforms/barebox-rpi2.in | 14 +-------------
configs/platform-v7a/platforms/barebox-vexpress.in | 2 +-
configs/platform-v7a/rules/barebox-am335x-mlo.make | 4 ++--
configs/platform-v7a/rules/barebox-am335x.make | 4 ++--
configs/platform-v7a/rules/barebox-mx6.make | 4 ++--
configs/platform-v7a/rules/barebox-rpi2.make | 4 ++--
configs/platform-v7a/rules/barebox-vexpress.make | 4 ++--
11 files changed, 15 insertions(+), 39 deletions(-)
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index b655f77d39b3..349036e35f34 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -171,10 +171,8 @@ PTXCONF_BAREBOX_COMMON_MD5="0b6fd3f04cb3e26276ae3cc20eed1bd7"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
PTXCONF_BAREBOX_AM335X=y
-# PTXCONF_BAREBOX_AM335X_NEEDS_HOST_LZOP is not set
PTXCONF_BAREBOX_MX6=y
PTXCONF_BAREBOX_RPI2=y
-PTXCONF_BAREBOX_RPI2_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_VEXPRESS=y
PTXCONF_BAREBOX_ARCH_STRING="arm"
# PTXCONF_BAREBOX is not set
diff --git a/configs/platform-v7a/platforms/barebox-am335x-mlo.in b/configs/platform-v7a/platforms/barebox-am335x-mlo.in
index 0aabf56c16f3..cb0bc2d3dc5c 100644
--- a/configs/platform-v7a/platforms/barebox-am335x-mlo.in
+++ b/configs/platform-v7a/platforms/barebox-am335x-mlo.in
@@ -3,5 +3,6 @@
config BAREBOX_AM335X_MLO
tristate
prompt "Barebox (am335x-mlo)"
+ select BAREBOX_COMMON
help
FIXME
diff --git a/configs/platform-v7a/platforms/barebox-am335x.in b/configs/platform-v7a/platforms/barebox-am335x.in
index f2c3e071a18b..853dbb80d7a3 100644
--- a/configs/platform-v7a/platforms/barebox-am335x.in
+++ b/configs/platform-v7a/platforms/barebox-am335x.in
@@ -3,18 +3,6 @@
config BAREBOX_AM335X
tristate
prompt "Barebox (am335x)"
- select HOST_LZOP if BAREBOX_AM335X_NEEDS_HOST_LZOP
+ select BAREBOX_COMMON
help
Gute Fee support for barebox.
-
-if BAREBOX_AM335X
-
-config BAREBOX_AM335X_NEEDS_HOST_LZOP
- prompt "barebox am335x needs lzop"
- bool
- help
- The barebox am335x can be compressed. Select this if lzop
- is used in order to compile lzop for your development
- host.
-
-endif
diff --git a/configs/platform-v7a/platforms/barebox-mx6.in b/configs/platform-v7a/platforms/barebox-mx6.in
index 71e6a05513cd..6003b400cef3 100644
--- a/configs/platform-v7a/platforms/barebox-mx6.in
+++ b/configs/platform-v7a/platforms/barebox-mx6.in
@@ -3,5 +3,6 @@
config BAREBOX_MX6
tristate
prompt "Barebox (mx6)"
+ select BAREBOX_COMMON
help
Barebox image for i.MX6
diff --git a/configs/platform-v7a/platforms/barebox-rpi2.in b/configs/platform-v7a/platforms/barebox-rpi2.in
index c72762ce21eb..d62acd3a96f2 100644
--- a/configs/platform-v7a/platforms/barebox-rpi2.in
+++ b/configs/platform-v7a/platforms/barebox-rpi2.in
@@ -3,18 +3,6 @@
menuconfig BAREBOX_RPI2
tristate
prompt "Barebox (rpi2)"
- select HOST_LZOP if BAREBOX_RPI2_NEEDS_HOST_LZOP
+ select BAREBOX_COMMON
help
Raspberry Pi 2 support for barebox.
-
-if BAREBOX_RPI2
-
-config BAREBOX_RPI2_NEEDS_HOST_LZOP
- prompt "barebox rpi2 needs lzop"
- bool
- help
- The barebox rpi2 can be compressed. Select this if lzop
- is used in order to compile lzop for your development
- host.
-
-endif
diff --git a/configs/platform-v7a/platforms/barebox-vexpress.in b/configs/platform-v7a/platforms/barebox-vexpress.in
index dbb1f0bad8d7..2d3540b312f5 100644
--- a/configs/platform-v7a/platforms/barebox-vexpress.in
+++ b/configs/platform-v7a/platforms/barebox-vexpress.in
@@ -2,7 +2,7 @@
config BAREBOX_VEXPRESS
tristate
- select HOST_LZOP
prompt "Barebox (vexpress)"
+ select BAREBOX_COMMON
help
Vexpress support for barebox.
diff --git a/configs/platform-v7a/rules/barebox-am335x-mlo.make b/configs/platform-v7a/rules/barebox-am335x-mlo.make
index 6d88de83765f..2056fc99b913 100644
--- a/configs/platform-v7a/rules/barebox-am335x-mlo.make
+++ b/configs/platform-v7a/rules/barebox-am335x-mlo.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X_MLO) += barebox-am335x-mlo
#
# Paths and names
#
-BAREBOX_AM335X_MLO_VERSION := 2019.03.0
-BAREBOX_AM335X_MLO_MD5 := 0b6fd3f04cb3e26276ae3cc20eed1bd7
+BAREBOX_AM335X_MLO_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_AM335X_MLO_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
BAREBOX_AM335X_MLO := barebox-$(BAREBOX_AM335X_MLO_VERSION)
BAREBOX_AM335X_MLO_SUFFIX := tar.bz2
BAREBOX_AM335X_MLO_DIR := $(BUILDDIR)/barebox-am335x-mlo-$(BAREBOX_AM335X_MLO_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
index 223deb4c221a..fb86c3b4a42a 100644
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ b/configs/platform-v7a/rules/barebox-am335x.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AM335X) += barebox-am335x
#
# Paths and names
#
-BAREBOX_AM335X_VERSION := 2019.03.0
-BAREBOX_AM335X_MD5 := 0b6fd3f04cb3e26276ae3cc20eed1bd7
+BAREBOX_AM335X_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_AM335X_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
BAREBOX_AM335X := barebox-$(BAREBOX_AM335X_VERSION)
BAREBOX_AM335X_SUFFIX := tar.bz2
BAREBOX_AM335X_DIR := $(BUILDDIR)/barebox-am335x-$(BAREBOX_AM335X_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index f151e2f58072..04c771fada60 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MX6) += barebox-mx6
#
# Paths and names
#
-BAREBOX_MX6_VERSION := 2019.03.0
-BAREBOX_MX6_MD5 := 0b6fd3f04cb3e26276ae3cc20eed1bd7
+BAREBOX_MX6_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_MX6_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
BAREBOX_MX6 := barebox-$(BAREBOX_MX6_VERSION)
BAREBOX_MX6_SUFFIX := tar.bz2
BAREBOX_MX6_DIR := $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index e23556cf6cf5..fb05123500f7 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_RPI2) += barebox-rpi2
#
# Paths and names
#
-BAREBOX_RPI2_VERSION := 2019.03.0
-BAREBOX_RPI2_MD5 := 0b6fd3f04cb3e26276ae3cc20eed1bd7
+BAREBOX_RPI2_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_RPI2_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
BAREBOX_RPI2 := barebox-$(BAREBOX_RPI2_VERSION)
BAREBOX_RPI2_SUFFIX := tar.bz2
BAREBOX_RPI2_DIR := $(BUILDDIR)/barebox-rpi2-$(BAREBOX_RPI2_VERSION)
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index dc3e430b3f07..76063982c628 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_BAREBOX_VEXPRESS) += barebox-vexpress
#
# Paths and names
#
-BAREBOX_VEXPRESS_VERSION := 2019.03.0
-BAREBOX_VEXPRESS_MD5 := 0b6fd3f04cb3e26276ae3cc20eed1bd7
+BAREBOX_VEXPRESS_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION))
+BAREBOX_VEXPRESS_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5))
BAREBOX_VEXPRESS := barebox-$(BAREBOX_VEXPRESS_VERSION)
BAREBOX_VEXPRESS_SUFFIX := tar.bz2
BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION)
--
2.20.1
_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de
next prev parent reply other threads:[~2019-06-05 18:52 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-05 18:52 [DistroKit] [PATCH v2 1/9] v7a: remove unused barebox_mlo menu entry Roland Hieber
2019-06-05 18:52 ` [DistroKit] [PATCH v2 2/9] pre/barebox: barebox-url: only use <PKG>_VERSION to build the URL Roland Hieber
2019-06-05 21:46 ` Robert Schwebel
2019-06-05 18:52 ` [DistroKit] [PATCH v2 3/9] v7a: barebox-common: add a common reference config for all barebox variants Roland Hieber
2019-06-05 19:05 ` [DistroKit] [PATCH v2] fixup! " Roland Hieber
2019-06-05 21:47 ` Robert Schwebel
2019-06-05 18:52 ` Roland Hieber [this message]
2019-06-05 21:47 ` [DistroKit] [PATCH v2 4/9] v7a: bareboxes: use shared settings from the barebox-common package Robert Schwebel
2019-06-05 18:52 ` [DistroKit] [PATCH v2 5/9] v7a: bareboxes: use config diffs with the common reference config Roland Hieber
2019-06-05 21:48 ` Robert Schwebel
2019-06-05 18:52 ` [DistroKit] [PATCH v2 6/9] v7a: barebox-am335x: slim down config diff Roland Hieber
2019-06-05 21:48 ` Robert Schwebel
2019-06-05 18:52 ` [DistroKit] [PATCH v2 7/9] v7a: barebox-mx6: " Roland Hieber
2019-06-05 21:48 ` Robert Schwebel
2019-06-05 18:52 ` [DistroKit] [PATCH v2 8/9] v7a: barebox-rpi2: " Roland Hieber
2019-06-05 21:49 ` Robert Schwebel
2019-06-05 18:52 ` [DistroKit] [PATCH v2 9/9] v7a: barebox-vexpress: " Roland Hieber
2019-06-05 21:49 ` Robert Schwebel
2019-06-05 21:46 ` [DistroKit] [PATCH v2 1/9] v7a: remove unused barebox_mlo menu entry Robert Schwebel
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=20190605185213.26698-4-rhi@pengutronix.de \
--to=rhi@pengutronix.de \
--cc=distrokit@pengutronix.de \
/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