Skip to content

Commit

Permalink
meta-lxatac-bsp: barebox: update to 2023.12.0
Browse files Browse the repository at this point in the history
No large and interesting changes, just a normal update to stay up to date.

Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
  • Loading branch information
hnez committed Mar 22, 2024
1 parent 224472f commit f37346c
Show file tree
Hide file tree
Showing 18 changed files with 56 additions and 52 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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] = "07823aa3cdc083087788a1cccded99a15a250746e259c2ff905dc48f8d9f409a"
SRC_URI[sha256sum] = "8079c3c2d8d2f5bbf8dc6130af3202491d68fa94760a99edd240c827a84abc0d"

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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ SRC_URI += " \
"
require files/patches/series.inc

SRC_URI[sha256sum] = "07823aa3cdc083087788a1cccded99a15a250746e259c2ff905dc48f8d9f409a"
SRC_URI[sha256sum] = "8079c3c2d8d2f5bbf8dc6130af3202491d68fa94760a99edd240c827a84abc0d"

COMPATIBLE_MACHINE = "lxatac"

Expand Down
8 changes: 6 additions & 2 deletions meta-lxatac-bsp/recipes-bsp/barebox/files/lxatac/defconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Barebox/arm 2023.10.0-20231024-1 Configuration
# Barebox/arm 2023.12.0-20231222-1 Configuration
#
CONFIG_ARM=y
CONFIG_ARM_LINUX=y
Expand Down Expand Up @@ -135,6 +135,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
Expand Down Expand Up @@ -460,7 +461,6 @@ CONFIG_CMD_TLV=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

Expand All @@ -482,6 +482,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
Expand Down Expand Up @@ -663,6 +664,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
# CONFIG_MCI_MMCI is not set
# CONFIG_MCI_ARASAN is not set
# CONFIG_MCI_AM654 is not set
# CONFIG_MCI_SPI is not set
CONFIG_MCI_STM32_SDMMC2=y
CONFIG_HAVE_CLK=y
Expand Down Expand Up @@ -695,6 +697,7 @@ CONFIG_MFD_SYSCON=y
# CONFIG_MFD_TWL4030 is not set
# CONFIG_MFD_TWL6030 is not set
CONFIG_MFD_STPMIC1=y
# CONFIG_MFD_PCA9450 is not set
# CONFIG_MFD_RN568PMIC is not set
CONFIG_MFD_STM32_TIMERS=y
# CONFIG_MFD_ATMEL_FLEXCOM is not set
Expand Down Expand Up @@ -873,6 +876,7 @@ CONFIG_SYSCON_REBOOT_MODE=y
# CONFIG_POWER_RESET_GPIO_RESTART is not set
CONFIG_RESET_STM32=y
# CONFIG_VIRTIO_MENU is not set
# CONFIG_MAILBOX is not set
# end of Drivers

#
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
2 files changed, 30 insertions(+)

diff --git a/scripts/common.c b/scripts/common.c
index 88173bc9772a..388031882b77 100644
index 49c468a1ea35..5d47efd197f9 100644
--- a/scripts/common.c
+++ b/scripts/common.c
@@ -96,6 +96,35 @@ void *read_file(const char *filename, size_t *size)
@@ -97,6 +97,35 @@ void *read_file(const char *filename, size_t *size)
return NULL;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ index 12a2dfce553e..522109c17b55 100644
}

diff --git a/include/of.h b/include/of.h
index a7a1ce125fc0..778c14467dc7 100644
index 7d1df462d8cf..d2f8ab8a83df 100644
--- a/include/of.h
+++ b/include/of.h
@@ -331,7 +331,8 @@ int of_add_memory(struct device_node *node, bool dump);
@@ -332,7 +332,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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 dc22ea546428..c513a8742504 100644
index 9a982e943cd4..6f431f820e33 100644
--- a/Makefile
+++ b/Makefile
@@ -445,6 +445,7 @@ LINUXINCLUDE := -Iinclude \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 a0ef8bee0404..d801a03a9adc 100644
index 83fb4def5d99..8c3ecf648af4 100644
--- a/include/net.h
+++ b/include/net.h
@@ -520,6 +520,26 @@ static inline void eth_addr_add(u8 *addr, long offset)
@@ -522,6 +522,26 @@ static inline void eth_addr_add(u8 *addr, long offset)
u64_to_ether_addr(u, addr);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 afa591cb76ff..5e814185ea45 100644
index 76b28ceaafe0..f0d37018cb67 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1082,6 +1082,14 @@ config MACHINE_ID
@@ -1087,6 +1087,14 @@ config MACHINE_ID
Note: if no hashable information is available no machine id will be passed
to the kernel.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 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 d801a03a9adc..7e2d0a0168f0 100644
index 8c3ecf648af4..98e7d4f7b768 100644
--- a/include/net.h
+++ b/include/net.h
@@ -131,6 +131,18 @@ static inline void of_eth_register_ethaddr(struct device_node *node,
Expand All @@ -37,10 +37,10 @@ index d801a03a9adc..7e2d0a0168f0 100644
* Ethernet header
*/
diff --git a/net/eth.c b/net/eth.c
index ccac5e2a6488..47f2a0eb443b 100644
index d1474ec57df3..ec9f46c0800a 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -321,19 +321,11 @@ static int eth_param_set_ethaddr(struct param_d *param, void *priv)
@@ -322,19 +322,11 @@ static int eth_param_set_ethaddr(struct param_d *param, void *priv)
}

