* [DistroKit] [PATCH 1/3] v7a: barebox: defaultenv: delete no-op init scripts
@ 2025-04-14 10:28 Ahmad Fatoum
2025-04-14 10:28 ` [DistroKit] [PATCH 2/3] v7a: barebox: rename barebox.config to barebox-common.config Ahmad Fatoum
2025-04-14 10:28 ` [DistroKit] [PATCH 3/3] v7a: barebox: am335x: switch to using upstream rule Ahmad Fatoum
0 siblings, 2 replies; 3+ messages in thread
From: Ahmad Fatoum @ 2025-04-14 10:28 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
These scripts are all no-ops when nv.boot.default is set and that file
in indeed set in the built-in environment shipped with DistroKit.
They can thus be safely removed.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
.../barebox-am335x-defaultenv/init/bootsource | 11 -----------
.../barebox-mx6-defaultenv/init/bootsource | 13 -------------
.../barebox-rpi2-defaultenv/init/bootsource | 12 ------------
.../barebox-vexpress-defaultenv/init/bootsource | 7 -------
4 files changed, 43 deletions(-)
delete mode 100644 configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource
delete mode 100644 configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource
delete mode 100644 configs/platform-v7a/barebox-rpi2-defaultenv/init/bootsource
delete mode 100644 configs/platform-v7a/barebox-vexpress-defaultenv/init/bootsource
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource b/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource
deleted file mode 100644
index b3b73e790334..000000000000
--- a/configs/platform-v7a/barebox-am335x-defaultenv/init/bootsource
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [ -n "$nv.boot.default" ]; then
- exit
-fi
-
-if [ $bootsource = mmc ]; then
- global.boot.default="bootchooser net"
-else
- global.boot.default="net bootchooser"
-fi
diff --git a/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource b/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource
deleted file mode 100644
index 852cfd7d9611..000000000000
--- a/configs/platform-v7a/barebox-mx6-defaultenv/init/bootsource
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if [ -n "$nv.boot.default" ]; then
- exit
-fi
-
-if [ $bootsource = mmc ]; then
- detect mmc$bootsource_instance
- global.boot.default="bootchooser net"
-else
- global.boot.default="net bootchooser"
-fi
-
diff --git a/configs/platform-v7a/barebox-rpi2-defaultenv/init/bootsource b/configs/platform-v7a/barebox-rpi2-defaultenv/init/bootsource
deleted file mode 100644
index 50f505f6266b..000000000000
--- a/configs/platform-v7a/barebox-rpi2-defaultenv/init/bootsource
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ -n "$nv.boot.default" ]; then
- exit
-fi
-
-if [ $bootsource = mmc ]; then
- global.boot.default="bootchooser net"
-else
- global.boot.default="net bootchooser"
-fi
-
diff --git a/configs/platform-v7a/barebox-vexpress-defaultenv/init/bootsource b/configs/platform-v7a/barebox-vexpress-defaultenv/init/bootsource
deleted file mode 100644
index 4432e021fb0f..000000000000
--- a/configs/platform-v7a/barebox-vexpress-defaultenv/init/bootsource
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-if [ -n "$nv.boot.default" ]; then
- exit
-fi
-
-global.boot.default="bootchooser net"
--
2.39.5
^ permalink raw reply [flat|nested] 3+ messages in thread
* [DistroKit] [PATCH 2/3] v7a: barebox: rename barebox.config to barebox-common.config
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
2025-04-14 10:28 ` [DistroKit] [PATCH 3/3] v7a: barebox: am335x: switch to using upstream rule Ahmad Fatoum
1 sibling, 0 replies; 3+ messages in thread
From: Ahmad Fatoum @ 2025-04-14 10:28 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* [DistroKit] [PATCH 3/3] v7a: barebox: am335x: switch to using upstream rule
2025-04-14 10:28 [DistroKit] [PATCH 1/3] v7a: barebox: defaultenv: delete no-op init scripts Ahmad Fatoum
2025-04-14 10:28 ` [DistroKit] [PATCH 2/3] v7a: barebox: rename barebox.config to barebox-common.config Ahmad Fatoum
@ 2025-04-14 10:28 ` Ahmad Fatoum
1 sibling, 0 replies; 3+ messages in thread
From: Ahmad Fatoum @ 2025-04-14 10:28 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
barebox' CONFIG_ARM_MULTIARCH (really, multi-platform) support allows
generating images for a wide number of targets from the same build and
the same config.
We already make use of it in platform-v8a to target both Rockchip and
i.MX8M at the same time and making use of it for platform-v7a would
simplify matters too.
As first step towards that goal, switch over barebox-am335x.
More can follow in future.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
configs/bsp.ref | 4 +-
.../platform-v7a/barebox-am335x.config.diff | 113 ------------------
.../init/usb-limit-1300 | 4 +
.../nv/boot.default | 0
.../nv/bootchooser.state_prefix | 0
.../nv/bootchooser.system0.boot | 0
.../nv/bootchooser.system1.boot | 0
.../nv/bootchooser.targets | 0
.../nv/dev.mmc0.broken_cd | 0
.../nv/linux.bootargs.loglevel | 0
.../{barebox-am335x.config => barebox.config} | 0
configs/platform-v7a/platformconfig | 28 ++++-
.../platform-v7a/platforms/barebox-am335x.in | 8 --
.../platforms/image-beaglebone.in | 2 +-
configs/platform-v7a/platforms/image-gf.in | 1 -
.../platform-v7a/rules/barebox-am335x.make | 108 -----------------
16 files changed, 33 insertions(+), 235 deletions(-)
delete mode 100644 configs/platform-v7a/barebox-am335x.config.diff
rename configs/platform-v7a/{barebox-am335x-defaultenv => barebox-defaultenv}/init/usb-limit-1300 (69%)
rename configs/platform-v7a/{barebox-am335x-defaultenv => barebox-defaultenv}/nv/boot.default (100%)
rename configs/platform-v7a/{barebox-am335x-defaultenv => barebox-defaultenv}/nv/bootchooser.state_prefix (100%)
rename configs/platform-v7a/{barebox-am335x-defaultenv => barebox-defaultenv}/nv/bootchooser.system0.boot (100%)
rename configs/platform-v7a/{barebox-am335x-defaultenv => barebox-defaultenv}/nv/bootchooser.system1.boot (100%)
rename configs/platform-v7a/{barebox-am335x-defaultenv => barebox-defaultenv}/nv/bootchooser.targets (100%)
rename configs/platform-v7a/{barebox-am335x-defaultenv => barebox-defaultenv}/nv/dev.mmc0.broken_cd (100%)
rename configs/platform-v7a/{barebox-am335x-defaultenv => barebox-defaultenv}/nv/linux.bootargs.loglevel (100%)
rename configs/platform-v7a/{barebox-am335x.config => barebox.config} (100%)
delete mode 100644 configs/platform-v7a/platforms/barebox-am335x.in
delete mode 100644 configs/platform-v7a/rules/barebox-am335x.make
diff --git a/configs/bsp.ref b/configs/bsp.ref
index e33f0e41c2d5..7138cbccc0aa 100644
--- a/configs/bsp.ref
+++ b/configs/bsp.ref
@@ -60,8 +60,8 @@ barebox_gpt_support:
first vfat partition. As the MLO
As the am335x-mlo configuration's only function is to chainload
- barebox, we only need GPT support later on in the second stage
- barebox-am335x configuration.
+ barebox, we only need GPT support later on in the regular second stage
+ barebox configuration.
variants:
- condition: |
kconfig.have_barebox_config() and
diff --git a/configs/platform-v7a/barebox-am335x.config.diff b/configs/platform-v7a/barebox-am335x.config.diff
deleted file mode 100644
index 030c822a5058..000000000000
--- a/configs/platform-v7a/barebox-am335x.config.diff
+++ /dev/null
@@ -1,113 +0,0 @@
-b84e018f387ca177ad90f1972d178d88
-# CONFIG_AM33XX_NET_BOOT is not set
-CONFIG_ARCH_AM33XX=y
-# CONFIG_ARCH_BCM283X is not set
-CONFIG_ARCH_OMAP=y
-CONFIG_ARCH_OMAP_MULTI=y
-CONFIG_ARM_BOARD_APPEND_ATAG=y
-# CONFIG_ARM_BOARD_PREPEND_ATAG is not set
-# CONFIG_ARM_SECURE_MONITOR is undefined
-# CONFIG_ARM_SMCCC is undefined
-# CONFIG_BAREBOX_UPDATE_AM33XX_EMMC is not set
-# CONFIG_BAREBOX_UPDATE_AM33XX_NAND is not set
-CONFIG_BAREBOX_UPDATE_AM33XX_SPI_NOR_MLO=y
-CONFIG_BOOTM_OFTREE_UIMAGE=y
-CONFIG_BUS_OMAP_GPMC=y
-# CONFIG_CLKDEV_LOOKUP is undefined
-# CONFIG_CLOCKSOURCE_BCM283X is undefined
-CONFIG_CLOCKSOURCE_TI_DM=y
-# CONFIG_CMD_CLK is undefined
-# CONFIG_CMD_KEYSTORE is not set
-CONFIG_CMD_NAND=y
-# CONFIG_CMD_NANDTEST is not set
-# CONFIG_CMD_NAND_BITFLIP is not set
-# CONFIG_CMD_NVMEM is not set
-# CONFIG_CMD_SMC is undefined
-# CONFIG_COMMON_CLK is not set
-# CONFIG_COMMON_CLK_GPIO is undefined
-# CONFIG_COMMON_CLK_OF_PROVIDER is undefined
-CONFIG_CRYPTO_KEYSTORE=y
-CONFIG_DEBUG_OMAP_UART_PORT=1
-CONFIG_DIGEST_HMAC_GENERIC=y
-CONFIG_DRIVER_NET_CPSW=y
-CONFIG_DRIVER_NET_TI_DAVINCI_MDIO=y
-CONFIG_DRIVER_SERIAL_NS16550=y
-# CONFIG_DRIVER_SERIAL_NS16550_OMAP_TTYS is not set
-# CONFIG_DRIVER_SPI_FSL_QUADSPI is not set
-CONFIG_DRIVER_SPI_OMAP3=y
-# CONFIG_EEPROM_93XX46 is not set
-CONFIG_EEPROM_AT24=y
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_GENERIC_PLATFORM=y
-CONFIG_GPIO_OMAP=y
-# CONFIG_GPIO_RASPBERRYPI_EXP is undefined
-# CONFIG_GREGORIAN_CALENDER is undefined
-# CONFIG_HAVE_CLK is undefined
-CONFIG_HAVE_DIGEST_HMAC=y
-# CONFIG_HW_RANDOM_BCM2835 is undefined
-# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined
-# CONFIG_HW_RANDOM_OMAP is not set
-# CONFIG_I2C_BCM283X is undefined
-# CONFIG_I2C_MV64XXX is undefined
-CONFIG_I2C_OMAP=y
-CONFIG_MACH_AFI_GF=y
-# CONFIG_MACH_BEAGLE is not set
-CONFIG_MACH_BEAGLEBONE=y
-# CONFIG_MACH_MYIRTECH_X335X is not set
-# CONFIG_MACH_PHYTEC_SOM_AM335X is not set
-# CONFIG_MACH_RPI2 is undefined
-# CONFIG_MACH_RPI3 is undefined
-# CONFIG_MACH_RPI4 is undefined
-# CONFIG_MACH_RPI is undefined
-# CONFIG_MACH_RPI_AARCH_32_64 is undefined
-# CONFIG_MACH_RPI_CM3 is undefined
-# CONFIG_MACH_RPI_COMMON is undefined
-# CONFIG_MACH_VSCOM_BALTOS is not set
-# CONFIG_MACH_WAGO_PFC_AM35XX is not set
-# CONFIG_MCI_BCM283X is undefined
-# CONFIG_MCI_BCM283X_SDHOST is undefined
-# CONFIG_MCI_MMCI is not set
-CONFIG_MCI_OMAP_HSMMC=y
-CONFIG_MTD_M25P80=y
-CONFIG_MTD_NAND_CORE=y
-# CONFIG_MTD_NAND_DENALI is not set
-CONFIG_MTD_NAND_ECC=y
-# CONFIG_MTD_NAND_ECC_SOFT is not set
-# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
-# CONFIG_MTD_NAND_OMAP_ELM is not set
-CONFIG_MTD_RAW_NAND=y
-CONFIG_MTD_SPI_NOR=y
-# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
-CONFIG_NAND=y
-# CONFIG_NAND_ALLOW_ERASE_BAD is not set
-CONFIG_NAND_ECC_HW_SYNDROME=y
-CONFIG_NAND_OMAP_GPMC=y
-CONFIG_NVMEM=y
-# CONFIG_NVMEM_REBOOT_MODE is not set
-# CONFIG_NVMEM_RMEM is not set
-# CONFIG_NVMEM_SNVS_LPGPR is not set
-# CONFIG_OMAP_BUILD_IFT is not set
-# CONFIG_OMAP_BUILD_SPI is not set
-CONFIG_OMAP_GPMC=y
-CONFIG_OMAP_IMAGE=y
-# CONFIG_PBL_OPTEE is undefined
-# CONFIG_PINCTRL_BCM283X is undefined
-CONFIG_PINCTRL_SINGLE=y
-CONFIG_PROMPT="barebox> "
-# CONFIG_REGULATOR_BCM283X is undefined
-CONFIG_REGULATOR_FIXED=y
-# CONFIG_SPI_BCM2835 is undefined
-# CONFIG_SPI_CADENCE_QUADSPI is not set
-CONFIG_SPI_MEM=y
-# CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set
-CONFIG_THUMB2_BAREBOX=y
-# CONFIG_TIMESTAMP is not set
-CONFIG_TI_SYSC=y
-CONFIG_USB_MUSB=y
-CONFIG_USB_MUSB_AM335X=y
-CONFIG_USB_MUSB_DSPS=y
-CONFIG_USB_MUSB_GADGET=y
-CONFIG_USB_MUSB_HOST=y
-CONFIG_USB_OTGDEV=y
-# CONFIG_WATCHDOG_BCM2835 is undefined
-CONFIG_WATCHDOG_OMAP=y
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/init/usb-limit-1300 b/configs/platform-v7a/barebox-defaultenv/init/usb-limit-1300
similarity index 69%
rename from configs/platform-v7a/barebox-am335x-defaultenv/init/usb-limit-1300
rename to configs/platform-v7a/barebox-defaultenv/init/usb-limit-1300
index 56313bfdfb5e..9801dd56c7e6 100644
--- a/configs/platform-v7a/barebox-am335x-defaultenv/init/usb-limit-1300
+++ b/configs/platform-v7a/barebox-defaultenv/init/usb-limit-1300
@@ -1,5 +1,9 @@
#!/bin/sh
+if ! of_compatible -k ti,am33xx; then
+ exit
+fi
+
echo -n "changing USB current limit to 1300 mA... "
i2c_write -b 0 -a 0x24 -r 0x01 0x3e
echo "done"
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/boot.default b/configs/platform-v7a/barebox-defaultenv/nv/boot.default
similarity index 100%
rename from configs/platform-v7a/barebox-am335x-defaultenv/nv/boot.default
rename to configs/platform-v7a/barebox-defaultenv/nv/boot.default
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootchooser.state_prefix b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.state_prefix
similarity index 100%
rename from configs/platform-v7a/barebox-am335x-defaultenv/nv/bootchooser.state_prefix
rename to configs/platform-v7a/barebox-defaultenv/nv/bootchooser.state_prefix
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootchooser.system0.boot b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot
similarity index 100%
rename from configs/platform-v7a/barebox-am335x-defaultenv/nv/bootchooser.system0.boot
rename to configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system0.boot
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootchooser.system1.boot b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot
similarity index 100%
rename from configs/platform-v7a/barebox-am335x-defaultenv/nv/bootchooser.system1.boot
rename to configs/platform-v7a/barebox-defaultenv/nv/bootchooser.system1.boot
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/bootchooser.targets b/configs/platform-v7a/barebox-defaultenv/nv/bootchooser.targets
similarity index 100%
rename from configs/platform-v7a/barebox-am335x-defaultenv/nv/bootchooser.targets
rename to configs/platform-v7a/barebox-defaultenv/nv/bootchooser.targets
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/dev.mmc0.broken_cd b/configs/platform-v7a/barebox-defaultenv/nv/dev.mmc0.broken_cd
similarity index 100%
rename from configs/platform-v7a/barebox-am335x-defaultenv/nv/dev.mmc0.broken_cd
rename to configs/platform-v7a/barebox-defaultenv/nv/dev.mmc0.broken_cd
diff --git a/configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.loglevel b/configs/platform-v7a/barebox-defaultenv/nv/linux.bootargs.loglevel
similarity index 100%
rename from configs/platform-v7a/barebox-am335x-defaultenv/nv/linux.bootargs.loglevel
rename to configs/platform-v7a/barebox-defaultenv/nv/linux.bootargs.loglevel
diff --git a/configs/platform-v7a/barebox-am335x.config b/configs/platform-v7a/barebox.config
similarity index 100%
rename from configs/platform-v7a/barebox-am335x.config
rename to configs/platform-v7a/barebox.config
diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 0ed935d55c04..b62ba1592ff1 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -189,14 +189,37 @@ PTXCONF_BAREBOX_COMMON_VERSION="2025.03.0"
PTXCONF_BAREBOX_COMMON_MD5="2b84bcf8644373db021c86864f2e5761"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AM335X_MLO=y
-PTXCONF_BAREBOX_AM335X=y
PTXCONF_BAREBOX_AT91=y
PTXCONF_BAREBOX_MX6=y
PTXCONF_BAREBOX_RPI2=y
PTXCONF_BAREBOX_STM32MP=y
PTXCONF_BAREBOX_VEXPRESS=y
PTXCONF_BAREBOX_ARCH_STRING="arm"
-# PTXCONF_BAREBOX is not set
+PTXCONF_BAREBOX_DEPENDENCIES=y
+PTXCONF_BAREBOX=y
+PTXCONF_BAREBOX_VERSION="2025.03.0"
+PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION=y
+PTXCONF_BAREBOX_BUILDSYSTEM_VERSION="${PTXDIST_VCS_VERSION}"
+PTXCONF_BAREBOX_MD5="2b84bcf8644373db021c86864f2e5761"
+PTXCONF_BAREBOX_CONFIG="barebox.config"
+# PTXCONF_BAREBOX_FIRMWARE is not set
+PTXCONF_BAREBOX_EXTRA_ENV=y
+PTXCONF_BAREBOX_EXTRA_ENV_PATH="barebox-defaultenv"
+# PTXCONF_BAREBOX_BAREBOXENV is not set
+# PTXCONF_BAREBOX_INSTALL_DTBS is not set
+# PTXCONF_BAREBOX_BAREBOXCRC32 is not set
+# PTXCONF_BAREBOX_KERNEL_INSTALL is not set
+# PTXCONF_BAREBOX_BAREBOXIMD is not set
+
+#
+# build dependencies
+#
+# PTXCONF_BAREBOX_NEEDS_HOST_LIBUSB is not set
+# PTXCONF_BAREBOX_NEEDS_HOST_OPENSSL is not set
+# PTXCONF_BAREBOX_NEEDS_HOST_IMX_CST is not set
+# PTXCONF_BAREBOX_NEEDS_KEYS is not set
+# PTXCONF_BAREBOX_NEEDS_HOST_LZOP is not set
+PTXCONF_BAREBOX_NEEDS_HOST_LZ4=y
# PTXCONF_BAREBOX_MLO is not set
PTXCONF_BOOTLOADER=y
# PTXCONF_GRUB is not set
@@ -337,6 +360,7 @@ PTXCONF_HOST_LIBKMOD=y
PTXCONF_HOST_LIBLZO=y
PTXCONF_HOST_LIBP11=y
PTXCONF_HOST_LIBTASN1=y
+PTXCONF_HOST_LZ4=y
PTXCONF_HOST_LZOP=y
PTXCONF_HOST_M4=y
PTXCONF_HOST_MESON=y
diff --git a/configs/platform-v7a/platforms/barebox-am335x.in b/configs/platform-v7a/platforms/barebox-am335x.in
deleted file mode 100644
index 853dbb80d7a3..000000000000
--- a/configs/platform-v7a/platforms/barebox-am335x.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=bootloader
-
-config BAREBOX_AM335X
- tristate
- prompt "Barebox (am335x)"
- select BAREBOX_COMMON
- help
- Gute Fee support for barebox.
diff --git a/configs/platform-v7a/platforms/image-beaglebone.in b/configs/platform-v7a/platforms/image-beaglebone.in
index 890201a70188..5858832bca14 100644
--- a/configs/platform-v7a/platforms/image-beaglebone.in
+++ b/configs/platform-v7a/platforms/image-beaglebone.in
@@ -6,7 +6,7 @@ config IMAGE_BEAGLEBONE
select HOST_DOSFSTOOLS
select HOST_MTOOLS
select IMAGE_ROOT_EXT
- select BAREBOX_AM335X
+ select BAREBOX
select BAREBOX_AM335X_MLO
prompt "Generate images/beaglebone.hdimg"
help
diff --git a/configs/platform-v7a/platforms/image-gf.in b/configs/platform-v7a/platforms/image-gf.in
index 37095be99c7f..4c11bbf41ed1 100644
--- a/configs/platform-v7a/platforms/image-gf.in
+++ b/configs/platform-v7a/platforms/image-gf.in
@@ -6,7 +6,6 @@ config IMAGE_GF
select HOST_DOSFSTOOLS
select HOST_MTOOLS
select IMAGE_ROOT_EXT
- select BAREBOX_AM335X
select BAREBOX_AM335X_MLO
prompt "Generate images/gf.hdimg"
help
diff --git a/configs/platform-v7a/rules/barebox-am335x.make b/configs/platform-v7a/rules/barebox-am335x.make
deleted file mode 100644
index fc84548e703d..000000000000
--- a/configs/platform-v7a/rules/barebox-am335x.make
+++ /dev/null
@@ -1,108 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Robert Schwebel <r.schwebel@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BAREBOX_AM335X) += barebox-am335x
-
-#
-# Paths and names
-#
-BAREBOX_AM335X_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON)
-BAREBOX_AM335X_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON)
-BAREBOX_AM335X := barebox-am335x-$(BAREBOX_AM335X_VERSION)
-BAREBOX_AM335X_SUFFIX := tar.bz2
-BAREBOX_AM335X_URL := $(call barebox-url, BAREBOX_AM335X)
-BAREBOX_AM335X_PATCHES := barebox-$(BAREBOX_AM335X_VERSION)
-BAREBOX_AM335X_SOURCE := $(SRCDIR)/$(BAREBOX_AM335X_PATCHES).$(BAREBOX_AM335X_SUFFIX)
-BAREBOX_AM335X_DIR := $(BUILDDIR)/$(BAREBOX_AM335X)
-BAREBOX_AM335X_BUILD_DIR := $(BAREBOX_AM335X_DIR)-build
-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-only
-BAREBOX_AM335X_BUILD_OOT := KEEP
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-# use host pkg-config for host tools
-BAREBOX_AM335X_PATH := PATH=$(HOST_PATH)
-
-BAREBOX_AM335X_WRAPPER_BLACKLIST := \
- $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-
-BAREBOX_AM335X_CONF_OPT := \
- -C $(BAREBOX_AM335X_DIR) \
- O=$(BAREBOX_AM335X_BUILD_DIR) \
- BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \
- $(call barebox-opts, BAREBOX_AM335X)
-
-BAREBOX_AM335X_MAKE_OPT := $(BAREBOX_AM335X_CONF_OPT)
-
-BAREBOX_AM335X_IMAGES := images/barebox-am33xx-afi-gf.img \
- images/barebox-am33xx-beaglebone.img
-BAREBOX_AM335X_IMAGES := $(addprefix $(BAREBOX_AM335X_BUILD_DIR)/,$(BAREBOX_AM335X_IMAGES))
-
-ifdef PTXCONF_BAREBOX_AM335X
-$(BAREBOX_AM335X_CONFIG):
- @echo
- @echo "****************************************************************************"
- @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-am335x'"
- @echo "****************************************************************************"
- @echo
- @echo
- @exit 1
-endif
-
-$(STATEDIR)/barebox-am335x.prepare: $(BAREBOX_AM335X_CONFIG)
- @$(call targetinfo)
- @$(call world/prepare, BAREBOX_AM335X)
- @rm -f "$(BAREBOX_AM335X_BUILD_DIR)/.ptxdist-defaultenv"
- @ln -s "$(call ptx/in-platformconfigdir, barebox-am335x-defaultenv)" \
- "$(BAREBOX_AM335X_BUILD_DIR)/.ptxdist-defaultenv"
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-am335x.install:
- @$(call targetinfo)
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-am335x.targetinstall:
- @$(call targetinfo)
- @$(foreach image, $(BAREBOX_AM335X_IMAGES), \
- install -m 644 \
- $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
- @$(call touch)
-
-# ----------------------------------------------------------------------------
-# Clean
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/barebox-am335x.clean:
- @$(call targetinfo)
- @$(call clean_pkg, BAREBOX_AM335X)
- @$(foreach image, $(BAREBOX_AM335X_IMAGES), \
- rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl))
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-barebox-am335x_oldconfig barebox-am335x_menuconfig barebox-am335x_nconfig: $(STATEDIR)/barebox-am335x.extract
- @$(call world/kconfig, BAREBOX_AM335X, $(subst barebox-am335x_,,$@))
-
-# vim: syntax=make
--
2.39.5
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-14 10:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-14 10:28 [DistroKit] [PATCH 1/3] v7a: barebox: defaultenv: delete no-op init scripts Ahmad Fatoum
2025-04-14 10:28 ` [DistroKit] [PATCH 2/3] v7a: barebox: rename barebox.config to barebox-common.config Ahmad Fatoum
2025-04-14 10:28 ` [DistroKit] [PATCH 3/3] v7a: barebox: am335x: switch to using upstream rule Ahmad Fatoum
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox