Merge pull request linux-automation#174 from hnez/barebox-2024-08

meta-lxatac-bsp: barebox: update to 2024.09.0
hnez · Oct 1, 2024 · 41a76e4 · 41a76e4
2 parents f4dcacf + c79e3d5
commit 41a76e4
Show file tree

Hide file tree

Showing 18 changed files with 111 additions and 137 deletions.
diff --git a/...es-bsp/barebox/barebox-tools_2024.03.0.bb → ...es-bsp/barebox/barebox-tools_2024.09.0.bb b/...es-bsp/barebox/barebox-tools_2024.03.0.bb → ...es-bsp/barebox/barebox-tools_2024.09.0.bb
@@ -8,7 +8,7 @@ DEPENDS = "libusb1 libusb1-native lzop-native bison-native flex-native pkgconfig
 BBCLASSEXTEND = "native"
 
 SRC_URI = "http://barebox.org/download/barebox-${PV}.tar.bz2"
-SRC_URI[sha256sum] = "7dda8cc4e989d38162dc04d287a882edc828093f75baace9e40b2ab7902958ea"
+SRC_URI[sha256sum] = "4d4ea7e232aeba2b3cb9ccf0dbf8cd8e01c65b6c615f64c3bd0c4f24f23a47da"
 
 S = "${WORKDIR}/barebox-${PV}"
 

diff --git a/.../recipes-bsp/barebox/barebox_2024.03.0.bb → .../recipes-bsp/barebox/barebox_2024.09.0.bb b/.../recipes-bsp/barebox/barebox_2024.03.0.bb → .../recipes-bsp/barebox/barebox_2024.09.0.bb
@@ -12,7 +12,7 @@ SRC_URI += " \
 "
 require files/patches/series.inc
 
-SRC_URI[sha256sum] = "7dda8cc4e989d38162dc04d287a882edc828093f75baace9e40b2ab7902958ea"
+SRC_URI[sha256sum] = "4d4ea7e232aeba2b3cb9ccf0dbf8cd8e01c65b6c615f64c3bd0c4f24f23a47da"
 
 COMPATIBLE_MACHINE = "lxatac"
 

diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/defconfig b/meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/defconfig
@@ -1,11 +1,11 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2024.03.0-20240322-1 Configuration
+# Barebox/arm 2024.09.0-20240918-1 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
@@ -14,17 +14,11 @@ CONFIG_ARCH_STM32=y
 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_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
@@ -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
@@ -167,6 +163,7 @@ CONFIG_BOOTM_SHOW_TYPE=y
 CONFIG_BOOTM_VERBOSE=y
 CONFIG_BOOTM_INITRD=y
 CONFIG_BOOTM_OFTREE=y
+CONFIG_BOOTM_UIMAGE=y
 CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_AIMAGE is not set
 # CONFIG_BOOTM_ELF is not set
@@ -182,6 +179,7 @@ CONFIG_CONSOLE_FULL=y
 # CONFIG_CONSOLE_NONE is not set
 # CONFIG_CONSOLE_ACTIVATE_FIRST is not set
 # CONFIG_CONSOLE_ACTIVATE_ALL is not set
+# CONFIG_CONSOLE_ACTIVATE_ALL_FALLBACK is not set
 CONFIG_CONSOLE_ACTIVATE_NONE=y
 CONFIG_CONSOLE_ALLOW_COLOR=y
 # CONFIG_CONSOLE_DISABLE_INPUT is not set
@@ -238,12 +236,14 @@ CONFIG_FASTBOOT_CMD_OEM=y
 #
 CONFIG_COMPILE_LOGLEVEL=6
 CONFIG_DEFAULT_LOGLEVEL=7
+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_DEBUG_RESOURCES is not set
 # CONFIG_PBL_BREAK is not set
 # CONFIG_PRINTF_FULL is not set
 # CONFIG_UBSAN is not set
@@ -257,9 +257,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
 
@@ -272,6 +272,7 @@ CONFIG_COMPILE_HASH=y
 #
 # CONFIG_CMD_TUTORIAL is not set
 CONFIG_CMD_ARM_CPUINFO=y
+# CONFIG_CMD_CLASS is not set
 CONFIG_CMD_DEVINFO=y
 # CONFIG_CMD_DEVLOOKUP is not set
 # CONFIG_CMD_DEVUNBIND is not set
