Skip to content

Commit c79e3d5

Browse files
committed
meta-lxatac-bsp: barebox: update to 2024.09.0
Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
1 parent 592fd2b commit c79e3d5

18 files changed

+111
-137
lines changed

meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.03.0.bb renamed to meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.09.0.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ DEPENDS = "libusb1 libusb1-native lzop-native bison-native flex-native pkgconfig
88
BBCLASSEXTEND = "native"
99

1010
SRC_URI = "http://barebox.org/download/barebox-${PV}.tar.bz2"
11-
SRC_URI[sha256sum] = "7dda8cc4e989d38162dc04d287a882edc828093f75baace9e40b2ab7902958ea"
11+
SRC_URI[sha256sum] = "4d4ea7e232aeba2b3cb9ccf0dbf8cd8e01c65b6c615f64c3bd0c4f24f23a47da"
1212

1313
S = "${WORKDIR}/barebox-${PV}"
1414

meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.03.0.bb renamed to meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.09.0.bb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SRC_URI += " \
1212
"
1313
require files/patches/series.inc
1414

15-
SRC_URI[sha256sum] = "7dda8cc4e989d38162dc04d287a882edc828093f75baace9e40b2ab7902958ea"
15+
SRC_URI[sha256sum] = "4d4ea7e232aeba2b3cb9ccf0dbf8cd8e01c65b6c615f64c3bd0c4f24f23a47da"
1616

1717
COMPATIBLE_MACHINE = "lxatac"
1818

meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/defconfig

Lines changed: 20 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#
22
# Automatically generated file; DO NOT EDIT.
3-
# Barebox/arm 2024.03.0-20240322-1 Configuration
3+
# Barebox/arm 2024.09.0-20240918-1 Configuration
44
#
55
CONFIG_ARM=y
6+
CONFIG_ARCH_TEXT_BASE=0x00000000
67
CONFIG_ARM_LINUX=y
78
CONFIG_ARM_USE_COMPRESSED_DTB=y
8-
CONFIG_TEXT_BASE=0x0
99

