From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: distrokit@pengutronix.de
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [DistroKit] [PATCH 2/3] v7a: barebox: rename barebox.config to barebox-common.config
Date: Mon, 14 Apr 2025 12:28:49 +0200 [thread overview]
Message-ID: <20250414102850.3164387-2-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20250414102850.3164387-1-a.fatoum@pengutronix.de>
As first step towards replacing our various barebox rules with a
single rule and single multi-image build, rename the old barebox.config
to barebox-common.config, so the new unified config can be called
barebox.config instead.
No functional change.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
configs/platform-v7a/{barebox.config => barebox-common.config} | 0
configs/platform-v7a/rules/barebox-at91.make | 2 +-
configs/platform-v7a/rules/barebox-common.make | 2 +-
configs/platform-v7a/rules/barebox-mx6.make | 2 +-
configs/platform-v7a/rules/barebox-rpi2.make | 2 +-
configs/platform-v7a/rules/barebox-stm32mp.make | 2 +-
configs/platform-v7a/rules/barebox-vexpress.make | 2 +-
configs/platform-v7a_noneon/rules/barebox-at91.make | 2 +-
configs/platform-v7a_noneon/rules/barebox-common.make | 2 +-
configs/platform-v7a_noneon/rules/barebox-vexpress.make | 2 +-
10 files changed, 9 insertions(+), 9 deletions(-)
rename configs/platform-v7a/{barebox.config => barebox-common.config} (100%)
diff --git a/configs/platform-v7a/barebox.config b/configs/platform-v7a/barebox-common.config
similarity index 100%
rename from configs/platform-v7a/barebox.config
rename to configs/platform-v7a/barebox-common.config
diff --git a/configs/platform-v7a/rules/barebox-at91.make b/configs/platform-v7a/rules/barebox-at91.make
index fe426e400bed..2e03e4ae05ee 100644
--- a/configs/platform-v7a/rules/barebox-at91.make
+++ b/configs/platform-v7a/rules/barebox-at91.make
@@ -24,7 +24,7 @@ BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91_PATCHES).$(BAREBOX_AT91_SUFFIX)
BAREBOX_AT91_DIR := $(BUILDDIR)/$(BAREBOX_AT91)
BAREBOX_AT91_BUILD_DIR := $(BAREBOX_AT91_DIR)-build
BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config)
-BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
BAREBOX_AT91_LICENSE := GPL-2.0-only
BAREBOX_AT91_BUILD_OOT := KEEP
diff --git a/configs/platform-v7a/rules/barebox-common.make b/configs/platform-v7a/rules/barebox-common.make
index 4411dbebd35f..652255f60eaa 100644
--- a/configs/platform-v7a/rules/barebox-common.make
+++ b/configs/platform-v7a/rules/barebox-common.make
@@ -23,7 +23,7 @@ BAREBOX_COMMON_PATCHES := barebox-$(BAREBOX_COMMON_VERSION)
BAREBOX_COMMON_SOURCE := $(SRCDIR)/$(BAREBOX_COMMON_PATCHES).$(BAREBOX_COMMON_SUFFIX)
BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
BAREBOX_COMMON_BUILD_DIR := $(BAREBOX_COMMON_DIR)-build
-BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
BAREBOX_COMMON_LICENSE := GPL-2.0-only
BAREBOX_COMMON_BUILD_OOT := KEEP
diff --git a/configs/platform-v7a/rules/barebox-mx6.make b/configs/platform-v7a/rules/barebox-mx6.make
index 338134a43724..a168117f8f3b 100644
--- a/configs/platform-v7a/rules/barebox-mx6.make
+++ b/configs/platform-v7a/rules/barebox-mx6.make
@@ -24,7 +24,7 @@ BAREBOX_MX6_SOURCE := $(SRCDIR)/$(BAREBOX_MX6_PATCHES).$(BAREBOX_MX6_SUFFIX)
BAREBOX_MX6_DIR := $(BUILDDIR)/$(BAREBOX_MX6)
BAREBOX_MX6_BUILD_DIR := $(BAREBOX_MX6_DIR)-build
BAREBOX_MX6_CONFIG := $(call ptx/in-platformconfigdir, barebox-mx6.config)
-BAREBOX_MX6_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_MX6_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
BAREBOX_MX6_LICENSE := GPL-2.0-only
BAREBOX_MX6_BUILD_OOT := KEEP
diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make
index ea2f18fb9702..ffb32d5a3609 100644
--- a/configs/platform-v7a/rules/barebox-rpi2.make
+++ b/configs/platform-v7a/rules/barebox-rpi2.make
@@ -24,7 +24,7 @@ BAREBOX_RPI2_SOURCE := $(SRCDIR)/$(BAREBOX_RPI2_PATCHES).$(BAREBOX_RPI2_SUFFIX)
BAREBOX_RPI2_DIR := $(BUILDDIR)/$(BAREBOX_RPI2)
BAREBOX_RPI2_BUILD_DIR := $(BAREBOX_RPI2_DIR)-build
BAREBOX_RPI2_CONFIG := $(call ptx/in-platformconfigdir, barebox-rpi2.config)
-BAREBOX_RPI2_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_RPI2_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
BAREBOX_RPI2_LICENSE := GPL-2.0-only
BAREBOX_RPI2_BUILD_OOT := KEEP
diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make
index 525886252a24..c2ee11957240 100644
--- a/configs/platform-v7a/rules/barebox-stm32mp.make
+++ b/configs/platform-v7a/rules/barebox-stm32mp.make
@@ -24,7 +24,7 @@ BAREBOX_STM32MP_SOURCE := $(SRCDIR)/$(BAREBOX_STM32MP_PATCHES).$(BAREBOX_STM32M
BAREBOX_STM32MP_DIR := $(BUILDDIR)/$(BAREBOX_STM32MP)
BAREBOX_STM32MP_BUILD_DIR := $(BAREBOX_STM32MP_DIR)-build
BAREBOX_STM32MP_CONFIG := $(call ptx/in-platformconfigdir, barebox-stm32mp.config)
-BAREBOX_STM32MP_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_STM32MP_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
BAREBOX_STM32MP_LICENSE := GPL-2.0
BAREBOX_STM32MP_BUILD_OOT := KEEP
diff --git a/configs/platform-v7a/rules/barebox-vexpress.make b/configs/platform-v7a/rules/barebox-vexpress.make
index fe16cc5ebcf7..1e3a38250256 100644
--- a/configs/platform-v7a/rules/barebox-vexpress.make
+++ b/configs/platform-v7a/rules/barebox-vexpress.make
@@ -24,7 +24,7 @@ BAREBOX_VEXPRESS_SOURCE := $(SRCDIR)/$(BAREBOX_VEXPRESS_PATCHES).$(BAREBOX_VEXP
BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/$(BAREBOX_VEXPRESS)
BAREBOX_VEXPRESS_BUILD_DIR := $(BAREBOX_VEXPRESS_DIR)-build
BAREBOX_VEXPRESS_CONFIG := $(call ptx/in-platformconfigdir, barebox-vexpress.config)
-BAREBOX_VEXPRESS_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_VEXPRESS_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
BAREBOX_VEXPRESS_LICENSE := GPL-2.0-only
BAREBOX_VEXPRESS_BUILD_OOT := KEEP
diff --git a/configs/platform-v7a_noneon/rules/barebox-at91.make b/configs/platform-v7a_noneon/rules/barebox-at91.make
index d9576aaf84e0..99222055a9c3 100644
--- a/configs/platform-v7a_noneon/rules/barebox-at91.make
+++ b/configs/platform-v7a_noneon/rules/barebox-at91.make
@@ -24,7 +24,7 @@ BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91_PATCHES).$(BAREBOX_AT91_SUFFIX)
BAREBOX_AT91_DIR := $(BUILDDIR)/$(BAREBOX_AT91)
BAREBOX_AT91_BUILD_DIR := $(BAREBOX_AT91_DIR)-build
BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config)
-BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
BAREBOX_AT91_LICENSE := GPL-2.0-only
BAREBOX_AT91_BUILD_OOT := KEEP
diff --git a/configs/platform-v7a_noneon/rules/barebox-common.make b/configs/platform-v7a_noneon/rules/barebox-common.make
index 4411dbebd35f..652255f60eaa 100644
--- a/configs/platform-v7a_noneon/rules/barebox-common.make
+++ b/configs/platform-v7a_noneon/rules/barebox-common.make
@@ -23,7 +23,7 @@ BAREBOX_COMMON_PATCHES := barebox-$(BAREBOX_COMMON_VERSION)
BAREBOX_COMMON_SOURCE := $(SRCDIR)/$(BAREBOX_COMMON_PATCHES).$(BAREBOX_COMMON_SUFFIX)
BAREBOX_COMMON_DIR := $(BUILDDIR)/$(BAREBOX_COMMON)
BAREBOX_COMMON_BUILD_DIR := $(BAREBOX_COMMON_DIR)-build
-BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_COMMON_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
BAREBOX_COMMON_LICENSE := GPL-2.0-only
BAREBOX_COMMON_BUILD_OOT := KEEP
diff --git a/configs/platform-v7a_noneon/rules/barebox-vexpress.make b/configs/platform-v7a_noneon/rules/barebox-vexpress.make
index fe16cc5ebcf7..1e3a38250256 100644
--- a/configs/platform-v7a_noneon/rules/barebox-vexpress.make
+++ b/configs/platform-v7a_noneon/rules/barebox-vexpress.make
@@ -24,7 +24,7 @@ BAREBOX_VEXPRESS_SOURCE := $(SRCDIR)/$(BAREBOX_VEXPRESS_PATCHES).$(BAREBOX_VEXP
BAREBOX_VEXPRESS_DIR := $(BUILDDIR)/$(BAREBOX_VEXPRESS)
BAREBOX_VEXPRESS_BUILD_DIR := $(BAREBOX_VEXPRESS_DIR)-build
BAREBOX_VEXPRESS_CONFIG := $(call ptx/in-platformconfigdir, barebox-vexpress.config)
-BAREBOX_VEXPRESS_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config)
+BAREBOX_VEXPRESS_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox-common.config)
BAREBOX_VEXPRESS_LICENSE := GPL-2.0-only
BAREBOX_VEXPRESS_BUILD_OOT := KEEP
--
2.39.5
next prev parent reply other threads:[~2025-04-14 10:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-04-14 10:28 [DistroKit] [PATCH 1/3] v7a: barebox: defaultenv: delete no-op init scripts Ahmad Fatoum
2025-04-14 10:28 ` Ahmad Fatoum [this message]
2025-04-14 10:28 ` [DistroKit] [PATCH 3/3] v7a: barebox: am335x: switch to using upstream rule Ahmad Fatoum
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=20250414102850.3164387-2-a.fatoum@pengutronix.de \
--to=a.fatoum@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