diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.03.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.08.0.bb similarity index 95% rename from meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.03.0.bb rename to meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.08.0.bb index 18ebfcd9..31c76685 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.03.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox-tools_2024.08.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] = "b08a762da8d63dd18b4f2d9f5d0a8da001b6e608d1b3eff6dcebc6a2e575d535" S = "${WORKDIR}/barebox-${PV}" diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.03.0.bb b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.08.0.bb similarity index 92% rename from meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.03.0.bb rename to meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.08.0.bb index 03be38d0..17da7eb0 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.03.0.bb +++ b/meta-lxatac-bsp/recipes-bsp/barebox/barebox_2024.08.0.bb @@ -12,7 +12,7 @@ SRC_URI += " \ " require files/patches/series.inc -SRC_URI[sha256sum] = "7dda8cc4e989d38162dc04d287a882edc828093f75baace9e40b2ab7902958ea" +SRC_URI[sha256sum] = "b08a762da8d63dd18b4f2d9f5d0a8da001b6e608d1b3eff6dcebc6a2e575d535" COMPATIBLE_MACHINE = "lxatac" diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0002-of_path-support-phandles-in-of_find_path.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0002-of_path-support-phandles-in-of_find_path.patch index 844f32e6..4a75b905 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0002-of_path-support-phandles-in-of_find_path.patch +++ b/meta-lxatac-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 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/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch index 8ee8873e..b445e941 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0003-Makefile-add-common-boards-include-to-include-search.patch @@ -11,7 +11,7 @@ Signed-off-by: Ahmad Fatoum 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile -index a539e57bc8a7..36145fc89eac 100644 +index 771ee5da55bc..28eb2918b188 100644 --- a/Makefile +++ b/Makefile @@ -445,6 +445,7 @@ LINUXINCLUDE := -Iinclude \ diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0004-net-add-ethaddr-sequence-handling.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0004-net-add-ethaddr-sequence-handling.patch index 1b0f4d60..67a7678e 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0004-net-add-ethaddr-sequence-handling.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0004-net-add-ethaddr-sequence-handling.patch @@ -19,10 +19,10 @@ Signed-off-by: Ahmad Fatoum 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/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch index 54005987..84e23faf 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0005-common-add-optional-systemd.hostname-generation.patch @@ -13,10 +13,10 @@ Signed-off-by: Ahmad Fatoum 2 files changed, 24 insertions(+) diff --git a/common/Kconfig b/common/Kconfig -index d16c8696dad4..e25131b74198 100644 +index 31360892aeef..cc3675346d1d 100644 --- a/common/Kconfig +++ b/common/Kconfig -@@ -1089,6 +1089,14 @@ config MACHINE_ID +@@ -1143,6 +1143,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 7bc92c0f9518..5cfe157a13ea 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; +@@ -209,6 +209,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) +@@ -224,6 +236,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) +@@ -248,6 +262,8 @@ void barebox_set_serial_number(const char *__serial_number) free(serial_number); serial_number = xstrdup(__serial_number); diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0006-net-factor-out-eth_of_get_fixup_node.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0006-net-factor-out-eth_of_get_fixup_node.patch index d387015b..f6e7a263 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0006-net-factor-out-eth_of_get_fixup_node.patch +++ b/meta-lxatac-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 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/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0007-net-export-list-of-registered-ethernet-addresses.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0007-net-export-list-of-registered-ethernet-addresses.patch index a08f8ee5..844d2736 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0007-net-export-list-of-registered-ethernet-addresses.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0007-net-export-list-of-registered-ethernet-addresses.patch @@ -24,12 +24,12 @@ Signed-off-by: Ahmad Fatoum 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/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0008-net-implement-ethaddr_string_cmp.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0008-net-implement-ethaddr_string_cmp.patch index e6250b03..3cffcd1d 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0008-net-implement-ethaddr_string_cmp.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0008-net-implement-ethaddr_string_cmp.patch @@ -15,10 +15,10 @@ Signed-off-by: Ahmad Fatoum 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]); diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0009-common-add-barebox-TLV-support.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0009-common-add-barebox-TLV-support.patch index 20373e1e..f2cdba50 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0009-common-add-barebox-TLV-support.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0009-common-add-barebox-TLV-support.patch @@ -31,10 +31,10 @@ Signed-off-by: Ahmad Fatoum create mode 100644 include/tlv/tlv.h diff --git a/common/Kconfig b/common/Kconfig -index e25131b74198..c3d8eeabf63d 100644 +index cc3675346d1d..02d2f622de72 100644 --- a/common/Kconfig +++ b/common/Kconfig -@@ -1014,6 +1014,30 @@ config BTHREAD +@@ -1068,6 +1068,30 @@ config BTHREAD scheduled within delay loops and the console idle to asynchronously execute actions, like checking for link up or feeding a watchdog. @@ -66,10 +66,10 @@ index e25131b74198..c3d8eeabf63d 100644 bool "generic state infrastructure" select CRC32 diff --git a/common/Makefile b/common/Makefile -index 74ef8b7d8af2..08c38eaff358 100644 +index 96498790b300..f5d7ee9b4d8f 100644 --- a/common/Makefile +++ b/common/Makefile -@@ -65,6 +65,7 @@ obj-$(CONFIG_RESET_SOURCE) += reset_source.o +@@ -66,6 +66,7 @@ obj-$(CONFIG_RESET_SOURCE) += reset_source.o obj-$(CONFIG_SHELL_HUSH) += hush.o obj-$(CONFIG_SHELL_SIMPLE) += parser.o obj-$(CONFIG_STATE) += state/ @@ -753,12 +753,12 @@ index 000000000000..54ebce2b4dd3 + return platform_driver_register(&decoder->_platform_driver); +} diff --git a/include/string.h b/include/string.h -index 43911b75762f..13eebc811aae 100644 +index cbe6eddf7f88..e56f4c77cfcb 100644 --- a/include/string.h +++ b/include/string.h -@@ -20,4 +20,9 @@ char *parse_assignment(char *str); - - int strverscmp(const char *a, const char *b); +@@ -43,4 +43,9 @@ static inline const char *nonempty(const char *s) + return isempty(s) ? NULL : s; + } +static inline bool is_nul_terminated(const char *val, size_t len) +{ diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch index c8a4cddb..a372eaff 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch @@ -14,10 +14,10 @@ Signed-off-by: Ahmad Fatoum create mode 100644 commands/tlv.c diff --git a/commands/Kconfig b/commands/Kconfig -index d8bcb573fd43..33cbf3c2d545 100644 +index 5b512f1bbac7..e1c0c2619f1c 100644 --- a/commands/Kconfig +++ b/commands/Kconfig -@@ -2396,6 +2396,18 @@ config CMD_STATE +@@ -2441,6 +2441,18 @@ config CMD_STATE depends on STATE prompt "state" @@ -37,10 +37,10 @@ index d8bcb573fd43..33cbf3c2d545 100644 bool prompt "dhrystone" diff --git a/commands/Makefile b/commands/Makefile -index b3114102765c..754f21576cab 100644 +index 4ca7ba7eb609..2f25e9228404 100644 --- a/commands/Makefile +++ b/commands/Makefile -@@ -132,6 +132,7 @@ obj-$(CONFIG_CMD_CMP) += cmp.o +@@ -136,6 +136,7 @@ obj-$(CONFIG_CMD_CMP) += cmp.o obj-$(CONFIG_CMD_NV) += nv.o obj-$(CONFIG_CMD_DEFAULTENV) += defaultenv.o obj-$(CONFIG_CMD_STATE) += state.o diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0011-scripts-add-bareboxtlv-host-target-tool.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0011-scripts-add-bareboxtlv-host-target-tool.patch index ea1d28b7..eeace99e 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0011-scripts-add-bareboxtlv-host-target-tool.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0011-scripts-add-bareboxtlv-host-target-tool.patch @@ -44,7 +44,7 @@ index 8c653d184f5f..e34ff994874b 100644 mxsimage mxsboot diff --git a/scripts/Makefile b/scripts/Makefile -index cb1d916439b7..2c6ed9254a36 100644 +index 20da6fc5e7b2..504530386a5a 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -10,6 +10,7 @@ hostprogs-always-y += bareboxenv @@ -55,7 +55,7 @@ index cb1d916439b7..2c6ed9254a36 100644 hostprogs-always-$(CONFIG_RSATOC) += rsatoc HOSTCFLAGS_rsatoc.o = `$(PKG_CONFIG) --cflags openssl` HOSTLDLIBS_rsatoc = `$(PKG_CONFIG) --libs openssl` -@@ -44,6 +45,7 @@ HOSTLDLIBS_rk-usb-loader = `$(PKG_CONFIG) --libs libusb-1.0` +@@ -43,6 +44,7 @@ HOSTLDLIBS_rk-usb-loader = `$(PKG_CONFIG) --libs libusb-1.0` hostprogs-always-$(CONFIG_RK_USB_LOADER) += rk-usb-loader userprogs-always-$(CONFIG_BAREBOXENV_TARGET) += bareboxenv-target diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch index 468103f7..5a6f9eb3 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch @@ -21,26 +21,26 @@ Signed-off-by: Ahmad Fatoum create mode 100644 common/boards/lxa/factory-data.c diff --git a/common/boards/Kconfig b/common/boards/Kconfig -index fe3a60d50879..7054a18007b8 100644 +index 586a54d7ca13..74947316954b 100644 --- a/common/boards/Kconfig +++ b/common/boards/Kconfig -@@ -13,3 +13,8 @@ config BOARD_PHYTEC_SOM_IMX8M_DETECTION - - config BOARD_TQ +@@ -19,3 +19,8 @@ config BOARD_WOLFVISION bool + select AIODEV + select ROCKCHIP_SARADC + +config BOARD_LXA + bool "LXA common board support" if COMPILE_TEST + select TLV + select TLV_BAREBOX diff --git a/common/boards/Makefile b/common/boards/Makefile -index 147c36643d2b..4f30be78dce9 100644 +index 3f8ac57b2f82..058733522411 100644 --- a/common/boards/Makefile +++ b/common/boards/Makefile -@@ -3,3 +3,4 @@ - obj-$(CONFIG_BOARD_QEMU_VIRT) += qemu-virt/ +@@ -4,3 +4,4 @@ obj-$(CONFIG_BOARD_QEMU_VIRT) += qemu-virt/ obj-$(CONFIG_BOARD_PHYTEC_SOM_DETECTION) += phytec/ obj-$(CONFIG_BOARD_TQ) += tq/ + obj-$(CONFIG_BOARD_WOLFVISION) += wolfvision/ +obj-$(CONFIG_BOARD_LXA) += lxa/ diff --git a/common/boards/include/boards/lxa/tlv.h b/common/boards/include/boards/lxa/tlv.h new file mode 100644 @@ -175,10 +175,10 @@ index 000000000000..70ddbc734613 + return tlv_register_decoder(&lxa_tlv_powerboard_v1); +} diff --git a/include/string.h b/include/string.h -index 13eebc811aae..785437ee59a7 100644 +index e56f4c77cfcb..b3d543262731 100644 --- a/include/string.h +++ b/include/string.h -@@ -10,6 +10,8 @@ char *strsep_unescaped(char **, const char *); +@@ -11,6 +11,8 @@ char *strsep_unescaped(char **, const char *); char *stpcpy(char *dest, const char *src); bool strends(const char *str, const char *postfix); @@ -201,7 +201,7 @@ index a32ec917a434..33f5c30a4beb 100644 #define TLV_IS_VENDOR_SPECIFIC(val) ((*(u8 *)&(val) & 0x80) == 0x80) #define TLV_IS_GENERIC(val) ((*(u8 *)&(val) & 0x80) != 0x80) diff --git a/lib/string.c b/lib/string.c -index bf0f0455ab3f..bcfba154082f 100644 +index 374f326143a7..f2f81144dbdd 100644 --- a/lib/string.c +++ b/lib/string.c @@ -791,6 +791,27 @@ void *memchr(const void *s, int c, size_t n) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch index c109bca6..a9a583fd 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch @@ -14,15 +14,15 @@ Signed-off-by: Rouven Czerwinski --- arch/arm/boards/Makefile | 1 + arch/arm/boards/lxa-tac/Makefile | 2 + - arch/arm/boards/lxa-tac/board.c | 48 ++++++++ - arch/arm/boards/lxa-tac/lowlevel.c | 68 ++++++++++++ + arch/arm/boards/lxa-tac/board.c | 48 +++++++++++ + arch/arm/boards/lxa-tac/lowlevel.c | 68 +++++++++++++++ arch/arm/dts/Makefile | 1 + arch/arm/dts/stm32mp157c-lxa-tac-gen1.dts | 7 ++ - arch/arm/dts/stm32mp157c-lxa-tac-gen2.dts | 38 +++++++ - arch/arm/dts/stm32mp15xc-lxa-tac.dtsi | 175 ++++++++++++++++++++++++++++++ - arch/arm/mach-stm32mp/Kconfig | 5 + - images/Makefile.stm32mp | 4 + - 10 files changed, 349 insertions(+) + arch/arm/dts/stm32mp157c-lxa-tac-gen2.dts | 38 ++++++++ + arch/arm/dts/stm32mp15xc-lxa-tac.dtsi | 138 ++++++++++++++++++++++++++++++ + arch/arm/mach-stm32mp/Kconfig | 5 ++ + images/Makefile.stm32mp | 1 + + 10 files changed, 309 insertions(+) create mode 100644 arch/arm/boards/lxa-tac/Makefile create mode 100644 arch/arm/boards/lxa-tac/board.c create mode 100644 arch/arm/boards/lxa-tac/lowlevel.c @@ -31,10 +31,10 @@ Signed-off-by: Rouven Czerwinski create mode 100644 arch/arm/dts/stm32mp15xc-lxa-tac.dtsi diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile -index e597b02be6c9..cfc35bdb158f 100644 +index e0dc27cb3d21..e36fd78aa3f1 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile -@@ -143,6 +143,7 @@ obj-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += solidrun-microsom/ +@@ -122,6 +122,7 @@ obj-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += solidrun-microsom/ obj-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp15xx-dkx/ obj-$(CONFIG_MACH_STM32MP13XX_DK) += stm32mp13xx-dk/ obj-$(CONFIG_MACH_LXA_MC1) += lxa-mc1/ @@ -179,10 +179,10 @@ index 000000000000..bb0600b4d66c + select_fdt_and_start((void *)r2); +} diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 7800231570cd..d39924c1d252 100644 +index 68585e1e4b1d..9c9e211728e6 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -146,6 +146,7 @@ lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb. +@@ -149,6 +149,7 @@ lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb. stm32mp157c-dk2-scmi.dtb.o stm32mp157a-dk1-scmi.dtb.o lwl-$(CONFIG_MACH_STM32MP13XX_DK) += stm32mp135f-dk.dtb.o lwl-$(CONFIG_MACH_LXA_MC1) += stm32mp157c-lxa-mc1.dtb.o stm32mp157c-lxa-mc1-scmi.dtb.o @@ -249,10 +249,10 @@ index 000000000000..f5261203f8ef +}; diff --git a/arch/arm/dts/stm32mp15xc-lxa-tac.dtsi b/arch/arm/dts/stm32mp15xc-lxa-tac.dtsi new file mode 100644 -index 000000000000..5a07ad7996e6 +index 000000000000..33f83e035457 --- /dev/null +++ b/arch/arm/dts/stm32mp15xc-lxa-tac.dtsi -@@ -0,0 +1,175 @@ +@@ -0,0 +1,138 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) +/* + * Copyright (C) 2020 Ahmad Fatoum, Pengutronix @@ -346,43 +346,6 @@ index 000000000000..5a07ad7996e6 + }; +}; + -+/* -+ * There are two bindings for pin bias: -+ -+ * - The pinctrl binding, which differs from controller to controller, -+ * but is capable of representing controller specific attributes like -+ * pull ups of varying strength. This is used via -+ * pinctrl-names/pinctrl-[0-9]+ DT properties -+ * -+ * - Or-ing GPIO_PULL_UP or GPIO_PULL_DOWN into the GPIO flags after the -+ * phandle, e.g. gpios = <&gpioe 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; -+ * Thix can expose a generic interface, but doesn't allow fine tuning. -+ * -+ * Not all Linux drivers support the second binding and barebox doesn't -+ * support it all; It requires pinctrl drivers to expose to the core -+ * a way to configure pull ups/pull downs, but we don't export this info. -+ * Instead drivers are called with the device tree node in action and -+ * instructed to apply it. -+ * -+ * We can add support for this binding for STM32 only as first step, but -+ * till then, let's just use the first binding instead to configure the -+ * GPIO pull-ups. -+ */ -+&{/gpio-keys} { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&lxatac_gpio_key_pins>; -+}; -+ -+&pinctrl { -+ lxatac_gpio_key_pins: lxatac-gpio-key-pins { -+ pins { -+ pinmux = , /* USER_BTN2 */ -+ ; /* USER_BTN */ -+ bias-pull-up; -+ }; -+ }; -+}; -+ +&baseboard_eeprom { + #address-cells = <1>; + #size-cells = <1>; @@ -429,7 +392,7 @@ index 000000000000..5a07ad7996e6 + status = "okay"; +}; diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig -index 524d282a1db8..220d5b2c15e5 100644 +index 5d60c7996786..ddf2451a49c5 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -29,6 +29,11 @@ config MACH_LXA_MC1 @@ -445,17 +408,14 @@ index 524d282a1db8..220d5b2c15e5 100644 select ARCH_STM32MP157 bool "Seeed Studio Odyssey" diff --git a/images/Makefile.stm32mp b/images/Makefile.stm32mp -index cc70aee92388..80f6b9dfc8f5 100644 +index cb01eb2555e8..32a10f09e52d 100644 --- a/images/Makefile.stm32mp +++ b/images/Makefile.stm32mp -@@ -35,6 +35,10 @@ $(call build_stm32mp_image, CONFIG_MACH_STM32MP15X_EV1, start_stm32mp15x_ev1, st +@@ -34,6 +34,7 @@ $(call build_stm32mp_image, CONFIG_MACH_STM32MP15XX_DKX, start_stm32mp15xx_dkx, + $(call build_stm32mp_image, CONFIG_MACH_STM32MP15X_EV1, start_stm32mp15x_ev1, stm32mp15x-ev1) $(call build_stm32mp_image, CONFIG_MACH_LXA_MC1, start_stm32mp157c_lxa_mc1, stm32mp157c-lxa-mc1) ++$(call build_stm32mp_image, CONFIG_MACH_LXA_TAC, start_stm32mp15xc_lxa_tac, stm32mp15xc-lxa-tac) -+pblb-$(CONFIG_MACH_LXA_TAC) += start_stm32mp15xc_lxa_tac -+FILE_barebox-stm32mp15xc-lxa-tac.img = start_stm32mp15xc_lxa_tac.pblb -+image-$(CONFIG_MACH_LXA_TAC) += barebox-stm32mp15xc-lxa-tac.img -+ $(call build_stm32mp_image, CONFIG_MACH_PROTONIC_STM32MP1, start_prtt1a, prtt1a) $(call build_stm32mp_image, CONFIG_MACH_PROTONIC_STM32MP1, start_prtt1s, prtt1s) - $(call build_stm32mp_image, CONFIG_MACH_PROTONIC_STM32MP1, start_prtt1c, prtt1c) diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch index 650b7256..0164492b 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch @@ -18,9 +18,9 @@ Signed-off-by: Leonard Göhrs dts/src/arm/st/stm32mp15-pinctrl.dtsi | 14 ++ dts/src/arm/st/stm32mp153c-lxa-tac-gen3.dts | 245 ++++++++++++++++++++++++++++ dts/src/arm/st/stm32mp157c-lxa-tac-gen1.dts | 78 +++++++++ - dts/src/arm/st/stm32mp157c-lxa-tac-gen2.dts | 79 ++++++++- - dts/src/arm/st/stm32mp15xc-lxa-tac.dtsi | 86 +--------- - 10 files changed, 472 insertions(+), 79 deletions(-) + dts/src/arm/st/stm32mp157c-lxa-tac-gen2.dts | 77 +++++++++ + dts/src/arm/st/stm32mp15xc-lxa-tac.dtsi | 80 +-------- + 10 files changed, 466 insertions(+), 77 deletions(-) create mode 100644 arch/arm/dts/stm32mp153c-lxa-tac-gen3.dts create mode 100644 dts/src/arm/st/stm32mp153c-lxa-tac-gen3.dts @@ -68,10 +68,10 @@ index bb0600b4d66c..bfb7aca29917 100644 stm32mp1_barebox_entry(fdt); diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index d39924c1d252..76f0c8244de7 100644 +index 9c9e211728e6..a260eb2ef34b 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile -@@ -146,7 +146,8 @@ lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb. +@@ -149,7 +149,8 @@ lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb. stm32mp157c-dk2-scmi.dtb.o stm32mp157a-dk1-scmi.dtb.o lwl-$(CONFIG_MACH_STM32MP13XX_DK) += stm32mp135f-dk.dtb.o lwl-$(CONFIG_MACH_LXA_MC1) += stm32mp157c-lxa-mc1.dtb.o stm32mp157c-lxa-mc1-scmi.dtb.o @@ -510,7 +510,7 @@ index 81f254fb88b0..2dd158841c85 100644 status = "disabled"; }; diff --git a/dts/src/arm/st/stm32mp157c-lxa-tac-gen2.dts b/dts/src/arm/st/stm32mp157c-lxa-tac-gen2.dts -index 8a34d15e9005..1fac9bb60cfb 100644 +index 4cc177031661..1fac9bb60cfb 100644 --- a/dts/src/arm/st/stm32mp157c-lxa-tac-gen2.dts +++ b/dts/src/arm/st/stm32mp157c-lxa-tac-gen2.dts @@ -121,6 +121,76 @@ led-15 { @@ -604,17 +604,8 @@ index 8a34d15e9005..1fac9bb60cfb 100644 &gpu { status = "disabled"; }; -@@ -148,7 +225,7 @@ adc@0 { - compatible = "ti,lmp92064"; - reg = <0>; - -- reset-gpios = <&gpioa 4 GPIO_ACTIVE_HIGH>; -+ reset-gpios = <&gpioa 4 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - shunt-resistor-micro-ohms = <15000>; - spi-max-frequency = <5000000>; - vdd-supply = <®_pb_3v3>; diff --git a/dts/src/arm/st/stm32mp15xc-lxa-tac.dtsi b/dts/src/arm/st/stm32mp15xc-lxa-tac.dtsi -index fc3a2386dbb9..0afbb1a1fa4f 100644 +index cfaf8adde319..0afbb1a1fa4f 100644 --- a/dts/src/arm/st/stm32mp15xc-lxa-tac.dtsi +++ b/dts/src/arm/st/stm32mp15xc-lxa-tac.dtsi @@ -142,75 +142,6 @@ output-vuart { @@ -707,27 +698,7 @@ index fc3a2386dbb9..0afbb1a1fa4f 100644 &gpiof { gpio-line-names = "TP36", "TP37", "", "", "OLED_CS", /* 0 */ "", "", "", "", "", /* 5 */ -@@ -409,7 +333,7 @@ &sdmmc2 { - &spi2 { - pinctrl-names = "default"; - pinctrl-0 = <&spi2_pins_c>; -- cs-gpios = <&gpiof 12 GPIO_ACTIVE_LOW>; -+ cs-gpios = <&gpiof 12 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; - status = "okay"; - }; - -@@ -471,6 +395,10 @@ switch: switch@0 { - interrupt-parent = <&gpioa>; - interrupts = <6 IRQ_TYPE_EDGE_RISING>; - -+ /* Reduce RGMII EMI emissions by reducing drive strength */ -+ microchip,hi-drive-strength-microamp = <2000>; -+ microchip,lo-drive-strength-microamp = <8000>; -+ - ports { - #address-cells = <1>; - #size-cells = <0>; -@@ -577,6 +505,10 @@ &usbotg_hs { +@@ -581,6 +505,10 @@ &usbotg_hs { vusb_d-supply = <&vdd_usb>; vusb_a-supply = <®18>; diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-Release-2024.03.0-customers-lxa-tac-20240405-1.patch b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-Release-2024.08.0-customers-lxa-tac-20240830-1.patch similarity index 61% rename from meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-Release-2024.03.0-customers-lxa-tac-20240405-1.patch rename to meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-Release-2024.08.0-customers-lxa-tac-20240830-1.patch index 30cacd37..2d4ac237 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-Release-2024.03.0-customers-lxa-tac-20240405-1.patch +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/0201-Release-2024.08.0-customers-lxa-tac-20240830-1.patch @@ -1,21 +1,21 @@ From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= -Date: Fri, 5 Apr 2024 07:25:48 +0200 -Subject: [PATCH] Release 2024.03.0/customers/lxa/tac/20240405-1 +Date: Fri, 30 Aug 2024 10:41:49 +0200 +Subject: [PATCH] Release 2024.08.0/customers/lxa/tac/20240830-1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index 36145fc89eac..e4c9bec8e9bf 100644 +index 28eb2918b188..b41f8b20df26 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ VERSION = 2024 - PATCHLEVEL = 03 + PATCHLEVEL = 08 SUBLEVEL = 0 -EXTRAVERSION = -+EXTRAVERSION =-20240405-1 ++EXTRAVERSION =-20240830-1 NAME = None # *DOCUMENTATION* diff --git a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc index d1d02e57..6c8e2d48 100644 --- a/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc +++ b/meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc @@ -1,9 +1,9 @@ -# umpf-base: v2024.03.0 -# umpf-name: 2024.03.0/customers/lxa/tac -# umpf-version: 2024.03.0/customers/lxa/tac/20240405-1 -# umpf-topic: v2024.03.0/topic/tlv -# umpf-hashinfo: 7cda350efdca11246b5cba188e3becd8a9219cd9 -# umpf-topic-range: c6d055d224e0b3a0aff638a05a367c30d2d0310e..c54d19b9a08f94b0fd087e2e827b428cdb1e5ea1 +# umpf-base: v2024.08.0 +# umpf-name: 2024.08.0/customers/lxa/tac +# umpf-version: 2024.08.0/customers/lxa/tac/20240830-1 +# umpf-topic: v2024.08.0/topic/tlv +# umpf-hashinfo: b5658cff49ae55f57750e74be3e98b9222ffe529 +# umpf-topic-range: 12df451f3e595d91657d8a1763624a4f4e8c17c0..962c5780e1acef0aef123c02ae09b90dc898d915 SRC_URI += "\ file://patches/0001-scripts-implement-slurp-a-read_file-with-fd-as-argum.patch \ file://patches/0002-of_path-support-phandles-in-of_find_path.patch \ @@ -17,21 +17,20 @@ SRC_URI += "\ file://patches/0010-commands-add-TLV-debugging-command.patch \ file://patches/0011-scripts-add-bareboxtlv-host-target-tool.patch \ " -# umpf-topic: v2024.03.0/customers/lxa/tac -# umpf-hashinfo: 31d3ca2be7d19ac2c3f9cf3db99becd0d6b619cc -# umpf-topic-range: c54d19b9a08f94b0fd087e2e827b428cdb1e5ea1..89a0aa7e1fcb64b12a8409cd226c2824d9dc1088 +# umpf-topic: v2024.08.0/customers/lxa/tac +# umpf-hashinfo: 7134fead98cd8407858d6e6ff75308d7f230e453 +# umpf-topic-range: 962c5780e1acef0aef123c02ae09b90dc898d915..3e9549fbf314275099857c6040e33a6780454b5c SRC_URI += "\ file://patches/0101-boards-add-decoder-for-LXA-TLV-v1-format.patch \ file://patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch \ file://patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch \ " -# umpf-release: 2024.03.0/customers/lxa/tac/20240405-1 -# umpf-topic-range: 89a0aa7e1fcb64b12a8409cd226c2824d9dc1088..fec71a6c1a830820c41747f2e66c6ffb4a0c0d58 +# umpf-release: 2024.08.0/customers/lxa/tac/20240830-1 +# umpf-topic-range: 3e9549fbf314275099857c6040e33a6780454b5c..b4fc4d4d487f9b828f20635a48a5c5c23a2d7303 SRC_URI += "\ - file://patches/0201-Release-2024.03.0-customers-lxa-tac-20240405-1.patch \ + file://patches/0201-Release-2024.08.0-customers-lxa-tac-20240830-1.patch \ " -UMPF_BASE = "2024.03.0" -UMPF_VERSION = "20240405-1" -# Manually comment out the PV assignment to not break the SRC_URI in barebox.inc -# PV = "${UMPF_BASE}-${UMPF_VERSION}" +UMPF_BASE = "2024.08.0" +UMPF_VERSION = "20240830-1" +UMPF_PV = "${UMPF_BASE}-${UMPF_VERSION}" # umpf-end