1010
#
1111
# System Type
@@ -14,17 +14,11 @@ CONFIG_ARCH_STM32=y
1414
CONFIG_ARCH_MULTIARCH=y
1515
# CONFIG_ARCH_AT91 is not set
1616
# CONFIG_ARCH_CLPS711X is not set
17-
# CONFIG_ARCH_DAVINCI is not set
18-
# CONFIG_ARCH_DIGIC is not set
19-
# CONFIG_ARCH_EP93XX is not set
2017
# CONFIG_ARCH_MVEBU is not set
2118
# CONFIG_ARCH_MXS is not set
22-
# CONFIG_ARCH_NOMADIK is not set
23-
# CONFIG_ARCH_OMAP_SINGLE is not set
2419
# CONFIG_ARCH_PXA is not set
2520
# CONFIG_ARCH_SOCFPGA is not set
2621
# CONFIG_ARCH_TEGRA is not set
27-
# CONFIG_ARCH_UEMD is not set
2822
# CONFIG_ARCH_ZYNQ is not set
2923
# CONFIG_ARCH_BCM283X is not set
3024
# CONFIG_ARCH_IMX is not set
@@ -144,7 +138,9 @@ CONFIG_MALLOC_TLSF=y
144138
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
145139
CONFIG_KALLSYMS=y
146140
CONFIG_RELOCATABLE=y
141+
# CONFIG_PANIC_POWEROFF is not set
147142
# CONFIG_PANIC_HANG is not set
143+
CONFIG_PANIC_RESET=y
148144
CONFIG_PROMPT="barebox:"
149145
CONFIG_BAUDRATE=115200
150146
CONFIG_CBSIZE=1024
@@ -167,6 +163,7 @@ CONFIG_BOOTM_SHOW_TYPE=y
167163
CONFIG_BOOTM_VERBOSE=y
168164
CONFIG_BOOTM_INITRD=y
169165
CONFIG_BOOTM_OFTREE=y
166+
CONFIG_BOOTM_UIMAGE=y
170167
CONFIG_BOOTM_OFTREE_UIMAGE=y
171168
# CONFIG_BOOTM_AIMAGE is not set
172169
# CONFIG_BOOTM_ELF is not set
@@ -182,6 +179,7 @@ CONFIG_CONSOLE_FULL=y
182179
# CONFIG_CONSOLE_NONE is not set
183180
# CONFIG_CONSOLE_ACTIVATE_FIRST is not set
184181
# CONFIG_CONSOLE_ACTIVATE_ALL is not set
182+
# CONFIG_CONSOLE_ACTIVATE_ALL_FALLBACK is not set
185183
CONFIG_CONSOLE_ACTIVATE_NONE=y
186184
CONFIG_CONSOLE_ALLOW_COLOR=y
187185
# CONFIG_CONSOLE_DISABLE_INPUT is not set
@@ -238,12 +236,14 @@ CONFIG_FASTBOOT_CMD_OEM=y
238236
#
239237
CONFIG_COMPILE_LOGLEVEL=6
240238
CONFIG_DEFAULT_LOGLEVEL=7
239+
CONFIG_HAS_DEBUG_LL=y
241240
# CONFIG_DEBUG_LL is not set
242241
# CONFIG_DEBUG_INITCALLS is not set
243242
# CONFIG_DEBUG_PBL is not set
244243
# CONFIG_DEBUG_PROBES is not set
245244
# CONFIG_DMA_API_DEBUG is not set
246245
# CONFIG_DEBUG_LIST is not set
246+
# CONFIG_DEBUG_RESOURCES is not set
247247
# CONFIG_PBL_BREAK is not set
248248
# CONFIG_PRINTF_FULL is not set
249249
# CONFIG_UBSAN is not set
@@ -257,9 +257,9 @@ CONFIG_CC_HAS_KASAN_GENERIC=y
257257
#
258258
# EFI (Extensible Firmware Interface) Support
259259
#
260+
CONFIG_HAVE_EFI_STUB=y
260261
# end of EFI (Extensible Firmware Interface) Support
261262

262-
CONFIG_HAS_DEBUG_LL=y
263263
CONFIG_COMMAND_SUPPORT=y
264264
CONFIG_COMPILE_HASH=y
265265

@@ -272,6 +272,7 @@ CONFIG_COMPILE_HASH=y
272272
#
273273
# CONFIG_CMD_TUTORIAL is not set
274274
CONFIG_CMD_ARM_CPUINFO=y
275+
# CONFIG_CMD_CLASS is not set
275276
CONFIG_CMD_DEVINFO=y
276277
# CONFIG_CMD_DEVLOOKUP is not set
277278
# CONFIG_CMD_DEVUNBIND is not set
@@ -283,6 +284,7 @@ CONFIG_CMD_IOMEM=y
283284
CONFIG_CMD_IMD=y
284285
CONFIG_CMD_MEMINFO=y
285286
CONFIG_CMD_ARM_MMUINFO=y
287+
# CONFIG_CMD_BLKSTATS is not set
286288
CONFIG_CMD_REGULATOR=y
287289
# CONFIG_CMD_NVMEM is not set
288290
CONFIG_CMD_VERSION=y
@@ -314,6 +316,7 @@ CONFIG_CMD_BOOTCHOOSER=y
314316
CONFIG_CMD_PARTITION=y
315317
CONFIG_CMD_AUTOMOUNT=y
316318
CONFIG_CMD_MOUNT=y
319+
# CONFIG_CMD_FINDMNT is not set
317320
# CONFIG_CMD_PARTED is not set
318321
CONFIG_CMD_UMOUNT=y
319322
# end of Partition
@@ -424,6 +427,7 @@ CONFIG_CMD_MW=y
424427
#
425428
CONFIG_CMD_CLK=y
426429
CONFIG_CMD_DETECT=y
430+
# CONFIG_CMD_SYNC is not set
427431
CONFIG_CMD_FLASH=y
428432
CONFIG_CMD_GPIO=y
429433
# CONFIG_CMD_I2C is not set
@@ -447,6 +451,7 @@ CONFIG_CMD_WD_DEFAULT_TIMOUT=0
447451
CONFIG_CMD_BAREBOX_UPDATE=y
448452
# CONFIG_CMD_BLOBGEN is not set
449453
# CONFIG_CMD_FIRMWARELOAD is not set
454+
# CONFIG_CMD_KALLSYMS is not set
450455
# CONFIG_CMD_OF_COMPATIBLE is not set
451456
CONFIG_CMD_OF_DIFF=y
452457
CONFIG_CMD_OF_DUMP=y
@@ -458,6 +463,7 @@ CONFIG_CMD_OF_PROPERTY=y
458463
CONFIG_CMD_OF_OVERLAY=y
459464
CONFIG_CMD_OFTREE=y
460465
CONFIG_CMD_TIME=y
466+
# CONFIG_CMD_WATCH is not set
461467
# CONFIG_CMD_UPTIME is not set
462468
CONFIG_CMD_STATE=y
463469
CONFIG_CMD_TLV=y
@@ -654,9 +660,11 @@ CONFIG_MCI=y
654660
#
655661
# --- Feature list ---
656662
#
663+
# CONFIG_MCI_TUNING is not set
657664
CONFIG_MCI_STARTUP=y
658665
CONFIG_MCI_INFO=y
659666
CONFIG_MCI_WRITE=y
667+
CONFIG_MCI_ERASE=y
660668
CONFIG_MCI_MMC_BOOT_PARTITIONS=y
661669
# CONFIG_MCI_MMC_GPP_PARTITIONS is not set
662670

