diff options
-rw-r--r-- | configs/platform-v7a/platformconfig | 2 | ||||
-rw-r--r-- | configs/platform-v7a/platforms/barebox-am335x-mlo.in | 1 | ||||
-rw-r--r-- | configs/platform-v7a/platforms/barebox-am335x.in | 14 | ||||
-rw-r--r-- | configs/platform-v7a/platforms/barebox-mx6.in | 1 | ||||
-rw-r--r-- | configs/platform-v7a/platforms/barebox-rpi2.in | 14 | ||||
-rw-r--r-- | configs/platform-v7a/platforms/barebox-vexpress.in | 2 | ||||
-rw-r--r-- | configs/platform-v7a/rules/barebox-am335x-mlo.make | 4 | ||||
-rw-r--r-- | configs/platform-v7a/rules/barebox-am335x.make | 4 | ||||
-rw-r--r-- | configs/platform-v7a/rules/barebox-mx6.make | 4 | ||||
-rw-r--r-- | configs/platform-v7a/rules/barebox-rpi2.make | 4 | ||||
-rw-r--r-- | 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 b655f77..349036e 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 0aabf56..cb0bc2d 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 f2c3e07..853dbb8 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 71e6a05..6003b40 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 c72762c..d62acd3 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 dbb1f0b..2d3540b 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 6d88de8..2056fc9 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 223deb4..fb86c3b 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 f151e2f..04c771f 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 e23556c..fb05123 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 dc3e430..7606398 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) |