From 984c1617231700da634c8e8aee59fc9966adb1ca Mon Sep 17 00:00:00 2001 From: Roland Hieber Date: Wed, 5 Jun 2019 20:52:09 +0200 Subject: v7a: bareboxes: use config diffs with the common reference config Make it easier to maintain a common set of features and also review the device-specific changes between all the barebox variants by using the config diff mechanism which has been available since PTXdist 2019.01.0. No barebox config was harmed in the making of this patch, only their difference to the common reference config was computed. Also add a helper script to regenerate the config diffs after the common config was changed. Signed-off-by: Roland Hieber --- configs/platform-v7a/rules/barebox-am335x.make | 1 + configs/platform-v7a/rules/barebox-mx6.make | 1 + configs/platform-v7a/rules/barebox-rpi2.make | 1 + configs/platform-v7a/rules/barebox-vexpress.make | 1 + 4 files changed, 4 insertions(+) (limited to 'configs/platform-v7a/rules') diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make index fb86c3b..0b9d458 100644 --- a/configs/platform-v7a/rules/barebox-am335x.make +++ b/configs/platform-v7a/rules/barebox-am335x.make @@ -22,6 +22,7 @@ BAREBOX_AM335X := barebox-$(BAREBOX_AM335X_VERSION) BAREBOX_AM335X_SUFFIX := tar.bz2 BAREBOX_AM335X_DIR := $(BUILDDIR)/barebox-am335x-$(BAREBOX_AM335X_VERSION) BAREBOX_AM335X_CONFIG := $(call ptx/in-platformconfigdir, barebox-am335x.config) +BAREBOX_AM335X_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) BAREBOX_AM335X_LICENSE := GPL-2.0 BAREBOX_AM335X_URL := $(call barebox-url, BAREBOX_AM335X) BAREBOX_AM335X_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X).$(BAREBOX_AM335X_SUFFIX) diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make index 04c771f..69d8236 100644 --- a/configs/platform-v7a/rules/barebox-mx6.make +++ b/configs/platform-v7a/rules/barebox-mx6.make @@ -22,6 +22,7 @@ BAREBOX_MX6 := barebox-$(BAREBOX_MX6_VERSION) BAREBOX_MX6_SUFFIX := tar.bz2 BAREBOX_MX6_DIR := $(BUILDDIR)/barebox-mx6-$(BAREBOX_MX6_VERSION) BAREBOX_MX6_CONFIG := $(call ptx/in-platformconfigdir, barebox-mx6.config) +BAREBOX_MX6_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) BAREBOX_MX6_LICENSE := GPL-2.0 BAREBOX_MX6_URL := $(call barebox-url, BAREBOX_MX6) BAREBOX_MX6_SOURCE := $(SRCDIR)/$(BAREBOX_MX6).$(BAREBOX_MX6_SUFFIX) diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make index fb05123..97b6687 100644 --- a/configs/platform-v7a/rules/barebox-rpi2.make +++ b/configs/platform-v7a/rules/barebox-rpi2.make @@ -22,6 +22,7 @@ BAREBOX_RPI2 := barebox-$(BAREBOX_RPI2_VERSION) BAREBOX_RPI2_SUFFIX := tar.bz2 BAREBOX_RPI2_DIR := $(BUILDDIR)/barebox-rpi2-$(BAREBOX_RPI2_VERSION) BAREBOX_RPI2_CONFIG := $(call ptx/in-platformconfigdir, barebox-rpi2.config) +BAREBOX_RPI2_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) BAREBOX_RPI2_LICENSE := GPL-2.0 BAREBOX_RPI2_URL := $(call barebox-url, BAREBOX_RPI2) BAREBOX_RPI2_SOURCE := $(SRCDIR)/$(BAREBOX_RPI2).$(BAREBOX_RPI2_SUFFIX) diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make index 7606398..cdf8cc1 100644 --- a/configs/platform-v7a/rules/barebox-vexpress.make +++ b/configs/platform-v7a/rules/barebox-vexpress.make @@ -22,6 +22,7 @@ BAREBOX_VEXPRESS := barebox-$(BAREBOX_VEXPRESS_VERSION) BAREBOX_VEXPRESS_SUFFIX := tar.bz2 BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/barebox-vexpress-$(BAREBOX_VEXPRESS_VERSION) BAREBOX_VEXPRESS_CONFIG := $(call ptx/in-platformconfigdir, barebox-vexpress.config) +BAREBOX_VEXPRESS_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) BAREBOX_VEXPRESS_LICENSE := GPL-2.0 BAREBOX_VEXPRESS_URL := $(call barebox-url, BAREBOX_VEXPRESS) BAREBOX_VEXPRESS_SOURCE := $(SRCDIR)/$(BAREBOX_VEXPRESS).$(BAREBOX_VEXPRESS_SUFFIX) -- cgit v1.2.3