@@ -742,6 +750,7 @@ CONFIG_EEPROM_AT24=y
742750
# Input device support
743751
#
744752
CONFIG_INPUT=y
753+
# CONFIG_INPUT_EVBUG is not set
745754
CONFIG_KEYBOARD_GPIO=y
746755
# CONFIG_KEYBOARD_QT1070 is not set
747756
# CONFIG_KEYBOARD_USB is not set
@@ -758,6 +767,7 @@ CONFIG_STPMIC1_WATCHDOG=y
758767
CONFIG_PWM=y
759768
CONFIG_PWM_STM32=y
760769
CONFIG_HWRNG=y
770+
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
761771
CONFIG_HWRNG_STM32=y
762772

763773
#
@@ -806,6 +816,7 @@ CONFIG_STM32_BSEC=y
806816

807817
CONFIG_REGULATOR=y
808818
CONFIG_REGULATOR_FIXED=y
819+
# CONFIG_REGULATOR_FAN53555 is not set
809820
CONFIG_REGULATOR_STM32_PWR=y
810821
CONFIG_REGULATOR_STM32_VREFBUF=y
811822
CONFIG_REGULATOR_STPMIC1=y
@@ -1054,12 +1065,7 @@ CONFIG_STM32_IMAGE=y
10541065
# CONFIG_KERNEL_INSTALL_TARGET is not set
10551066
# CONFIG_BAREBOXENV_TARGET is not set
10561067
# CONFIG_BAREBOXCRC32_TARGET is not set
1057-
CONFIG_HAS_TARGET_LIBUSB_1_0=y
10581068
# CONFIG_MVEBU_KWBOOT_TARGET is not set
1059-
# CONFIG_ARCH_IMX_USBLOADER_TARGET is not set
1060-
# CONFIG_OMAP3_USB_LOADER_TARGET is not set
1061-
# CONFIG_OMAP4_USBBOOT_TARGET is not set
1062-
# CONFIG_RK_USB_LOADER_TARGET is not set
10631069
# end of Target Tools
10641070

10651071
# CONFIG_TEST is not set

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0002-of_path-support-phandles-in-of_find_path.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
2121
2 files changed, 34 insertions(+), 18 deletions(-)
2222