#ifdef CONFIG_OFTREE
Expand All @@ -62,7 +62,7 @@ index ccac5e2a6488..47f2a0eb443b 100644

if (node_path) {
bb_node = of_find_node_by_path_from(0, node_path);
@@ -346,6 +338,23 @@ static void eth_of_fixup_node(struct device_node *root,
@@ -347,6 +339,23 @@ static void eth_of_fixup_node(struct device_node *root,
fixup_node = of_find_node_by_alias(root, eth);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ 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 7e2d0a0168f0..bdbaa65d0080 100644
index 98e7d4f7b768..1576ed544a48 100644
--- a/include/net.h
+++ b/include/net.h
@@ -627,6 +627,15 @@ void ifdown_all(void);
@@ -629,6 +629,15 @@ void ifdown_all(void);

extern struct list_head netdev_list;

Expand All @@ -44,10 +44,10 @@ index 7e2d0a0168f0..bdbaa65d0080 100644

#endif /* __NET_H__ */
diff --git a/net/eth.c b/net/eth.c
index 47f2a0eb443b..49260ba64183 100644
index ec9f46c0800a..ffc4355145a8 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -22,14 +22,7 @@
@@ -23,14 +23,7 @@

LIST_HEAD(netdev_list);

Expand All @@ -63,7 +63,7 @@ index 47f2a0eb443b..49260ba64183 100644

int eth_set_promisc(struct eth_device *edev, bool enable)
{
@@ -104,7 +97,7 @@ void eth_register_ethaddr(int ethid, const char *ethaddr)
@@ -105,7 +98,7 @@ void eth_register_ethaddr(int ethid, const char *ethaddr)
for_each_netdev(edev) {
if (edev->dev.id == ethid) {
register_preset_mac_address(edev, ethaddr);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
2 files changed, 11 insertions(+)

diff --git a/include/net.h b/include/net.h
index bdbaa65d0080..9407215ee5e8 100644
index 1576ed544a48..6cb319349784 100644
--- a/include/net.h
+++ b/include/net.h
@@ -372,6 +372,7 @@ int setenv_ip(const char *name, IPaddr_t ip);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
create mode 100644 include/tlv/tlv.h

diff --git a/common/Kconfig b/common/Kconfig
index 5e814185ea45..d7b8c179b49c 100644
index f0d37018cb67..4dfc58f3fbff 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1007,6 +1007,30 @@ config BTHREAD
@@ -1012,6 +1012,30 @@ config BTHREAD
scheduled within delay loops and the console idle to asynchronously
execute actions, like checking for link up or feeding a watchdog.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
create mode 100644 commands/tlv.c

diff --git a/commands/Kconfig b/commands/Kconfig
index c1bba22443e6..53219f88eb57 100644
index a6806f198ec4..a4f4669d2bfb 100644
--- a/commands/Kconfig
+++ b/commands/Kconfig
@@ -2375,6 +2375,18 @@ config CMD_STATE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ index 8c653d184f5f..e34ff994874b 100644
mxsimage
mxsboot
diff --git a/scripts/Makefile b/scripts/Makefile
index 42ac4e548bb4..3014f8ee10a8 100644
index cb1d916439b7..2c6ed9254a36 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -10,6 +10,7 @@ hostprogs-always-y += bareboxenv
Expand All @@ -55,7 +55,7 @@ index 42ac4e548bb4..3014f8ee10a8 100644
hostprogs-always-$(CONFIG_RSATOC) += rsatoc
HOSTCFLAGS_rsatoc.o = `$(PKG_CONFIG) --cflags openssl`
HOSTLDLIBS_rsatoc = `$(PKG_CONFIG) --libs openssl`
@@ -43,6 +44,7 @@ HOSTLDLIBS_rk-usb-loader = `$(PKG_CONFIG) --libs libusb-1.0`
@@ -44,6 +45,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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,10 +201,10 @@ 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 166ef190d6aa..8ed737e9b97e 100644
index bf0f0455ab3f..bcfba154082f 100644
--- a/lib/string.c
+++ b/lib/string.c
@@ -720,6 +720,27 @@ void *memchr(const void *s, int c, size_t n)
@@ -791,6 +791,27 @@ void *memchr(const void *s, int c, size_t n)
#endif
EXPORT_SYMBOL(memchr);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
create mode 100644 arch/arm/dts/stm32mp15xc-lxa-tac.dtsi

diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile
index c285ed7aee2d..f75de70d01b1 100644
index 024ceeb6fd7e..ddf6c8587146 100644
--- a/arch/arm/boards/Makefile
+++ b/arch/arm/boards/Makefile
@@ -141,6 +141,7 @@ obj-$(CONFIG_MACH_SOLIDRUN_MICROSOM) += solidrun-microsom/
@@ -143,6 +143,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/
Expand Down Expand Up @@ -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 97fbb8115341..3ff2b09cdc38 100644
index 339108445afa..f8c5744d157c 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -144,6 +144,7 @@ lwl-$(CONFIG_MACH_SEEED_ODYSSEY) += stm32mp157c-odyssey.dtb.o
@@ -145,6 +145,7 @@ lwl-$(CONFIG_MACH_SEEED_ODYSSEY) += stm32mp157c-odyssey.dtb.o
lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb.o
lwl-$(CONFIG_MACH_STM32MP13XX_DK) += stm32mp135f-dk.dtb.o
lwl-$(CONFIG_MACH_LXA_MC1) += stm32mp157c-lxa-mc1.dtb.o
Expand Down Expand Up @@ -392,7 +392,7 @@ index 000000000000..33f83e035457
+ status = "okay";
+};
diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig
index bc0a48d64c82..accf1b306e13 100644
index 524d282a1db8..220d5b2c15e5 100644
--- a/arch/arm/mach-stm32mp/Kconfig
+++ b/arch/arm/mach-stm32mp/Kconfig
@@ -29,6 +29,11 @@ config MACH_LXA_MC1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= <l.goehrs@pengutronix.de>
Date: Tue, 24 Oct 2023 11:45:31 +0200
Subject: [PATCH] Release 2023.10.0/customers/lxa/tac/20231024-1
Date: Fri, 22 Dec 2023 14:05:33 +0100
Subject: [PATCH] Release 2023.12.0/customers/lxa/tac/20231222-1

---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index c513a8742504..29253370e55c 100644
index 6f431f820e33..a2d34f064597 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
VERSION = 2023
PATCHLEVEL = 10
PATCHLEVEL = 12
SUBLEVEL = 0
-EXTRAVERSION =
+EXTRAVERSION =-20231024-1
+EXTRAVERSION =-20231222-1
NAME = None

# *DOCUMENTATION*
24 changes: 12 additions & 12 deletions meta-lxatac-bsp/recipes-bsp/barebox/files/patches/series.inc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# umpf-base: v2023.10.0
# umpf-name: 2023.10.0/customers/lxa/tac
# umpf-version: 2023.10.0/customers/lxa/tac/20231024-1
# umpf-topic: v2023.10.0/topic/tlv
# umpf-hashinfo: dc2c1cf14ce0dceb10a10874d3e41f7aacbba6a4
# umpf-topic-range: bc5e49335067d0c6c6e97c082a0368fe9d86b725..795783323c2d9c7890ba52382ba50e081a40e076
# umpf-base: v2023.12.0
# umpf-name: 2023.12.0/customers/lxa/tac
# umpf-version: 2023.12.0/customers/lxa/tac/20231222-1
# umpf-topic: v2023.12.0/topic/tlv
# umpf-hashinfo: 7cb6fc8a43fa1b0b8758ff231e15eb6ae6582e5d
# umpf-topic-range: ed433cbef99860b39dfbc2d36983026cced54583..b99a5285a013ef96fe647965e3f6c4ef2a3381ee
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 \
Expand All @@ -17,16 +17,16 @@ SRC_URI += "\
file://patches/0010-commands-add-TLV-debugging-command.patch \
file://patches/0011-scripts-add-bareboxtlv-host-target-tool.patch \
"
# umpf-topic: v2023.10.0/customers/lxa/tac
# umpf-hashinfo: ef3992fcd189834e633f466bd6d68b5512162726
# umpf-topic-range: 795783323c2d9c7890ba52382ba50e081a40e076..a5d76ea4f6f84917216011ee6d6a519e69a58c26
# umpf-topic: v2023.12.0/customers/lxa/tac
# umpf-hashinfo: e68bc9e17a5797c661b499effb2422f80922cd84
# umpf-topic-range: b99a5285a013ef96fe647965e3f6c4ef2a3381ee..e8be1c578bbce8a952b2507b5fd6de2c01c3a07b
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 \
"
# umpf-release: 2023.10.0/customers/lxa/tac/20231024-1
# umpf-topic-range: a5d76ea4f6f84917216011ee6d6a519e69a58c26..a8fe26cc7bef670597217cc9842e3d08fe0d7733
# umpf-release: 2023.12.0/customers/lxa/tac/20231222-1
# umpf-topic-range: e8be1c578bbce8a952b2507b5fd6de2c01c3a07b..86f51aa9f707ecf7a8b2236443f84cbd2b750b6a
SRC_URI += "\
file://patches/0201-Release-2023.10.0-customers-lxa-tac-20231024-1.patch \
file://patches/0201-Release-2023.12.0-customers-lxa-tac-20231222-1.patch \
"
# umpf-end

0 comments on commit f37346c

Please sign in to comment.