@@ -283,6 +284,7 @@ CONFIG_CMD_IOMEM=y
 CONFIG_CMD_IMD=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_ARM_MMUINFO=y
+# CONFIG_CMD_BLKSTATS is not set
 CONFIG_CMD_REGULATOR=y
 # CONFIG_CMD_NVMEM is not set
 CONFIG_CMD_VERSION=y
@@ -314,6 +316,7 @@ CONFIG_CMD_BOOTCHOOSER=y
 CONFIG_CMD_PARTITION=y
 CONFIG_CMD_AUTOMOUNT=y
 CONFIG_CMD_MOUNT=y
+# CONFIG_CMD_FINDMNT is not set
 # CONFIG_CMD_PARTED is not set
 CONFIG_CMD_UMOUNT=y
 # end of Partition
@@ -424,6 +427,7 @@ CONFIG_CMD_MW=y
 #
 CONFIG_CMD_CLK=y
 CONFIG_CMD_DETECT=y
+# CONFIG_CMD_SYNC is not set
 CONFIG_CMD_FLASH=y
 CONFIG_CMD_GPIO=y
 # CONFIG_CMD_I2C is not set
@@ -447,6 +451,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=y
 CONFIG_CMD_OF_DUMP=y
@@ -458,6 +463,7 @@ CONFIG_CMD_OF_PROPERTY=y
 CONFIG_CMD_OF_OVERLAY=y
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_TIME=y
+# CONFIG_CMD_WATCH is not set
 # CONFIG_CMD_UPTIME is not set
 CONFIG_CMD_STATE=y
 CONFIG_CMD_TLV=y
@@ -654,9 +660,11 @@ CONFIG_MCI=y
 #
 # --- Feature list ---
 #
+# CONFIG_MCI_TUNING is not set
 CONFIG_MCI_STARTUP=y
 CONFIG_MCI_INFO=y
 CONFIG_MCI_WRITE=y
+CONFIG_MCI_ERASE=y
 CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 # CONFIG_MCI_MMC_GPP_PARTITIONS is not set
 
@@ -742,6 +750,7 @@ CONFIG_EEPROM_AT24=y
 # Input device support
 #
 CONFIG_INPUT=y
+# CONFIG_INPUT_EVBUG is not set
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_KEYBOARD_QT1070 is not set
 # CONFIG_KEYBOARD_USB is not set
@@ -758,6 +767,7 @@ CONFIG_STPMIC1_WATCHDOG=y
 CONFIG_PWM=y
 CONFIG_PWM_STM32=y
 CONFIG_HWRNG=y
+# CONFIG_HW_RANDOM_TIMERIOMEM is not set
 CONFIG_HWRNG_STM32=y
 
 #
@@ -806,6 +816,7 @@ CONFIG_STM32_BSEC=y
 
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED=y
+# CONFIG_REGULATOR_FAN53555 is not set
 CONFIG_REGULATOR_STM32_PWR=y
 CONFIG_REGULATOR_STM32_VREFBUF=y
 CONFIG_REGULATOR_STPMIC1=y
@@ -1054,12 +1065,7 @@ CONFIG_STM32_IMAGE=y
 # CONFIG_KERNEL_INSTALL_TARGET is not set
 # CONFIG_BAREBOXENV_TARGET is not set
 # CONFIG_BAREBOXCRC32_TARGET is not set
-CONFIG_HAS_TARGET_LIBUSB_1_0=y
 # CONFIG_MVEBU_KWBOOT_TARGET is not set
-# CONFIG_ARCH_IMX_USBLOADER_TARGET is not set
-# CONFIG_OMAP3_USB_LOADER_TARGET is not set
-# CONFIG_OMAP4_USBBOOT_TARGET is not set
-# CONFIG_RK_USB_LOADER_TARGET is not set
 # end of Target Tools
 
 # CONFIG_TEST is not set
diff --git a/...bsp/recipes-bsp/barebox/files/patches/0002-of_path-support-phandles-in-of_find_path.patch b/...bsp/recipes-bsp/barebox/files/patches/0002-of_path-support-phandles-in-of_find_path.patch
@@ -21,7 +21,7 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
  2 files changed, 34 insertions(+), 18 deletions(-)
 
 diff --git a/drivers/of/of_path.c b/drivers/of/of_path.c
