* [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0
@ 2024-08-01 11:38 Ahmad Fatoum
2024-08-01 11:38 ` [DistroKit] [PATCH 2/6] v7a_noneon: barebox: don't activate all consoles by default Ahmad Fatoum
` (6 more replies)
0 siblings, 7 replies; 19+ messages in thread
From: Ahmad Fatoum @ 2024-08-01 11:38 UTC (permalink / raw)
To: distrokit; +Cc: Ahmad Fatoum
Besides being a year newer, this update allows us to drop the patches we
have carrying around.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
.../platform-v7a_noneon/barebox-at91.config | 90 +++++--
.../barebox-at91.config.diff | 19 +-
.../barebox-vexpress.config | 81 +++++--
.../barebox-vexpress.config.diff | 5 +-
configs/platform-v7a_noneon/barebox.config | 84 +++++--
...nable-ddramc-for-sama5d3-and-sama5d4.patch | 32 ---
...port-for-SAMA5D3-Ethernet-Developmen.patch | 219 ------------------
...ip-ksz9477-evb-migrate-to-sama5d3_ba.patch | 23 --
...0-customers-pengutronix-distrokit-sa.patch | 22 --
.../patches/barebox-2023.07.1/series | 13 --
configs/platform-v7a_noneon/platformconfig | 4 +-
11 files changed, 234 insertions(+), 358 deletions(-)
delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch
delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch
delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch
delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch
delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/series
diff --git a/configs/platform-v7a_noneon/barebox-at91.config b/configs/platform-v7a_noneon/barebox-at91.config
index c24b5d36b79d..97f5f2b95031 100644
--- a/configs/platform-v7a_noneon/barebox-at91.config
+++ b/configs/platform-v7a_noneon/barebox-at91.config
@@ -1,11 +1,11 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2023.07.1-20230706-1 Configuration
+# Barebox/arm 2024.07.0 Configuration
#
CONFIG_ARM=y
+CONFIG_ARCH_TEXT_BASE=0x00000000
CONFIG_ARM_LINUX=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
-CONFIG_TEXT_BASE=0x0
#
# System Type
@@ -13,18 +13,11 @@ CONFIG_TEXT_BASE=0x0
# CONFIG_ARCH_MULTIARCH is not set
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DIGIC is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_OMAP_SINGLE is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_SOCFPGA is not set
# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_UEMD is not set
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_STM32MP is not set
@@ -50,15 +43,16 @@ CONFIG_HAVE_AT91_DDRAMC=y
CONFIG_AT91_MCI_PBL=y
CONFIG_AT91SAM9_SMC=y
CONFIG_HAVE_AT91SAM9_RST=y
+CONFIG_SOC_SAM_V7=y
CONFIG_SOC_SAMA5=y
CONFIG_SOC_SAMA5_MULTI=y
CONFIG_SOC_SAMA5D3=y
-CONFIG_ARCH_TEXT_BASE=0x23f00000
#
# Atmel AT91 System-on-Chip
#
CONFIG_AT91_MULTI_BOARDS=y
+# CONFIG_MACH_CALAO is not set
# CONFIG_MACH_SKOV_ARM9CPU is not set
# CONFIG_MACH_AT91SAM9263EK is not set
# CONFIG_MACH_AT91SAM9X5EK is not set
@@ -143,6 +137,7 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_STACK_SIZE=0x8000
CONFIG_MALLOC_SIZE=0x0
+CONFIG_MALLOC_ALIGNMENT=8
# end of memory layout
# CONFIG_EXPERIMENTAL is not set
@@ -151,7 +146,9 @@ CONFIG_MALLOC_TLSF=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
+# CONFIG_PANIC_POWEROFF is not set
# CONFIG_PANIC_HANG is not set
+CONFIG_PANIC_RESET=y
CONFIG_PROMPT="barebox:"
CONFIG_BAUDRATE=115200
CONFIG_CBSIZE=1024
@@ -166,7 +163,6 @@ CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_MENU=y
# CONFIG_PASSWORD is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
CONFIG_TIMESTAMP=y
CONFIG_BOOTM=y
@@ -174,7 +170,7 @@ CONFIG_BOOTM_SHOW_TYPE=y
# CONFIG_BOOTM_VERBOSE is not set
CONFIG_BOOTM_INITRD=y
CONFIG_BOOTM_OFTREE=y
-CONFIG_BOOTM_OFTREE_UIMAGE=y
+# CONFIG_BOOTM_UIMAGE is not set
# CONFIG_BOOTM_AIMAGE is not set
# CONFIG_BOOTM_ELF is not set
# CONFIG_BOOTM_FITIMAGE is not set
@@ -195,6 +191,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
CONFIG_PBL_CONSOLE=y
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -234,11 +231,14 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=6
CONFIG_DEFAULT_LOGLEVEL=6
+CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
CONFIG_DEBUG_AT91_UART_BASE=0xffffee00
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PBL is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -252,9 +252,9 @@ CONFIG_CC_HAS_KASAN_GENERIC=y
#
# EFI (Extensible Firmware Interface) Support
#
+CONFIG_HAVE_EFI_STUB=y
# end of EFI (Extensible Firmware Interface) Support
-CONFIG_HAS_DEBUG_LL=y
CONFIG_COMMAND_SUPPORT=y
CONFIG_COMPILE_HASH=y
@@ -310,6 +310,8 @@ CONFIG_CMD_UIMAGE=y
# CONFIG_CMD_PARTITION is not set
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+# CONFIG_CMD_FINDMNT is not set
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UBI=y
CONFIG_CMD_UBIFORMAT=y
CONFIG_CMD_UMOUNT=y
@@ -439,6 +441,7 @@ CONFIG_CMD_USBGADGET=y
CONFIG_CMD_BAREBOX_UPDATE=y
# CONFIG_CMD_BLOBGEN is not set
# CONFIG_CMD_FIRMWARELOAD is not set
+# CONFIG_CMD_KALLSYMS is not set
# CONFIG_CMD_OF_COMPATIBLE is not set
# CONFIG_CMD_OF_DIFF is not set
CONFIG_CMD_OF_DUMP=y
@@ -454,6 +457,7 @@ CONFIG_CMD_TIME=y
# CONFIG_CMD_DHRYSTONE is not set
# CONFIG_CMD_SPD_DECODE is not set
# CONFIG_CMD_SEED is not set
+# CONFIG_CMD_STACKSMASH is not set
# end of Miscellaneous
# end of Commands
@@ -475,6 +479,7 @@ CONFIG_REGMAP_SPI=y
CONFIG_OFTREE=y
CONFIG_OFTREE_MEM_GENERIC=y
CONFIG_DTC=y
+CONFIG_OF=y
CONFIG_OFDEVICE=y
CONFIG_OF_GPIO=y
CONFIG_OF_BAREBOX_DRIVERS=y
@@ -523,6 +528,7 @@ CONFIG_DRIVER_NET_MICREL=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
CONFIG_MICREL_PHY=y
@@ -597,17 +603,38 @@ CONFIG_MTD_M25P80=y
# end of Self contained MTD devices
# CONFIG_DRIVER_CFI is not set
+
+#
+# NAND
+#
+CONFIG_MTD_NAND_CORE=y
+CONFIG_MTD_RAW_NAND=y
CONFIG_NAND=y
CONFIG_MTD_NAND_ECC_SOFT=y
-CONFIG_MTD_NAND_ECC_SW_BCH=y
# CONFIG_NAND_ECC_HW_SYNDROME is not set
# CONFIG_NAND_ALLOW_ERASE_BAD is not set
+CONFIG_NAND_NEED_EXEC_OP=y
+
+#
+# Raw/parallel NAND flash controllers
+#
CONFIG_NAND_ATMEL=y
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
# CONFIG_MTD_NAND_DENALI is not set
+
+#
+# ECC engine support
+#
+CONFIG_MTD_NAND_ECC=y
+# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+# end of ECC engine support
+# end of NAND
+
CONFIG_MTD_SPI_NOR=y
# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
# CONFIG_SPI_CADENCE_QUADSPI is not set
+# CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set
CONFIG_MTD_UBI=y
CONFIG_MTD_UBI_BEB_LIMIT=20
# CONFIG_MTD_UBI_FASTMAP is not set
@@ -669,6 +696,7 @@ CONFIG_MCI=y
#
# --- Feature list ---
#
+# CONFIG_MCI_TUNING is not set
# CONFIG_MCI_STARTUP is not set
CONFIG_MCI_INFO=y
CONFIG_MCI_WRITE=y
@@ -678,11 +706,13 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
#
# --- MCI host drivers ---
#
+# CONFIG_MCI_DWC_MSHC is not set
# CONFIG_MCI_DW is not set
# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
CONFIG_MCI_ATMEL=y
CONFIG_MCI_ATMEL_SDHCI=y
# CONFIG_MCI_ARASAN is not set
+# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
CONFIG_MCI_ATMEL_PBL=y
CONFIG_HAVE_CLK=y
@@ -715,6 +745,7 @@ CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
# CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_PCA9450 is not set
# CONFIG_MFD_RN568PMIC is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_RK808 is not set
@@ -751,6 +782,7 @@ CONFIG_LED_TRIGGERS=y
#
# Input device support
#
+# CONFIG_INPUT_EVBUG is not set
# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_USB is not set
@@ -833,6 +865,12 @@ CONFIG_REGULATOR_FIXED=y
#
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -869,6 +907,16 @@ CONFIG_ATMEL_EBI=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -881,6 +929,8 @@ CONFIG_ATMEL_EBI=y
# CONFIG_POWER_RESET_GPIO_RESTART is not set
CONFIG_VIRTIO_MENU=y
# CONFIG_VIRTIO_MMIO is not set
+# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
@@ -953,6 +1003,7 @@ CONFIG_ZSTD_DECOMPRESS=y
CONFIG_PROCESS_ESCAPE_SEQUENCE=y
CONFIG_LZO_DECOMPRESS=y
CONFIG_BCH=y
+CONFIG_BITREV=y
CONFIG_FNMATCH=y
CONFIG_QSORT=y
CONFIG_LIBSCAN=y
@@ -977,6 +1028,17 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
CONFIG_GENERIC_ALLOCATOR=y
# end of Library routines
+#
+# Hardening options
+#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+CONFIG_STACK_GUARD_PAGE=y
+CONFIG_STACKPROTECTOR_NONE=y
+# CONFIG_STACKPROTECTOR_STRONG is not set
+CONFIG_PBL_STACKPROTECTOR_NONE=y
+# CONFIG_PBL_STACKPROTECTOR_STRONG is not set
+# end of Hardening options
+
#
# Crypto support
#
diff --git a/configs/platform-v7a_noneon/barebox-at91.config.diff b/configs/platform-v7a_noneon/barebox-at91.config.diff
index e2cdc16d00ff..9f362cd4f8aa 100644
--- a/configs/platform-v7a_noneon/barebox-at91.config.diff
+++ b/configs/platform-v7a_noneon/barebox-at91.config.diff
@@ -1,14 +1,13 @@
-71b0583d9737e188a32240ae7d29a558
+e4e5faf13c3a7da2755222882364530a
CONFIG_ARCH_AT91=y
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is undefined
+# CONFIG_ARCH_LAYERSCAPE is undefined
# CONFIG_ARCH_MULTIARCH is not set
# CONFIG_ARCH_OMAP_MULTI is undefined
# CONFIG_ARCH_ROCKCHIP is undefined
-CONFIG_ARCH_TEXT_BASE=0x23f00000
# CONFIG_ARM_AMBA is undefined
# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set
-# CONFIG_ARM_SCMI_PROTOCOL is undefined
# CONFIG_ARM_SECURE_MONITOR is undefined
# CONFIG_ARM_SMCCC is undefined
CONFIG_AT91SAM9_SMC=y
@@ -16,11 +15,12 @@ CONFIG_AT91_MCI_PBL=y
CONFIG_AT91_MULTI_BOARDS=y
CONFIG_ATMEL_EBI=y
CONFIG_BCH=y
+CONFIG_BITREV=y
# CONFIG_BOARD_ARM_GENERIC_DT is not set
# CONFIG_BOARD_GENERIC_DT is undefined
-CONFIG_BOOTM_OFTREE_UIMAGE=y
# CONFIG_BOOTM_VERBOSE is not set
# CONFIG_BZLIB is not set
+# CONFIG_CADENCE_WATCHDOG is undefined
CONFIG_CLOCKSOURCE_ATMEL_PIT=y
# CONFIG_CLOCKSOURCE_BCM283X is undefined
# CONFIG_CMD_ARM_MMUINFO is not set
@@ -89,6 +89,9 @@ CONFIG_HAVE_AT91_USB_CLK=y
CONFIG_HAVE_AT91_UTMI=y
# CONFIG_HAVE_DIGEST_SHA1 is undefined
# CONFIG_HWRNG is not set
+# CONFIG_HW_RANDOM_BCM2835 is undefined
+# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined
+# CONFIG_HW_RANDOM_TIMERIOMEM is undefined
# CONFIG_I2C_ALGOBIT is undefined
# CONFIG_I2C_AT91 is not set
# CONFIG_I2C_BCM283X is undefined
@@ -102,6 +105,7 @@ CONFIG_LIBUBIGEN=y
# CONFIG_MACHINE_ID is undefined
# CONFIG_MACH_AT91SAM9263EK is not set
# CONFIG_MACH_AT91SAM9X5EK is not set
+# CONFIG_MACH_CALAO is not set
CONFIG_MACH_MICROCHIP_KSZ9477_EVB=y
CONFIG_MACH_MICROCHIP_SAMA5D3_EDS=y
# CONFIG_MACH_RPI2 is undefined
@@ -132,10 +136,13 @@ CONFIG_MFD_SYSCON=y
CONFIG_MICREL_PHY=y
# CONFIG_MMUINFO is undefined
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=y
CONFIG_MTD_NAND_ECC_SW_BCH=y
# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=y
CONFIG_MTD_SPI_NOR=y
# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set
# CONFIG_MTD_SST25L is not set
@@ -148,6 +155,7 @@ CONFIG_NAND=y
# CONFIG_NAND_ALLOW_ERASE_BAD is not set
CONFIG_NAND_ATMEL=y
# CONFIG_NAND_ECC_HW_SYNDROME is not set
+CONFIG_NAND_NEED_EXEC_OP=y
CONFIG_NET_USB_RTL8152=y
CONFIG_OF_BAREBOX_ENV_IN_FS=y
# CONFIG_OF_OVERLAY is not set
@@ -167,9 +175,11 @@ CONFIG_REGULATOR_FIXED=y
CONFIG_SOC_SAMA5=y
CONFIG_SOC_SAMA5D3=y
CONFIG_SOC_SAMA5_MULTI=y
+CONFIG_SOC_SAM_V7=y
CONFIG_SPI_ATMEL_QUADSPI=y
# CONFIG_SPI_CADENCE_QUADSPI is not set
CONFIG_SPI_MEM=y
+# CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set
# CONFIG_STATE is not set
# CONFIG_STATE_BACKWARD_COMPATIBLE is undefined
# CONFIG_STATE_CRYPTO is undefined
@@ -198,6 +208,7 @@ CONFIG_W1=y
# CONFIG_WATCHDOG_POLLER is undefined
CONFIG_XXHASH=y
# CONFIG_XZ_DECOMPRESS is not set
+# CONFIG_XZ_DEC_ARM64 is undefined
# CONFIG_XZ_DEC_ARM is undefined
# CONFIG_XZ_DEC_ARMTHUMB is undefined
# CONFIG_XZ_DEC_IA64 is undefined
diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config b/configs/platform-v7a_noneon/barebox-vexpress.config
index 09f112d397e1..9423207ea413 100644
--- a/configs/platform-v7a_noneon/barebox-vexpress.config
+++ b/configs/platform-v7a_noneon/barebox-vexpress.config
@@ -1,10 +1,10 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2023.07.1-20230706-1 Configuration
+# Barebox/arm 2024.07.0 Configuration
#
CONFIG_ARM=y
+CONFIG_ARCH_TEXT_BASE=0x00000000
CONFIG_ARM_LINUX=y
-CONFIG_TEXT_BASE=0x0
#
# System Type
@@ -12,21 +12,15 @@ CONFIG_TEXT_BASE=0x0
CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DIGIC is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_OMAP_SINGLE is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_SOCFPGA is not set
# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_UEMD is not set
# CONFIG_ARCH_ZYNQ is not set
# CONFIG_ARCH_BCM283X is not set
# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_OMAP_MULTI is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_STM32MP is not set
@@ -44,7 +38,6 @@ CONFIG_CPU_32v7=y
# processor features
#
# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_ARCH_TEXT_BASE=0x0
CONFIG_MACH_VEXPRESS=y
# CONFIG_MACH_VIRT is not set
CONFIG_BOARD_ARM_GENERIC_DT=y
@@ -120,6 +113,7 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_STACK_SIZE=0x8000
CONFIG_MALLOC_SIZE=0x0
+CONFIG_MALLOC_ALIGNMENT=8
# end of memory layout
# CONFIG_EXPERIMENTAL is not set
@@ -128,7 +122,9 @@ CONFIG_MALLOC_TLSF=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
+# CONFIG_PANIC_POWEROFF is not set
# CONFIG_PANIC_HANG is not set
+CONFIG_PANIC_RESET=y
CONFIG_PROMPT="vexpress: "
CONFIG_BAUDRATE=115200
CONFIG_CBSIZE=1024
@@ -144,7 +140,6 @@ CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_MENU=y
# CONFIG_PASSWORD is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
CONFIG_TIMESTAMP=y
CONFIG_BOOTM=y
@@ -152,7 +147,7 @@ CONFIG_BOOTM_SHOW_TYPE=y
CONFIG_BOOTM_VERBOSE=y
CONFIG_BOOTM_INITRD=y
CONFIG_BOOTM_OFTREE=y
-# CONFIG_BOOTM_OFTREE_UIMAGE is not set
+# CONFIG_BOOTM_UIMAGE is not set
# CONFIG_BOOTM_AIMAGE is not set
# CONFIG_BOOTM_ELF is not set
# CONFIG_BOOTM_FITIMAGE is not set
@@ -173,6 +168,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
CONFIG_PBL_CONSOLE=y
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -217,10 +213,13 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
+CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PBL is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -234,9 +233,9 @@ CONFIG_CC_HAS_KASAN_GENERIC=y
#
# EFI (Extensible Firmware Interface) Support
#
+CONFIG_HAVE_EFI_STUB=y
# end of EFI (Extensible Firmware Interface) Support
-CONFIG_HAS_DEBUG_LL=y
CONFIG_COMMAND_SUPPORT=y
CONFIG_COMPILE_HASH=y
@@ -290,6 +289,8 @@ CONFIG_CMD_UIMAGE=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+# CONFIG_CMD_FINDMNT is not set
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UMOUNT=y
# end of Partition
@@ -416,6 +417,7 @@ CONFIG_CMD_WD_DEFAULT_TIMOUT=0
CONFIG_CMD_BAREBOX_UPDATE=y
# CONFIG_CMD_BLOBGEN is not set
# CONFIG_CMD_FIRMWARELOAD is not set
+# CONFIG_CMD_KALLSYMS is not set
# CONFIG_CMD_OF_COMPATIBLE is not set
# CONFIG_CMD_OF_DIFF is not set
CONFIG_CMD_OF_DUMP=y
@@ -432,6 +434,7 @@ CONFIG_CMD_STATE=y
# CONFIG_CMD_DHRYSTONE is not set
# CONFIG_CMD_SPD_DECODE is not set
# CONFIG_CMD_SEED is not set
+# CONFIG_CMD_STACKSMASH is not set
# end of Miscellaneous
# end of Commands
@@ -450,6 +453,7 @@ CONFIG_NET_FASTBOOT=y
CONFIG_OFTREE=y
CONFIG_OFTREE_MEM_GENERIC=y
CONFIG_DTC=y
+CONFIG_OF=y
CONFIG_OFDEVICE=y
CONFIG_OF_BAREBOX_DRIVERS=y
# CONFIG_OF_BAREBOX_ENV_IN_FS is not set
@@ -497,6 +501,7 @@ CONFIG_DRIVER_NET_SMC911X=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -566,7 +571,20 @@ CONFIG_DRIVER_CFI_BANK_WIDTH_2=y
CONFIG_DRIVER_CFI_BANK_WIDTH_4=y
# CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set
# CONFIG_CFI_BUFFER_WRITE is not set
+
+#
+# NAND
+#
# CONFIG_NAND is not set
+
+#
+# ECC engine support
+#
+# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+# end of ECC engine support
+# end of NAND
+
# CONFIG_MTD_SPI_NOR is not set
# CONFIG_MTD_UBI is not set
CONFIG_DISK=y
@@ -616,6 +634,7 @@ CONFIG_MCI=y
#
# --- Feature list ---
#
+# CONFIG_MCI_TUNING is not set
CONFIG_MCI_STARTUP=y
CONFIG_MCI_INFO=y
CONFIG_MCI_WRITE=y
@@ -625,10 +644,12 @@ CONFIG_MCI_WRITE=y
#
# --- MCI host drivers ---
#
+# CONFIG_MCI_DWC_MSHC is not set
# CONFIG_MCI_DW is not set
# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
CONFIG_MCI_MMCI=y
# CONFIG_MCI_ARASAN is not set
+# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
@@ -660,6 +681,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
# CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_PCA9450 is not set
# CONFIG_MFD_RN568PMIC is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_RK808 is not set
@@ -691,6 +713,7 @@ CONFIG_LED_TRIGGERS=y
#
# Input device support
#
+# CONFIG_INPUT_EVBUG is not set
# CONFIG_KEYBOARD_USB is not set
# CONFIG_INPUT_SPECIALKEYS is not set
# end of Input device support
@@ -698,8 +721,10 @@ CONFIG_LED_TRIGGERS=y
CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_POLLER is not set
# CONFIG_WATCHDOG_DW is not set
+# CONFIG_CADENCE_WATCHDOG is not set
# CONFIG_PWM is not set
CONFIG_HWRNG=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
#
# DMA support
@@ -737,6 +762,12 @@ CONFIG_REGULATOR=y
# Firmware Drivers
#
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -772,6 +803,16 @@ CONFIG_REGULATOR=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -780,6 +821,8 @@ CONFIG_REGULATOR=y
# CONFIG_POWER_RESET_SYSCON is not set
# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
# CONFIG_VIRTIO_MENU is not set
+# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
@@ -849,6 +892,7 @@ CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_ARMTHUMB=y
CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_ARM64=y
# CONFIG_BASE64 is not set
CONFIG_PROCESS_ESCAPE_SEQUENCE=y
CONFIG_LZO_DECOMPRESS=y
@@ -874,6 +918,17 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
CONFIG_ARCH_HAS_ZERO_PAGE=y
# end of Library routines
+#
+# Hardening options
+#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+CONFIG_STACK_GUARD_PAGE=y
+CONFIG_STACKPROTECTOR_NONE=y
+# CONFIG_STACKPROTECTOR_STRONG is not set
+CONFIG_PBL_STACKPROTECTOR_NONE=y
+# CONFIG_PBL_STACKPROTECTOR_STRONG is not set
+# end of Hardening options
+
#
# Crypto support
#
diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config.diff b/configs/platform-v7a_noneon/barebox-vexpress.config.diff
index 36ab78e8ebc3..23060c8178b1 100644
--- a/configs/platform-v7a_noneon/barebox-vexpress.config.diff
+++ b/configs/platform-v7a_noneon/barebox-vexpress.config.diff
@@ -1,8 +1,7 @@
-71b0583d9737e188a32240ae7d29a558
+e4e5faf13c3a7da2755222882364530a
CONFIG_AMBA_SP804=y
# CONFIG_ARCH_BCM283X is not set
CONFIG_ARCH_VEXPRESS=y
-# CONFIG_ARM_SCMI_PROTOCOL is undefined
# CONFIG_ARM_SECURE_MONITOR is undefined
# CONFIG_ARM_SMCCC is undefined
# CONFIG_ARM_USE_COMPRESSED_DTB is undefined
@@ -37,6 +36,8 @@ CONFIG_DRIVER_NET_SMC911X=y
# CONFIG_GPIO_SIFIVE is undefined
# CONFIG_GPIO_SX150X is undefined
# CONFIG_GPIO_WATCHDOG is undefined
+# CONFIG_HW_RANDOM_BCM2835 is undefined
+# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined
# CONFIG_I2C_ALGOBIT is undefined
# CONFIG_I2C_BCM283X is undefined
# CONFIG_I2C_GPIO is undefined
diff --git a/configs/platform-v7a_noneon/barebox.config b/configs/platform-v7a_noneon/barebox.config
index 9bbc3745d184..8734770abc4d 100644
--- a/configs/platform-v7a_noneon/barebox.config
+++ b/configs/platform-v7a_noneon/barebox.config
@@ -1,11 +1,11 @@
#
# Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2023.07.1-20230706-1 Configuration
+# Barebox/arm 2024.07.0 Configuration
#
CONFIG_ARM=y
+CONFIG_ARCH_TEXT_BASE=0x00000000
CONFIG_ARM_LINUX=y
CONFIG_ARM_USE_COMPRESSED_DTB=y
-CONFIG_TEXT_BASE=0x0
#
# System Type
@@ -13,21 +13,15 @@ CONFIG_TEXT_BASE=0x0
CONFIG_ARCH_MULTIARCH=y
# CONFIG_ARCH_AT91 is not set
# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_DIGIC is not set
-# CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_MVEBU is not set
# CONFIG_ARCH_MXS is not set
-# CONFIG_ARCH_NOMADIK is not set
-# CONFIG_ARCH_OMAP_SINGLE is not set
# CONFIG_ARCH_PXA is not set
# CONFIG_ARCH_SOCFPGA is not set
# CONFIG_ARCH_TEGRA is not set
-# CONFIG_ARCH_UEMD is not set
# CONFIG_ARCH_ZYNQ is not set
CONFIG_ARCH_BCM283X=y
# CONFIG_ARCH_IMX is not set
+# CONFIG_ARCH_LAYERSCAPE is not set
# CONFIG_ARCH_OMAP_MULTI is not set
# CONFIG_ARCH_ROCKCHIP is not set
# CONFIG_ARCH_STM32MP is not set
@@ -45,7 +39,6 @@ CONFIG_CPU_32v7=y
# processor features
#
# CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_ARCH_TEXT_BASE=0x0
CONFIG_MACH_RPI_COMMON=y
CONFIG_MACH_RPI_AARCH_32_64=y
@@ -136,6 +129,7 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
CONFIG_STACK_SIZE=0x8000
CONFIG_MALLOC_SIZE=0x0
+CONFIG_MALLOC_ALIGNMENT=8
# end of memory layout
# CONFIG_EXPERIMENTAL is not set
@@ -144,7 +138,9 @@ CONFIG_MALLOC_TLSF=y
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
CONFIG_KALLSYMS=y
CONFIG_RELOCATABLE=y
+# CONFIG_PANIC_POWEROFF is not set
# CONFIG_PANIC_HANG is not set
+CONFIG_PANIC_RESET=y
CONFIG_PROMPT="barebox>"
CONFIG_BAUDRATE=115200
CONFIG_CBSIZE=1024
@@ -160,7 +156,6 @@ CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_MENU=y
# CONFIG_PASSWORD is not set
-CONFIG_DYNAMIC_CRC_TABLE=y
CONFIG_ERRNO_MESSAGES=y
CONFIG_TIMESTAMP=y
CONFIG_BOOTM=y
@@ -168,7 +163,7 @@ CONFIG_BOOTM_SHOW_TYPE=y
CONFIG_BOOTM_VERBOSE=y
CONFIG_BOOTM_INITRD=y
CONFIG_BOOTM_OFTREE=y
-# CONFIG_BOOTM_OFTREE_UIMAGE is not set
+# CONFIG_BOOTM_UIMAGE is not set
# CONFIG_BOOTM_AIMAGE is not set
# CONFIG_BOOTM_ELF is not set
# CONFIG_BOOTM_FITIMAGE is not set
@@ -189,6 +184,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y
# CONFIG_PBL_CONSOLE is not set
# CONFIG_CONSOLE_RATP is not set
CONFIG_PARTITION=y
+CONFIG_PARTITION_MANIPULATION=y
CONFIG_PARTITION_DISK=y
CONFIG_PARTITION_DISK_DOS=y
CONFIG_PARTITION_DISK_EFI=y
@@ -233,9 +229,12 @@ CONFIG_FASTBOOT_CMD_OEM=y
#
CONFIG_COMPILE_LOGLEVEL=7
CONFIG_DEFAULT_LOGLEVEL=6
+CONFIG_HAS_DEBUG_LL=y
# CONFIG_DEBUG_LL is not set
# CONFIG_DEBUG_INITCALLS is not set
# CONFIG_DEBUG_PROBES is not set
+# CONFIG_DMA_API_DEBUG is not set
+# CONFIG_DEBUG_LIST is not set
# CONFIG_PBL_BREAK is not set
# CONFIG_PRINTF_FULL is not set
# CONFIG_UBSAN is not set
@@ -249,9 +248,9 @@ CONFIG_CC_HAS_KASAN_GENERIC=y
#
# EFI (Extensible Firmware Interface) Support
#
+CONFIG_HAVE_EFI_STUB=y
# end of EFI (Extensible Firmware Interface) Support
-CONFIG_HAS_DEBUG_LL=y
CONFIG_COMMAND_SUPPORT=y
CONFIG_COMPILE_HASH=y
@@ -305,6 +304,8 @@ CONFIG_CMD_UIMAGE=y
CONFIG_CMD_PARTITION=y
CONFIG_CMD_AUTOMOUNT=y
CONFIG_CMD_MOUNT=y
+# CONFIG_CMD_FINDMNT is not set
+CONFIG_CMD_PARTED=y
CONFIG_CMD_UMOUNT=y
# end of Partition
@@ -433,6 +434,7 @@ CONFIG_CMD_WD_DEFAULT_TIMOUT=0
CONFIG_CMD_BAREBOX_UPDATE=y
# CONFIG_CMD_BLOBGEN is not set
# CONFIG_CMD_FIRMWARELOAD is not set
+# CONFIG_CMD_KALLSYMS is not set
# CONFIG_CMD_OF_COMPATIBLE is not set
# CONFIG_CMD_OF_DIFF is not set
CONFIG_CMD_OF_DUMP=y
@@ -449,6 +451,7 @@ CONFIG_CMD_STATE=y
# CONFIG_CMD_DHRYSTONE is not set
# CONFIG_CMD_SPD_DECODE is not set
# CONFIG_CMD_SEED is not set
+# CONFIG_CMD_STACKSMASH is not set
# end of Miscellaneous
# end of Commands
@@ -467,6 +470,7 @@ CONFIG_NET_FASTBOOT=y
CONFIG_OFTREE=y
CONFIG_OFTREE_MEM_GENERIC=y
CONFIG_DTC=y
+CONFIG_OF=y
CONFIG_OFDEVICE=y
CONFIG_OF_GPIO=y
CONFIG_OF_BAREBOX_DRIVERS=y
@@ -515,6 +519,7 @@ CONFIG_PHYLIB=y
# CONFIG_DAVICOM_PHY is not set
# CONFIG_DP83867_PHY is not set
# CONFIG_DP83TD510_PHY is not set
+# CONFIG_DP83TG720_PHY is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MARVELL_PHY is not set
# CONFIG_MICREL_PHY is not set
@@ -582,7 +587,20 @@ CONFIG_MTD_OOB_DEVICE=y
# end of Self contained MTD devices
# CONFIG_DRIVER_CFI is not set
+
+#
+# NAND
+#
# CONFIG_NAND is not set
+
+#
+# ECC engine support
+#
+# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set
+# CONFIG_MTD_NAND_ECC_SW_BCH is not set
+# end of ECC engine support
+# end of NAND
+
# CONFIG_MTD_SPI_NOR is not set
# CONFIG_MTD_UBI is not set
CONFIG_DISK=y
@@ -632,6 +650,7 @@ CONFIG_MCI=y
#
# --- Feature list ---
#
+# CONFIG_MCI_TUNING is not set
CONFIG_MCI_STARTUP=y
CONFIG_MCI_INFO=y
CONFIG_MCI_WRITE=y
@@ -641,12 +660,14 @@ CONFIG_MCI_WRITE=y
#
# --- MCI host drivers ---
#
+# CONFIG_MCI_DWC_MSHC is not set
# CONFIG_MCI_DW is not set
# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
# CONFIG_MCI_BCM283X is not set
# CONFIG_MCI_BCM283X_SDHOST is not set
CONFIG_MCI_MMCI=y
# CONFIG_MCI_ARASAN is not set
+# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
CONFIG_HAVE_CLK=y
CONFIG_CLKDEV_LOOKUP=y
@@ -678,6 +699,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
# CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_PCA9450 is not set
# CONFIG_MFD_RN568PMIC is not set
# CONFIG_MFD_ATMEL_FLEXCOM is not set
# CONFIG_MFD_RK808 is not set
@@ -714,6 +736,7 @@ CONFIG_LED_TRIGGERS=y
#
# Input device support
#
+# CONFIG_INPUT_EVBUG is not set
# CONFIG_KEYBOARD_GPIO is not set
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_USB is not set
@@ -725,8 +748,12 @@ CONFIG_WATCHDOG=y
# CONFIG_WATCHDOG_DW is not set
# CONFIG_WATCHDOG_BCM2835 is not set
# CONFIG_GPIO_WATCHDOG is not set
+# CONFIG_CADENCE_WATCHDOG is not set
# CONFIG_PWM is not set
CONFIG_HWRNG=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
+# CONFIG_HW_RANDOM_BCM2835 is not set
+# CONFIG_HW_RANDOM_IPROC_RNG200 is not set
#
# DMA support
@@ -785,8 +812,13 @@ CONFIG_REGULATOR_BCM283X=y
# Firmware Drivers
#
# CONFIG_FIRMWARE_ALTERA_SERIAL is not set
-# CONFIG_ARM_SCMI_PROTOCOL is not set
# CONFIG_QEMU_FW_CFG is not set
+
+#
+# ARM System Control and Management Interface Protocol
+#
+# CONFIG_ARM_SCMI_PROTOCOL is not set
+# end of ARM System Control and Management Interface Protocol
# end of Firmware Drivers
#
@@ -822,6 +854,16 @@ CONFIG_REGULATOR_BCM283X=y
# end of KVX SoC drivers
# end of SoC drivers
+#
+# PM Domains
+#
+
+#
+# i.MX PM Domains
+#
+# end of i.MX PM Domains
+# end of PM Domains
+
#
# NVME Support
#
@@ -832,6 +874,8 @@ CONFIG_REGULATOR_BCM283X=y
# CONFIG_POWER_RESET_GPIO is not set
# CONFIG_POWER_RESET_GPIO_RESTART is not set
# CONFIG_VIRTIO_MENU is not set
+# CONFIG_MAILBOX is not set
+# CONFIG_TEE is not set
# end of Drivers
#
@@ -901,6 +945,7 @@ CONFIG_XZ_DEC_IA64=y
CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_ARMTHUMB=y
CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_ARM64=y
# CONFIG_BASE64 is not set
CONFIG_PROCESS_ESCAPE_SEQUENCE=y
CONFIG_LZO_DECOMPRESS=y
@@ -926,6 +971,17 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y
CONFIG_ARCH_HAS_ZERO_PAGE=y
# end of Library routines
+#
+# Hardening options
+#
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+CONFIG_STACK_GUARD_PAGE=y
+CONFIG_STACKPROTECTOR_NONE=y
+# CONFIG_STACKPROTECTOR_STRONG is not set
+CONFIG_PBL_STACKPROTECTOR_NONE=y
+# CONFIG_PBL_STACKPROTECTOR_STRONG is not set
+# end of Hardening options
+
#
# Crypto support
#
diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch
deleted file mode 100644
index 1afe82806d60..000000000000
--- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Oleksij Rempel <o.rempel@pengutronix.de>
-Date: Thu, 6 Jul 2023 09:04:40 +0200
-Subject: [PATCH] ARM: at91: enable ddramc for sama5d3 and sama5d4
-
-ddramc has already support for sama5d3 and sama5d4, so enable it
-officially.
-
-Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
----
- arch/arm/mach-at91/Kconfig | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
-index b803a1185d20..349586b68339 100644
---- a/arch/arm/mach-at91/Kconfig
-+++ b/arch/arm/mach-at91/Kconfig
-@@ -104,6 +104,7 @@ config SOC_SAMA5D3
- select HAVE_AT91_UTMI
- select PINCTRL_AT91
- select HAS_MACB
-+ select HAVE_AT91_DDRAMC
-
- config SOC_SAMA5D4
- bool
-@@ -116,6 +117,7 @@ config SOC_SAMA5D4
- select HAVE_AT91_UTMI
- select PINCTRL_AT91
- select HAS_MACB
-+ select HAVE_AT91_DDRAMC
-
- config SOC_SAM9X60
- bool
diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch
deleted file mode 100644
index 7aeec243824b..000000000000
--- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From: Oleksij Rempel <o.rempel@pengutronix.de>
-Date: Tue, 4 Jul 2023 06:35:09 +0200
-Subject: [PATCH] ARM: at91: add support for SAMA5D3 - Ethernet Development
- System Board
-
-Microchip Technology SAMA5D3 Ethernet Development System (EDS) Board
-(DM320114) is an MPU-based platform for evaluating Ethernet Switch and
-PHY products. Compatible Ethernet Switch and PHY Evaluation Boards
-connect to the SAMA5D3 EDS Board via either an RGMII or RMII connector.
-The Microchip Technology SAMA5D3 EDS Board is not intended for
-stand-alone use and has no Ethernet capabilities when no daughter board
-or an USB Ethernet adapter is connected.
-
-For more information see:
-https://www.microchip.com/en-us/development-tool/DM320114
-
-Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
----
- Documentation/boards/at91.rst | 2 +
- arch/arm/boards/Makefile | 1 +
- arch/arm/boards/microchip-sama5d3-eds/Makefile | 3 ++
- arch/arm/boards/microchip-sama5d3-eds/lowlevel.c | 62 ++++++++++++++++++++++++
- arch/arm/configs/at91_multi_defconfig | 1 +
- arch/arm/dts/Makefile | 1 +
- arch/arm/dts/at91-microchip-sama5d3-eds.dts | 14 ++++++
- arch/arm/mach-at91/Kconfig | 10 ++++
- images/Makefile.at91 | 9 ++++
- 9 files changed, 103 insertions(+)
- create mode 100644 arch/arm/boards/microchip-sama5d3-eds/Makefile
- create mode 100644 arch/arm/boards/microchip-sama5d3-eds/lowlevel.c
- create mode 100644 arch/arm/dts/at91-microchip-sama5d3-eds.dts
-
-diff --git a/Documentation/boards/at91.rst b/Documentation/boards/at91.rst
-index f502979df6eb..961ef58d84ac 100644
---- a/Documentation/boards/at91.rst
-+++ b/Documentation/boards/at91.rst
-@@ -35,6 +35,8 @@ The resulting images will be placed under ``images/``:
- barebox-at91sam9263ek.img
- barebox-microchip-ksz9477-evb.img
- barebox-microchip-ksz9477-evb-xload-mmc.img
-+ barebox-microchip-sama5d3-eds.img
-+ barebox-microchip-sama5d3-eds-xload-mmc.img
- barebox-sama5d3-xplained.img
- barebox-sama5d3-xplained-xload-mmc.img
- barebox-sama5d27-som1-ek.img
-diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
-index 2877debad535..382e649fce62 100644
---- a/arch/arm/boards/Makefile
-+++ b/arch/arm/boards/Makefile
-@@ -121,6 +121,7 @@ obj-$(CONFIG_MACH_SAMA5D27_SOM1) += sama5d27-som1/
- obj-$(CONFIG_MACH_SAMA5D3XEK) += sama5d3xek/
- obj-$(CONFIG_MACH_SAMA5D3_XPLAINED) += sama5d3_xplained/
- obj-$(CONFIG_MACH_MICROCHIP_KSZ9477_EVB) += microchip-ksz9477-evb/
-+obj-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += microchip-sama5d3-eds/
- obj-$(CONFIG_MACH_SAMA5D4_XPLAINED) += sama5d4_xplained/
- obj-$(CONFIG_MACH_SAMA5D4_WIFX) += sama5d4_wifx/
- obj-$(CONFIG_MACH_SAMA5D4EK) += sama5d4ek/
-diff --git a/arch/arm/boards/microchip-sama5d3-eds/Makefile b/arch/arm/boards/microchip-sama5d3-eds/Makefile
-new file mode 100644
-index 000000000000..458f5209008d
---- /dev/null
-+++ b/arch/arm/boards/microchip-sama5d3-eds/Makefile
-@@ -0,0 +1,3 @@
-+# SPDX-License-Identifier: GPL-2.0-only
-+
-+lwl-y += lowlevel.o
-diff --git a/arch/arm/boards/microchip-sama5d3-eds/lowlevel.c b/arch/arm/boards/microchip-sama5d3-eds/lowlevel.c
-new file mode 100644
-index 000000000000..79346a9b6ac1
---- /dev/null
-+++ b/arch/arm/boards/microchip-sama5d3-eds/lowlevel.c
-@@ -0,0 +1,62 @@
-+// SPDX-License-Identifier: GPL-2.0-only AND BSD-1-Clause
-+/*
-+ * Copyright (C) 2014, Atmel Corporation
-+ * Copyright (C) 2018 Ahmad Fatoum, Pengutronix
-+ */
-+
-+#include <common.h>
-+#include <init.h>
-+
-+#include <asm/barebox-arm-head.h>
-+#include <debug_ll.h>
-+#include <mach/at91/barebox-arm.h>
-+#include <mach/at91/iomux.h>
-+#include <mach/at91/sama5d3.h>
-+#include <mach/at91/sama5d3-xplained-ddramc.h>
-+#include <mach/at91/xload.h>
-+
-+/* PCK = 528MHz, MCK = 132MHz */
-+#define MASTER_CLOCK 132000000
-+
-+static void dbgu_init(void)
-+{
-+ void __iomem *pio = IOMEM(SAMA5D3_BASE_PIOB);
-+
-+ sama5d3_pmc_enable_periph_clock(SAMA5D3_ID_PIOB);
-+
-+ at91_mux_pio3_pin(pio, pin_to_mask(AT91_PIN_PB31), AT91_MUX_PERIPH_A, 0);
-+
-+ sama5d3_pmc_enable_periph_clock(SAMA5D3_ID_DBGU);
-+ at91_dbgu_setup_ll(IOMEM(AT91_BASE_DBGU1), MASTER_CLOCK, 115200);
-+
-+ putc_ll('>');
-+}
-+
-+SAMA5D3_ENTRY_FUNCTION(start_microchip_sama5d3_eds_xload_mmc, r4)
-+{
-+ sama5d3_lowlevel_init();
-+
-+ relocate_to_current_adr();
-+ setup_c();
-+
-+ sama5d3_udelay_init(MASTER_CLOCK);
-+ sama5d3_xplained_ddrconf();
-+ if (IS_ENABLED(CONFIG_DEBUG_LL))
-+ dbgu_init();
-+
-+ sama5d3_atmci_start_image(0, MASTER_CLOCK, 0);
-+}
-+
-+extern char __dtb_z_at91_microchip_sama5d3_eds_start[];
-+
-+SAMA5D3_ENTRY_FUNCTION(start_microchip_sama5d3_eds, r4)
-+{
-+ void *fdt;
-+
-+ if (IS_ENABLED(CONFIG_DEBUG_LL))
-+ dbgu_init();
-+
-+ fdt = __dtb_z_at91_microchip_sama5d3_eds_start + get_runtime_offset();
-+
-+ sama5d3_barebox_entry(r4, fdt);
-+}
-diff --git a/arch/arm/configs/at91_multi_defconfig b/arch/arm/configs/at91_multi_defconfig
-index c93c2f578609..de47af3bd0a6 100644
---- a/arch/arm/configs/at91_multi_defconfig
-+++ b/arch/arm/configs/at91_multi_defconfig
-@@ -4,6 +4,7 @@ CONFIG_MACH_SKOV_ARM9CPU=y
- CONFIG_MACH_AT91SAM9263EK=y
- CONFIG_MACH_AT91SAM9X5EK=y
- CONFIG_MACH_MICROCHIP_KSZ9477_EVB=y
-+CONFIG_MACH_MICROCHIP_SAMA5D3_EDS=y
- CONFIG_MACH_SAMA5D3_XPLAINED=y
- CONFIG_MACH_SAMA5D27_SOM1=y
- CONFIG_MACH_SAMA5D27_GIANTBOARD=y
-diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 98f4c4e0194b..eb9e0e062adf 100644
---- a/arch/arm/dts/Makefile
-+++ b/arch/arm/dts/Makefile
-@@ -193,6 +193,7 @@ lwl-$(CONFIG_MACH_AC_SXB) += ac-sxb.dtb.o
- lwl-$(CONFIG_MACH_AT91SAM9263EK_DT) += at91sam9263ek.dtb.o
- lwl-$(CONFIG_MACH_SAMA5D3_XPLAINED) += at91-sama5d3_xplained.dtb.o
- lwl-$(CONFIG_MACH_MICROCHIP_KSZ9477_EVB) += at91-microchip-ksz9477-evb.dtb.o
-+lwl-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += at91-microchip-sama5d3-eds.dtb.o
- lwl-$(CONFIG_MACH_SAMA5D27_SOM1) += at91-sama5d27_som1_ek.dtb.o
- lwl-$(CONFIG_MACH_SAMA5D27_GIANTBOARD) += at91-sama5d27_giantboard.dtb.o
- lwl-$(CONFIG_MACH_SAMA5D4_WIFX) += at91-sama5d4_wifx_l1.dtb.o
-diff --git a/arch/arm/dts/at91-microchip-sama5d3-eds.dts b/arch/arm/dts/at91-microchip-sama5d3-eds.dts
-new file mode 100644
-index 000000000000..ad75fc882c63
---- /dev/null
-+++ b/arch/arm/dts/at91-microchip-sama5d3-eds.dts
-@@ -0,0 +1,14 @@
-+/* SPDX-License-Identifier: GPL-2.0 */
-+/dts-v1/;
-+#include <arm/at91-sama5d3_eds.dts>
-+#include "sama5d3.dtsi"
-+
-+/ {
-+ chosen {
-+ environment {
-+ compatible = "barebox,environment";
-+ device-path = &mmc0, "partname:0";
-+ file-path = "barebox.env";
-+ };
-+ };
-+};
-diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
-index 349586b68339..d2499747252d 100644
---- a/arch/arm/mach-at91/Kconfig
-+++ b/arch/arm/mach-at91/Kconfig
-@@ -606,6 +606,16 @@ config MACH_MICROCHIP_KSZ9477_EVB
- help
- Select this if you are using Microchip's EVB-KSZ9477 Evaluation Kit.
-
-+config MACH_MICROCHIP_SAMA5D3_EDS
-+ bool "Microchip SAMA5D3 Ethernet Development System"
-+ select SOC_SAMA5D3
-+ select OFDEVICE
-+ select MCI_ATMEL_PBL
-+ select COMMON_CLK_OF_PROVIDER
-+ help
-+ Select this if you are using Microchip's SAMA5D3 Ethernet Development
-+ System.
-+
- config MACH_SAMA5D3_XPLAINED
- bool "Atmel SAMA5D3_XPLAINED Evaluation Kit"
- select SOC_SAMA5D3
-diff --git a/images/Makefile.at91 b/images/Makefile.at91
-index 19a81e2e9a3c..36f725940639 100644
---- a/images/Makefile.at91
-+++ b/images/Makefile.at91
-@@ -20,6 +20,15 @@ MAX_PBL_IMAGE_SIZE_start_sama5d3_xplained_ung8071_xload_mmc = 0xffff
- FILE_barebox-microchip-ksz9477-evb-xload-mmc.img = start_sama5d3_xplained_ung8071_xload_mmc.pblb
- image-$(CONFIG_MACH_MICROCHIP_KSZ9477_EVB) += barebox-microchip-ksz9477-evb-xload-mmc.img
-
-+pblb-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += start_microchip_sama5d3_eds
-+FILE_barebox-microchip-sama5d3-eds.img = start_microchip_sama5d3_eds.pblb
-+image-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += barebox-microchip-sama5d3-eds.img
-+
-+pblb-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += start_microchip_sama5d3_eds_xload_mmc
-+MAX_PBL_IMAGE_SIZE_start_microchip_sama5d3_eds_xload_mmc = 0xffff
-+FILE_barebox-microchip-sama5d3-eds-xload-mmc.img = start_microchip_sama5d3_eds_xload_mmc.pblb
-+image-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += barebox-microchip-sama5d3-eds-xload-mmc.img
-+
- pblb-$(CONFIG_MACH_SAMA5D3_XPLAINED) += start_sama5d3_xplained
- FILE_barebox-sama5d3-xplained.img = start_sama5d3_xplained.pblb
- image-$(CONFIG_MACH_SAMA5D3_XPLAINED) += barebox-sama5d3-xplained.img
diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch
deleted file mode 100644
index 519ea4ace1a7..000000000000
--- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Oleksij Rempel <o.rempel@pengutronix.de>
-Date: Thu, 6 Jul 2023 09:26:22 +0200
-Subject: [PATCH] ARM: at91: microchip-ksz9477-evb: migrate to
- sama5d3_barebox_entry()
-
-We have sama5d3_barebox_entry(), so make use of it.
-
-Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
----
- arch/arm/boards/microchip-ksz9477-evb/lowlevel.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c b/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c
-index bda6a94160a5..aa2161daeef0 100644
---- a/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c
-+++ b/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c
-@@ -58,5 +58,5 @@ SAMA5D3_ENTRY_FUNCTION(start_sama5d3_xplained_ung8071, r4)
-
- fdt = __dtb_z_at91_microchip_ksz9477_evb_start + get_runtime_offset();
-
-- barebox_arm_entry(SAMA5_DDRCS, SZ_256M, fdt);
-+ sama5d3_barebox_entry(r4, fdt);
- }
diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch
deleted file mode 100644
index d6e6193a9fde..000000000000
--- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Oleksij Rempel <o.rempel@pengutronix.de>
-Date: Thu, 6 Jul 2023 11:03:50 +0200
-Subject: [PATCH] Release
- 2023.07.0/customers/pengutronix/distrokit-sama5d3/20230706-1
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 92b5c6779a52..323f757908bc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -2,7 +2,7 @@
- VERSION = 2023
- PATCHLEVEL = 07
- SUBLEVEL = 1
--EXTRAVERSION =
-+EXTRAVERSION =-20230706-1
- NAME = None
-
- # *DOCUMENTATION*
diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/series b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/series
deleted file mode 100644
index bdd8894835ae..000000000000
--- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/series
+++ /dev/null
@@ -1,13 +0,0 @@
-# umpf-base: v2023.07.1
-# umpf-name: 2023.07.0/customers/pengutronix/distrokit-sama5d3
-# umpf-version: 2023.07.0/customers/pengutronix/distrokit-sama5d3/20230706-1
-# umpf-topic: v2023.07.0/topic/microchip-sama5d3-ether-dev-sys
-# umpf-hashinfo: 8a1d1b8e7204ee57b743ae7f1325d5729104425e
-# umpf-topic-range: 0186c17838e655dbf6a3bcd01fa74821d5e67ae6..b2883ce6100ca0f8259a1726bf53387e6da04a99
-0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch
-0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch
-0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch
-# umpf-release: 2023.07.0/customers/pengutronix/distrokit-sama5d3/20230706-1
-# umpf-topic-range: b2883ce6100ca0f8259a1726bf53387e6da04a99..eaaffd9164ab19a152d00c6d5f8f91cd07e5ec48
-0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch
-# umpf-end
diff --git a/configs/platform-v7a_noneon/platformconfig b/configs/platform-v7a_noneon/platformconfig
index d600f7c84534..9aec8b079cc5 100644
--- a/configs/platform-v7a_noneon/platformconfig
+++ b/configs/platform-v7a_noneon/platformconfig
@@ -179,8 +179,8 @@ PTXCONF_CONSOLE_SPEED="115200"
# PTXCONF_AT91BOOTSTRAP2 is not set
PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm"
PTXCONF_BAREBOX_COMMON=y
-PTXCONF_BAREBOX_COMMON_VERSION="2023.07.1"
-PTXCONF_BAREBOX_COMMON_MD5="0b7ea966cd01266a93a4ccfa7d68bce0"
+PTXCONF_BAREBOX_COMMON_VERSION="2024.07.0"
+PTXCONF_BAREBOX_COMMON_MD5="c82948dfe7fba729e9d7eaaeff45f863"
PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y
PTXCONF_BAREBOX_AT91=y
PTXCONF_BAREBOX_VEXPRESS=y
--
2.39.2
^ permalink raw reply [flat|nested] 19+ messages in thread* [DistroKit] [PATCH 2/6] v7a_noneon: barebox: don't activate all consoles by default 2024-08-01 11:38 [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Ahmad Fatoum @ 2024-08-01 11:38 ` Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 3/6] v7a_noneon: barebox: use ARM-optimized routines where appropriate Ahmad Fatoum ` (5 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Ahmad Fatoum @ 2024-08-01 11:38 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum The device trees have a /chosen/stdout-path property pointing at the dedicated console device, so there's no need to output the barebox console on all registered UARTs. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- configs/platform-v7a_noneon/barebox-vexpress.config | 4 ++-- configs/platform-v7a_noneon/barebox-vexpress.config.diff | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config b/configs/platform-v7a_noneon/barebox-vexpress.config index 9423207ea413..39429bbce6fb 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config +++ b/configs/platform-v7a_noneon/barebox-vexpress.config @@ -161,8 +161,8 @@ CONFIG_CONSOLE_FULL=y # CONFIG_CONSOLE_SIMPLE is not set # CONFIG_CONSOLE_NONE is not set # CONFIG_CONSOLE_ACTIVATE_FIRST is not set -CONFIG_CONSOLE_ACTIVATE_ALL=y -# CONFIG_CONSOLE_ACTIVATE_NONE is not set +# CONFIG_CONSOLE_ACTIVATE_ALL is not set +CONFIG_CONSOLE_ACTIVATE_NONE=y CONFIG_CONSOLE_ALLOW_COLOR=y # CONFIG_CONSOLE_DISABLE_INPUT is not set CONFIG_PBL_CONSOLE=y diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config.diff b/configs/platform-v7a_noneon/barebox-vexpress.config.diff index 23060c8178b1..8467df162532 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config.diff +++ b/configs/platform-v7a_noneon/barebox-vexpress.config.diff @@ -9,8 +9,8 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_CLOCKSOURCE_BCM283X is undefined # CONFIG_CMD_GPIO is undefined # CONFIG_CMD_SMC is undefined -CONFIG_CONSOLE_ACTIVATE_ALL=y # CONFIG_CONSOLE_ACTIVATE_FIRST is not set +CONFIG_CONSOLE_ACTIVATE_NONE=y # CONFIG_DEBUG_PBL is not set CONFIG_DRIVER_CFI=y CONFIG_DRIVER_CFI_AMD=y -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH 3/6] v7a_noneon: barebox: use ARM-optimized routines where appropriate 2024-08-01 11:38 [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 2/6] v7a_noneon: barebox: don't activate all consoles by default Ahmad Fatoum @ 2024-08-01 11:38 ` Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 4/6] v7a_noneon: barebox: enable of_diff command Ahmad Fatoum ` (4 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Ahmad Fatoum @ 2024-08-01 11:38 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum The ARM optimized string routines are a good deal faster, so enable them. While at it, also enable SHA1 acceleration on the VExpress, which so far had only the generic SHA1 implementation enabled. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- configs/platform-v7a_noneon/barebox-at91.config | 2 +- configs/platform-v7a_noneon/barebox-at91.config.diff | 1 - configs/platform-v7a_noneon/barebox-vexpress.config | 2 +- configs/platform-v7a_noneon/barebox-vexpress.config.diff | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/platform-v7a_noneon/barebox-at91.config b/configs/platform-v7a_noneon/barebox-at91.config index 97f5f2b95031..4e0c69761551 100644 --- a/configs/platform-v7a_noneon/barebox-at91.config +++ b/configs/platform-v7a_noneon/barebox-at91.config @@ -77,7 +77,7 @@ CONFIG_32BIT=y # # ARM specific settings # -# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set +CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y CONFIG_ARM_EXCEPTIONS=y CONFIG_ARM_UNWIND=y # CONFIG_ARM_SEMIHOSTING is not set diff --git a/configs/platform-v7a_noneon/barebox-at91.config.diff b/configs/platform-v7a_noneon/barebox-at91.config.diff index 9f362cd4f8aa..36e17449b38f 100644 --- a/configs/platform-v7a_noneon/barebox-at91.config.diff +++ b/configs/platform-v7a_noneon/barebox-at91.config.diff @@ -7,7 +7,6 @@ CONFIG_ARCH_AT91=y # CONFIG_ARCH_OMAP_MULTI is undefined # CONFIG_ARCH_ROCKCHIP is undefined # CONFIG_ARM_AMBA is undefined -# CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set # CONFIG_ARM_SECURE_MONITOR is undefined # CONFIG_ARM_SMCCC is undefined CONFIG_AT91SAM9_SMC=y diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config b/configs/platform-v7a_noneon/barebox-vexpress.config index 39429bbce6fb..f1cde1c36f14 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config +++ b/configs/platform-v7a_noneon/barebox-vexpress.config @@ -944,7 +944,7 @@ CONFIG_DIGEST_SHA1_GENERIC=y # CONFIG_DIGEST_SHA384_GENERIC is not set # CONFIG_DIGEST_SHA512_GENERIC is not set # CONFIG_DIGEST_HMAC_GENERIC is not set -# CONFIG_DIGEST_SHA1_ARM is not set +CONFIG_DIGEST_SHA1_ARM=y # CONFIG_DIGEST_SHA256_ARM is not set # CONFIG_CRYPTO_KEYSTORE is not set # end of Crypto support diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config.diff b/configs/platform-v7a_noneon/barebox-vexpress.config.diff index 8467df162532..dd842cf761df 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config.diff +++ b/configs/platform-v7a_noneon/barebox-vexpress.config.diff @@ -12,6 +12,7 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_CONSOLE_ACTIVATE_NONE=y # CONFIG_DEBUG_PBL is not set +CONFIG_DIGEST_SHA1_ARM=y CONFIG_DRIVER_CFI=y CONFIG_DRIVER_CFI_AMD=y CONFIG_DRIVER_CFI_BANK_WIDTH_1=y -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH 4/6] v7a_noneon: barebox: enable of_diff command 2024-08-01 11:38 [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 2/6] v7a_noneon: barebox: don't activate all consoles by default Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 3/6] v7a_noneon: barebox: use ARM-optimized routines where appropriate Ahmad Fatoum @ 2024-08-01 11:38 ` Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 5/6] v7a_noneon: generate vexpress.norimg by default Ahmad Fatoum ` (3 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Ahmad Fatoum @ 2024-08-01 11:38 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum The of_diff command shows a diff over the fixups barebox would do to the device tree when booting and is very useful to see at a glance, things like fixed up bootsource or memory size. Enable it for all v7a_noneon boards. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- configs/platform-v7a_noneon/barebox-at91.config | 2 +- configs/platform-v7a_noneon/barebox-at91.config.diff | 1 + configs/platform-v7a_noneon/barebox-vexpress.config | 2 +- configs/platform-v7a_noneon/barebox-vexpress.config.diff | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configs/platform-v7a_noneon/barebox-at91.config b/configs/platform-v7a_noneon/barebox-at91.config index 4e0c69761551..b30bdcf9d242 100644 --- a/configs/platform-v7a_noneon/barebox-at91.config +++ b/configs/platform-v7a_noneon/barebox-at91.config @@ -443,7 +443,7 @@ CONFIG_CMD_BAREBOX_UPDATE=y # CONFIG_CMD_FIRMWARELOAD is not set # CONFIG_CMD_KALLSYMS is not set # CONFIG_CMD_OF_COMPATIBLE is not set -# CONFIG_CMD_OF_DIFF is not set +CONFIG_CMD_OF_DIFF=y CONFIG_CMD_OF_DUMP=y CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y diff --git a/configs/platform-v7a_noneon/barebox-at91.config.diff b/configs/platform-v7a_noneon/barebox-at91.config.diff index 36e17449b38f..230e6ddd1a2e 100644 --- a/configs/platform-v7a_noneon/barebox-at91.config.diff +++ b/configs/platform-v7a_noneon/barebox-at91.config.diff @@ -38,6 +38,7 @@ CONFIG_CMD_AT91_BOOT_TEST=y CONFIG_CMD_NAND=y # CONFIG_CMD_NANDTEST is not set # CONFIG_CMD_NAND_BITFLIP is not set +CONFIG_CMD_OF_DIFF=y # CONFIG_CMD_OF_FIXUP_STATUS is not set # CONFIG_CMD_OF_OVERLAY is not set # CONFIG_CMD_PARTITION is not set diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config b/configs/platform-v7a_noneon/barebox-vexpress.config index f1cde1c36f14..1027f0356e7a 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config +++ b/configs/platform-v7a_noneon/barebox-vexpress.config @@ -419,7 +419,7 @@ CONFIG_CMD_BAREBOX_UPDATE=y # CONFIG_CMD_FIRMWARELOAD is not set # CONFIG_CMD_KALLSYMS is not set # CONFIG_CMD_OF_COMPATIBLE is not set -# CONFIG_CMD_OF_DIFF is not set +CONFIG_CMD_OF_DIFF=y CONFIG_CMD_OF_DUMP=y CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config.diff b/configs/platform-v7a_noneon/barebox-vexpress.config.diff index dd842cf761df..5fb3e8147b88 100644 --- a/configs/platform-v7a_noneon/barebox-vexpress.config.diff +++ b/configs/platform-v7a_noneon/barebox-vexpress.config.diff @@ -8,6 +8,7 @@ CONFIG_ARCH_VEXPRESS=y # CONFIG_CFI_BUFFER_WRITE is not set # CONFIG_CLOCKSOURCE_BCM283X is undefined # CONFIG_CMD_GPIO is undefined +CONFIG_CMD_OF_DIFF=y # CONFIG_CMD_SMC is undefined # CONFIG_CONSOLE_ACTIVATE_FIRST is not set CONFIG_CONSOLE_ACTIVATE_NONE=y -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH 5/6] v7a_noneon: generate vexpress.norimg by default 2024-08-01 11:38 [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Ahmad Fatoum ` (2 preceding siblings ...) 2024-08-01 11:38 ` [DistroKit] [PATCH 4/6] v7a_noneon: barebox: enable of_diff command Ahmad Fatoum @ 2024-08-01 11:38 ` Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 6/6] v7a_noneon: run: really constrain the forwarded SSH port to <= 64000 Ahmad Fatoum ` (2 subsequent siblings) 6 siblings, 0 replies; 19+ messages in thread From: Ahmad Fatoum @ 2024-08-01 11:38 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum This is used in the run script in the same directory. Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- configs/platform-v7a_noneon/platformconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/platform-v7a_noneon/platformconfig b/configs/platform-v7a_noneon/platformconfig index 9aec8b079cc5..9adf902112c4 100644 --- a/configs/platform-v7a_noneon/platformconfig +++ b/configs/platform-v7a_noneon/platformconfig @@ -239,7 +239,7 @@ PTXCONF_IMAGE_ROOT_TGZ_LABEL="" # PTXCONF_IMAGE_ROOT_UBI is not set # PTXCONF_IMAGE_ROOT_UBIFS is not set PTXCONF_IMAGE_SAMA5D3_EDS=y -# PTXCONF_IMAGE_VEXPRESS_NOR is not set +PTXCONF_IMAGE_VEXPRESS_NOR=y PTXCONF_IMAGE_VEXPRESS=y # -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH 6/6] v7a_noneon: run: really constrain the forwarded SSH port to <= 64000 2024-08-01 11:38 [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Ahmad Fatoum ` (3 preceding siblings ...) 2024-08-01 11:38 ` [DistroKit] [PATCH 5/6] v7a_noneon: generate vexpress.norimg by default Ahmad Fatoum @ 2024-08-01 11:38 ` Ahmad Fatoum 2024-08-08 13:01 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber 2024-08-14 7:59 ` [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Robert Schwebel 6 siblings, 1 reply; 19+ messages in thread From: Ahmad Fatoum @ 2024-08-01 11:38 UTC (permalink / raw) To: distrokit; +Cc: Ahmad Fatoum The variable expansion braces should have been arithmetic evaluation parentheses, which had the effect that the PPID was always used as a port number (which incidentally works fine for PPIDs < 65535). This was fixed in configs/platform-v7a/run by commit fb3e1645e6b5 ("v7a: run: really constrain the forwarded SSH port to <= 64000"), so apply the same fix here. Fixes: 5d2b3d23b2da ("platform-v7a_noneon: sama5: platform w/out NEON extension") Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> --- configs/platform-v7a_noneon/run | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/platform-v7a_noneon/run b/configs/platform-v7a_noneon/run index ccdcdb91c767..0307e982a334 100755 --- a/configs/platform-v7a_noneon/run +++ b/configs/platform-v7a_noneon/run @@ -31,10 +31,10 @@ if [ ! -e "${QEMU_EXEC}" ]; then exit 1 fi -# the port to which an sshd would connect (in the emulated sysem) +# the port to which an sshd would connect (in the emulated system) SSH_INTERNAL_PORT=22 # the port which QEMU opens at the host side to give access to the ${SSH_INTERNAL_PORT} -SSH_EXTERNAL_PORT=${QEMU_SSH_PORT:-${PPID%64000+1025}} +SSH_EXTERNAL_PORT=${QEMU_SSH_PORT:-$((PPID%64000+1025))} # check if vde is available for networking if [ -z "${VDE_SOCKET}" ]; then -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [DistroKit] [PATCH 6/6] v7a_noneon: run: really constrain the forwarded SSH port to <= 64000 2024-08-01 11:38 ` [DistroKit] [PATCH 6/6] v7a_noneon: run: really constrain the forwarded SSH port to <= 64000 Ahmad Fatoum @ 2024-08-08 13:01 ` Roland Hieber 0 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-08 13:01 UTC (permalink / raw) To: Ahmad Fatoum; +Cc: distrokit On Thu, Aug 01, 2024 at 01:38:19PM +0200, Ahmad Fatoum wrote: > The variable expansion braces should have been arithmetic evaluation > parentheses, which had the effect that the PPID was always used as a > port number (which incidentally works fine for PPIDs < 65535). > > This was fixed in configs/platform-v7a/run by commit > fb3e1645e6b5 ("v7a: run: really constrain the forwarded SSH port to <= 64000"), > so apply the same fix here. > > Fixes: 5d2b3d23b2da ("platform-v7a_noneon: sama5: platform w/out NEON extension") > Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > --- > configs/platform-v7a_noneon/run | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/configs/platform-v7a_noneon/run b/configs/platform-v7a_noneon/run > index ccdcdb91c767..0307e982a334 100755 > --- a/configs/platform-v7a_noneon/run > +++ b/configs/platform-v7a_noneon/run > @@ -31,10 +31,10 @@ if [ ! -e "${QEMU_EXEC}" ]; then > exit 1 > fi > > -# the port to which an sshd would connect (in the emulated sysem) > +# the port to which an sshd would connect (in the emulated system) > SSH_INTERNAL_PORT=22 > # the port which QEMU opens at the host side to give access to the ${SSH_INTERNAL_PORT} > -SSH_EXTERNAL_PORT=${QEMU_SSH_PORT:-${PPID%64000+1025}} > +SSH_EXTERNAL_PORT=${QEMU_SSH_PORT:-$((PPID%64000+1025))} I guess we should really divide this script up into re-usable parts so that we don't have to fix all bugs three times… but the patches in this series look good to me. - Roland > > # check if vde is available for networking > if [ -z "${VDE_SOCKET}" ]; then > -- > 2.39.2 > > > -- Roland Hieber, Pengutronix e.K. | r.hieber@pengutronix.de | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 0/9] mips(el) cleanup 2024-08-01 11:38 [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Ahmad Fatoum ` (4 preceding siblings ...) 2024-08-01 11:38 ` [DistroKit] [PATCH 6/6] v7a_noneon: run: really constrain the forwarded SSH port to <= 64000 Ahmad Fatoum @ 2024-08-13 13:20 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 1/9] mipsel: sync kernelconfig Roland Hieber ` (9 more replies) 2024-08-14 7:59 ` [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Robert Schwebel 6 siblings, 10 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber PATCH v3: * in PATCH 06/10, select KERNEL only at BUILDTIME (Sorry for the delay, somehow I was under the impression that I had already sent these patches on Friday, only to find my DistroKit screen session waiting at the 'Send this email?' prompt today) PATCH v2: * reorder PATCH 01 and 02 * update log message in PATCH (now-)02 to explain the PAHOLE changes * Patches 03 to 10 are new, Roland Hieber (9): mipsel: sync kernelconfig mips, mipsel: remove forked kernel rule mips, mipsel: kernel-*: sync with template mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage mips, mipsel: kernel-*: select KERNEL mips, mipsel: migrate barebox-common recipe to barebox mips, mipsel: barebox-*: sync with template mips, mipsel: barebox-*: use ptx/image-install mips, mipsel: barebox-*: set LICENSE_FILES configs/platform-mips/kernelconfig | 1 - .../platform-mips/kernelconfig-ar9331.diff | 3 +- configs/platform-mips/kernelconfig-malta.diff | 3 +- configs/platform-mips/platformconfig | 65 ++++++++++++-- .../platforms/barebox-0-common.in | 33 -------- .../platform-mips/platforms/barebox-ar9331.in | 2 +- .../platform-mips/platforms/barebox-malta.in | 2 +- .../platform-mips/platforms/kernel-ar9331.in | 2 + .../platform-mips/platforms/kernel-malta.in | 2 + configs/platform-mips/platforms/kernel.in | 26 ------ .../platform-mips/rules/barebox-ar9331.make | 45 +++++----- .../platform-mips/rules/barebox-common.make | 84 ------------------- .../platform-mips/rules/barebox-malta.make | 50 +++++------ .../platform-mips/rules/barebox.noexec.make | 7 ++ .../platform-mips/rules/kernel-ar9331.make | 57 ++++++------- configs/platform-mips/rules/kernel-malta.make | 65 +++++++------- configs/platform-mips/rules/kernel.make | 83 ------------------ .../platform-mips/rules/kernel.noexec.make | 2 + configs/platform-mipsel/kernelconfig | 1 - configs/platform-mipsel/kernelconfig-malta | 17 ++-- .../platform-mipsel/kernelconfig-malta.diff | 21 ++--- configs/platform-mipsel/platformconfig | 65 ++++++++++++-- .../platforms/barebox-0-common.in | 33 -------- .../platforms/barebox-malta.in | 2 +- .../platform-mipsel/platforms/kernel-malta.in | 2 + configs/platform-mipsel/platforms/kernel.in | 26 ------ .../platform-mipsel/rules/barebox-common.make | 84 ------------------- .../platform-mipsel/rules/barebox-malta.make | 50 +++++------ .../platform-mipsel/rules/barebox.noexec.make | 7 ++ .../platform-mipsel/rules/kernel-malta.make | 60 +++++++------ configs/platform-mipsel/rules/kernel.make | 82 ------------------ .../platform-mipsel/rules/kernel.noexec.make | 2 + 32 files changed, 317 insertions(+), 667 deletions(-) delete mode 100644 configs/platform-mips/platforms/barebox-0-common.in delete mode 100644 configs/platform-mips/platforms/kernel.in delete mode 100644 configs/platform-mips/rules/barebox-common.make create mode 100644 configs/platform-mips/rules/barebox.noexec.make delete mode 100644 configs/platform-mips/rules/kernel.make create mode 100644 configs/platform-mips/rules/kernel.noexec.make delete mode 100644 configs/platform-mipsel/platforms/barebox-0-common.in delete mode 100644 configs/platform-mipsel/platforms/kernel.in delete mode 100644 configs/platform-mipsel/rules/barebox-common.make create mode 100644 configs/platform-mipsel/rules/barebox.noexec.make delete mode 100644 configs/platform-mipsel/rules/kernel.make create mode 100644 configs/platform-mipsel/rules/kernel.noexec.make -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 1/9] mipsel: sync kernelconfig 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber @ 2024-08-13 13:20 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 2/9] mips, mipsel: remove forked kernel rule Roland Hieber ` (8 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber Part of the changes stem from the toolchain update (commit 282b31d940f79ed01352, 2024-04-22, Ladislav Michl: "mipsel: update to OSELAS.Toolchain 2023.07.1"), other parts in the kernel-malta config were just out of sync with the main kernelconfig. Use default values for all prompted options. The changes in the PAHOLE version stem from the fact that our kernel rules are outdated, which we'll fix in later commits. Nevertheless, keep the kernelconfigs in sync so as not to break bisectability. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- configs/platform-mipsel/kernelconfig | 2 +- configs/platform-mipsel/kernelconfig-malta | 15 ++++++++++---- .../platform-mipsel/kernelconfig-malta.diff | 20 ++++++++++--------- 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig index 499b7b6c1d17..176969bb7c9b 100644 --- a/configs/platform-mipsel/kernelconfig +++ b/configs/platform-mipsel/kernelconfig @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=0 +CONFIG_PAHOLE_VERSION=124 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta index 35d3219ab371..6f73c6047892 100644 --- a/configs/platform-mipsel/kernelconfig-malta +++ b/configs/platform-mipsel/kernelconfig-malta @@ -2,9 +2,9 @@ # Automatically generated file; DO NOT EDIT. # Linux/mips 6.4.10 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.0 13-20230624) 13.1.1 20230624" +CONFIG_CC_VERSION_TEXT="mipsel-softfloat-linux-gnu-gcc (OSELAS.Toolchain-2023.07.1 13-20231118) 13.2.1 20231118" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=130101 +CONFIG_GCC_VERSION=130201 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y CONFIG_AS_VERSION=24000 @@ -1450,6 +1450,7 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_FD is not set # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set +# CONFIG_ZRAM is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 # CONFIG_BLK_DEV_DRBD is not set @@ -3500,11 +3501,11 @@ CONFIG_CRYPTO_CRC32C=y # Compression # CONFIG_CRYPTO_DEFLATE=m -# CONFIG_CRYPTO_LZO is not set +CONFIG_CRYPTO_LZO=y # CONFIG_CRYPTO_842 is not set # CONFIG_CRYPTO_LZ4 is not set # CONFIG_CRYPTO_LZ4HC is not set -# CONFIG_CRYPTO_ZSTD is not set +CONFIG_CRYPTO_ZSTD=y # end of Compression # @@ -3621,9 +3622,15 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC7 is not set CONFIG_LIBCRC32C=m # CONFIG_CRC8 is not set +CONFIG_XXHASH=y # CONFIG_RANDOM32_SELFTEST is not set CONFIG_ZLIB_INFLATE=m CONFIG_ZLIB_DEFLATE=m +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_ZSTD_COMMON=y +CONFIG_ZSTD_COMPRESS=y +CONFIG_ZSTD_DECOMPRESS=y # CONFIG_XZ_DEC is not set CONFIG_GENERIC_ALLOCATOR=y CONFIG_TEXTSEARCH=y diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff index 941646631905..ec0a67f42e54 100644 --- a/configs/platform-mipsel/kernelconfig-malta.diff +++ b/configs/platform-mipsel/kernelconfig-malta.diff @@ -1,4 +1,4 @@ -bb72d3559ad286bbed584fb7dce43ed7 +f4618f2656cf4f48bc6b8561c7b86726 # CONFIG_8139CP is not set # CONFIG_8139TOO is not set # CONFIG_ACENIC is not set @@ -84,10 +84,10 @@ CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_BSG_COMMON=y CONFIG_BLK_DEV_DM=m -# CONFIG_BLK_DEV_FD is not set CONFIG_BLK_DEV_LOOP=m CONFIG_BLK_DEV_MD=m # CONFIG_BLK_DEV_NVME is not set +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set CONFIG_BLK_DEV_SD=y # CONFIG_BLK_DEV_SR is not set CONFIG_BLK_MQ_PCI=y @@ -160,7 +160,6 @@ CONFIG_CRC32_SLICEBY8=y # CONFIG_CRC_CCITT is not set CONFIG_CRC_ITU_T=m CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AEAD=m CONFIG_CRYPTO_AES=m @@ -207,7 +206,6 @@ CONFIG_CRYPTO_ESSIV=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_GHASH=m -CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_HW=y CONFIG_CRYPTO_JITTERENTROPY=m @@ -830,11 +828,7 @@ CONFIG_MTD_OOPS=m # CONFIG_MTD_PHYSMAP_VERSATILE is undefined # CONFIG_MTD_PMC551 is not set CONFIG_MTD_UBI=m -CONFIG_MTD_UBI_BEB_LIMIT=20 -# CONFIG_MTD_UBI_BLOCK is not set -# CONFIG_MTD_UBI_FASTMAP is not set CONFIG_MTD_UBI_GLUEBI=m -CONFIG_MTD_UBI_WL_THRESHOLD=4096 CONFIG_MULTIPLEXER=y # CONFIG_MUX_ADG792A is not set # CONFIG_MUX_MMIO is not set @@ -1523,7 +1517,6 @@ CONFIG_SERIO_SERPORT=y # CONFIG_SFP is undefined CONFIG_SGETMASK_SYSCALL=y # CONFIG_SGI_PARTITION is undefined -CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y # CONFIG_SIS190 is not set # CONFIG_SIS900 is not set @@ -1602,6 +1595,15 @@ CONFIG_TEXTSEARCH_KMP=m # CONFIG_TPS65010 is undefined CONFIG_TUN=m # CONFIG_TXGBE is not set +# CONFIG_UBIFS_ATIME_SUPPORT is undefined +# CONFIG_UBIFS_FS is undefined +# CONFIG_UBIFS_FS_ADVANCED_COMPR is undefined +# CONFIG_UBIFS_FS_AUTHENTICATION is undefined +# CONFIG_UBIFS_FS_LZO is undefined +# CONFIG_UBIFS_FS_SECURITY is undefined +# CONFIG_UBIFS_FS_XATTR is undefined +# CONFIG_UBIFS_FS_ZLIB is undefined +# CONFIG_UBIFS_FS_ZSTD is undefined # CONFIG_UEVENT_HELPER is not set # CONFIG_UEVENT_HELPER_PATH is undefined # CONFIG_UFS_FS is undefined -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 2/9] mips, mipsel: remove forked kernel rule 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 1/9] mipsel: sync kernelconfig Roland Hieber @ 2024-08-13 13:20 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 3/9] mips, mipsel: kernel-*: sync with template Roland Hieber ` (7 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber Our forked kernel rule is outdated, but it is only a stripped-down version of the upstream kernel rule that does not actually build a kernel, but is used to provide a REF_CONFIG for other kernel recipes. Remove the forked rule to make future maintainance easier, and set the platformconfig options and the KERNEL_MAKE_ENV suitably so that the upstream kernel rule does the same as before. Also run 'oldconfig' to update the kernelconfig and pick up the changes from the upstream kernel rule. The changes in the PAHOLE version in the kernelconfig diffs stem from the fact that the kernel rules are outdated, which we'll fix in later commits. Nevertheless, keep the kernelconfigs in sync so as not to break bisectability. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- configs/platform-mips/kernelconfig | 1 - .../platform-mips/kernelconfig-ar9331.diff | 3 +- configs/platform-mips/kernelconfig-malta.diff | 3 +- configs/platform-mips/platformconfig | 35 ++++++++ configs/platform-mips/platforms/kernel.in | 26 ------ configs/platform-mips/rules/kernel.make | 83 ------------------- .../platform-mips/rules/kernel.noexec.make | 2 + configs/platform-mipsel/kernelconfig | 3 +- .../platform-mipsel/kernelconfig-malta.diff | 4 +- configs/platform-mipsel/platformconfig | 35 ++++++++ configs/platform-mipsel/platforms/kernel.in | 26 ------ configs/platform-mipsel/rules/kernel.make | 82 ------------------ .../platform-mipsel/rules/kernel.noexec.make | 2 + 13 files changed, 79 insertions(+), 226 deletions(-) delete mode 100644 configs/platform-mips/platforms/kernel.in delete mode 100644 configs/platform-mips/rules/kernel.make create mode 100644 configs/platform-mips/rules/kernel.noexec.make delete mode 100644 configs/platform-mipsel/platforms/kernel.in delete mode 100644 configs/platform-mipsel/rules/kernel.make create mode 100644 configs/platform-mipsel/rules/kernel.noexec.make diff --git a/configs/platform-mips/kernelconfig b/configs/platform-mips/kernelconfig index a84595b3abdd..98f3196ef1ef 100644 --- a/configs/platform-mips/kernelconfig +++ b/configs/platform-mips/kernelconfig @@ -474,7 +474,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set CONFIG_FUNCTION_ALIGNMENT=0 # end of General architecture-dependent options diff --git a/configs/platform-mips/kernelconfig-ar9331.diff b/configs/platform-mips/kernelconfig-ar9331.diff index e58712b1d558..727497c2a06c 100644 --- a/configs/platform-mips/kernelconfig-ar9331.diff +++ b/configs/platform-mips/kernelconfig-ar9331.diff @@ -1,4 +1,4 @@ -13afb78f9f73380b2d43b220956bd5d8 +af97ac2360293c1315a7accdcaa0b01e # CONFIG_ACORN_PARTITION is undefined # CONFIG_AIX_PARTITION is undefined # CONFIG_AMIGA_PARTITION is undefined @@ -6,7 +6,6 @@ CONFIG_BLK_DEBUG_FS=y # CONFIG_BSD_DISKLABEL is undefined # CONFIG_CMDLINE_PARTITION is undefined -# CONFIG_GCC_PLUGINS is undefined # CONFIG_KARMA_PARTITION is undefined # CONFIG_LDM_PARTITION is undefined CONFIG_LOCALVERSION="-ar9331" diff --git a/configs/platform-mips/kernelconfig-malta.diff b/configs/platform-mips/kernelconfig-malta.diff index 4aad01f21607..ce4b18d27390 100644 --- a/configs/platform-mips/kernelconfig-malta.diff +++ b/configs/platform-mips/kernelconfig-malta.diff @@ -1,4 +1,4 @@ -13afb78f9f73380b2d43b220956bd5d8 +af97ac2360293c1315a7accdcaa0b01e # CONFIG_8139CP is not set # CONFIG_8139TOO is not set # CONFIG_ACENIC is not set @@ -364,7 +364,6 @@ CONFIG_FUSE_FS=m CONFIG_FWNODE_MDIO=m CONFIG_GACT_PROB=y CONFIG_GARP=m -# CONFIG_GCC_PLUGINS is undefined CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_IPI=y CONFIG_GENERIC_ISA_DMA=y diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig index 86e4d6f40537..6a7cab8ef6a7 100644 --- a/configs/platform-mips/platformconfig +++ b/configs/platform-mips/platformconfig @@ -114,9 +114,43 @@ PTXCONF_TARGET_EXTRA_LDFLAGS="" # end of architecture PTXCONF_KERNEL=y +# PTXCONF_KERNEL_INSTALL is not set +# PTXCONF_KERNEL_MODULES is not set PTXCONF_KERNEL_VERSION="6.6" PTXCONF_KERNEL_MD5="452098d80ba925af3a4ab35998f3aef5" +# PTXCONF_KERNEL_IMAGE_BZ is not set +# PTXCONF_KERNEL_IMAGE_Z is not set +# PTXCONF_KERNEL_IMAGE_XIP is not set +# PTXCONF_KERNEL_IMAGE_U is not set +# PTXCONF_KERNEL_IMAGE_VM is not set +# PTXCONF_KERNEL_IMAGE_VMLINUX is not set +PTXCONF_KERNEL_IMAGE_VMLINUZ=y +# PTXCONF_KERNEL_IMAGE_RAW is not set +# PTXCONF_KERNEL_IMAGE_SIMPLE is not set +PTXCONF_KERNEL_IMAGE="vmlinuz" +# PTXCONF_KERNEL_DTB is not set +# PTXCONF_KERNEL_DTBO is not set +# PTXCONF_KERNEL_CODE_SIGNING is not set +# PTXCONF_KERNEL_ZSTD is not set +# PTXCONF_KERNEL_XZ is not set PTXCONF_KERNEL_LZOP=y +# PTXCONF_KERNEL_LZ4 is not set +# PTXCONF_KERNEL_OPENSSL is not set +# PTXCONF_KERNEL_LIBELF is not set +# PTXCONF_KERNEL_GCC_PLUGINS is not set +# PTXCONF_KERNEL_CONFIG_BASE_VERSION is not set + +# +# patching & configuration +# +PTXCONF_KERNEL_SERIES="series" +PTXCONF_KERNEL_CONFIG="kernelconfig" +# end of patching & configuration + +# +# Development features +# +PTXCONF_KERNEL_EXTRA_MAKEVARS="" # # console options @@ -225,6 +259,7 @@ PTXCONF_HOST_OPENSSL=y PTXCONF_HOST_P11_KIT=y PTXCONF_HOST_SOFTHSM=y PTXCONF_HOST_SQLITE=y +PTXCONF_HOST_SYSTEM_BC=y PTXCONF_HOST_SYSTEM_PYTHON3_FLIT_CORE=y PTXCONF_HOST_SYSTEM_PYTHON3_INSTALLER=y PTXCONF_HOST_SYSTEM_PYTHON3_PACKAGING=y diff --git a/configs/platform-mips/platforms/kernel.in b/configs/platform-mips/platforms/kernel.in deleted file mode 100644 index 1889211a7ae2..000000000000 --- a/configs/platform-mips/platforms/kernel.in +++ /dev/null @@ -1,26 +0,0 @@ -## SECTION=base_kernel - -menuconfig KERNEL - bool - default y - prompt "Linux kernel " - -if KERNEL - -config KERNEL_VERSION - prompt "kernel version" - string - default "4.15" - -config KERNEL_MD5 - prompt "kernel source md5sum" - string - -config KERNEL_INSTALL - bool - -config KERNEL_LZOP - prompt "build lzop hosttool" - bool - -endif # KERNEL diff --git a/configs/platform-mips/rules/kernel.make b/configs/platform-mips/rules/kernel.make deleted file mode 100644 index e4efb46f68de..000000000000 --- a/configs/platform-mips/rules/kernel.make +++ /dev/null @@ -1,83 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2002-2009 by Pengutronix e.K., Hildesheim, Germany -# 2010 by Marc Kleine-Budde <mkl@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_KERNEL) += kernel - -# -# Paths and names -# -KERNEL := linux-$(KERNEL_VERSION) -KERNEL_MD5 := $(call remove_quotes,$(PTXCONF_KERNEL_MD5)) -ifneq ($(KERNEL_NEEDS_GIT_URL),y) -KERNEL_SUFFIX := tar.xz -KERNEL_URL := $(call kernel-url, KERNEL) -else -KERNEL_SUFFIX := tar.gz -KERNEL_URL := https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX) -endif -KERNEL_DIR := $(BUILDDIR)/$(KERNEL) -KERNEL_BUILD_DIR := $(KERNEL_DIR)-build -KERNEL_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_LICENSE := GPL-2.0-only -KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX) -KERNEL_DEVPKG := NO -KERNEL_BUILD_OOT := KEEP - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -KERNEL_CONF_OPT := \ - -C $(KERNEL_DIR) \ - O=$(KERNEL_BUILD_DIR) \ - PAHOLE=false \ - $(call kernel-opts, KERNEL) - -# no gcc plugins; avoid config changes depending on the host compiler -KERNEL_CONF_OPT += \ - HOSTCXX=false - -ifdef PTXCONF_KERNEL -$(KERNEL_CONFIG): - @echo - @echo "*************************************************************************" - @echo "**** Please generate a kernelconfig with 'ptxdist menuconfig kernel' ****" - @echo "*************************************************************************" - @echo - @echo - @exit 1 -endif - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# oldconfig / menuconfig -# ---------------------------------------------------------------------------- - -$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract - @$(call world/kconfig, KERNEL, $(subst kernel_,,$@)) - -# vim: syntax=make diff --git a/configs/platform-mips/rules/kernel.noexec.make b/configs/platform-mips/rules/kernel.noexec.make new file mode 100644 index 000000000000..df74af2c5b3d --- /dev/null +++ b/configs/platform-mips/rules/kernel.noexec.make @@ -0,0 +1,2 @@ +# short-circuit the build since the recipe is only used to serve a REF_CONFIG +KERNEL_MAKE_ENV=: diff --git a/configs/platform-mipsel/kernelconfig b/configs/platform-mipsel/kernelconfig index 176969bb7c9b..117c56cca057 100644 --- a/configs/platform-mipsel/kernelconfig +++ b/configs/platform-mipsel/kernelconfig @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=124 +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y @@ -536,7 +536,6 @@ CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y # end of GCOV-based kernel profiling CONFIG_HAVE_GCC_PLUGINS=y -# CONFIG_GCC_PLUGINS is not set CONFIG_FUNCTION_ALIGNMENT=0 # end of General architecture-dependent options diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff index ec0a67f42e54..8e5b3352dedb 100644 --- a/configs/platform-mipsel/kernelconfig-malta.diff +++ b/configs/platform-mipsel/kernelconfig-malta.diff @@ -1,4 +1,4 @@ -f4618f2656cf4f48bc6b8561c7b86726 +9b8cb4d1395ae94191677a625040e2fa # CONFIG_8139CP is not set # CONFIG_8139TOO is not set # CONFIG_ACENIC is not set @@ -338,7 +338,6 @@ CONFIG_FUSE_FS=m CONFIG_FWNODE_MDIO=m CONFIG_GACT_PROB=y CONFIG_GARP=m -# CONFIG_GCC_PLUGINS is undefined # CONFIG_GENERIC_PINCONF is undefined # CONFIG_GENERIC_PINCTRL_GROUPS is undefined # CONFIG_GENERIC_PINMUX_FUNCTIONS is undefined @@ -1110,6 +1109,7 @@ CONFIG_OF_MDIO=m CONFIG_PAGE_POOL_STATS=y CONFIG_PAGE_SIZE_16KB=y # CONFIG_PAGE_SIZE_4KB is not set +CONFIG_PAHOLE_VERSION=124 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 diff --git a/configs/platform-mipsel/platformconfig b/configs/platform-mipsel/platformconfig index ca1112e01e76..d69bab59bdd1 100644 --- a/configs/platform-mipsel/platformconfig +++ b/configs/platform-mipsel/platformconfig @@ -114,9 +114,43 @@ PTXCONF_TARGET_EXTRA_LDFLAGS="" # end of architecture PTXCONF_KERNEL=y +# PTXCONF_KERNEL_INSTALL is not set +# PTXCONF_KERNEL_MODULES is not set PTXCONF_KERNEL_VERSION="6.4.10" PTXCONF_KERNEL_MD5="2e19e7badc3d4b080bf6b4864912f2d3" +# PTXCONF_KERNEL_IMAGE_BZ is not set +# PTXCONF_KERNEL_IMAGE_Z is not set +# PTXCONF_KERNEL_IMAGE_XIP is not set +# PTXCONF_KERNEL_IMAGE_U is not set +# PTXCONF_KERNEL_IMAGE_VM is not set +# PTXCONF_KERNEL_IMAGE_VMLINUX is not set +PTXCONF_KERNEL_IMAGE_VMLINUZ=y +# PTXCONF_KERNEL_IMAGE_RAW is not set +# PTXCONF_KERNEL_IMAGE_SIMPLE is not set +PTXCONF_KERNEL_IMAGE="vmlinuz" +# PTXCONF_KERNEL_DTB is not set +# PTXCONF_KERNEL_DTBO is not set +# PTXCONF_KERNEL_CODE_SIGNING is not set +# PTXCONF_KERNEL_ZSTD is not set +# PTXCONF_KERNEL_XZ is not set PTXCONF_KERNEL_LZOP=y +# PTXCONF_KERNEL_LZ4 is not set +# PTXCONF_KERNEL_OPENSSL is not set +# PTXCONF_KERNEL_LIBELF is not set +# PTXCONF_KERNEL_GCC_PLUGINS is not set +# PTXCONF_KERNEL_CONFIG_BASE_VERSION is not set + +# +# patching & configuration +# +PTXCONF_KERNEL_SERIES="series" +PTXCONF_KERNEL_CONFIG="kernelconfig" +# end of patching & configuration + +# +# Development features +# +PTXCONF_KERNEL_EXTRA_MAKEVARS="" # # console options @@ -221,6 +255,7 @@ PTXCONF_HOST_OPENSSL=y PTXCONF_HOST_P11_KIT=y PTXCONF_HOST_SOFTHSM=y PTXCONF_HOST_SQLITE=y +PTXCONF_HOST_SYSTEM_BC=y PTXCONF_HOST_SYSTEM_PYTHON3_FLIT_CORE=y PTXCONF_HOST_SYSTEM_PYTHON3_INSTALLER=y PTXCONF_HOST_SYSTEM_PYTHON3_PACKAGING=y diff --git a/configs/platform-mipsel/platforms/kernel.in b/configs/platform-mipsel/platforms/kernel.in deleted file mode 100644 index 1889211a7ae2..000000000000 --- a/configs/platform-mipsel/platforms/kernel.in +++ /dev/null @@ -1,26 +0,0 @@ -## SECTION=base_kernel - -menuconfig KERNEL - bool - default y - prompt "Linux kernel " - -if KERNEL - -config KERNEL_VERSION - prompt "kernel version" - string - default "4.15" - -config KERNEL_MD5 - prompt "kernel source md5sum" - string - -config KERNEL_INSTALL - bool - -config KERNEL_LZOP - prompt "build lzop hosttool" - bool - -endif # KERNEL diff --git a/configs/platform-mipsel/rules/kernel.make b/configs/platform-mipsel/rules/kernel.make deleted file mode 100644 index 6d5ca4d4ea0e..000000000000 --- a/configs/platform-mipsel/rules/kernel.make +++ /dev/null @@ -1,82 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2002-2009 by Pengutronix e.K., Hildesheim, Germany -# 2010 by Marc Kleine-Budde <mkl@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_KERNEL) += kernel - -# -# Paths and names -# -KERNEL := linux-$(KERNEL_VERSION) -KERNEL_MD5 := $(call remove_quotes,$(PTXCONF_KERNEL_MD5)) -ifneq ($(KERNEL_NEEDS_GIT_URL),y) -KERNEL_SUFFIX := tar.xz -KERNEL_URL := $(call kernel-url, KERNEL) -else -KERNEL_SUFFIX := tar.gz -KERNEL_URL := https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX) -endif -KERNEL_DIR := $(BUILDDIR)/$(KERNEL) -KERNEL_BUILD_DIR := $(KERNEL_DIR)-build -KERNEL_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_LICENSE := GPL-2.0-only -KERNEL_SOURCE := $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX) -KERNEL_DEVPKG := NO -KERNEL_BUILD_OOT := KEEP - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -KERNEL_CONF_OPT := \ - -C $(KERNEL_DIR) \ - O=$(KERNEL_BUILD_DIR) \ - $(call kernel-opts, KERNEL) - -# no gcc plugins; avoid config changes depending on the host compiler -KERNEL_CONF_OPT += \ - HOSTCXX=false - -ifdef PTXCONF_KERNEL -$(KERNEL_CONFIG): - @echo - @echo "*************************************************************************" - @echo "**** Please generate a kernelconfig with 'ptxdist menuconfig kernel' ****" - @echo "*************************************************************************" - @echo - @echo - @exit 1 -endif - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# oldconfig / menuconfig -# ---------------------------------------------------------------------------- - -$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract - @$(call world/kconfig, KERNEL, $(subst kernel_,,$@)) - -# vim: syntax=make diff --git a/configs/platform-mipsel/rules/kernel.noexec.make b/configs/platform-mipsel/rules/kernel.noexec.make new file mode 100644 index 000000000000..df74af2c5b3d --- /dev/null +++ b/configs/platform-mipsel/rules/kernel.noexec.make @@ -0,0 +1,2 @@ +# short-circuit the build since the recipe is only used to serve a REF_CONFIG +KERNEL_MAKE_ENV=: -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 3/9] mips, mipsel: kernel-*: sync with template 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 1/9] mipsel: sync kernelconfig Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 2/9] mips, mipsel: remove forked kernel rule Roland Hieber @ 2024-08-13 13:20 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 4/9] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber ` (6 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber Update the template-generated kernel rules by porting the following PTXdist commits: * ceb09a1f5e56 (2021-11-29, "template: kernel: avoid config changes based on availability of pahole") * c49ffe4cd093 (2022-04-28, "kernel/kernel template: really allow subdirectories in KERNEL*_DTS") * 208fe87261b8 (2022-04-28, "kernel template: make sure bc is available") * 7205e52a301c (2023-09-12, "kernel: add make target for the installed device trees") While at it, align the package variables. Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=ceb09a1f5e56 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=c49ffe4cd093 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=208fe87261b8 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=7205e52a301c Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- .../platform-mips/platforms/kernel-ar9331.in | 1 + .../platform-mips/platforms/kernel-malta.in | 1 + .../platform-mips/rules/kernel-ar9331.make | 34 ++++++++------- configs/platform-mips/rules/kernel-malta.make | 42 ++++++++++--------- configs/platform-mipsel/kernelconfig-malta | 2 +- .../platform-mipsel/kernelconfig-malta.diff | 1 - .../platform-mipsel/platforms/kernel-malta.in | 1 + .../platform-mipsel/rules/kernel-malta.make | 37 +++++++++------- 8 files changed, 67 insertions(+), 52 deletions(-) diff --git a/configs/platform-mips/platforms/kernel-ar9331.in b/configs/platform-mips/platforms/kernel-ar9331.in index 51a28f94aee5..e7dd81f3e410 100644 --- a/configs/platform-mips/platforms/kernel-ar9331.in +++ b/configs/platform-mips/platforms/kernel-ar9331.in @@ -4,6 +4,7 @@ config KERNEL_AR9331 tristate prompt "Linux kernel (ar9331)" select HOST_LIBKMOD + select HOST_SYSTEM_BC #select HOST_U_BOOT_TOOLS help FIXME diff --git a/configs/platform-mips/platforms/kernel-malta.in b/configs/platform-mips/platforms/kernel-malta.in index 8dcd50c8bde9..069ccceba301 100644 --- a/configs/platform-mips/platforms/kernel-malta.in +++ b/configs/platform-mips/platforms/kernel-malta.in @@ -4,6 +4,7 @@ config KERNEL_MALTA tristate prompt "Linux kernel (malta)" select HOST_LIBKMOD + select HOST_SYSTEM_BC #select HOST_U_BOOT_TOOLS help FIXME diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make index 1ed0fa4f006d..0b3a3a1c3d33 100644 --- a/configs/platform-mips/rules/kernel-ar9331.make +++ b/configs/platform-mips/rules/kernel-ar9331.make @@ -14,23 +14,23 @@ PACKAGES-$(PTXCONF_KERNEL_AR9331) += kernel-ar9331 # # Paths and names # -KERNEL_AR9331_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) -KERNEL_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) -KERNEL_AR9331 := linux-ar9331-$(KERNEL_AR9331_VERSION) -KERNEL_AR9331_SUFFIX := tar.xz -KERNEL_AR9331_URL := $(call kernel-url, KERNEL_AR9331) -KERNEL_AR9331_PATCHES := linux-$(KERNEL_AR9331_VERSION) -KERNEL_AR9331_SOURCE := $(SRCDIR)/$(KERNEL_AR9331_PATCHES).$(KERNEL_AR9331_SUFFIX) -KERNEL_AR9331_DIR := $(BUILDDIR)/$(KERNEL_AR9331) -KERNEL_AR9331_BUILD_DIR := $(KERNEL_AR9331_DIR)-build -KERNEL_AR9331_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-ar9331) +KERNEL_AR9331_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) +KERNEL_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) +KERNEL_AR9331 := linux-ar9331-$(KERNEL_AR9331_VERSION) +KERNEL_AR9331_SUFFIX := tar.xz +KERNEL_AR9331_URL := $(call kernel-url, KERNEL_AR9331) +KERNEL_AR9331_PATCHES := linux-$(KERNEL_AR9331_VERSION) +KERNEL_AR9331_SOURCE := $(SRCDIR)/$(KERNEL_AR9331_PATCHES).$(KERNEL_AR9331_SUFFIX) +KERNEL_AR9331_DIR := $(BUILDDIR)/$(KERNEL_AR9331) +KERNEL_AR9331_BUILD_DIR := $(KERNEL_AR9331_DIR)-build +KERNEL_AR9331_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-ar9331) KERNEL_AR9331_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_AR9331_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_AR9331_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/qca -KERNEL_AR9331_DTS := ar9331_dpt_module.dts -KERNEL_AR9331_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_AR9331_DTS))) -KERNEL_AR9331_LICENSE := GPL-2.0-only +KERNEL_AR9331_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_AR9331_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts +KERNEL_AR9331_DTS := qca/ar9331_dpt_module.dts +KERNEL_AR9331_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_AR9331_DTS)))) +KERNEL_AR9331_LICENSE := GPL-2.0-only KERNEL_AR9331_LICENSE_FILES := -KERNEL_AR9331_BUILD_OOT := KEEP +KERNEL_AR9331_BUILD_OOT := KEEP # track changes to devices-trees in the BSP $(call world/dts-cfghash-file, KERNEL_AR9331) @@ -107,6 +107,10 @@ $(STATEDIR)/kernel-ar9331.install: # Target-Install # ---------------------------------------------------------------------------- +ifneq ($(KERNEL_AR9331_DTB_FILES),) +$(addprefix $(IMAGEDIR)/,$(KERNEL_AR9331_DTB_FILES)): $(STATEDIR)/kernel-ar9331.targetinstall +endif + $(STATEDIR)/kernel-ar9331.targetinstall: @$(call targetinfo) diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make index e6116de830e2..8dc3ce79f5c2 100644 --- a/configs/platform-mips/rules/kernel-malta.make +++ b/configs/platform-mips/rules/kernel-malta.make @@ -14,23 +14,23 @@ PACKAGES-$(PTXCONF_KERNEL_MALTA) += kernel-malta # # Paths and names # -KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) -KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) -KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_SUFFIX := tar.xz -KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA) -KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX) -KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA) -KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build -KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) -KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/mti -KERNEL_MALTA_DTS := malta.dts -KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_MALTA_DTS))) -KERNEL_MALTA_LICENSE := GPL-2.0-only +KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) +KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) +KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION) +KERNEL_MALTA_SUFFIX := tar.xz +KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA) +KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION) +KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX) +KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA) +KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build +KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) +KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) +KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts +KERNEL_MALTA_DTS := mti/malta.dts +KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_MALTA_DTS)))) +KERNEL_MALTA_LICENSE := GPL-2.0-only KERNEL_MALTA_LICENSE_FILES := -KERNEL_MALTA_BUILD_OOT := KEEP +KERNEL_MALTA_BUILD_OOT := KEEP # track changes to devices-trees in the BSP $(call world/dts-cfghash-file, KERNEL_MALTA) @@ -43,7 +43,7 @@ $(call world/dts-cfghash-file, KERNEL_MALTA) KERNEL_MALTA_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -KERNEL_MALTA_PATH := PATH=$(CROSS_PATH) +KERNEL_MALTA_PATH := PATH=$(CROSS_PATH) KERNEL_MALTA_SHARED_OPT := \ -C $(KERNEL_MALTA_DIR) \ O=$(KERNEL_MALTA_BUILD_DIR) \ @@ -67,8 +67,8 @@ KERNEL_MALTA_CONF_OPT := \ #KERNEL_MALTA_CONF_OPT += \ # KERNELVERSION=$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_IMAGES := vmlinuz -KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES)) +KERNEL_MALTA_IMAGES := vmlinuz +KERNEL_MALTA_IMAGES := $(addprefix $(KERNEL_MALTA_BUILD_DIR)/,$(KERNEL_MALTA_IMAGES)) ifdef PTXCONF_KERNEL_MALTA $(KERNEL_MALTA_CONFIG): @@ -107,6 +107,10 @@ $(STATEDIR)/kernel-malta.install: # Target-Install # ---------------------------------------------------------------------------- +ifneq ($(KERNEL_MALTA_DTB_FILES),) +$(addprefix $(IMAGEDIR)/,$(KERNEL_MALTA_DTB_FILES)): $(STATEDIR)/kernel-malta.targetinstall +endif + $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) diff --git a/configs/platform-mipsel/kernelconfig-malta b/configs/platform-mipsel/kernelconfig-malta index 6f73c6047892..5fdfd84df5ff 100644 --- a/configs/platform-mipsel/kernelconfig-malta +++ b/configs/platform-mipsel/kernelconfig-malta @@ -17,7 +17,7 @@ CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y CONFIG_CC_HAS_ASM_INLINE=y CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y -CONFIG_PAHOLE_VERSION=124 +CONFIG_PAHOLE_VERSION=0 CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_TABLE_SORT=y diff --git a/configs/platform-mipsel/kernelconfig-malta.diff b/configs/platform-mipsel/kernelconfig-malta.diff index 8e5b3352dedb..15b80d0fafd8 100644 --- a/configs/platform-mipsel/kernelconfig-malta.diff +++ b/configs/platform-mipsel/kernelconfig-malta.diff @@ -1109,7 +1109,6 @@ CONFIG_OF_MDIO=m CONFIG_PAGE_POOL_STATS=y CONFIG_PAGE_SIZE_16KB=y # CONFIG_PAGE_SIZE_4KB is not set -CONFIG_PAHOLE_VERSION=124 # CONFIG_PANIC_ON_OOPS is not set CONFIG_PANIC_ON_OOPS_VALUE=0 CONFIG_PANIC_TIMEOUT=0 diff --git a/configs/platform-mipsel/platforms/kernel-malta.in b/configs/platform-mipsel/platforms/kernel-malta.in index 8dcd50c8bde9..069ccceba301 100644 --- a/configs/platform-mipsel/platforms/kernel-malta.in +++ b/configs/platform-mipsel/platforms/kernel-malta.in @@ -4,6 +4,7 @@ config KERNEL_MALTA tristate prompt "Linux kernel (malta)" select HOST_LIBKMOD + select HOST_SYSTEM_BC #select HOST_U_BOOT_TOOLS help FIXME diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make index 89f1e06c529a..8dc3ce79f5c2 100644 --- a/configs/platform-mipsel/rules/kernel-malta.make +++ b/configs/platform-mipsel/rules/kernel-malta.make @@ -14,23 +14,23 @@ PACKAGES-$(PTXCONF_KERNEL_MALTA) += kernel-malta # # Paths and names # -KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) -KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) -KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_SUFFIX := tar.xz -KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA) -KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION) -KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX) -KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA) -KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build -KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) -KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) -KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts/mti -KERNEL_MALTA_DTS := malta.dts -KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(KERNEL_MALTA_DTS))) -KERNEL_MALTA_LICENSE := GPL-2.0-only +KERNEL_MALTA_VERSION := $(call ptx/config-version, PTXCONF_KERNEL) +KERNEL_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_KERNEL) +KERNEL_MALTA := linux-malta-$(KERNEL_MALTA_VERSION) +KERNEL_MALTA_SUFFIX := tar.xz +KERNEL_MALTA_URL := $(call kernel-url, KERNEL_MALTA) +KERNEL_MALTA_PATCHES := linux-$(KERNEL_MALTA_VERSION) +KERNEL_MALTA_SOURCE := $(SRCDIR)/$(KERNEL_MALTA_PATCHES).$(KERNEL_MALTA_SUFFIX) +KERNEL_MALTA_DIR := $(BUILDDIR)/$(KERNEL_MALTA) +KERNEL_MALTA_BUILD_DIR := $(KERNEL_MALTA_DIR)-build +KERNEL_MALTA_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig-malta) +KERNEL_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, kernelconfig) +KERNEL_MALTA_DTS_PATH := ${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_MALTA_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts +KERNEL_MALTA_DTS := mti/malta.dts +KERNEL_MALTA_DTB_FILES := $(addsuffix .dtb,$(basename $(notdir $(KERNEL_MALTA_DTS)))) +KERNEL_MALTA_LICENSE := GPL-2.0-only KERNEL_MALTA_LICENSE_FILES := -KERNEL_MALTA_BUILD_OOT := KEEP +KERNEL_MALTA_BUILD_OOT := KEEP # track changes to devices-trees in the BSP $(call world/dts-cfghash-file, KERNEL_MALTA) @@ -47,6 +47,7 @@ KERNEL_MALTA_PATH := PATH=$(CROSS_PATH) KERNEL_MALTA_SHARED_OPT := \ -C $(KERNEL_MALTA_DIR) \ O=$(KERNEL_MALTA_BUILD_DIR) \ + PAHOLE=false \ $(call kernel-opts, KERNEL_MALTA) # no gcc plugins; avoid config changes depending on the host compiler @@ -106,6 +107,10 @@ $(STATEDIR)/kernel-malta.install: # Target-Install # ---------------------------------------------------------------------------- +ifneq ($(KERNEL_MALTA_DTB_FILES),) +$(addprefix $(IMAGEDIR)/,$(KERNEL_MALTA_DTB_FILES)): $(STATEDIR)/kernel-malta.targetinstall +endif + $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 4/9] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber ` (2 preceding siblings ...) 2024-08-13 13:20 ` [DistroKit] [PATCH v3 3/9] mips, mipsel: kernel-*: sync with template Roland Hieber @ 2024-08-13 13:20 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 5/9] mips, mipsel: kernel-*: select KERNEL Roland Hieber ` (5 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber The clean stage did not clean up the installed kernel images from the image directory, but if we use ptx/image-install to install them, this can all be done by PTXdist's default clean stage. That macro now also prints the installed images, so we don't need to echo them. Forwarded: https://lore.ptxdist.org/ptxdist/20240808093643.1634147-1-rhi@pengutronix.de Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- .../platform-mips/rules/kernel-ar9331.make | 23 ++++++------------- configs/platform-mips/rules/kernel-malta.make | 23 ++++++------------- .../platform-mipsel/rules/kernel-malta.make | 23 ++++++------------- 3 files changed, 21 insertions(+), 48 deletions(-) diff --git a/configs/platform-mips/rules/kernel-ar9331.make b/configs/platform-mips/rules/kernel-ar9331.make index 0b3a3a1c3d33..a711e756118c 100644 --- a/configs/platform-mips/rules/kernel-ar9331.make +++ b/configs/platform-mips/rules/kernel-ar9331.make @@ -115,13 +115,14 @@ $(STATEDIR)/kernel-ar9331.targetinstall: @$(call targetinfo) @$(foreach image, $(KERNEL_AR9331_IMAGES), \ - install -v -m 644 $(image) \ - $(IMAGEDIR)/$(notdir $(image))-ar9331$(ptx/nl)) + $(call ptx/image-install, KERNEL_AR9331, \ + $(image), \ + $(notdir $(image))-ar9331$(ptx/nl))) - @$(foreach dtb ,$(KERNEL_AR9331_DTB_FILES), \ - echo -e "Installing $(dtb) ...\n"$(ptx/nl) \ - install -D -m0644 $(KERNEL_AR9331_PKGDIR)/boot/$(dtb) \ - $(IMAGEDIR)/$(dtb)$(ptx/nl)) + @$(foreach dtb, $(KERNEL_AR9331_DTB_FILES), \ + $(call ptx/image-install, KERNEL_AR9331, \ + $(KERNEL_AR9331_PKGDIR)/boot/$(dtb), \ + $(dtb)$(ptx/nl))) @$(call install_init, kernel-ar9331) @$(call install_fixup, kernel-ar9331, PRIORITY,optional) @@ -143,16 +144,6 @@ $(STATEDIR)/kernel-ar9331.targetinstall: @$(call touch) -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel-ar9331.clean: - @$(call targetinfo) - @$(call clean_pkg, KERNEL_AR9331) - @$(foreach dtb,$(KERNEL_AR9331_DTB_FILES), \ - rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl)) - # ---------------------------------------------------------------------------- # oldconfig / menuconfig # ---------------------------------------------------------------------------- diff --git a/configs/platform-mips/rules/kernel-malta.make b/configs/platform-mips/rules/kernel-malta.make index 8dc3ce79f5c2..badcff469994 100644 --- a/configs/platform-mips/rules/kernel-malta.make +++ b/configs/platform-mips/rules/kernel-malta.make @@ -115,13 +115,14 @@ $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) @$(foreach image, $(KERNEL_MALTA_IMAGES), \ - install -v -m 644 $(image) \ - $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl)) + $(call ptx/image-install, KERNEL_MALTA, \ + $(image), \ + $(notdir $(image))-malta$(ptx/nl))) - @$(foreach dtb ,$(KERNEL_MALTA_DTB_FILES), \ - echo -e "Installing $(dtb) ...\n"$(ptx/nl) \ - install -D -m0644 $(KERNEL_MALTA_PKGDIR)/boot/$(dtb) \ - $(IMAGEDIR)/$(dtb)$(ptx/nl)) + @$(foreach dtb, $(KERNEL_MALTA_DTB_FILES), \ + $(call ptx/image-install, KERNEL_MALTA, \ + $(KERNEL_MALTA_PKGDIR)/boot/$(dtb), \ + $(dtb)$(ptx/nl))) @$(call install_init, kernel-malta) @$(call install_fixup, kernel-malta, PRIORITY,optional) @@ -143,16 +144,6 @@ $(STATEDIR)/kernel-malta.targetinstall: @$(call touch) -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel-malta.clean: - @$(call targetinfo) - @$(call clean_pkg, KERNEL_MALTA) - @$(foreach dtb,$(KERNEL_MALTA_DTB_FILES), \ - rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl)) - # ---------------------------------------------------------------------------- # oldconfig / menuconfig # ---------------------------------------------------------------------------- diff --git a/configs/platform-mipsel/rules/kernel-malta.make b/configs/platform-mipsel/rules/kernel-malta.make index 8dc3ce79f5c2..badcff469994 100644 --- a/configs/platform-mipsel/rules/kernel-malta.make +++ b/configs/platform-mipsel/rules/kernel-malta.make @@ -115,13 +115,14 @@ $(STATEDIR)/kernel-malta.targetinstall: @$(call targetinfo) @$(foreach image, $(KERNEL_MALTA_IMAGES), \ - install -v -m 644 $(image) \ - $(IMAGEDIR)/$(notdir $(image))-malta$(ptx/nl)) + $(call ptx/image-install, KERNEL_MALTA, \ + $(image), \ + $(notdir $(image))-malta$(ptx/nl))) - @$(foreach dtb ,$(KERNEL_MALTA_DTB_FILES), \ - echo -e "Installing $(dtb) ...\n"$(ptx/nl) \ - install -D -m0644 $(KERNEL_MALTA_PKGDIR)/boot/$(dtb) \ - $(IMAGEDIR)/$(dtb)$(ptx/nl)) + @$(foreach dtb, $(KERNEL_MALTA_DTB_FILES), \ + $(call ptx/image-install, KERNEL_MALTA, \ + $(KERNEL_MALTA_PKGDIR)/boot/$(dtb), \ + $(dtb)$(ptx/nl))) @$(call install_init, kernel-malta) @$(call install_fixup, kernel-malta, PRIORITY,optional) @@ -143,16 +144,6 @@ $(STATEDIR)/kernel-malta.targetinstall: @$(call touch) -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/kernel-malta.clean: - @$(call targetinfo) - @$(call clean_pkg, KERNEL_MALTA) - @$(foreach dtb,$(KERNEL_MALTA_DTB_FILES), \ - rm -vf $(IMAGEDIR)/$(dtb)$(ptx/nl)) - # ---------------------------------------------------------------------------- # oldconfig / menuconfig # ---------------------------------------------------------------------------- -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 5/9] mips, mipsel: kernel-*: select KERNEL 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber ` (3 preceding siblings ...) 2024-08-13 13:20 ` [DistroKit] [PATCH v3 4/9] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber @ 2024-08-13 13:20 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 6/9] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber ` (4 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber We're using PTXCONF_KERNEL_VERSION and PTXCONF_KERNEL_MD5 in our rules, which are only defined when KERNEL is selected. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- configs/platform-mips/platforms/kernel-ar9331.in | 1 + configs/platform-mips/platforms/kernel-malta.in | 1 + configs/platform-mipsel/platforms/kernel-malta.in | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/platform-mips/platforms/kernel-ar9331.in b/configs/platform-mips/platforms/kernel-ar9331.in index e7dd81f3e410..6e423d6ed0e9 100644 --- a/configs/platform-mips/platforms/kernel-ar9331.in +++ b/configs/platform-mips/platforms/kernel-ar9331.in @@ -6,5 +6,6 @@ config KERNEL_AR9331 select HOST_LIBKMOD select HOST_SYSTEM_BC #select HOST_U_BOOT_TOOLS + select KERNEL if BUILDTIME help FIXME diff --git a/configs/platform-mips/platforms/kernel-malta.in b/configs/platform-mips/platforms/kernel-malta.in index 069ccceba301..069a69f08002 100644 --- a/configs/platform-mips/platforms/kernel-malta.in +++ b/configs/platform-mips/platforms/kernel-malta.in @@ -6,5 +6,6 @@ config KERNEL_MALTA select HOST_LIBKMOD select HOST_SYSTEM_BC #select HOST_U_BOOT_TOOLS + select KERNEL if BUILDTIME help FIXME diff --git a/configs/platform-mipsel/platforms/kernel-malta.in b/configs/platform-mipsel/platforms/kernel-malta.in index 069ccceba301..069a69f08002 100644 --- a/configs/platform-mipsel/platforms/kernel-malta.in +++ b/configs/platform-mipsel/platforms/kernel-malta.in @@ -6,5 +6,6 @@ config KERNEL_MALTA select HOST_LIBKMOD select HOST_SYSTEM_BC #select HOST_U_BOOT_TOOLS + select KERNEL if BUILDTIME help FIXME -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 6/9] mips, mipsel: migrate barebox-common recipe to barebox 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber ` (4 preceding siblings ...) 2024-08-13 13:20 ` [DistroKit] [PATCH v3 5/9] mips, mipsel: kernel-*: select KERNEL Roland Hieber @ 2024-08-13 13:20 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 7/9] mips, mipsel: barebox-*: sync with template Roland Hieber ` (3 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber With a bit of hackery in barebox.noexec.make, we can use the upstream barebox package to provide a REF_CONFIG for the other barebox packages. The slight disadvantage is that its targetinstall stage creates an empty barebox-default-environment file in the image folder, but the big advantage is that we can save maintaining a custom rule. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- configs/platform-mips/platformconfig | 30 +++++-- .../platforms/barebox-0-common.in | 33 -------- .../platform-mips/platforms/barebox-ar9331.in | 2 +- .../platform-mips/platforms/barebox-malta.in | 2 +- .../platform-mips/rules/barebox-ar9331.make | 4 +- .../platform-mips/rules/barebox-common.make | 84 ------------------- .../platform-mips/rules/barebox-malta.make | 4 +- .../platform-mips/rules/barebox.noexec.make | 7 ++ configs/platform-mipsel/platformconfig | 30 +++++-- .../platforms/barebox-0-common.in | 33 -------- .../platforms/barebox-malta.in | 2 +- .../platform-mipsel/rules/barebox-common.make | 84 ------------------- .../platform-mipsel/rules/barebox-malta.make | 4 +- .../platform-mipsel/rules/barebox.noexec.make | 7 ++ 14 files changed, 71 insertions(+), 255 deletions(-) delete mode 100644 configs/platform-mips/platforms/barebox-0-common.in delete mode 100644 configs/platform-mips/rules/barebox-common.make create mode 100644 configs/platform-mips/rules/barebox.noexec.make delete mode 100644 configs/platform-mipsel/platforms/barebox-0-common.in delete mode 100644 configs/platform-mipsel/rules/barebox-common.make create mode 100644 configs/platform-mipsel/rules/barebox.noexec.make diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig index 6a7cab8ef6a7..fc7b10c2587b 100644 --- a/configs/platform-mips/platformconfig +++ b/configs/platform-mips/platformconfig @@ -170,16 +170,34 @@ PTXCONF_KERNEL_MALTA=y # bootloaders # # PTXCONF_AT91BOOTSTRAP2 is not set -PTXCONF_BAREBOX_COMMON_ARCH_STRING="mips" -PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2021.02.0" -PTXCONF_BAREBOX_COMMON_MD5="07045e34faa1135d9cd18503186b2d7f" -PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_AR9331=y PTXCONF_BAREBOX_MALTA=y PTXCONF_BAREBOX_ARCH_STRING="mips" -# PTXCONF_BAREBOX is not set +PTXCONF_BAREBOX_DEPENDENCIES=y +PTXCONF_BAREBOX=y +PTXCONF_BAREBOX_VERSION="2021.02.0" +# PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION is not set +PTXCONF_BAREBOX_MD5="07045e34faa1135d9cd18503186b2d7f" +PTXCONF_BAREBOX_CONFIG="barebox.config" +# PTXCONF_BAREBOX_FIRMWARE is not set +# PTXCONF_BAREBOX_EXTRA_ENV is not set +# 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=y +# PTXCONF_BAREBOX_NEEDS_HOST_LZ4 is not set # PTXCONF_BAREBOX_MLO is not set +PTXCONF_BOOTLOADER=y # PTXCONF_GRUB is not set # PTXCONF_HOST_MXS_UTILS is not set # PTXCONF_U_BOOT is not set diff --git a/configs/platform-mips/platforms/barebox-0-common.in b/configs/platform-mips/platforms/barebox-0-common.in deleted file mode 100644 index 0b487ba3bdea..000000000000 --- a/configs/platform-mips/platforms/barebox-0-common.in +++ /dev/null @@ -1,33 +0,0 @@ -## SECTION=bootloader - -config BAREBOX_COMMON_ARCH_STRING - string - default "mips" - -menuconfig BAREBOX_COMMON - prompt "common barebox options " - bool - select HOST_LZOP if BAREBOX_COMMON_NEEDS_HOST_LZOP - help - A metapackage serving a reference config for all other barebox - variants in the v7a platform. It doesn't install anything. - -if BAREBOX_COMMON - -config BAREBOX_COMMON_VERSION - prompt "barebox version" - string - default "2016.08.0" - -config BAREBOX_COMMON_MD5 - prompt "barebox source md5sum" - string - -config BAREBOX_COMMON_NEEDS_HOST_LZOP - prompt "barebox needs lzop" - bool - help - The barebox binaries can be compressed. Select this if lzop - is used in order to compile lzop for your development host. - -endif diff --git a/configs/platform-mips/platforms/barebox-ar9331.in b/configs/platform-mips/platforms/barebox-ar9331.in index b54fc44693c0..5f22bd160fd0 100644 --- a/configs/platform-mips/platforms/barebox-ar9331.in +++ b/configs/platform-mips/platforms/barebox-ar9331.in @@ -3,6 +3,6 @@ config BAREBOX_AR9331 tristate prompt "Barebox (ar9331)" - select BAREBOX_COMMON + select BAREBOX help MIPS Malta support for barebox. diff --git a/configs/platform-mips/platforms/barebox-malta.in b/configs/platform-mips/platforms/barebox-malta.in index 6976a961f31d..3388a67c13dc 100644 --- a/configs/platform-mips/platforms/barebox-malta.in +++ b/configs/platform-mips/platforms/barebox-malta.in @@ -3,6 +3,6 @@ config BAREBOX_MALTA tristate prompt "Barebox (malta)" - select BAREBOX_COMMON + select BAREBOX help MIPS Malta support for barebox. diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make index 3cc949555f75..c769d2111978 100644 --- a/configs/platform-mips/rules/barebox-ar9331.make +++ b/configs/platform-mips/rules/barebox-ar9331.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_AR9331) += barebox-ar9331 # # Paths and names # -BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) -BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) +BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX) +BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX) BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION) BAREBOX_AR9331_SUFFIX := tar.bz2 BAREBOX_AR9331_URL := $(call barebox-url, BAREBOX_AR9331) diff --git a/configs/platform-mips/rules/barebox-common.make b/configs/platform-mips/rules/barebox-common.make deleted file mode 100644 index 4411dbebd35f..000000000000 --- a/configs/platform-mips/rules/barebox-common.make +++ /dev/null @@ -1,84 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2019 Roland Hieber <rhi@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common - -# -# Paths and names -# -BAREBOX_COMMON_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) -BAREBOX_COMMON_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) -BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION) -BAREBOX_COMMON_SUFFIX := tar.bz2 -BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON) -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_LICENSE := GPL-2.0-only -BAREBOX_COMMON_BUILD_OOT := KEEP - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# use host pkg-config for host tools -BAREBOX_COMMON_PATH := PATH=$(HOST_PATH) - -BAREBOX_COMMON_CONF_OPT := \ - -C $(BAREBOX_COMMON_DIR) \ - O=$(BAREBOX_COMMON_BUILD_DIR) \ - BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ - $(call barebox-opts, BAREBOX_COMMON) - -BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT) - -BAREBOX_COMMON_TAGS_OPT := TAGS tags cscope - -ifdef PTXCONF_BAREBOX_COMMON -$(BAREBOX_COMMON_CONFIG): - @echo - @echo "****************************************************************************" - @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-common'" - @echo "****************************************************************************" - @echo - @echo - @exit 1 -endif - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/barebox-common.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/barebox-common.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# oldconfig / menuconfig -# ---------------------------------------------------------------------------- - -barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract - @$(call world/kconfig, BAREBOX_COMMON, $(subst barebox-common_,,$@)) - -barebox-common_do_oldconfig: $(STATEDIR)/barebox-common.extract - @$(call world/kconfig, BAREBOX_COMMON, oldconfig) - -# vim: syntax=make diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make index 31b0b066e332..ae4dcfe8d6e4 100644 --- a/configs/platform-mips/rules/barebox-malta.make +++ b/configs/platform-mips/rules/barebox-malta.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta # # Paths and names # -BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) -BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) +BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX) +BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX) BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SUFFIX := tar.bz2 BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA) diff --git a/configs/platform-mips/rules/barebox.noexec.make b/configs/platform-mips/rules/barebox.noexec.make new file mode 100644 index 000000000000..76b4a4f78126 --- /dev/null +++ b/configs/platform-mips/rules/barebox.noexec.make @@ -0,0 +1,7 @@ +# short-circuit the build since the recipe is only used to serve a REF_CONFIG +BAREBOX_MAKE_ENV=: + +# don't error out when trying to copy the defaultenv in the targetinstall stage +$(STATEDIR)/barebox.targetinstall: $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env +$(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env: $(STATEDIR)/barebox.compile + mkdir -p "$(dir $@)" && touch $@ diff --git a/configs/platform-mipsel/platformconfig b/configs/platform-mipsel/platformconfig index d69bab59bdd1..e71cbcd27f71 100644 --- a/configs/platform-mipsel/platformconfig +++ b/configs/platform-mipsel/platformconfig @@ -169,15 +169,33 @@ PTXCONF_KERNEL_MALTA=y # bootloaders # # PTXCONF_AT91BOOTSTRAP2 is not set -PTXCONF_BAREBOX_COMMON_ARCH_STRING="mips" -PTXCONF_BAREBOX_COMMON=y -PTXCONF_BAREBOX_COMMON_VERSION="2021.06.0" -PTXCONF_BAREBOX_COMMON_MD5="62d995d4b70c7007800e688ac6ca80df" -PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y PTXCONF_BAREBOX_MALTA=y PTXCONF_BAREBOX_ARCH_STRING="mips" -# PTXCONF_BAREBOX is not set +PTXCONF_BAREBOX_DEPENDENCIES=y +PTXCONF_BAREBOX=y +PTXCONF_BAREBOX_VERSION="2021.06.0" +# PTXCONF_BAREBOX_CONFIG_BUILDSYSTEM_VERSION is not set +PTXCONF_BAREBOX_MD5="62d995d4b70c7007800e688ac6ca80df" +PTXCONF_BAREBOX_CONFIG="barebox.config" +# PTXCONF_BAREBOX_FIRMWARE is not set +# PTXCONF_BAREBOX_EXTRA_ENV is not set +# 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=y +# PTXCONF_BAREBOX_NEEDS_HOST_LZ4 is not set # PTXCONF_BAREBOX_MLO is not set +PTXCONF_BOOTLOADER=y # PTXCONF_GRUB is not set # PTXCONF_HOST_MXS_UTILS is not set # PTXCONF_U_BOOT is not set diff --git a/configs/platform-mipsel/platforms/barebox-0-common.in b/configs/platform-mipsel/platforms/barebox-0-common.in deleted file mode 100644 index 0b487ba3bdea..000000000000 --- a/configs/platform-mipsel/platforms/barebox-0-common.in +++ /dev/null @@ -1,33 +0,0 @@ -## SECTION=bootloader - -config BAREBOX_COMMON_ARCH_STRING - string - default "mips" - -menuconfig BAREBOX_COMMON - prompt "common barebox options " - bool - select HOST_LZOP if BAREBOX_COMMON_NEEDS_HOST_LZOP - help - A metapackage serving a reference config for all other barebox - variants in the v7a platform. It doesn't install anything. - -if BAREBOX_COMMON - -config BAREBOX_COMMON_VERSION - prompt "barebox version" - string - default "2016.08.0" - -config BAREBOX_COMMON_MD5 - prompt "barebox source md5sum" - string - -config BAREBOX_COMMON_NEEDS_HOST_LZOP - prompt "barebox needs lzop" - bool - help - The barebox binaries can be compressed. Select this if lzop - is used in order to compile lzop for your development host. - -endif diff --git a/configs/platform-mipsel/platforms/barebox-malta.in b/configs/platform-mipsel/platforms/barebox-malta.in index 6976a961f31d..3388a67c13dc 100644 --- a/configs/platform-mipsel/platforms/barebox-malta.in +++ b/configs/platform-mipsel/platforms/barebox-malta.in @@ -3,6 +3,6 @@ config BAREBOX_MALTA tristate prompt "Barebox (malta)" - select BAREBOX_COMMON + select BAREBOX help MIPS Malta support for barebox. diff --git a/configs/platform-mipsel/rules/barebox-common.make b/configs/platform-mipsel/rules/barebox-common.make deleted file mode 100644 index d0caead4ac40..000000000000 --- a/configs/platform-mipsel/rules/barebox-common.make +++ /dev/null @@ -1,84 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2019 Roland Hieber <rhi@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BAREBOX_COMMON) += barebox-common - -# -# Paths and names -# -BAREBOX_COMMON_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_COMMON_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) -BAREBOX_COMMON := barebox-common-$(BAREBOX_COMMON_VERSION) -BAREBOX_COMMON_SUFFIX := tar.bz2 -BAREBOX_COMMON_URL := $(call barebox-url, BAREBOX_COMMON) -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_LICENSE := GPL-2.0-only -BAREBOX_COMMON_BUILD_OOT := KEEP - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -# use host pkg-config for host tools -BAREBOX_COMMON_PATH := PATH=$(HOST_PATH) - -BAREBOX_COMMON_CONF_OPT := \ - -C $(BAREBOX_COMMON_DIR) \ - O=$(BAREBOX_COMMON_BUILD_DIR) \ - BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ - $(call barebox-opts, BAREBOX_COMMON) - -BAREBOX_COMMON_MAKE_OPT := $(BAREBOX_COMMON_CONF_OPT) - -BAREBOX_COMMON_TAGS_OPT := TAGS tags cscope - -ifdef PTXCONF_BAREBOX_COMMON -$(BAREBOX_COMMON_CONFIG): - @echo - @echo "****************************************************************************" - @echo " Please generate a bareboxconfig with 'ptxdist menuconfig barebox-common'" - @echo "****************************************************************************" - @echo - @echo - @exit 1 -endif - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/barebox-common.compile: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/barebox-common.install: - @$(call targetinfo) - @$(call touch) - -# ---------------------------------------------------------------------------- -# oldconfig / menuconfig -# ---------------------------------------------------------------------------- - -barebox-common_menuconfig barebox-common_nconfig: $(STATEDIR)/barebox-common.extract - @$(call world/kconfig, BAREBOX_COMMON, $(subst barebox-common_,,$@)) - -barebox-common_do_oldconfig: $(STATEDIR)/barebox-common.extract - @$(call world/kconfig, BAREBOX_COMMON, oldconfig) - -# vim: syntax=make diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make index d9a63fa13fbf..ec40264bdc48 100644 --- a/configs/platform-mipsel/rules/barebox-malta.make +++ b/configs/platform-mipsel/rules/barebox-malta.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta # # Paths and names # -BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_VERSION)) -BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_COMMON_MD5)) +BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_VERSION)) +BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_MD5)) BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SUFFIX := tar.bz2 BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA) diff --git a/configs/platform-mipsel/rules/barebox.noexec.make b/configs/platform-mipsel/rules/barebox.noexec.make new file mode 100644 index 000000000000..76b4a4f78126 --- /dev/null +++ b/configs/platform-mipsel/rules/barebox.noexec.make @@ -0,0 +1,7 @@ +# short-circuit the build since the recipe is only used to serve a REF_CONFIG +BAREBOX_MAKE_ENV=: + +# don't error out when trying to copy the defaultenv in the targetinstall stage +$(STATEDIR)/barebox.targetinstall: $(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env +$(BAREBOX_BUILD_DIR)/defaultenv/barebox_zero_env: $(STATEDIR)/barebox.compile + mkdir -p "$(dir $@)" && touch $@ -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 7/9] mips, mipsel: barebox-*: sync with template 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber ` (5 preceding siblings ...) 2024-08-13 13:20 ` [DistroKit] [PATCH v3 6/9] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber @ 2024-08-13 13:20 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 8/9] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber ` (2 subsequent siblings) 9 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber Update the template-generated barebox rules to port the following PTXdist commits: * b0f9f2fe33ca (2020-08-07, Roland Hieber: "barebox, kernel: enable use of {allyes, allno, allmod, alldef, rand}config") * 682d95986b7a (2020-08-19, Roland Hieber: "barebox, kernel: set <PKG>_CONF_TOOL := kconfig explicitely") * 5af76a1c7d63 (2020-08-19, Roland Hieber: "barebox, kernel: tab-align variables") * 7fa9235fb915 (2020-10-07, Michael Olbrich: "kernel, barebox: use explicit list of config targets") * 6db79433b230 (2020-09-28, Roland Hieber: "templates: add <PKG>_LICENSE_FILES variable where appropriate") Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=b0f9f2fe33ca Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=682d95986b7a Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=5af76a1c7d63 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=7fa9235fb915 Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=6db79433b230 Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- .../platform-mips/rules/barebox-ar9331.make | 17 +++++++------- .../platform-mips/rules/barebox-malta.make | 21 +++++++++-------- .../platform-mipsel/rules/barebox-malta.make | 23 ++++++++++--------- 3 files changed, 32 insertions(+), 29 deletions(-) diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make index c769d2111978..8627f19c5e79 100644 --- a/configs/platform-mips/rules/barebox-ar9331.make +++ b/configs/platform-mips/rules/barebox-ar9331.make @@ -17,16 +17,17 @@ PACKAGES-$(PTXCONF_BAREBOX_AR9331) += barebox-ar9331 # BAREBOX_AR9331_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX) BAREBOX_AR9331_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX) -BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION) +BAREBOX_AR9331 := barebox-ar9331-$(BAREBOX_AR9331_VERSION) BAREBOX_AR9331_SUFFIX := tar.bz2 BAREBOX_AR9331_URL := $(call barebox-url, BAREBOX_AR9331) -BAREBOX_AR9331_PATCHES := barebox-$(BAREBOX_AR9331_VERSION) +BAREBOX_AR9331_PATCHES := barebox-$(BAREBOX_AR9331_VERSION) BAREBOX_AR9331_SOURCE := $(SRCDIR)/$(BAREBOX_AR9331_PATCHES).$(BAREBOX_AR9331_SUFFIX) BAREBOX_AR9331_DIR := $(BUILDDIR)/$(BAREBOX_AR9331) BAREBOX_AR9331_BUILD_DIR := $(BAREBOX_AR9331_DIR)-build BAREBOX_AR9331_CONFIG := $(call ptx/in-platformconfigdir, barebox-ar9331.config) BAREBOX_AR9331_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_AR9331_LICENSE := GPL-2.0-only +BAREBOX_AR9331_LICENSE := GPL-2.0-only +BAREBOX_AR9331_LICENSE_FILES := BAREBOX_AR9331_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- @@ -34,18 +35,18 @@ BAREBOX_AR9331_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # use host pkg-config for host tools -BAREBOX_AR9331_PATH := PATH=$(HOST_PATH) +BAREBOX_AR9331_PATH := PATH=$(HOST_PATH) BAREBOX_AR9331_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_AR9331_CONF_OPT := \ +BAREBOX_AR9331_CONF_TOOL := kconfig +BAREBOX_AR9331_CONF_OPT := \ -C $(BAREBOX_AR9331_DIR) \ O=$(BAREBOX_AR9331_BUILD_DIR) \ - BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ $(call barebox-opts, BAREBOX_AR9331) -BAREBOX_AR9331_MAKE_OPT := $(BAREBOX_AR9331_CONF_OPT) +BAREBOX_AR9331_MAKE_OPT := $(BAREBOX_AR9331_CONF_OPT) BAREBOX_AR9331_IMAGES := images/barebox-dptechnics-dpt-module.img BAREBOX_AR9331_IMAGES := $(addprefix $(BAREBOX_AR9331_BUILD_DIR)/,$(BAREBOX_AR9331_IMAGES)) @@ -106,7 +107,7 @@ $(STATEDIR)/barebox-ar9331.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox-ar9331_oldconfig barebox-ar9331_menuconfig barebox-ar9331_nconfig: $(STATEDIR)/barebox-ar9331.extract +$(call ptx/kconfig-targets, barebox-ar9331): $(STATEDIR)/barebox-ar9331.extract @$(call world/kconfig, BAREBOX_AR9331, $(subst barebox-ar9331_,,$@)) # vim: syntax=make diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make index ae4dcfe8d6e4..281f3338504b 100644 --- a/configs/platform-mips/rules/barebox-malta.make +++ b/configs/platform-mips/rules/barebox-malta.make @@ -17,35 +17,36 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta # BAREBOX_MALTA_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX) BAREBOX_MALTA_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX) -BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) +BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SUFFIX := tar.bz2 BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA) -BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION) +BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SOURCE := $(SRCDIR)/$(BAREBOX_MALTA_PATCHES).$(BAREBOX_MALTA_SUFFIX) BAREBOX_MALTA_DIR := $(BUILDDIR)/$(BAREBOX_MALTA) -BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build +BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config) BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_MALTA_LICENSE := GPL-2.0-only -BAREBOX_MALTA_BUILD_OOT := KEEP +BAREBOX_MALTA_LICENSE := GPL-2.0-only +BAREBOX_MALTA_LICENSE_FILES := +BAREBOX_MALTA_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- # use host pkg-config for host tools -BAREBOX_MALTA_PATH := PATH=$(HOST_PATH) +BAREBOX_MALTA_PATH := PATH=$(HOST_PATH) BAREBOX_MALTA_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_MALTA_CONF_OPT := \ +BAREBOX_MALTA_CONF_TOOL := kconfig +BAREBOX_MALTA_CONF_OPT := \ -C $(BAREBOX_MALTA_DIR) \ O=$(BAREBOX_MALTA_BUILD_DIR) \ - BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ $(call barebox-opts, BAREBOX_MALTA) -BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT) +BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT) BAREBOX_MALTA_IMAGES := images/barebox-qemu-malta.img BAREBOX_MALTA_IMAGES := $(addprefix $(BAREBOX_MALTA_BUILD_DIR)/,$(BAREBOX_MALTA_IMAGES)) @@ -106,7 +107,7 @@ $(STATEDIR)/barebox-malta.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox-malta_oldconfig barebox-malta_menuconfig barebox-malta_nconfig: $(STATEDIR)/barebox-malta.extract +$(call ptx/kconfig-targets, barebox-malta): $(STATEDIR)/barebox-malta.extract @$(call world/kconfig, BAREBOX_MALTA, $(subst barebox-malta_,,$@)) # vim: syntax=make diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make index ec40264bdc48..93502441fc0d 100644 --- a/configs/platform-mipsel/rules/barebox-malta.make +++ b/configs/platform-mipsel/rules/barebox-malta.make @@ -15,37 +15,38 @@ PACKAGES-$(PTXCONF_BAREBOX_MALTA) += barebox-malta # # Paths and names # -BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_VERSION)) +BAREBOX_MALTA_VERSION := $(call remove_quotes,$(PTXCONF_BAREBOX_VERSION)) BAREBOX_MALTA_MD5 := $(call remove_quotes,$(PTXCONF_BAREBOX_MD5)) -BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) +BAREBOX_MALTA := barebox-malta-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SUFFIX := tar.bz2 BAREBOX_MALTA_URL := $(call barebox-url, BAREBOX_MALTA) -BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION) +BAREBOX_MALTA_PATCHES := barebox-$(BAREBOX_MALTA_VERSION) BAREBOX_MALTA_SOURCE := $(SRCDIR)/$(BAREBOX_MALTA_PATCHES).$(BAREBOX_MALTA_SUFFIX) BAREBOX_MALTA_DIR := $(BUILDDIR)/$(BAREBOX_MALTA) -BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build +BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config) BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_MALTA_LICENSE := GPL-2.0-only -BAREBOX_MALTA_BUILD_OOT := KEEP +BAREBOX_MALTA_LICENSE := GPL-2.0-only +BAREBOX_MALTA_LICENSE_FILES := +BAREBOX_MALTA_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- # use host pkg-config for host tools -BAREBOX_MALTA_PATH := PATH=$(HOST_PATH) +BAREBOX_MALTA_PATH := PATH=$(HOST_PATH) BAREBOX_MALTA_WRAPPER_BLACKLIST := \ $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_MALTA_CONF_OPT := \ +BAREBOX_MALTA_CONF_TOOL := kconfig +BAREBOX_MALTA_CONF_OPT := \ -C $(BAREBOX_MALTA_DIR) \ O=$(BAREBOX_MALTA_BUILD_DIR) \ - BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ $(call barebox-opts, BAREBOX_MALTA) -BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT) +BAREBOX_MALTA_MAKE_OPT := $(BAREBOX_MALTA_CONF_OPT) BAREBOX_MALTA_IMAGES := images/barebox-qemu-malta.img BAREBOX_MALTA_IMAGES := $(addprefix $(BAREBOX_MALTA_BUILD_DIR)/,$(BAREBOX_MALTA_IMAGES)) @@ -106,7 +107,7 @@ $(STATEDIR)/barebox-malta.clean: # oldconfig / menuconfig # ---------------------------------------------------------------------------- -barebox-malta_oldconfig barebox-malta_menuconfig barebox-malta_nconfig: $(STATEDIR)/barebox-malta.extract +$(call ptx/kconfig-targets, barebox-malta): $(STATEDIR)/barebox-malta.extract @$(call world/kconfig, BAREBOX_MALTA, $(subst barebox-malta_,,$@)) # vim: syntax=make -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 8/9] mips, mipsel: barebox-*: use ptx/image-install 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber ` (6 preceding siblings ...) 2024-08-13 13:20 ` [DistroKit] [PATCH v3 7/9] mips, mipsel: barebox-*: sync with template Roland Hieber @ 2024-08-13 13:20 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 9/9] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber 2024-08-14 7:55 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Robert Schwebel 9 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber The images installed by ptx/image-install are automatically cleaned up by PTXdist's default clean stage. Forwarded: https://lore.ptxdist.org/ptxdist/20240802102529.1411407-2-rhi@pengutronix.de/ Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- .../platform-mips/rules/barebox-ar9331.make | 24 ++++++------------ .../platform-mips/rules/barebox-malta.make | 25 +++++++------------ .../platform-mipsel/rules/barebox-malta.make | 25 +++++++------------ 3 files changed, 26 insertions(+), 48 deletions(-) diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make index 8627f19c5e79..714f3191f688 100644 --- a/configs/platform-mips/rules/barebox-ar9331.make +++ b/configs/platform-mips/rules/barebox-ar9331.make @@ -85,24 +85,16 @@ $(STATEDIR)/barebox-ar9331.install: $(STATEDIR)/barebox-ar9331.targetinstall: @$(call targetinfo) @$(foreach image, $(BAREBOX_AR9331_IMAGES), \ - install -m 644 \ - $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) - @install -D -m644 $(BAREBOX_AR9331_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-ar9331 - @install -D -m644 $(BAREBOX_AR9331_BUILD_DIR)/arch/mips/dts/ar9331-dptechnics-dpt-module.dtb $(IMAGEDIR)/ar9331-dptechnics-dpt-module.dtb-bb + $(call ptx/image-install, BAREBOX_AR9331, $(image), \ + $(notdir $(image))-ar9331)$(ptx/nl)) + @$(call ptx/image-install, BAREBOX_AR9331, \ + $(BAREBOX_AR9331_BUILD_DIR)/defaultenv/barebox_zero_env, \ + barebox-zero-env-ar9331) + @$(call ptx/image-install, BAREBOX_AR9331, \ + $(BAREBOX_AR9331_BUILD_DIR)/arch/mips/dts/ar9331-dptechnics-dpt-module.dtb, \ + ar9331-dptechnics-dpt-module.dtb) @$(call touch) -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/barebox-ar9331.clean: - @$(call targetinfo) - @$(call clean_pkg, BAREBOX_AR9331) - @$(foreach image, $(BAREBOX_AR9331_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) - @rm -vf $(IMAGEDIR)/barebox-zero-env-ar9331 \ - $(IMAGEDIR)/ar9331-dptechnics-dpt-module.dtb-bb - # ---------------------------------------------------------------------------- # oldconfig / menuconfig # ---------------------------------------------------------------------------- diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make index 281f3338504b..ff594480db7d 100644 --- a/configs/platform-mips/rules/barebox-malta.make +++ b/configs/platform-mips/rules/barebox-malta.make @@ -85,23 +85,16 @@ $(STATEDIR)/barebox-malta.install: $(STATEDIR)/barebox-malta.targetinstall: @$(call targetinfo) @$(foreach image, $(BAREBOX_MALTA_IMAGES), \ - install -m 644 \ - $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) - @install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-malta - @install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb $(IMAGEDIR)/qemu-malta.dtb-bb - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- + $(call ptx/image-install, BAREBOX_MALTA, $(image), \ + $(notdir $(image))-malta)$(ptx/nl)) + @$(call ptx/image-install, BAREBOX_MALTA, \ + $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env, \ + barebox-zero-env-malta) + @$(call ptx/image-install, BAREBOX_MALTA, \ + $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb, \ + qemu-malta.dtb-bb) -$(STATEDIR)/barebox-malta.clean: - @$(call targetinfo) - @$(call clean_pkg, BAREBOX_MALTA) - @$(foreach image, $(BAREBOX_MALTA_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) - @rm -vf $(IMAGEDIR)/barebox-zero-env-malta \ - $(IMAGEDIR)/qemu-malta.dtb-bb + @$(call touch) # ---------------------------------------------------------------------------- # oldconfig / menuconfig diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make index 93502441fc0d..64be579ea1a5 100644 --- a/configs/platform-mipsel/rules/barebox-malta.make +++ b/configs/platform-mipsel/rules/barebox-malta.make @@ -85,23 +85,16 @@ $(STATEDIR)/barebox-malta.install: $(STATEDIR)/barebox-malta.targetinstall: @$(call targetinfo) @$(foreach image, $(BAREBOX_MALTA_IMAGES), \ - install -m 644 \ - $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) - @install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env $(IMAGEDIR)/barebox-zero-env-malta - @install -D -m644 $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb $(IMAGEDIR)/qemu-malta.dtb-bb - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- + $(call ptx/image-install, BAREBOX_MALTA, $(image), \ + $(notdir $(image))-malta)$(ptx/nl)) + @$(call ptx/image-install, BAREBOX_MALTA, \ + $(BAREBOX_MALTA_BUILD_DIR)/defaultenv/barebox_zero_env, \ + barebox-zero-env-malta) + @$(call ptx/image-install, BAREBOX_MALTA, \ + $(BAREBOX_MALTA_BUILD_DIR)/arch/mips/dts/qemu-malta.dtb, \ + qemu-malta.dtb-bb) -$(STATEDIR)/barebox-malta.clean: - @$(call targetinfo) - @$(call clean_pkg, BAREBOX_MALTA) - @$(foreach image, $(BAREBOX_MALTA_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) - @rm -vf $(IMAGEDIR)/barebox-zero-env-malta \ - $(IMAGEDIR)/qemu-malta.dtb-bb + @$(call touch) # ---------------------------------------------------------------------------- # oldconfig / menuconfig -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* [DistroKit] [PATCH v3 9/9] mips, mipsel: barebox-*: set LICENSE_FILES 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber ` (7 preceding siblings ...) 2024-08-13 13:20 ` [DistroKit] [PATCH v3 8/9] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber @ 2024-08-13 13:20 ` Roland Hieber 2024-08-14 7:55 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Robert Schwebel 9 siblings, 0 replies; 19+ messages in thread From: Roland Hieber @ 2024-08-13 13:20 UTC (permalink / raw) To: distrokit; +Cc: Roland Hieber The source is not different than the upstream barebox rule, so we can just use the same checksums. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- configs/platform-mips/rules/barebox-ar9331.make | 2 +- configs/platform-mips/rules/barebox-malta.make | 2 +- configs/platform-mipsel/rules/barebox-malta.make | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configs/platform-mips/rules/barebox-ar9331.make b/configs/platform-mips/rules/barebox-ar9331.make index 714f3191f688..13b517a48ce6 100644 --- a/configs/platform-mips/rules/barebox-ar9331.make +++ b/configs/platform-mips/rules/barebox-ar9331.make @@ -27,7 +27,7 @@ BAREBOX_AR9331_BUILD_DIR := $(BAREBOX_AR9331_DIR)-build BAREBOX_AR9331_CONFIG := $(call ptx/in-platformconfigdir, barebox-ar9331.config) BAREBOX_AR9331_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) BAREBOX_AR9331_LICENSE := GPL-2.0-only -BAREBOX_AR9331_LICENSE_FILES := +BAREBOX_AR9331_LICENSE_FILES := $(BAREBOX_LICENSE_FILES) BAREBOX_AR9331_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- diff --git a/configs/platform-mips/rules/barebox-malta.make b/configs/platform-mips/rules/barebox-malta.make index ff594480db7d..52ded8ce41c4 100644 --- a/configs/platform-mips/rules/barebox-malta.make +++ b/configs/platform-mips/rules/barebox-malta.make @@ -27,7 +27,7 @@ BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config) BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) BAREBOX_MALTA_LICENSE := GPL-2.0-only -BAREBOX_MALTA_LICENSE_FILES := +BAREBOX_MALTA_LICENSE_FILES := $(BAREBOX_LICENSE_FILES) BAREBOX_MALTA_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- diff --git a/configs/platform-mipsel/rules/barebox-malta.make b/configs/platform-mipsel/rules/barebox-malta.make index 64be579ea1a5..9143d47433c8 100644 --- a/configs/platform-mipsel/rules/barebox-malta.make +++ b/configs/platform-mipsel/rules/barebox-malta.make @@ -27,7 +27,7 @@ BAREBOX_MALTA_BUILD_DIR := $(BAREBOX_MALTA_DIR)-build BAREBOX_MALTA_CONFIG := $(call ptx/in-platformconfigdir, barebox-malta.config) BAREBOX_MALTA_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) BAREBOX_MALTA_LICENSE := GPL-2.0-only -BAREBOX_MALTA_LICENSE_FILES := +BAREBOX_MALTA_LICENSE_FILES := $(BAREBOX_LICENSE_FILES) BAREBOX_MALTA_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- -- 2.39.2 ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [DistroKit] [PATCH v3 0/9] mips(el) cleanup 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber ` (8 preceding siblings ...) 2024-08-13 13:20 ` [DistroKit] [PATCH v3 9/9] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber @ 2024-08-14 7:55 ` Robert Schwebel 9 siblings, 0 replies; 19+ messages in thread From: Robert Schwebel @ 2024-08-14 7:55 UTC (permalink / raw) To: Roland Hieber; +Cc: distrokit Took this version into next now. On Tue, Aug 13, 2024 at 03:20:41PM +0200, Roland Hieber wrote: > PATCH v3: > * in PATCH 06/10, select KERNEL only at BUILDTIME > (Sorry for the delay, somehow I was under the impression that I had > already sent these patches on Friday, only to find my DistroKit screen > session waiting at the 'Send this email?' prompt today) > > PATCH v2: > * reorder PATCH 01 and 02 > * update log message in PATCH (now-)02 to explain the PAHOLE changes > * Patches 03 to 10 are new, > > Roland Hieber (9): > mipsel: sync kernelconfig > mips, mipsel: remove forked kernel rule > mips, mipsel: kernel-*: sync with template > mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage > mips, mipsel: kernel-*: select KERNEL > mips, mipsel: migrate barebox-common recipe to barebox > mips, mipsel: barebox-*: sync with template > mips, mipsel: barebox-*: use ptx/image-install > mips, mipsel: barebox-*: set LICENSE_FILES > > configs/platform-mips/kernelconfig | 1 - > .../platform-mips/kernelconfig-ar9331.diff | 3 +- > configs/platform-mips/kernelconfig-malta.diff | 3 +- > configs/platform-mips/platformconfig | 65 ++++++++++++-- > .../platforms/barebox-0-common.in | 33 -------- > .../platform-mips/platforms/barebox-ar9331.in | 2 +- > .../platform-mips/platforms/barebox-malta.in | 2 +- > .../platform-mips/platforms/kernel-ar9331.in | 2 + > .../platform-mips/platforms/kernel-malta.in | 2 + > configs/platform-mips/platforms/kernel.in | 26 ------ > .../platform-mips/rules/barebox-ar9331.make | 45 +++++----- > .../platform-mips/rules/barebox-common.make | 84 ------------------- > .../platform-mips/rules/barebox-malta.make | 50 +++++------ > .../platform-mips/rules/barebox.noexec.make | 7 ++ > .../platform-mips/rules/kernel-ar9331.make | 57 ++++++------- > configs/platform-mips/rules/kernel-malta.make | 65 +++++++------- > configs/platform-mips/rules/kernel.make | 83 ------------------ > .../platform-mips/rules/kernel.noexec.make | 2 + > configs/platform-mipsel/kernelconfig | 1 - > configs/platform-mipsel/kernelconfig-malta | 17 ++-- > .../platform-mipsel/kernelconfig-malta.diff | 21 ++--- > configs/platform-mipsel/platformconfig | 65 ++++++++++++-- > .../platforms/barebox-0-common.in | 33 -------- > .../platforms/barebox-malta.in | 2 +- > .../platform-mipsel/platforms/kernel-malta.in | 2 + > configs/platform-mipsel/platforms/kernel.in | 26 ------ > .../platform-mipsel/rules/barebox-common.make | 84 ------------------- > .../platform-mipsel/rules/barebox-malta.make | 50 +++++------ > .../platform-mipsel/rules/barebox.noexec.make | 7 ++ > .../platform-mipsel/rules/kernel-malta.make | 60 +++++++------ > configs/platform-mipsel/rules/kernel.make | 82 ------------------ > .../platform-mipsel/rules/kernel.noexec.make | 2 + > 32 files changed, 317 insertions(+), 667 deletions(-) > delete mode 100644 configs/platform-mips/platforms/barebox-0-common.in > delete mode 100644 configs/platform-mips/platforms/kernel.in > delete mode 100644 configs/platform-mips/rules/barebox-common.make > create mode 100644 configs/platform-mips/rules/barebox.noexec.make > delete mode 100644 configs/platform-mips/rules/kernel.make > create mode 100644 configs/platform-mips/rules/kernel.noexec.make > delete mode 100644 configs/platform-mipsel/platforms/barebox-0-common.in > delete mode 100644 configs/platform-mipsel/platforms/kernel.in > delete mode 100644 configs/platform-mipsel/rules/barebox-common.make > create mode 100644 configs/platform-mipsel/rules/barebox.noexec.make > delete mode 100644 configs/platform-mipsel/rules/kernel.make > create mode 100644 configs/platform-mipsel/rules/kernel.noexec.make > > -- > 2.39.2 > > > -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | ^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 2024-08-01 11:38 [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Ahmad Fatoum ` (5 preceding siblings ...) 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber @ 2024-08-14 7:59 ` Robert Schwebel 6 siblings, 0 replies; 19+ messages in thread From: Robert Schwebel @ 2024-08-14 7:59 UTC (permalink / raw) To: Ahmad Fatoum; +Cc: distrokit Could you resend the series and check that it still fits on top of next? b4 seems to be disturbed by Rohieb's MIPS series being a reply to this thread. On Thu, Aug 01, 2024 at 01:38:14PM +0200, Ahmad Fatoum wrote: > Besides being a year newer, this update allows us to drop the patches we > have carrying around. > > Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de> > --- > .../platform-v7a_noneon/barebox-at91.config | 90 +++++-- > .../barebox-at91.config.diff | 19 +- > .../barebox-vexpress.config | 81 +++++-- > .../barebox-vexpress.config.diff | 5 +- > configs/platform-v7a_noneon/barebox.config | 84 +++++-- > ...nable-ddramc-for-sama5d3-and-sama5d4.patch | 32 --- > ...port-for-SAMA5D3-Ethernet-Developmen.patch | 219 ------------------ > ...ip-ksz9477-evb-migrate-to-sama5d3_ba.patch | 23 -- > ...0-customers-pengutronix-distrokit-sa.patch | 22 -- > .../patches/barebox-2023.07.1/series | 13 -- > configs/platform-v7a_noneon/platformconfig | 4 +- > 11 files changed, 234 insertions(+), 358 deletions(-) > delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch > delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch > delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch > delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch > delete mode 100644 configs/platform-v7a_noneon/patches/barebox-2023.07.1/series > > diff --git a/configs/platform-v7a_noneon/barebox-at91.config b/configs/platform-v7a_noneon/barebox-at91.config > index c24b5d36b79d..97f5f2b95031 100644 > --- a/configs/platform-v7a_noneon/barebox-at91.config > +++ b/configs/platform-v7a_noneon/barebox-at91.config > @@ -1,11 +1,11 @@ > # > # Automatically generated file; DO NOT EDIT. > -# Barebox/arm 2023.07.1-20230706-1 Configuration > +# Barebox/arm 2024.07.0 Configuration > # > CONFIG_ARM=y > +CONFIG_ARCH_TEXT_BASE=0x00000000 > CONFIG_ARM_LINUX=y > CONFIG_ARM_USE_COMPRESSED_DTB=y > -CONFIG_TEXT_BASE=0x0 > > # > # System Type > @@ -13,18 +13,11 @@ CONFIG_TEXT_BASE=0x0 > # CONFIG_ARCH_MULTIARCH is not set > CONFIG_ARCH_AT91=y > # CONFIG_ARCH_CLPS711X is not set > -# CONFIG_ARCH_DAVINCI is not set > -# CONFIG_ARCH_DIGIC is not set > -# CONFIG_ARCH_EP93XX is not set > -# CONFIG_ARCH_LAYERSCAPE is not set > # CONFIG_ARCH_MVEBU is not set > # CONFIG_ARCH_MXS is not set > -# CONFIG_ARCH_NOMADIK is not set > -# CONFIG_ARCH_OMAP_SINGLE is not set > # CONFIG_ARCH_PXA is not set > # CONFIG_ARCH_SOCFPGA is not set > # CONFIG_ARCH_TEGRA is not set > -# CONFIG_ARCH_UEMD is not set > # CONFIG_ARCH_ZYNQ is not set > # CONFIG_ARCH_BCM283X is not set > # CONFIG_ARCH_STM32MP is not set > @@ -50,15 +43,16 @@ CONFIG_HAVE_AT91_DDRAMC=y > CONFIG_AT91_MCI_PBL=y > CONFIG_AT91SAM9_SMC=y > CONFIG_HAVE_AT91SAM9_RST=y > +CONFIG_SOC_SAM_V7=y > CONFIG_SOC_SAMA5=y > CONFIG_SOC_SAMA5_MULTI=y > CONFIG_SOC_SAMA5D3=y > -CONFIG_ARCH_TEXT_BASE=0x23f00000 > > # > # Atmel AT91 System-on-Chip > # > CONFIG_AT91_MULTI_BOARDS=y > +# CONFIG_MACH_CALAO is not set > # CONFIG_MACH_SKOV_ARM9CPU is not set > # CONFIG_MACH_AT91SAM9263EK is not set > # CONFIG_MACH_AT91SAM9X5EK is not set > @@ -143,6 +137,7 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff > CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff > CONFIG_STACK_SIZE=0x8000 > CONFIG_MALLOC_SIZE=0x0 > +CONFIG_MALLOC_ALIGNMENT=8 > # end of memory layout > > # CONFIG_EXPERIMENTAL is not set > @@ -151,7 +146,9 @@ CONFIG_MALLOC_TLSF=y > CONFIG_HAVE_MOD_ARCH_SPECIFIC=y > CONFIG_KALLSYMS=y > CONFIG_RELOCATABLE=y > +# CONFIG_PANIC_POWEROFF is not set > # CONFIG_PANIC_HANG is not set > +CONFIG_PANIC_RESET=y > CONFIG_PROMPT="barebox:" > CONFIG_BAUDRATE=115200 > CONFIG_CBSIZE=1024 > @@ -166,7 +163,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > @@ -174,7 +170,7 @@ CONFIG_BOOTM_SHOW_TYPE=y > # CONFIG_BOOTM_VERBOSE is not set > CONFIG_BOOTM_INITRD=y > CONFIG_BOOTM_OFTREE=y > -CONFIG_BOOTM_OFTREE_UIMAGE=y > +# CONFIG_BOOTM_UIMAGE is not set > # CONFIG_BOOTM_AIMAGE is not set > # CONFIG_BOOTM_ELF is not set > # CONFIG_BOOTM_FITIMAGE is not set > @@ -195,6 +191,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y > CONFIG_PBL_CONSOLE=y > # CONFIG_CONSOLE_RATP is not set > CONFIG_PARTITION=y > +CONFIG_PARTITION_MANIPULATION=y > CONFIG_PARTITION_DISK=y > CONFIG_PARTITION_DISK_DOS=y > CONFIG_PARTITION_DISK_EFI=y > @@ -234,11 +231,14 @@ CONFIG_FASTBOOT_CMD_OEM=y > # > CONFIG_COMPILE_LOGLEVEL=6 > CONFIG_DEFAULT_LOGLEVEL=6 > +CONFIG_HAS_DEBUG_LL=y > # CONFIG_DEBUG_LL is not set > CONFIG_DEBUG_AT91_UART_BASE=0xffffee00 > # CONFIG_DEBUG_INITCALLS is not set > # CONFIG_DEBUG_PBL is not set > # CONFIG_DEBUG_PROBES is not set > +# CONFIG_DMA_API_DEBUG is not set > +# CONFIG_DEBUG_LIST is not set > # CONFIG_PBL_BREAK is not set > # CONFIG_PRINTF_FULL is not set > # CONFIG_UBSAN is not set > @@ -252,9 +252,9 @@ CONFIG_CC_HAS_KASAN_GENERIC=y > # > # EFI (Extensible Firmware Interface) Support > # > +CONFIG_HAVE_EFI_STUB=y > # end of EFI (Extensible Firmware Interface) Support > > -CONFIG_HAS_DEBUG_LL=y > CONFIG_COMMAND_SUPPORT=y > CONFIG_COMPILE_HASH=y > > @@ -310,6 +310,8 @@ CONFIG_CMD_UIMAGE=y > # CONFIG_CMD_PARTITION is not set > CONFIG_CMD_AUTOMOUNT=y > CONFIG_CMD_MOUNT=y > +# CONFIG_CMD_FINDMNT is not set > +CONFIG_CMD_PARTED=y > CONFIG_CMD_UBI=y > CONFIG_CMD_UBIFORMAT=y > CONFIG_CMD_UMOUNT=y > @@ -439,6 +441,7 @@ CONFIG_CMD_USBGADGET=y > CONFIG_CMD_BAREBOX_UPDATE=y > # CONFIG_CMD_BLOBGEN is not set > # CONFIG_CMD_FIRMWARELOAD is not set > +# CONFIG_CMD_KALLSYMS is not set > # CONFIG_CMD_OF_COMPATIBLE is not set > # CONFIG_CMD_OF_DIFF is not set > CONFIG_CMD_OF_DUMP=y > @@ -454,6 +457,7 @@ CONFIG_CMD_TIME=y > # CONFIG_CMD_DHRYSTONE is not set > # CONFIG_CMD_SPD_DECODE is not set > # CONFIG_CMD_SEED is not set > +# CONFIG_CMD_STACKSMASH is not set > # end of Miscellaneous > # end of Commands > > @@ -475,6 +479,7 @@ CONFIG_REGMAP_SPI=y > CONFIG_OFTREE=y > CONFIG_OFTREE_MEM_GENERIC=y > CONFIG_DTC=y > +CONFIG_OF=y > CONFIG_OFDEVICE=y > CONFIG_OF_GPIO=y > CONFIG_OF_BAREBOX_DRIVERS=y > @@ -523,6 +528,7 @@ CONFIG_DRIVER_NET_MICREL=y > # CONFIG_DAVICOM_PHY is not set > # CONFIG_DP83867_PHY is not set > # CONFIG_DP83TD510_PHY is not set > +# CONFIG_DP83TG720_PHY is not set > # CONFIG_LXT_PHY is not set > # CONFIG_MARVELL_PHY is not set > CONFIG_MICREL_PHY=y > @@ -597,17 +603,38 @@ CONFIG_MTD_M25P80=y > # end of Self contained MTD devices > > # CONFIG_DRIVER_CFI is not set > + > +# > +# NAND > +# > +CONFIG_MTD_NAND_CORE=y > +CONFIG_MTD_RAW_NAND=y > CONFIG_NAND=y > CONFIG_MTD_NAND_ECC_SOFT=y > -CONFIG_MTD_NAND_ECC_SW_BCH=y > # CONFIG_NAND_ECC_HW_SYNDROME is not set > # CONFIG_NAND_ALLOW_ERASE_BAD is not set > +CONFIG_NAND_NEED_EXEC_OP=y > + > +# > +# Raw/parallel NAND flash controllers > +# > CONFIG_NAND_ATMEL=y > # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set > # CONFIG_MTD_NAND_DENALI is not set > + > +# > +# ECC engine support > +# > +CONFIG_MTD_NAND_ECC=y > +# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set > +CONFIG_MTD_NAND_ECC_SW_BCH=y > +# end of ECC engine support > +# end of NAND > + > CONFIG_MTD_SPI_NOR=y > # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set > # CONFIG_SPI_CADENCE_QUADSPI is not set > +# CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set > CONFIG_MTD_UBI=y > CONFIG_MTD_UBI_BEB_LIMIT=20 > # CONFIG_MTD_UBI_FASTMAP is not set > @@ -669,6 +696,7 @@ CONFIG_MCI=y > # > # --- Feature list --- > # > +# CONFIG_MCI_TUNING is not set > # CONFIG_MCI_STARTUP is not set > CONFIG_MCI_INFO=y > CONFIG_MCI_WRITE=y > @@ -678,11 +706,13 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y > # > # --- MCI host drivers --- > # > +# CONFIG_MCI_DWC_MSHC is not set > # CONFIG_MCI_DW is not set > # CONFIG_MCI_ROCKCHIP_DWCMSHC is not set > CONFIG_MCI_ATMEL=y > CONFIG_MCI_ATMEL_SDHCI=y > # CONFIG_MCI_ARASAN is not set > +# CONFIG_MCI_AM654 is not set > # CONFIG_MCI_SPI is not set > CONFIG_MCI_ATMEL_PBL=y > CONFIG_HAVE_CLK=y > @@ -715,6 +745,7 @@ CONFIG_MFD_SYSCON=y > # CONFIG_MFD_TWL4030 is not set > # CONFIG_MFD_TWL6030 is not set > # CONFIG_MFD_STPMIC1 is not set > +# CONFIG_MFD_PCA9450 is not set > # CONFIG_MFD_RN568PMIC is not set > # CONFIG_MFD_ATMEL_FLEXCOM is not set > # CONFIG_MFD_RK808 is not set > @@ -751,6 +782,7 @@ CONFIG_LED_TRIGGERS=y > # > # Input device support > # > +# CONFIG_INPUT_EVBUG is not set > # CONFIG_KEYBOARD_GPIO is not set > # CONFIG_KEYBOARD_QT1070 is not set > # CONFIG_KEYBOARD_USB is not set > @@ -833,6 +865,12 @@ CONFIG_REGULATOR_FIXED=y > # > # CONFIG_FIRMWARE_ALTERA_SERIAL is not set > # CONFIG_QEMU_FW_CFG is not set > + > +# > +# ARM System Control and Management Interface Protocol > +# > +# CONFIG_ARM_SCMI_PROTOCOL is not set > +# end of ARM System Control and Management Interface Protocol > # end of Firmware Drivers > > # > @@ -869,6 +907,16 @@ CONFIG_ATMEL_EBI=y > # end of KVX SoC drivers > # end of SoC drivers > > +# > +# PM Domains > +# > + > +# > +# i.MX PM Domains > +# > +# end of i.MX PM Domains > +# end of PM Domains > + > # > # NVME Support > # > @@ -881,6 +929,8 @@ CONFIG_ATMEL_EBI=y > # CONFIG_POWER_RESET_GPIO_RESTART is not set > CONFIG_VIRTIO_MENU=y > # CONFIG_VIRTIO_MMIO is not set > +# CONFIG_MAILBOX is not set > +# CONFIG_TEE is not set > # end of Drivers > > # > @@ -953,6 +1003,7 @@ CONFIG_ZSTD_DECOMPRESS=y > CONFIG_PROCESS_ESCAPE_SEQUENCE=y > CONFIG_LZO_DECOMPRESS=y > CONFIG_BCH=y > +CONFIG_BITREV=y > CONFIG_FNMATCH=y > CONFIG_QSORT=y > CONFIG_LIBSCAN=y > @@ -977,6 +1028,17 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y > CONFIG_GENERIC_ALLOCATOR=y > # end of Library routines > > +# > +# Hardening options > +# > +# CONFIG_BUG_ON_DATA_CORRUPTION is not set > +CONFIG_STACK_GUARD_PAGE=y > +CONFIG_STACKPROTECTOR_NONE=y > +# CONFIG_STACKPROTECTOR_STRONG is not set > +CONFIG_PBL_STACKPROTECTOR_NONE=y > +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set > +# end of Hardening options > + > # > # Crypto support > # > diff --git a/configs/platform-v7a_noneon/barebox-at91.config.diff b/configs/platform-v7a_noneon/barebox-at91.config.diff > index e2cdc16d00ff..9f362cd4f8aa 100644 > --- a/configs/platform-v7a_noneon/barebox-at91.config.diff > +++ b/configs/platform-v7a_noneon/barebox-at91.config.diff > @@ -1,14 +1,13 @@ > -71b0583d9737e188a32240ae7d29a558 > +e4e5faf13c3a7da2755222882364530a > CONFIG_ARCH_AT91=y > # CONFIG_ARCH_BCM283X is not set > # CONFIG_ARCH_IMX is undefined > +# CONFIG_ARCH_LAYERSCAPE is undefined > # CONFIG_ARCH_MULTIARCH is not set > # CONFIG_ARCH_OMAP_MULTI is undefined > # CONFIG_ARCH_ROCKCHIP is undefined > -CONFIG_ARCH_TEXT_BASE=0x23f00000 > # CONFIG_ARM_AMBA is undefined > # CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS is not set > -# CONFIG_ARM_SCMI_PROTOCOL is undefined > # CONFIG_ARM_SECURE_MONITOR is undefined > # CONFIG_ARM_SMCCC is undefined > CONFIG_AT91SAM9_SMC=y > @@ -16,11 +15,12 @@ CONFIG_AT91_MCI_PBL=y > CONFIG_AT91_MULTI_BOARDS=y > CONFIG_ATMEL_EBI=y > CONFIG_BCH=y > +CONFIG_BITREV=y > # CONFIG_BOARD_ARM_GENERIC_DT is not set > # CONFIG_BOARD_GENERIC_DT is undefined > -CONFIG_BOOTM_OFTREE_UIMAGE=y > # CONFIG_BOOTM_VERBOSE is not set > # CONFIG_BZLIB is not set > +# CONFIG_CADENCE_WATCHDOG is undefined > CONFIG_CLOCKSOURCE_ATMEL_PIT=y > # CONFIG_CLOCKSOURCE_BCM283X is undefined > # CONFIG_CMD_ARM_MMUINFO is not set > @@ -89,6 +89,9 @@ CONFIG_HAVE_AT91_USB_CLK=y > CONFIG_HAVE_AT91_UTMI=y > # CONFIG_HAVE_DIGEST_SHA1 is undefined > # CONFIG_HWRNG is not set > +# CONFIG_HW_RANDOM_BCM2835 is undefined > +# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined > +# CONFIG_HW_RANDOM_TIMERIOMEM is undefined > # CONFIG_I2C_ALGOBIT is undefined > # CONFIG_I2C_AT91 is not set > # CONFIG_I2C_BCM283X is undefined > @@ -102,6 +105,7 @@ CONFIG_LIBUBIGEN=y > # CONFIG_MACHINE_ID is undefined > # CONFIG_MACH_AT91SAM9263EK is not set > # CONFIG_MACH_AT91SAM9X5EK is not set > +# CONFIG_MACH_CALAO is not set > CONFIG_MACH_MICROCHIP_KSZ9477_EVB=y > CONFIG_MACH_MICROCHIP_SAMA5D3_EDS=y > # CONFIG_MACH_RPI2 is undefined > @@ -132,10 +136,13 @@ CONFIG_MFD_SYSCON=y > CONFIG_MICREL_PHY=y > # CONFIG_MMUINFO is undefined > 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=y > CONFIG_MTD_NAND_ECC_SW_BCH=y > # CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set > +CONFIG_MTD_RAW_NAND=y > CONFIG_MTD_SPI_NOR=y > # CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set > # CONFIG_MTD_SST25L is not set > @@ -148,6 +155,7 @@ CONFIG_NAND=y > # CONFIG_NAND_ALLOW_ERASE_BAD is not set > CONFIG_NAND_ATMEL=y > # CONFIG_NAND_ECC_HW_SYNDROME is not set > +CONFIG_NAND_NEED_EXEC_OP=y > CONFIG_NET_USB_RTL8152=y > CONFIG_OF_BAREBOX_ENV_IN_FS=y > # CONFIG_OF_OVERLAY is not set > @@ -167,9 +175,11 @@ CONFIG_REGULATOR_FIXED=y > CONFIG_SOC_SAMA5=y > CONFIG_SOC_SAMA5D3=y > CONFIG_SOC_SAMA5_MULTI=y > +CONFIG_SOC_SAM_V7=y > CONFIG_SPI_ATMEL_QUADSPI=y > # CONFIG_SPI_CADENCE_QUADSPI is not set > CONFIG_SPI_MEM=y > +# CONFIG_SPI_SYNOPSYS_OCTALSPI_NOR is not set > # CONFIG_STATE is not set > # CONFIG_STATE_BACKWARD_COMPATIBLE is undefined > # CONFIG_STATE_CRYPTO is undefined > @@ -198,6 +208,7 @@ CONFIG_W1=y > # CONFIG_WATCHDOG_POLLER is undefined > CONFIG_XXHASH=y > # CONFIG_XZ_DECOMPRESS is not set > +# CONFIG_XZ_DEC_ARM64 is undefined > # CONFIG_XZ_DEC_ARM is undefined > # CONFIG_XZ_DEC_ARMTHUMB is undefined > # CONFIG_XZ_DEC_IA64 is undefined > diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config b/configs/platform-v7a_noneon/barebox-vexpress.config > index 09f112d397e1..9423207ea413 100644 > --- a/configs/platform-v7a_noneon/barebox-vexpress.config > +++ b/configs/platform-v7a_noneon/barebox-vexpress.config > @@ -1,10 +1,10 @@ > # > # Automatically generated file; DO NOT EDIT. > -# Barebox/arm 2023.07.1-20230706-1 Configuration > +# Barebox/arm 2024.07.0 Configuration > # > CONFIG_ARM=y > +CONFIG_ARCH_TEXT_BASE=0x00000000 > CONFIG_ARM_LINUX=y > -CONFIG_TEXT_BASE=0x0 > > # > # System Type > @@ -12,21 +12,15 @@ CONFIG_TEXT_BASE=0x0 > CONFIG_ARCH_MULTIARCH=y > # CONFIG_ARCH_AT91 is not set > # CONFIG_ARCH_CLPS711X is not set > -# CONFIG_ARCH_DAVINCI is not set > -# CONFIG_ARCH_DIGIC is not set > -# CONFIG_ARCH_EP93XX is not set > -# CONFIG_ARCH_LAYERSCAPE is not set > # CONFIG_ARCH_MVEBU is not set > # CONFIG_ARCH_MXS is not set > -# CONFIG_ARCH_NOMADIK is not set > -# CONFIG_ARCH_OMAP_SINGLE is not set > # CONFIG_ARCH_PXA is not set > # CONFIG_ARCH_SOCFPGA is not set > # CONFIG_ARCH_TEGRA is not set > -# CONFIG_ARCH_UEMD is not set > # CONFIG_ARCH_ZYNQ is not set > # CONFIG_ARCH_BCM283X is not set > # CONFIG_ARCH_IMX is not set > +# CONFIG_ARCH_LAYERSCAPE is not set > # CONFIG_ARCH_OMAP_MULTI is not set > # CONFIG_ARCH_ROCKCHIP is not set > # CONFIG_ARCH_STM32MP is not set > @@ -44,7 +38,6 @@ CONFIG_CPU_32v7=y > # processor features > # > # CONFIG_BOOT_ENDIANNESS_SWITCH is not set > -CONFIG_ARCH_TEXT_BASE=0x0 > CONFIG_MACH_VEXPRESS=y > # CONFIG_MACH_VIRT is not set > CONFIG_BOARD_ARM_GENERIC_DT=y > @@ -120,6 +113,7 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff > CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff > CONFIG_STACK_SIZE=0x8000 > CONFIG_MALLOC_SIZE=0x0 > +CONFIG_MALLOC_ALIGNMENT=8 > # end of memory layout > > # CONFIG_EXPERIMENTAL is not set > @@ -128,7 +122,9 @@ CONFIG_MALLOC_TLSF=y > CONFIG_HAVE_MOD_ARCH_SPECIFIC=y > CONFIG_KALLSYMS=y > CONFIG_RELOCATABLE=y > +# CONFIG_PANIC_POWEROFF is not set > # CONFIG_PANIC_HANG is not set > +CONFIG_PANIC_RESET=y > CONFIG_PROMPT="vexpress: " > CONFIG_BAUDRATE=115200 > CONFIG_CBSIZE=1024 > @@ -144,7 +140,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > @@ -152,7 +147,7 @@ CONFIG_BOOTM_SHOW_TYPE=y > CONFIG_BOOTM_VERBOSE=y > CONFIG_BOOTM_INITRD=y > CONFIG_BOOTM_OFTREE=y > -# CONFIG_BOOTM_OFTREE_UIMAGE is not set > +# CONFIG_BOOTM_UIMAGE is not set > # CONFIG_BOOTM_AIMAGE is not set > # CONFIG_BOOTM_ELF is not set > # CONFIG_BOOTM_FITIMAGE is not set > @@ -173,6 +168,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y > CONFIG_PBL_CONSOLE=y > # CONFIG_CONSOLE_RATP is not set > CONFIG_PARTITION=y > +CONFIG_PARTITION_MANIPULATION=y > CONFIG_PARTITION_DISK=y > CONFIG_PARTITION_DISK_DOS=y > CONFIG_PARTITION_DISK_EFI=y > @@ -217,10 +213,13 @@ CONFIG_FASTBOOT_CMD_OEM=y > # > CONFIG_COMPILE_LOGLEVEL=7 > CONFIG_DEFAULT_LOGLEVEL=6 > +CONFIG_HAS_DEBUG_LL=y > # CONFIG_DEBUG_LL is not set > # CONFIG_DEBUG_INITCALLS is not set > # CONFIG_DEBUG_PBL is not set > # CONFIG_DEBUG_PROBES is not set > +# CONFIG_DMA_API_DEBUG is not set > +# CONFIG_DEBUG_LIST is not set > # CONFIG_PBL_BREAK is not set > # CONFIG_PRINTF_FULL is not set > # CONFIG_UBSAN is not set > @@ -234,9 +233,9 @@ CONFIG_CC_HAS_KASAN_GENERIC=y > # > # EFI (Extensible Firmware Interface) Support > # > +CONFIG_HAVE_EFI_STUB=y > # end of EFI (Extensible Firmware Interface) Support > > -CONFIG_HAS_DEBUG_LL=y > CONFIG_COMMAND_SUPPORT=y > CONFIG_COMPILE_HASH=y > > @@ -290,6 +289,8 @@ CONFIG_CMD_UIMAGE=y > CONFIG_CMD_PARTITION=y > CONFIG_CMD_AUTOMOUNT=y > CONFIG_CMD_MOUNT=y > +# CONFIG_CMD_FINDMNT is not set > +CONFIG_CMD_PARTED=y > CONFIG_CMD_UMOUNT=y > # end of Partition > > @@ -416,6 +417,7 @@ CONFIG_CMD_WD_DEFAULT_TIMOUT=0 > CONFIG_CMD_BAREBOX_UPDATE=y > # CONFIG_CMD_BLOBGEN is not set > # CONFIG_CMD_FIRMWARELOAD is not set > +# CONFIG_CMD_KALLSYMS is not set > # CONFIG_CMD_OF_COMPATIBLE is not set > # CONFIG_CMD_OF_DIFF is not set > CONFIG_CMD_OF_DUMP=y > @@ -432,6 +434,7 @@ CONFIG_CMD_STATE=y > # CONFIG_CMD_DHRYSTONE is not set > # CONFIG_CMD_SPD_DECODE is not set > # CONFIG_CMD_SEED is not set > +# CONFIG_CMD_STACKSMASH is not set > # end of Miscellaneous > # end of Commands > > @@ -450,6 +453,7 @@ CONFIG_NET_FASTBOOT=y > CONFIG_OFTREE=y > CONFIG_OFTREE_MEM_GENERIC=y > CONFIG_DTC=y > +CONFIG_OF=y > CONFIG_OFDEVICE=y > CONFIG_OF_BAREBOX_DRIVERS=y > # CONFIG_OF_BAREBOX_ENV_IN_FS is not set > @@ -497,6 +501,7 @@ CONFIG_DRIVER_NET_SMC911X=y > # CONFIG_DAVICOM_PHY is not set > # CONFIG_DP83867_PHY is not set > # CONFIG_DP83TD510_PHY is not set > +# CONFIG_DP83TG720_PHY is not set > # CONFIG_LXT_PHY is not set > # CONFIG_MARVELL_PHY is not set > # CONFIG_MICREL_PHY is not set > @@ -566,7 +571,20 @@ CONFIG_DRIVER_CFI_BANK_WIDTH_2=y > CONFIG_DRIVER_CFI_BANK_WIDTH_4=y > # CONFIG_DRIVER_CFI_BANK_WIDTH_8 is not set > # CONFIG_CFI_BUFFER_WRITE is not set > + > +# > +# NAND > +# > # CONFIG_NAND is not set > + > +# > +# ECC engine support > +# > +# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set > +# CONFIG_MTD_NAND_ECC_SW_BCH is not set > +# end of ECC engine support > +# end of NAND > + > # CONFIG_MTD_SPI_NOR is not set > # CONFIG_MTD_UBI is not set > CONFIG_DISK=y > @@ -616,6 +634,7 @@ CONFIG_MCI=y > # > # --- Feature list --- > # > +# CONFIG_MCI_TUNING is not set > CONFIG_MCI_STARTUP=y > CONFIG_MCI_INFO=y > CONFIG_MCI_WRITE=y > @@ -625,10 +644,12 @@ CONFIG_MCI_WRITE=y > # > # --- MCI host drivers --- > # > +# CONFIG_MCI_DWC_MSHC is not set > # CONFIG_MCI_DW is not set > # CONFIG_MCI_ROCKCHIP_DWCMSHC is not set > CONFIG_MCI_MMCI=y > # CONFIG_MCI_ARASAN is not set > +# CONFIG_MCI_AM654 is not set > # CONFIG_MCI_SPI is not set > CONFIG_HAVE_CLK=y > CONFIG_CLKDEV_LOOKUP=y > @@ -660,6 +681,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y > # CONFIG_MFD_TWL4030 is not set > # CONFIG_MFD_TWL6030 is not set > # CONFIG_MFD_STPMIC1 is not set > +# CONFIG_MFD_PCA9450 is not set > # CONFIG_MFD_RN568PMIC is not set > # CONFIG_MFD_ATMEL_FLEXCOM is not set > # CONFIG_MFD_RK808 is not set > @@ -691,6 +713,7 @@ CONFIG_LED_TRIGGERS=y > # > # Input device support > # > +# CONFIG_INPUT_EVBUG is not set > # CONFIG_KEYBOARD_USB is not set > # CONFIG_INPUT_SPECIALKEYS is not set > # end of Input device support > @@ -698,8 +721,10 @@ CONFIG_LED_TRIGGERS=y > CONFIG_WATCHDOG=y > # CONFIG_WATCHDOG_POLLER is not set > # CONFIG_WATCHDOG_DW is not set > +# CONFIG_CADENCE_WATCHDOG is not set > # CONFIG_PWM is not set > CONFIG_HWRNG=y > +# CONFIG_HW_RANDOM_TIMERIOMEM is not set > > # > # DMA support > @@ -737,6 +762,12 @@ CONFIG_REGULATOR=y > # Firmware Drivers > # > # CONFIG_QEMU_FW_CFG is not set > + > +# > +# ARM System Control and Management Interface Protocol > +# > +# CONFIG_ARM_SCMI_PROTOCOL is not set > +# end of ARM System Control and Management Interface Protocol > # end of Firmware Drivers > > # > @@ -772,6 +803,16 @@ CONFIG_REGULATOR=y > # end of KVX SoC drivers > # end of SoC drivers > > +# > +# PM Domains > +# > + > +# > +# i.MX PM Domains > +# > +# end of i.MX PM Domains > +# end of PM Domains > + > # > # NVME Support > # > @@ -780,6 +821,8 @@ CONFIG_REGULATOR=y > # CONFIG_POWER_RESET_SYSCON is not set > # CONFIG_POWER_RESET_SYSCON_POWEROFF is not set > # CONFIG_VIRTIO_MENU is not set > +# CONFIG_MAILBOX is not set > +# CONFIG_TEE is not set > # end of Drivers > > # > @@ -849,6 +892,7 @@ CONFIG_XZ_DEC_IA64=y > CONFIG_XZ_DEC_ARM=y > CONFIG_XZ_DEC_ARMTHUMB=y > CONFIG_XZ_DEC_SPARC=y > +CONFIG_XZ_DEC_ARM64=y > # CONFIG_BASE64 is not set > CONFIG_PROCESS_ESCAPE_SEQUENCE=y > CONFIG_LZO_DECOMPRESS=y > @@ -874,6 +918,17 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y > CONFIG_ARCH_HAS_ZERO_PAGE=y > # end of Library routines > > +# > +# Hardening options > +# > +# CONFIG_BUG_ON_DATA_CORRUPTION is not set > +CONFIG_STACK_GUARD_PAGE=y > +CONFIG_STACKPROTECTOR_NONE=y > +# CONFIG_STACKPROTECTOR_STRONG is not set > +CONFIG_PBL_STACKPROTECTOR_NONE=y > +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set > +# end of Hardening options > + > # > # Crypto support > # > diff --git a/configs/platform-v7a_noneon/barebox-vexpress.config.diff b/configs/platform-v7a_noneon/barebox-vexpress.config.diff > index 36ab78e8ebc3..23060c8178b1 100644 > --- a/configs/platform-v7a_noneon/barebox-vexpress.config.diff > +++ b/configs/platform-v7a_noneon/barebox-vexpress.config.diff > @@ -1,8 +1,7 @@ > -71b0583d9737e188a32240ae7d29a558 > +e4e5faf13c3a7da2755222882364530a > CONFIG_AMBA_SP804=y > # CONFIG_ARCH_BCM283X is not set > CONFIG_ARCH_VEXPRESS=y > -# CONFIG_ARM_SCMI_PROTOCOL is undefined > # CONFIG_ARM_SECURE_MONITOR is undefined > # CONFIG_ARM_SMCCC is undefined > # CONFIG_ARM_USE_COMPRESSED_DTB is undefined > @@ -37,6 +36,8 @@ CONFIG_DRIVER_NET_SMC911X=y > # CONFIG_GPIO_SIFIVE is undefined > # CONFIG_GPIO_SX150X is undefined > # CONFIG_GPIO_WATCHDOG is undefined > +# CONFIG_HW_RANDOM_BCM2835 is undefined > +# CONFIG_HW_RANDOM_IPROC_RNG200 is undefined > # CONFIG_I2C_ALGOBIT is undefined > # CONFIG_I2C_BCM283X is undefined > # CONFIG_I2C_GPIO is undefined > diff --git a/configs/platform-v7a_noneon/barebox.config b/configs/platform-v7a_noneon/barebox.config > index 9bbc3745d184..8734770abc4d 100644 > --- a/configs/platform-v7a_noneon/barebox.config > +++ b/configs/platform-v7a_noneon/barebox.config > @@ -1,11 +1,11 @@ > # > # Automatically generated file; DO NOT EDIT. > -# Barebox/arm 2023.07.1-20230706-1 Configuration > +# Barebox/arm 2024.07.0 Configuration > # > CONFIG_ARM=y > +CONFIG_ARCH_TEXT_BASE=0x00000000 > CONFIG_ARM_LINUX=y > CONFIG_ARM_USE_COMPRESSED_DTB=y > -CONFIG_TEXT_BASE=0x0 > > # > # System Type > @@ -13,21 +13,15 @@ CONFIG_TEXT_BASE=0x0 > CONFIG_ARCH_MULTIARCH=y > # CONFIG_ARCH_AT91 is not set > # CONFIG_ARCH_CLPS711X is not set > -# CONFIG_ARCH_DAVINCI is not set > -# CONFIG_ARCH_DIGIC is not set > -# CONFIG_ARCH_EP93XX is not set > -# CONFIG_ARCH_LAYERSCAPE is not set > # CONFIG_ARCH_MVEBU is not set > # CONFIG_ARCH_MXS is not set > -# CONFIG_ARCH_NOMADIK is not set > -# CONFIG_ARCH_OMAP_SINGLE is not set > # CONFIG_ARCH_PXA is not set > # CONFIG_ARCH_SOCFPGA is not set > # CONFIG_ARCH_TEGRA is not set > -# CONFIG_ARCH_UEMD is not set > # CONFIG_ARCH_ZYNQ is not set > CONFIG_ARCH_BCM283X=y > # CONFIG_ARCH_IMX is not set > +# CONFIG_ARCH_LAYERSCAPE is not set > # CONFIG_ARCH_OMAP_MULTI is not set > # CONFIG_ARCH_ROCKCHIP is not set > # CONFIG_ARCH_STM32MP is not set > @@ -45,7 +39,6 @@ CONFIG_CPU_32v7=y > # processor features > # > # CONFIG_BOOT_ENDIANNESS_SWITCH is not set > -CONFIG_ARCH_TEXT_BASE=0x0 > CONFIG_MACH_RPI_COMMON=y > CONFIG_MACH_RPI_AARCH_32_64=y > > @@ -136,6 +129,7 @@ CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff > CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff > CONFIG_STACK_SIZE=0x8000 > CONFIG_MALLOC_SIZE=0x0 > +CONFIG_MALLOC_ALIGNMENT=8 > # end of memory layout > > # CONFIG_EXPERIMENTAL is not set > @@ -144,7 +138,9 @@ CONFIG_MALLOC_TLSF=y > CONFIG_HAVE_MOD_ARCH_SPECIFIC=y > CONFIG_KALLSYMS=y > CONFIG_RELOCATABLE=y > +# CONFIG_PANIC_POWEROFF is not set > # CONFIG_PANIC_HANG is not set > +CONFIG_PANIC_RESET=y > CONFIG_PROMPT="barebox>" > CONFIG_BAUDRATE=115200 > CONFIG_CBSIZE=1024 > @@ -160,7 +156,6 @@ CONFIG_CMDLINE_EDITING=y > CONFIG_AUTO_COMPLETE=y > CONFIG_MENU=y > # CONFIG_PASSWORD is not set > -CONFIG_DYNAMIC_CRC_TABLE=y > CONFIG_ERRNO_MESSAGES=y > CONFIG_TIMESTAMP=y > CONFIG_BOOTM=y > @@ -168,7 +163,7 @@ CONFIG_BOOTM_SHOW_TYPE=y > CONFIG_BOOTM_VERBOSE=y > CONFIG_BOOTM_INITRD=y > CONFIG_BOOTM_OFTREE=y > -# CONFIG_BOOTM_OFTREE_UIMAGE is not set > +# CONFIG_BOOTM_UIMAGE is not set > # CONFIG_BOOTM_AIMAGE is not set > # CONFIG_BOOTM_ELF is not set > # CONFIG_BOOTM_FITIMAGE is not set > @@ -189,6 +184,7 @@ CONFIG_CONSOLE_ALLOW_COLOR=y > # CONFIG_PBL_CONSOLE is not set > # CONFIG_CONSOLE_RATP is not set > CONFIG_PARTITION=y > +CONFIG_PARTITION_MANIPULATION=y > CONFIG_PARTITION_DISK=y > CONFIG_PARTITION_DISK_DOS=y > CONFIG_PARTITION_DISK_EFI=y > @@ -233,9 +229,12 @@ CONFIG_FASTBOOT_CMD_OEM=y > # > CONFIG_COMPILE_LOGLEVEL=7 > CONFIG_DEFAULT_LOGLEVEL=6 > +CONFIG_HAS_DEBUG_LL=y > # CONFIG_DEBUG_LL is not set > # CONFIG_DEBUG_INITCALLS is not set > # CONFIG_DEBUG_PROBES is not set > +# CONFIG_DMA_API_DEBUG is not set > +# CONFIG_DEBUG_LIST is not set > # CONFIG_PBL_BREAK is not set > # CONFIG_PRINTF_FULL is not set > # CONFIG_UBSAN is not set > @@ -249,9 +248,9 @@ CONFIG_CC_HAS_KASAN_GENERIC=y > # > # EFI (Extensible Firmware Interface) Support > # > +CONFIG_HAVE_EFI_STUB=y > # end of EFI (Extensible Firmware Interface) Support > > -CONFIG_HAS_DEBUG_LL=y > CONFIG_COMMAND_SUPPORT=y > CONFIG_COMPILE_HASH=y > > @@ -305,6 +304,8 @@ CONFIG_CMD_UIMAGE=y > CONFIG_CMD_PARTITION=y > CONFIG_CMD_AUTOMOUNT=y > CONFIG_CMD_MOUNT=y > +# CONFIG_CMD_FINDMNT is not set > +CONFIG_CMD_PARTED=y > CONFIG_CMD_UMOUNT=y > # end of Partition > > @@ -433,6 +434,7 @@ CONFIG_CMD_WD_DEFAULT_TIMOUT=0 > CONFIG_CMD_BAREBOX_UPDATE=y > # CONFIG_CMD_BLOBGEN is not set > # CONFIG_CMD_FIRMWARELOAD is not set > +# CONFIG_CMD_KALLSYMS is not set > # CONFIG_CMD_OF_COMPATIBLE is not set > # CONFIG_CMD_OF_DIFF is not set > CONFIG_CMD_OF_DUMP=y > @@ -449,6 +451,7 @@ CONFIG_CMD_STATE=y > # CONFIG_CMD_DHRYSTONE is not set > # CONFIG_CMD_SPD_DECODE is not set > # CONFIG_CMD_SEED is not set > +# CONFIG_CMD_STACKSMASH is not set > # end of Miscellaneous > # end of Commands > > @@ -467,6 +470,7 @@ CONFIG_NET_FASTBOOT=y > CONFIG_OFTREE=y > CONFIG_OFTREE_MEM_GENERIC=y > CONFIG_DTC=y > +CONFIG_OF=y > CONFIG_OFDEVICE=y > CONFIG_OF_GPIO=y > CONFIG_OF_BAREBOX_DRIVERS=y > @@ -515,6 +519,7 @@ CONFIG_PHYLIB=y > # CONFIG_DAVICOM_PHY is not set > # CONFIG_DP83867_PHY is not set > # CONFIG_DP83TD510_PHY is not set > +# CONFIG_DP83TG720_PHY is not set > # CONFIG_LXT_PHY is not set > # CONFIG_MARVELL_PHY is not set > # CONFIG_MICREL_PHY is not set > @@ -582,7 +587,20 @@ CONFIG_MTD_OOB_DEVICE=y > # end of Self contained MTD devices > > # CONFIG_DRIVER_CFI is not set > + > +# > +# NAND > +# > # CONFIG_NAND is not set > + > +# > +# ECC engine support > +# > +# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set > +# CONFIG_MTD_NAND_ECC_SW_BCH is not set > +# end of ECC engine support > +# end of NAND > + > # CONFIG_MTD_SPI_NOR is not set > # CONFIG_MTD_UBI is not set > CONFIG_DISK=y > @@ -632,6 +650,7 @@ CONFIG_MCI=y > # > # --- Feature list --- > # > +# CONFIG_MCI_TUNING is not set > CONFIG_MCI_STARTUP=y > CONFIG_MCI_INFO=y > CONFIG_MCI_WRITE=y > @@ -641,12 +660,14 @@ CONFIG_MCI_WRITE=y > # > # --- MCI host drivers --- > # > +# CONFIG_MCI_DWC_MSHC is not set > # CONFIG_MCI_DW is not set > # CONFIG_MCI_ROCKCHIP_DWCMSHC is not set > # CONFIG_MCI_BCM283X is not set > # CONFIG_MCI_BCM283X_SDHOST is not set > CONFIG_MCI_MMCI=y > # CONFIG_MCI_ARASAN is not set > +# CONFIG_MCI_AM654 is not set > # CONFIG_MCI_SPI is not set > CONFIG_HAVE_CLK=y > CONFIG_CLKDEV_LOOKUP=y > @@ -678,6 +699,7 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y > # CONFIG_MFD_TWL4030 is not set > # CONFIG_MFD_TWL6030 is not set > # CONFIG_MFD_STPMIC1 is not set > +# CONFIG_MFD_PCA9450 is not set > # CONFIG_MFD_RN568PMIC is not set > # CONFIG_MFD_ATMEL_FLEXCOM is not set > # CONFIG_MFD_RK808 is not set > @@ -714,6 +736,7 @@ CONFIG_LED_TRIGGERS=y > # > # Input device support > # > +# CONFIG_INPUT_EVBUG is not set > # CONFIG_KEYBOARD_GPIO is not set > # CONFIG_KEYBOARD_QT1070 is not set > # CONFIG_KEYBOARD_USB is not set > @@ -725,8 +748,12 @@ CONFIG_WATCHDOG=y > # CONFIG_WATCHDOG_DW is not set > # CONFIG_WATCHDOG_BCM2835 is not set > # CONFIG_GPIO_WATCHDOG is not set > +# CONFIG_CADENCE_WATCHDOG is not set > # CONFIG_PWM is not set > CONFIG_HWRNG=y > +# CONFIG_HW_RANDOM_TIMERIOMEM is not set > +# CONFIG_HW_RANDOM_BCM2835 is not set > +# CONFIG_HW_RANDOM_IPROC_RNG200 is not set > > # > # DMA support > @@ -785,8 +812,13 @@ CONFIG_REGULATOR_BCM283X=y > # Firmware Drivers > # > # CONFIG_FIRMWARE_ALTERA_SERIAL is not set > -# CONFIG_ARM_SCMI_PROTOCOL is not set > # CONFIG_QEMU_FW_CFG is not set > + > +# > +# ARM System Control and Management Interface Protocol > +# > +# CONFIG_ARM_SCMI_PROTOCOL is not set > +# end of ARM System Control and Management Interface Protocol > # end of Firmware Drivers > > # > @@ -822,6 +854,16 @@ CONFIG_REGULATOR_BCM283X=y > # end of KVX SoC drivers > # end of SoC drivers > > +# > +# PM Domains > +# > + > +# > +# i.MX PM Domains > +# > +# end of i.MX PM Domains > +# end of PM Domains > + > # > # NVME Support > # > @@ -832,6 +874,8 @@ CONFIG_REGULATOR_BCM283X=y > # CONFIG_POWER_RESET_GPIO is not set > # CONFIG_POWER_RESET_GPIO_RESTART is not set > # CONFIG_VIRTIO_MENU is not set > +# CONFIG_MAILBOX is not set > +# CONFIG_TEE is not set > # end of Drivers > > # > @@ -901,6 +945,7 @@ CONFIG_XZ_DEC_IA64=y > CONFIG_XZ_DEC_ARM=y > CONFIG_XZ_DEC_ARMTHUMB=y > CONFIG_XZ_DEC_SPARC=y > +CONFIG_XZ_DEC_ARM64=y > # CONFIG_BASE64 is not set > CONFIG_PROCESS_ESCAPE_SEQUENCE=y > CONFIG_LZO_DECOMPRESS=y > @@ -926,6 +971,17 @@ CONFIG_ARCH_HAS_DATA_ABORT_MASK=y > CONFIG_ARCH_HAS_ZERO_PAGE=y > # end of Library routines > > +# > +# Hardening options > +# > +# CONFIG_BUG_ON_DATA_CORRUPTION is not set > +CONFIG_STACK_GUARD_PAGE=y > +CONFIG_STACKPROTECTOR_NONE=y > +# CONFIG_STACKPROTECTOR_STRONG is not set > +CONFIG_PBL_STACKPROTECTOR_NONE=y > +# CONFIG_PBL_STACKPROTECTOR_STRONG is not set > +# end of Hardening options > + > # > # Crypto support > # > diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch > deleted file mode 100644 > index 1afe82806d60..000000000000 > --- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch > +++ /dev/null > @@ -1,32 +0,0 @@ > -From: Oleksij Rempel <o.rempel@pengutronix.de> > -Date: Thu, 6 Jul 2023 09:04:40 +0200 > -Subject: [PATCH] ARM: at91: enable ddramc for sama5d3 and sama5d4 > - > -ddramc has already support for sama5d3 and sama5d4, so enable it > -officially. > - > -Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > ---- > - arch/arm/mach-at91/Kconfig | 2 ++ > - 1 file changed, 2 insertions(+) > - > -diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig > -index b803a1185d20..349586b68339 100644 > ---- a/arch/arm/mach-at91/Kconfig > -+++ b/arch/arm/mach-at91/Kconfig > -@@ -104,6 +104,7 @@ config SOC_SAMA5D3 > - select HAVE_AT91_UTMI > - select PINCTRL_AT91 > - select HAS_MACB > -+ select HAVE_AT91_DDRAMC > - > - config SOC_SAMA5D4 > - bool > -@@ -116,6 +117,7 @@ config SOC_SAMA5D4 > - select HAVE_AT91_UTMI > - select PINCTRL_AT91 > - select HAS_MACB > -+ select HAVE_AT91_DDRAMC > - > - config SOC_SAM9X60 > - bool > diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch > deleted file mode 100644 > index 7aeec243824b..000000000000 > --- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch > +++ /dev/null > @@ -1,219 +0,0 @@ > -From: Oleksij Rempel <o.rempel@pengutronix.de> > -Date: Tue, 4 Jul 2023 06:35:09 +0200 > -Subject: [PATCH] ARM: at91: add support for SAMA5D3 - Ethernet Development > - System Board > - > -Microchip Technology SAMA5D3 Ethernet Development System (EDS) Board > -(DM320114) is an MPU-based platform for evaluating Ethernet Switch and > -PHY products. Compatible Ethernet Switch and PHY Evaluation Boards > -connect to the SAMA5D3 EDS Board via either an RGMII or RMII connector. > -The Microchip Technology SAMA5D3 EDS Board is not intended for > -stand-alone use and has no Ethernet capabilities when no daughter board > -or an USB Ethernet adapter is connected. > - > -For more information see: > -https://www.microchip.com/en-us/development-tool/DM320114 > - > -Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > ---- > - Documentation/boards/at91.rst | 2 + > - arch/arm/boards/Makefile | 1 + > - arch/arm/boards/microchip-sama5d3-eds/Makefile | 3 ++ > - arch/arm/boards/microchip-sama5d3-eds/lowlevel.c | 62 ++++++++++++++++++++++++ > - arch/arm/configs/at91_multi_defconfig | 1 + > - arch/arm/dts/Makefile | 1 + > - arch/arm/dts/at91-microchip-sama5d3-eds.dts | 14 ++++++ > - arch/arm/mach-at91/Kconfig | 10 ++++ > - images/Makefile.at91 | 9 ++++ > - 9 files changed, 103 insertions(+) > - create mode 100644 arch/arm/boards/microchip-sama5d3-eds/Makefile > - create mode 100644 arch/arm/boards/microchip-sama5d3-eds/lowlevel.c > - create mode 100644 arch/arm/dts/at91-microchip-sama5d3-eds.dts > - > -diff --git a/Documentation/boards/at91.rst b/Documentation/boards/at91.rst > -index f502979df6eb..961ef58d84ac 100644 > ---- a/Documentation/boards/at91.rst > -+++ b/Documentation/boards/at91.rst > -@@ -35,6 +35,8 @@ The resulting images will be placed under ``images/``: > - barebox-at91sam9263ek.img > - barebox-microchip-ksz9477-evb.img > - barebox-microchip-ksz9477-evb-xload-mmc.img > -+ barebox-microchip-sama5d3-eds.img > -+ barebox-microchip-sama5d3-eds-xload-mmc.img > - barebox-sama5d3-xplained.img > - barebox-sama5d3-xplained-xload-mmc.img > - barebox-sama5d27-som1-ek.img > -diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile > -index 2877debad535..382e649fce62 100644 > ---- a/arch/arm/boards/Makefile > -+++ b/arch/arm/boards/Makefile > -@@ -121,6 +121,7 @@ obj-$(CONFIG_MACH_SAMA5D27_SOM1) += sama5d27-som1/ > - obj-$(CONFIG_MACH_SAMA5D3XEK) += sama5d3xek/ > - obj-$(CONFIG_MACH_SAMA5D3_XPLAINED) += sama5d3_xplained/ > - obj-$(CONFIG_MACH_MICROCHIP_KSZ9477_EVB) += microchip-ksz9477-evb/ > -+obj-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += microchip-sama5d3-eds/ > - obj-$(CONFIG_MACH_SAMA5D4_XPLAINED) += sama5d4_xplained/ > - obj-$(CONFIG_MACH_SAMA5D4_WIFX) += sama5d4_wifx/ > - obj-$(CONFIG_MACH_SAMA5D4EK) += sama5d4ek/ > -diff --git a/arch/arm/boards/microchip-sama5d3-eds/Makefile b/arch/arm/boards/microchip-sama5d3-eds/Makefile > -new file mode 100644 > -index 000000000000..458f5209008d > ---- /dev/null > -+++ b/arch/arm/boards/microchip-sama5d3-eds/Makefile > -@@ -0,0 +1,3 @@ > -+# SPDX-License-Identifier: GPL-2.0-only > -+ > -+lwl-y += lowlevel.o > -diff --git a/arch/arm/boards/microchip-sama5d3-eds/lowlevel.c b/arch/arm/boards/microchip-sama5d3-eds/lowlevel.c > -new file mode 100644 > -index 000000000000..79346a9b6ac1 > ---- /dev/null > -+++ b/arch/arm/boards/microchip-sama5d3-eds/lowlevel.c > -@@ -0,0 +1,62 @@ > -+// SPDX-License-Identifier: GPL-2.0-only AND BSD-1-Clause > -+/* > -+ * Copyright (C) 2014, Atmel Corporation > -+ * Copyright (C) 2018 Ahmad Fatoum, Pengutronix > -+ */ > -+ > -+#include <common.h> > -+#include <init.h> > -+ > -+#include <asm/barebox-arm-head.h> > -+#include <debug_ll.h> > -+#include <mach/at91/barebox-arm.h> > -+#include <mach/at91/iomux.h> > -+#include <mach/at91/sama5d3.h> > -+#include <mach/at91/sama5d3-xplained-ddramc.h> > -+#include <mach/at91/xload.h> > -+ > -+/* PCK = 528MHz, MCK = 132MHz */ > -+#define MASTER_CLOCK 132000000 > -+ > -+static void dbgu_init(void) > -+{ > -+ void __iomem *pio = IOMEM(SAMA5D3_BASE_PIOB); > -+ > -+ sama5d3_pmc_enable_periph_clock(SAMA5D3_ID_PIOB); > -+ > -+ at91_mux_pio3_pin(pio, pin_to_mask(AT91_PIN_PB31), AT91_MUX_PERIPH_A, 0); > -+ > -+ sama5d3_pmc_enable_periph_clock(SAMA5D3_ID_DBGU); > -+ at91_dbgu_setup_ll(IOMEM(AT91_BASE_DBGU1), MASTER_CLOCK, 115200); > -+ > -+ putc_ll('>'); > -+} > -+ > -+SAMA5D3_ENTRY_FUNCTION(start_microchip_sama5d3_eds_xload_mmc, r4) > -+{ > -+ sama5d3_lowlevel_init(); > -+ > -+ relocate_to_current_adr(); > -+ setup_c(); > -+ > -+ sama5d3_udelay_init(MASTER_CLOCK); > -+ sama5d3_xplained_ddrconf(); > -+ if (IS_ENABLED(CONFIG_DEBUG_LL)) > -+ dbgu_init(); > -+ > -+ sama5d3_atmci_start_image(0, MASTER_CLOCK, 0); > -+} > -+ > -+extern char __dtb_z_at91_microchip_sama5d3_eds_start[]; > -+ > -+SAMA5D3_ENTRY_FUNCTION(start_microchip_sama5d3_eds, r4) > -+{ > -+ void *fdt; > -+ > -+ if (IS_ENABLED(CONFIG_DEBUG_LL)) > -+ dbgu_init(); > -+ > -+ fdt = __dtb_z_at91_microchip_sama5d3_eds_start + get_runtime_offset(); > -+ > -+ sama5d3_barebox_entry(r4, fdt); > -+} > -diff --git a/arch/arm/configs/at91_multi_defconfig b/arch/arm/configs/at91_multi_defconfig > -index c93c2f578609..de47af3bd0a6 100644 > ---- a/arch/arm/configs/at91_multi_defconfig > -+++ b/arch/arm/configs/at91_multi_defconfig > -@@ -4,6 +4,7 @@ CONFIG_MACH_SKOV_ARM9CPU=y > - CONFIG_MACH_AT91SAM9263EK=y > - CONFIG_MACH_AT91SAM9X5EK=y > - CONFIG_MACH_MICROCHIP_KSZ9477_EVB=y > -+CONFIG_MACH_MICROCHIP_SAMA5D3_EDS=y > - CONFIG_MACH_SAMA5D3_XPLAINED=y > - CONFIG_MACH_SAMA5D27_SOM1=y > - CONFIG_MACH_SAMA5D27_GIANTBOARD=y > -diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > -index 98f4c4e0194b..eb9e0e062adf 100644 > ---- a/arch/arm/dts/Makefile > -+++ b/arch/arm/dts/Makefile > -@@ -193,6 +193,7 @@ lwl-$(CONFIG_MACH_AC_SXB) += ac-sxb.dtb.o > - lwl-$(CONFIG_MACH_AT91SAM9263EK_DT) += at91sam9263ek.dtb.o > - lwl-$(CONFIG_MACH_SAMA5D3_XPLAINED) += at91-sama5d3_xplained.dtb.o > - lwl-$(CONFIG_MACH_MICROCHIP_KSZ9477_EVB) += at91-microchip-ksz9477-evb.dtb.o > -+lwl-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += at91-microchip-sama5d3-eds.dtb.o > - lwl-$(CONFIG_MACH_SAMA5D27_SOM1) += at91-sama5d27_som1_ek.dtb.o > - lwl-$(CONFIG_MACH_SAMA5D27_GIANTBOARD) += at91-sama5d27_giantboard.dtb.o > - lwl-$(CONFIG_MACH_SAMA5D4_WIFX) += at91-sama5d4_wifx_l1.dtb.o > -diff --git a/arch/arm/dts/at91-microchip-sama5d3-eds.dts b/arch/arm/dts/at91-microchip-sama5d3-eds.dts > -new file mode 100644 > -index 000000000000..ad75fc882c63 > ---- /dev/null > -+++ b/arch/arm/dts/at91-microchip-sama5d3-eds.dts > -@@ -0,0 +1,14 @@ > -+/* SPDX-License-Identifier: GPL-2.0 */ > -+/dts-v1/; > -+#include <arm/at91-sama5d3_eds.dts> > -+#include "sama5d3.dtsi" > -+ > -+/ { > -+ chosen { > -+ environment { > -+ compatible = "barebox,environment"; > -+ device-path = &mmc0, "partname:0"; > -+ file-path = "barebox.env"; > -+ }; > -+ }; > -+}; > -diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig > -index 349586b68339..d2499747252d 100644 > ---- a/arch/arm/mach-at91/Kconfig > -+++ b/arch/arm/mach-at91/Kconfig > -@@ -606,6 +606,16 @@ config MACH_MICROCHIP_KSZ9477_EVB > - help > - Select this if you are using Microchip's EVB-KSZ9477 Evaluation Kit. > - > -+config MACH_MICROCHIP_SAMA5D3_EDS > -+ bool "Microchip SAMA5D3 Ethernet Development System" > -+ select SOC_SAMA5D3 > -+ select OFDEVICE > -+ select MCI_ATMEL_PBL > -+ select COMMON_CLK_OF_PROVIDER > -+ help > -+ Select this if you are using Microchip's SAMA5D3 Ethernet Development > -+ System. > -+ > - config MACH_SAMA5D3_XPLAINED > - bool "Atmel SAMA5D3_XPLAINED Evaluation Kit" > - select SOC_SAMA5D3 > -diff --git a/images/Makefile.at91 b/images/Makefile.at91 > -index 19a81e2e9a3c..36f725940639 100644 > ---- a/images/Makefile.at91 > -+++ b/images/Makefile.at91 > -@@ -20,6 +20,15 @@ MAX_PBL_IMAGE_SIZE_start_sama5d3_xplained_ung8071_xload_mmc = 0xffff > - FILE_barebox-microchip-ksz9477-evb-xload-mmc.img = start_sama5d3_xplained_ung8071_xload_mmc.pblb > - image-$(CONFIG_MACH_MICROCHIP_KSZ9477_EVB) += barebox-microchip-ksz9477-evb-xload-mmc.img > - > -+pblb-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += start_microchip_sama5d3_eds > -+FILE_barebox-microchip-sama5d3-eds.img = start_microchip_sama5d3_eds.pblb > -+image-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += barebox-microchip-sama5d3-eds.img > -+ > -+pblb-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += start_microchip_sama5d3_eds_xload_mmc > -+MAX_PBL_IMAGE_SIZE_start_microchip_sama5d3_eds_xload_mmc = 0xffff > -+FILE_barebox-microchip-sama5d3-eds-xload-mmc.img = start_microchip_sama5d3_eds_xload_mmc.pblb > -+image-$(CONFIG_MACH_MICROCHIP_SAMA5D3_EDS) += barebox-microchip-sama5d3-eds-xload-mmc.img > -+ > - pblb-$(CONFIG_MACH_SAMA5D3_XPLAINED) += start_sama5d3_xplained > - FILE_barebox-sama5d3-xplained.img = start_sama5d3_xplained.pblb > - image-$(CONFIG_MACH_SAMA5D3_XPLAINED) += barebox-sama5d3-xplained.img > diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch > deleted file mode 100644 > index 519ea4ace1a7..000000000000 > --- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -From: Oleksij Rempel <o.rempel@pengutronix.de> > -Date: Thu, 6 Jul 2023 09:26:22 +0200 > -Subject: [PATCH] ARM: at91: microchip-ksz9477-evb: migrate to > - sama5d3_barebox_entry() > - > -We have sama5d3_barebox_entry(), so make use of it. > - > -Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > ---- > - arch/arm/boards/microchip-ksz9477-evb/lowlevel.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c b/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c > -index bda6a94160a5..aa2161daeef0 100644 > ---- a/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c > -+++ b/arch/arm/boards/microchip-ksz9477-evb/lowlevel.c > -@@ -58,5 +58,5 @@ SAMA5D3_ENTRY_FUNCTION(start_sama5d3_xplained_ung8071, r4) > - > - fdt = __dtb_z_at91_microchip_ksz9477_evb_start + get_runtime_offset(); > - > -- barebox_arm_entry(SAMA5_DDRCS, SZ_256M, fdt); > -+ sama5d3_barebox_entry(r4, fdt); > - } > diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch > deleted file mode 100644 > index d6e6193a9fde..000000000000 > --- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch > +++ /dev/null > @@ -1,22 +0,0 @@ > -From: Oleksij Rempel <o.rempel@pengutronix.de> > -Date: Thu, 6 Jul 2023 11:03:50 +0200 > -Subject: [PATCH] Release > - 2023.07.0/customers/pengutronix/distrokit-sama5d3/20230706-1 > - > ---- > - Makefile | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index 92b5c6779a52..323f757908bc 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -2,7 +2,7 @@ > - VERSION = 2023 > - PATCHLEVEL = 07 > - SUBLEVEL = 1 > --EXTRAVERSION = > -+EXTRAVERSION =-20230706-1 > - NAME = None > - > - # *DOCUMENTATION* > diff --git a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/series b/configs/platform-v7a_noneon/patches/barebox-2023.07.1/series > deleted file mode 100644 > index bdd8894835ae..000000000000 > --- a/configs/platform-v7a_noneon/patches/barebox-2023.07.1/series > +++ /dev/null > @@ -1,13 +0,0 @@ > -# umpf-base: v2023.07.1 > -# umpf-name: 2023.07.0/customers/pengutronix/distrokit-sama5d3 > -# umpf-version: 2023.07.0/customers/pengutronix/distrokit-sama5d3/20230706-1 > -# umpf-topic: v2023.07.0/topic/microchip-sama5d3-ether-dev-sys > -# umpf-hashinfo: 8a1d1b8e7204ee57b743ae7f1325d5729104425e > -# umpf-topic-range: 0186c17838e655dbf6a3bcd01fa74821d5e67ae6..b2883ce6100ca0f8259a1726bf53387e6da04a99 > -0001-ARM-at91-enable-ddramc-for-sama5d3-and-sama5d4.patch > -0002-ARM-at91-add-support-for-SAMA5D3-Ethernet-Developmen.patch > -0003-ARM-at91-microchip-ksz9477-evb-migrate-to-sama5d3_ba.patch > -# umpf-release: 2023.07.0/customers/pengutronix/distrokit-sama5d3/20230706-1 > -# umpf-topic-range: b2883ce6100ca0f8259a1726bf53387e6da04a99..eaaffd9164ab19a152d00c6d5f8f91cd07e5ec48 > -0101-Release-2023.07.0-customers-pengutronix-distrokit-sa.patch > -# umpf-end > diff --git a/configs/platform-v7a_noneon/platformconfig b/configs/platform-v7a_noneon/platformconfig > index d600f7c84534..9aec8b079cc5 100644 > --- a/configs/platform-v7a_noneon/platformconfig > +++ b/configs/platform-v7a_noneon/platformconfig > @@ -179,8 +179,8 @@ PTXCONF_CONSOLE_SPEED="115200" > # PTXCONF_AT91BOOTSTRAP2 is not set > PTXCONF_BAREBOX_COMMON_ARCH_STRING="arm" > PTXCONF_BAREBOX_COMMON=y > -PTXCONF_BAREBOX_COMMON_VERSION="2023.07.1" > -PTXCONF_BAREBOX_COMMON_MD5="0b7ea966cd01266a93a4ccfa7d68bce0" > +PTXCONF_BAREBOX_COMMON_VERSION="2024.07.0" > +PTXCONF_BAREBOX_COMMON_MD5="c82948dfe7fba729e9d7eaaeff45f863" > PTXCONF_BAREBOX_COMMON_NEEDS_HOST_LZOP=y > PTXCONF_BAREBOX_AT91=y > PTXCONF_BAREBOX_VEXPRESS=y > -- > 2.39.2 > > > -- Pengutronix e.K. | Dipl.-Ing. Robert Schwebel | Steuerwalder Str. 21 | https://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 | ^ permalink raw reply [flat|nested] 19+ messages in thread
end of thread, other threads:[~2024-08-14 7:59 UTC | newest] Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-08-01 11:38 [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 2/6] v7a_noneon: barebox: don't activate all consoles by default Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 3/6] v7a_noneon: barebox: use ARM-optimized routines where appropriate Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 4/6] v7a_noneon: barebox: enable of_diff command Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 5/6] v7a_noneon: generate vexpress.norimg by default Ahmad Fatoum 2024-08-01 11:38 ` [DistroKit] [PATCH 6/6] v7a_noneon: run: really constrain the forwarded SSH port to <= 64000 Ahmad Fatoum 2024-08-08 13:01 ` Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 1/9] mipsel: sync kernelconfig Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 2/9] mips, mipsel: remove forked kernel rule Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 3/9] mips, mipsel: kernel-*: sync with template Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 4/9] mips, mipsel: kernel-*: use ptx/image-install and fix 'clean' stage Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 5/9] mips, mipsel: kernel-*: select KERNEL Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 6/9] mips, mipsel: migrate barebox-common recipe to barebox Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 7/9] mips, mipsel: barebox-*: sync with template Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 8/9] mips, mipsel: barebox-*: use ptx/image-install Roland Hieber 2024-08-13 13:20 ` [DistroKit] [PATCH v3 9/9] mips, mipsel: barebox-*: set LICENSE_FILES Roland Hieber 2024-08-14 7:55 ` [DistroKit] [PATCH v3 0/9] mips(el) cleanup Robert Schwebel 2024-08-14 7:59 ` [DistroKit] [PATCH 1/6] v7a_noneon: barebox: update to v2024.07.0 Robert Schwebel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox