Skip to content

Commit 088b33c

Browse files
committed
meta-lxatac-bsp: barebox: update to 2024.08.0
Apart from spinning the "*.img" / "*.stm32" carrousel one step further again this is mostly a routine upgrade. Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
1 parent dcc1694 commit 088b33c

18 files changed

+98
-170
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.08.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] = "b08a762da8d63dd18b4f2d9f5d0a8da001b6e608d1b3eff6dcebc6a2e575d535"
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.08.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] = "b08a762da8d63dd18b4f2d9f5d0a8da001b6e608d1b3eff6dcebc6a2e575d535"
1616

1717
COMPATIBLE_MACHINE = "lxatac"
1818

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 771ee5da55bc..28eb2918b188 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 31360892aeef..cc3675346d1d 100644
1717
--- a/common/Kconfig
1818
+++ b/common/Kconfig
19-
@@ -1089,6 +1089,14 @@ config MACHINE_ID
19+
@@ -1143,6 +1143,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 7bc92c0f9518..5cfe157a13ea 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+
@@ -209,6 +209,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+
@@ -224,6 +236,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+
@@ -248,6 +262,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]);

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0009-common-add-barebox-TLV-support.patch

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
3131
create mode 100644 include/tlv/tlv.h
3232

3333
diff --git a/common/Kconfig b/common/Kconfig
34-
index e25131b74198..c3d8eeabf63d 100644
34+
index cc3675346d1d..02d2f622de72 100644
3535
--- a/common/Kconfig
3636
+++ b/common/Kconfig
37-
@@ -1014,6 +1014,30 @@ config BTHREAD
37+
@@ -1068,6 +1068,30 @@ config BTHREAD
3838
scheduled within delay loops and the console idle to asynchronously
3939
execute actions, like checking for link up or feeding a watchdog.
4040

@@ -66,10 +66,10 @@ index e25131b74198..c3d8eeabf63d 100644
6666
bool "generic state infrastructure"
6767
select CRC32
6868
diff --git a/common/Makefile b/common/Makefile
69-
index 74ef8b7d8af2..08c38eaff358 100644
69+
index 96498790b300..f5d7ee9b4d8f 100644
7070
--- a/common/Makefile
7171
+++ b/common/Makefile
72-
@@ -65,6 +65,7 @@ obj-$(CONFIG_RESET_SOURCE) += reset_source.o
72+
@@ -66,6 +66,7 @@ obj-$(CONFIG_RESET_SOURCE) += reset_source.o
7373
obj-$(CONFIG_SHELL_HUSH) += hush.o
7474
obj-$(CONFIG_SHELL_SIMPLE) += parser.o
7575
obj-$(CONFIG_STATE) += state/
@@ -753,12 +753,12 @@ index 000000000000..54ebce2b4dd3
753753
+ return platform_driver_register(&decoder->_platform_driver);
754754
+}
755755
diff --git a/include/string.h b/include/string.h
756-
index 43911b75762f..13eebc811aae 100644
756+
index cbe6eddf7f88..e56f4c77cfcb 100644
757757
--- a/include/string.h
758758
+++ b/include/string.h
759-
@@ -20,4 +20,9 @@ char *parse_assignment(char *str);
760-
761-
int strverscmp(const char *a, const char *b);
759+
@@ -43,4 +43,9 @@ static inline const char *nonempty(const char *s)
760+
return isempty(s) ? NULL : s;
761+
}
762762

763763
+static inline bool is_nul_terminated(const char *val, size_t len)
764764
+{

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
1414
create mode 100644 commands/tlv.c
1515

1616
diff --git a/commands/Kconfig b/commands/Kconfig
17-
index d8bcb573fd43..33cbf3c2d545 100644
17+
index 5b512f1bbac7..e1c0c2619f1c 100644
1818
--- a/commands/Kconfig
1919
+++ b/commands/Kconfig
20-
@@ -2396,6 +2396,18 @@ config CMD_STATE
20+
@@ -2441,6 +2441,18 @@ config CMD_STATE
2121
depends on STATE
2222
prompt "state"
2323

@@ -37,10 +37,10 @@ index d8bcb573fd43..33cbf3c2d545 100644
3737
bool
3838
prompt "dhrystone"
3939
diff --git a/commands/Makefile b/commands/Makefile
40-
index b3114102765c..754f21576cab 100644
40+
index 4ca7ba7eb609..2f25e9228404 100644
4141
--- a/commands/Makefile
4242
+++ b/commands/Makefile
43-
@@ -132,6 +132,7 @@ obj-$(CONFIG_CMD_CMP) += cmp.o
43+
@@ -136,6 +136,7 @@ obj-$(CONFIG_CMD_CMP) += cmp.o
4444
obj-$(CONFIG_CMD_NV) += nv.o
4545
obj-$(CONFIG_CMD_DEFAULTENV) += defaultenv.o
4646
obj-$(CONFIG_CMD_STATE) += state.o

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0011-scripts-add-bareboxtlv-host-target-tool.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ index 8c653d184f5f..e34ff994874b 100644
4444
mxsimage
4545
mxsboot
4646
diff --git a/scripts/Makefile b/scripts/Makefile
47-
index cb1d916439b7..2c6ed9254a36 100644
47+
index 20da6fc5e7b2..504530386a5a 100644
4848
--- a/scripts/Makefile
4949
+++ b/scripts/Makefile
5050
@@ -10,6 +10,7 @@ hostprogs-always-y += bareboxenv
@@ -55,7 +55,7 @@ index cb1d916439b7..2c6ed9254a36 100644
5555
hostprogs-always-$(CONFIG_RSATOC) += rsatoc
5656
HOSTCFLAGS_rsatoc.o = `$(PKG_CONFIG) --cflags openssl`
5757
HOSTLDLIBS_rsatoc = `$(PKG_CONFIG) --libs openssl`
58-
@@ -44,6 +45,7 @@ HOSTLDLIBS_rk-usb-loader = `$(PKG_CONFIG) --libs libusb-1.0`
58+
@@ -43,6 +44,7 @@ HOSTLDLIBS_rk-usb-loader = `$(PKG_CONFIG) --libs libusb-1.0`
5959
hostprogs-always-$(CONFIG_RK_USB_LOADER) += rk-usb-loader
6060

6161
userprogs-always-$(CONFIG_BAREBOXENV_TARGET) += bareboxenv-target

meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,26 +21,26 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
2121
create mode 100644 common/boards/lxa/factory-data.c
2222

2323
diff --git a/common/boards/Kconfig b/common/boards/Kconfig
24-
index fe3a60d50879..7054a18007b8 100644
24+
index 586a54d7ca13..74947316954b 100644
2525
--- a/common/boards/Kconfig
2626
+++ b/common/boards/Kconfig
27-
@@ -13,3 +13,8 @@ config BOARD_PHYTEC_SOM_IMX8M_DETECTION
28-
29-
config BOARD_TQ
27+
@@ -19,3 +19,8 @@ config BOARD_WOLFVISION
3028
bool
29+
select AIODEV
30+
select ROCKCHIP_SARADC
3131
+
3232
+config BOARD_LXA
3333
+ bool "LXA common board support" if COMPILE_TEST
3434
+ select TLV
3535
+ select TLV_BAREBOX
3636
diff --git a/common/boards/Makefile b/common/boards/Makefile
37-
index 147c36643d2b..4f30be78dce9 100644
37+
index 3f8ac57b2f82..058733522411 100644
3838
--- a/common/boards/Makefile
3939
+++ b/common/boards/Makefile
40-
@@ -3,3 +3,4 @@
41-
obj-$(CONFIG_BOARD_QEMU_VIRT) += qemu-virt/
40+
@@ -4,3 +4,4 @@ obj-$(CONFIG_BOARD_QEMU_VIRT) += qemu-virt/
4241
obj-$(CONFIG_BOARD_PHYTEC_SOM_DETECTION) += phytec/
4342
obj-$(CONFIG_BOARD_TQ) += tq/
43+
obj-$(CONFIG_BOARD_WOLFVISION) += wolfvision/
4444
+obj-$(CONFIG_BOARD_LXA) += lxa/
4545
diff --git a/common/boards/include/boards/lxa/tlv.h b/common/boards/include/boards/lxa/tlv.h
4646
new file mode 100644
@@ -175,10 +175,10 @@ index 000000000000..70ddbc734613
175175
+ return tlv_register_decoder(&lxa_tlv_powerboard_v1);
176176
+}
177177
diff --git a/include/string.h b/include/string.h
178-
index 13eebc811aae..785437ee59a7 100644
178+
index e56f4c77cfcb..b3d543262731 100644
179179
--- a/include/string.h
180180
+++ b/include/string.h
181-
@@ -10,6 +10,8 @@ char *strsep_unescaped(char **, const char *);
181+
@@ -11,6 +11,8 @@ char *strsep_unescaped(char **, const char *);
182182
char *stpcpy(char *dest, const char *src);
183183
bool strends(const char *str, const char *postfix);
184184

@@ -201,7 +201,7 @@ index a32ec917a434..33f5c30a4beb 100644
201201
#define TLV_IS_VENDOR_SPECIFIC(val) ((*(u8 *)&(val) & 0x80) == 0x80)
202202
#define TLV_IS_GENERIC(val) ((*(u8 *)&(val) & 0x80) != 0x80)
203203
diff --git a/lib/string.c b/lib/string.c
204-
index bf0f0455ab3f..bcfba154082f 100644
204+
index 374f326143a7..f2f81144dbdd 100644
205205
--- a/lib/string.c
206206
+++ b/lib/string.c
207207
@@ -791,6 +791,27 @@ void *memchr(const void *s, int c, size_t n)

0 commit comments

Comments
 (0)