2323
diff --git a/drivers/of/of_path.c b/drivers/of/of_path.c
24-
index 12a2dfce553e..522109c17b55 100644
24+
index 42efb1ad1dbf..a1a47cad0c20 100644
2525
--- a/drivers/of/of_path.c
2626
+++ b/drivers/of/of_path.c
2727
@@ -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
9595
}
9696

9797
diff --git a/include/of.h b/include/of.h
98-
index 19b8e7c038a4..51ad5773007b 100644
98+
index 55f2c0cbdedf..187a55439a8a 100644
9999
--- a/include/of.h
100100
+++ b/include/of.h
101-
@@ -336,7 +336,8 @@ int of_add_memory(struct device_node *node, bool dump);
101+
@@ -350,7 +350,8 @@ int of_add_memory(struct device_node *node, bool dump);
102102
int of_add_memory_bank(struct device_node *node, bool dump, int r,
103103
u64 base, u64 size);
104104
struct device *of_find_device_by_node_path(const char *path);

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
1111
1 file changed, 1 insertion(+)
1212

1313
diff --git a/Makefile b/Makefile
14-
index a539e57bc8a7..36145fc89eac 100644
14+
index 403ab3fd48dd..29d94792ffae 100644
1515
--- a/Makefile
1616
+++ b/Makefile
1717
@@ -445,6 +445,7 @@ LINUXINCLUDE := -Iinclude \

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0004-net-add-ethaddr-sequence-handling.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
1919
1 file changed, 20 insertions(+)
2020

2121
diff --git a/include/net.h b/include/net.h
22-
index ffc1093ae6e7..a569fdcf470f 100644
22+
index a04ed5b0ab92..8a943e1bb1b2 100644
2323
--- a/include/net.h
2424
+++ b/include/net.h
25-
@@ -520,6 +520,26 @@ static inline void eth_addr_add(u8 *addr, long offset)
25+
@@ -516,6 +516,26 @@ static inline void eth_addr_add(u8 *addr, long offset)
2626
u64_to_ether_addr(u, addr);
2727
}
2828

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
1313
2 files changed, 24 insertions(+)
1414

1515
diff --git a/common/Kconfig b/common/Kconfig
16-
index d16c8696dad4..e25131b74198 100644
16+
index 4500feb66c92..06ff53e9dd95 100644
1717
--- a/common/Kconfig
1818
+++ b/common/Kconfig
19-
@@ -1089,6 +1089,14 @@ config MACHINE_ID
19+
@@ -1169,6 +1169,14 @@ config MACHINE_ID
2020
Note: if no hashable information is available no machine id will be passed
2121
to the kernel.
2222

@@ -32,12 +32,12 @@ index d16c8696dad4..e25131b74198 100644
3232
bool "inform devicetree-enabled kernel of used watchdog"
3333
depends on WATCHDOG && OFTREE && FLEXIBLE_BOOTARGS
3434
diff --git a/common/misc.c b/common/misc.c
35-
index e266f0951ee9..36dfd6f34873 100644
35+
index 7e19797c2f99..1154ae9e21cd 100644
3636
--- a/common/misc.c
3737
+++ b/common/misc.c
38-
@@ -146,6 +146,18 @@ static char *hostname;
39-
static char *serial_number;
40-
static char *of_machine_compatible;
38+
@@ -210,6 +210,18 @@ bool barebox_hostname_is_valid(const char *s)
39+
return true;
40+
}
4141