-index 12a2dfce553e..522109c17b55 100644
+index 42efb1ad1dbf..a1a47cad0c20 100644
 --- a/drivers/of/of_path.c
 +++ b/drivers/of/of_path.c
 @@ -254,7 +254,11 @@ struct device_node *of_find_node_by_devpath(struct device_node *root, const char
@@ -95,10 +95,10 @@ index 12a2dfce553e..522109c17b55 100644
  	}
 
 diff --git a/include/of.h b/include/of.h
-index 19b8e7c038a4..51ad5773007b 100644
+index 55f2c0cbdedf..187a55439a8a 100644
 --- a/include/of.h
 +++ b/include/of.h
-@@ -336,7 +336,8 @@ int of_add_memory(struct device_node *node, bool dump);
+@@ -350,7 +350,8 @@ int of_add_memory(struct device_node *node, bool dump);
  int of_add_memory_bank(struct device_node *node, bool dump, int r,
  		u64 base, u64 size);
  struct device *of_find_device_by_node_path(const char *path);

diff --git a/...bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch b/...bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch
@@ -11,7 +11,7 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
  1 file changed, 1 insertion(+)
 
 diff --git a/Makefile b/Makefile
-index a539e57bc8a7..36145fc89eac 100644
+index 403ab3fd48dd..29d94792ffae 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -445,6 +445,7 @@ LINUXINCLUDE    := -Iinclude \

diff --git a/...lxatac-bsp/recipes-bsp/barebox/files/patches/0004-net-add-ethaddr-sequence-handling.patch b/...lxatac-bsp/recipes-bsp/barebox/files/patches/0004-net-add-ethaddr-sequence-handling.patch
@@ -19,10 +19,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
  1 file changed, 20 insertions(+)
 
 diff --git a/include/net.h b/include/net.h
-index ffc1093ae6e7..a569fdcf470f 100644
+index a04ed5b0ab92..8a943e1bb1b2 100644
 --- a/include/net.h
 +++ b/include/net.h
-@@ -520,6 +520,26 @@ static inline void eth_addr_add(u8 *addr, long offset)
+@@ -516,6 +516,26 @@ static inline void eth_addr_add(u8 *addr, long offset)
  	u64_to_ether_addr(u, addr);
  }
 

diff --git a/...ipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch b/...ipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch
@@ -13,10 +13,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
  2 files changed, 24 insertions(+)
 
 diff --git a/common/Kconfig b/common/Kconfig
-index d16c8696dad4..e25131b74198 100644
+index 4500feb66c92..06ff53e9dd95 100644
 --- a/common/Kconfig
 +++ b/common/Kconfig
-@@ -1089,6 +1089,14 @@ config MACHINE_ID
+@@ -1169,6 +1169,14 @@ config MACHINE_ID
  	  Note: if no hashable information is available no machine id will be passed
  	  to the kernel.
 
@@ -32,12 +32,12 @@ index d16c8696dad4..e25131b74198 100644
  	bool "inform devicetree-enabled kernel of used watchdog"
  	depends on WATCHDOG && OFTREE && FLEXIBLE_BOOTARGS
 diff --git a/common/misc.c b/common/misc.c
-index e266f0951ee9..36dfd6f34873 100644
+index 7e19797c2f99..1154ae9e21cd 100644
 --- a/common/misc.c
 +++ b/common/misc.c