4242
+static void linux_bootargs_set_hostname(void)
4343
+{
@@ -54,16 +54,16 @@ index e266f0951ee9..36dfd6f34873 100644
5454
/*
5555
* The hostname is supposed to be the shortname of a board. It should
5656
* contain only lowercase letters, numbers, '-', '_'. No whitespaces
57-
@@ -157,6 +169,8 @@ void barebox_set_hostname(const char *__hostname)
57+
@@ -225,6 +237,8 @@ void barebox_set_hostname(const char *__hostname)
58+
pr_warn("Hostname is not valid, please fix it\n");
5859

59-
free(hostname);
6060
hostname = xstrdup(__hostname);
6161
+
6262
+ linux_bootargs_set_hostname();
6363
}
6464

6565
const char *barebox_get_hostname(void)
66-
@@ -181,6 +195,8 @@ void barebox_set_serial_number(const char *__serial_number)
66+
@@ -249,6 +263,8 @@ void barebox_set_serial_number(const char *__serial_number)
6767

6868
free(serial_number);
6969
serial_number = xstrdup(__serial_number);

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0006-net-factor-out-eth_of_get_fixup_node.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
1414
2 files changed, 31 insertions(+), 10 deletions(-)
1515

1616
diff --git a/include/net.h b/include/net.h
17-
index a569fdcf470f..d11b7b8f1e0d 100644
17+
index 8a943e1bb1b2..5171c6485d26 100644
1818
--- a/include/net.h
1919
+++ b/include/net.h
20-
@@ -130,6 +130,18 @@ static inline void of_eth_register_ethaddr(struct device_node *node,
20+
@@ -128,6 +128,18 @@ static inline void of_eth_register_ethaddr(struct device_node *node,
2121
void eth_register_ethaddr(int ethid, const char *ethaddr);
2222
void of_eth_register_ethaddr(struct device_node *node, const char *ethaddr);
2323
#endif
@@ -37,7 +37,7 @@ index a569fdcf470f..d11b7b8f1e0d 100644
3737
* Ethernet header
3838
*/
3939
diff --git a/net/eth.c b/net/eth.c
40-
index 28961e868b7a..8097fb949412 100644
40+
index 7229530c055b..a1d6860be830 100644
4141
--- a/net/eth.c
4242
+++ b/net/eth.c
4343
@@ -319,19 +319,11 @@ static int eth_param_set_ethaddr(struct param_d *param, void *priv)

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0007-net-export-list-of-registered-ethernet-addresses.patch

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
2424
2 files changed, 11 insertions(+), 9 deletions(-)
2525

2626
diff --git a/include/net.h b/include/net.h
27-
index d11b7b8f1e0d..0ec2519e2eff 100644
27+
index 5171c6485d26..cbb26169f288 100644
2828
--- a/include/net.h
2929
+++ b/include/net.h
30-
@@ -627,6 +627,15 @@ void ifdown_all(void);
30+
@@ -633,4 +633,13 @@ void ifdown_all(void);
3131

32-
extern struct list_head netdev_list;
32+
extern struct class eth_class;
3333

3434
+struct eth_ethaddr {
3535
+ struct list_head list;
@@ -40,16 +40,14 @@ index d11b7b8f1e0d..0ec2519e2eff 100644
4040
+
4141
+extern struct list_head ethaddr_list;
4242
+
43-
#define for_each_netdev(netdev) list_for_each_entry(netdev, &netdev_list, list)
44-
4543
#endif /* __NET_H__ */
4644
diff --git a/net/eth.c b/net/eth.c
47-
index 8097fb949412..ebeeb620d567 100644
45+
index a1d6860be830..3714dde44026 100644
4846
--- a/net/eth.c
4947
+++ b/net/eth.c
5048
@@ -23,14 +23,7 @@
5149

52-
LIST_HEAD(netdev_list);
50+
DEFINE_DEV_CLASS(eth_class, "eth");
5351

5452
-struct eth_ethaddr {
5553
- struct list_head list;

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0008-net-implement-ethaddr_string_cmp.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
1515
2 files changed, 19 insertions(+)
1616

1717
diff --git a/include/net.h b/include/net.h
18-
index 0ec2519e2eff..728684b56646 100644
18+
index cbb26169f288..b210996d2ae8 100644
1919
--- a/include/net.h
2020
+++ b/include/net.h
21-
@@ -370,6 +370,8 @@ IPaddr_t getenv_ip(const char *name);
21+
@@ -366,6 +366,8 @@ IPaddr_t getenv_ip(const char *name);
2222
int setenv_ip(const char *name, IPaddr_t ip);
2323

2424
int string_to_ethaddr(const char *str, u8 enetaddr[6]);

0 commit comments

Comments
 (0)