-@@ -146,6 +146,18 @@ static char *hostname;
- static char *serial_number;
- static char *of_machine_compatible;
+@@ -210,6 +210,18 @@ bool barebox_hostname_is_valid(const char *s)
+ 	return true;
+ }
 
 +static void linux_bootargs_set_hostname(void)
 +{
@@ -54,16 +54,16 @@ index e266f0951ee9..36dfd6f34873 100644
  /*
   * The hostname is supposed to be the shortname of a board. It should
   * contain only lowercase letters, numbers, '-', '_'. No whitespaces
-@@ -157,6 +169,8 @@ void barebox_set_hostname(const char *__hostname)
+@@ -225,6 +237,8 @@ void barebox_set_hostname(const char *__hostname)
+ 		pr_warn("Hostname is not valid, please fix it\n");
 
- 	free(hostname);
  	hostname = xstrdup(__hostname);
 +
 +	linux_bootargs_set_hostname();
  }
 
  const char *barebox_get_hostname(void)
-@@ -181,6 +195,8 @@ void barebox_set_serial_number(const char *__serial_number)
+@@ -249,6 +263,8 @@ void barebox_set_serial_number(const char *__serial_number)
 
  	free(serial_number);
  	serial_number = xstrdup(__serial_number);

diff --git a/...tac-bsp/recipes-bsp/barebox/files/patches/0006-net-factor-out-eth_of_get_fixup_node.patch b/...tac-bsp/recipes-bsp/barebox/files/patches/0006-net-factor-out-eth_of_get_fixup_node.patch
@@ -14,10 +14,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
  2 files changed, 31 insertions(+), 10 deletions(-)
 
 diff --git a/include/net.h b/include/net.h
-index a569fdcf470f..d11b7b8f1e0d 100644
+index 8a943e1bb1b2..5171c6485d26 100644
 --- a/include/net.h
 +++ b/include/net.h
-@@ -130,6 +130,18 @@ static inline void of_eth_register_ethaddr(struct device_node *node,
+@@ -128,6 +128,18 @@ static inline void of_eth_register_ethaddr(struct device_node *node,
  void eth_register_ethaddr(int ethid, const char *ethaddr);
  void of_eth_register_ethaddr(struct device_node *node, const char *ethaddr);
  #endif
@@ -37,7 +37,7 @@ index a569fdcf470f..d11b7b8f1e0d 100644
   *	Ethernet header
   */
 diff --git a/net/eth.c b/net/eth.c
-index 28961e868b7a..8097fb949412 100644
+index 7229530c055b..a1d6860be830 100644
 --- a/net/eth.c
 +++ b/net/eth.c
 @@ -319,19 +319,11 @@ static int eth_param_set_ethaddr(struct param_d *param, void *priv)

diff --git a/...pes-bsp/barebox/files/patches/0007-net-export-list-of-registered-ethernet-addresses.patch b/...pes-bsp/barebox/files/patches/0007-net-export-list-of-registered-ethernet-addresses.patch
@@ -24,12 +24,12 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
  2 files changed, 11 insertions(+), 9 deletions(-)
 
 diff --git a/include/net.h b/include/net.h
-index d11b7b8f1e0d..0ec2519e2eff 100644
+index 5171c6485d26..cbb26169f288 100644
 --- a/include/net.h
 +++ b/include/net.h
-@@ -627,6 +627,15 @@ void ifdown_all(void);
+@@ -633,4 +633,13 @@ void ifdown_all(void);
 
- extern struct list_head netdev_list;
+ extern struct class eth_class;
 
 +struct eth_ethaddr {
 +	struct list_head list;
@@ -40,16 +40,14 @@ index d11b7b8f1e0d..0ec2519e2eff 100644
 +
 +extern struct list_head ethaddr_list;
 +
- #define for_each_netdev(netdev) list_for_each_entry(netdev, &netdev_list, list)
-
  #endif /* __NET_H__ */
 diff --git a/net/eth.c b/net/eth.c
-index 8097fb949412..ebeeb620d567 100644
+index a1d6860be830..3714dde44026 100644
 --- a/net/eth.c
 +++ b/net/eth.c
 @@ -23,14 +23,7 @@
 
- LIST_HEAD(netdev_list);
+ DEFINE_DEV_CLASS(eth_class, "eth");
 
 -struct eth_ethaddr {
 -	struct list_head list;

diff --git a/...-lxatac-bsp/recipes-bsp/barebox/files/patches/0008-net-implement-ethaddr_string_cmp.patch b/...-lxatac-bsp/recipes-bsp/barebox/files/patches/0008-net-implement-ethaddr_string_cmp.patch
@@ -15,10 +15,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
  2 files changed, 19 insertions(+)
 
 diff --git a/include/net.h b/include/net.h
-index 0ec2519e2eff..728684b56646 100644
+index cbb26169f288..b210996d2ae8 100644
 --- a/include/net.h
 +++ b/include/net.h
-@@ -370,6 +370,8 @@ IPaddr_t getenv_ip(const char *name);
+@@ -366,6 +366,8 @@ IPaddr_t getenv_ip(const char *name);
  int setenv_ip(const char *name, IPaddr_t ip);
 
  int string_to_ethaddr(const char *str, u8 enetaddr[6]);