Merge pull request #193 from hnez/barebox-2024-10

meta-lxatac-bsp: barebox: update to 2024.10.0
linux-automation · Oct 25, 2024 · b2a636d · b2a636d
2 parents 88af8e0 + 22e857e
commit b2a636d
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 252 deletions.
diff --git a/...es-bsp/barebox/barebox-tools_2024.09.0.bb → ...es-bsp/barebox/barebox-tools_2024.10.0.bb b/...es-bsp/barebox/barebox-tools_2024.09.0.bb → ...es-bsp/barebox/barebox-tools_2024.10.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] = "4d4ea7e232aeba2b3cb9ccf0dbf8cd8e01c65b6c615f64c3bd0c4f24f23a47da"
+SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a5af88d"
 
 S = "${WORKDIR}/barebox-${PV}"
 

diff --git a/.../recipes-bsp/barebox/barebox_2024.09.0.bb → .../recipes-bsp/barebox/barebox_2024.10.0.bb b/.../recipes-bsp/barebox/barebox_2024.09.0.bb → .../recipes-bsp/barebox/barebox_2024.10.0.bb
@@ -12,7 +12,7 @@ SRC_URI += " \
 "
 require files/patches/series.inc
 
-SRC_URI[sha256sum] = "4d4ea7e232aeba2b3cb9ccf0dbf8cd8e01c65b6c615f64c3bd0c4f24f23a47da"
+SRC_URI[sha256sum] = "955b20bfa7358732d2c0c09ccfd4c1a69087b7e2c610b16dee7442d71a5af88d"
 
 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,8 +1,9 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2024.09.0-20240918-1 Configuration
+# Barebox/arm 2024.10.0-20241018-1 Configuration
 #
 CONFIG_ARM=y
+CONFIG_ARM32=y
 CONFIG_ARCH_TEXT_BASE=0x00000000
 CONFIG_ARM_LINUX=y
 CONFIG_ARM_USE_COMPRESSED_DTB=y
@@ -70,7 +71,6 @@ CONFIG_ARM_UNWIND=y
 # CONFIG_ARM_SEMIHOSTING is not set
 CONFIG_ARM_SMCCC=y
 CONFIG_ARM_PSCI_OF=y
-# CONFIG_ARM_PSCI is not set
 CONFIG_ARM_PSCI_CLIENT=y
 # end of ARM specific settings
 
@@ -494,6 +494,7 @@ CONFIG_DTC=y
 CONFIG_OF=y
 CONFIG_OFDEVICE=y
 CONFIG_OF_GPIO=y
+CONFIG_OF_GPIO_PINCONF=y
 CONFIG_OF_BAREBOX_DRIVERS=y
 # CONFIG_OF_BAREBOX_ENV_IN_FS is not set
 CONFIG_OF_OVERLAY=y
@@ -780,6 +781,8 @@ CONFIG_GPIOLIB=y
 #
 # GPIO
 #
+CONFIG_HAVE_GPIO_PINCONF=y
+CONFIG_GPIO_PINCONF=y
 # CONFIG_GPIO_74164 is not set
 # CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
@@ -1001,6 +1004,7 @@ CONFIG_FONT_8x16=y
 # CONFIG_FONT_7x14 is not set
 # CONFIG_FONT_MINI_4x6 is not set
 # CONFIG_FONT_CUSTOM_16X is not set
+# CONFIG_FONT_TER16x32 is not set
 # CONFIG_FONT_6x8 is not set
 CONFIG_FONT_AUTOSELECT=y
 # CONFIG_BAREBOX_LOGO is not set

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 403ab3fd48dd..29d94792ffae 100644
+index 46707fb44f68..9ef8ea726d19 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -445,6 +445,7 @@ LINUXINCLUDE    := -Iinclude \

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,7 +13,7 @@ Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
  2 files changed, 24 insertions(+)
 
 diff --git a/common/Kconfig b/common/Kconfig
-index 4500feb66c92..06ff53e9dd95 100644
+index e505032e14d1..dcc88707bad9 100644
 --- a/common/Kconfig
 +++ b/common/Kconfig
 @@ -1169,6 +1169,14 @@ config MACHINE_ID

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
@@ -31,7 +31,7 @@ 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 06ff53e9dd95..237109d57be0 100644
+index dcc88707bad9..43e62f94b73e 100644
 --- a/common/Kconfig
 +++ b/common/Kconfig
 @@ -1094,6 +1094,30 @@ config BTHREAD
@@ -66,7 +66,7 @@ index 06ff53e9dd95..237109d57be0 100644
  	bool "generic state infrastructure"
  	select CRC32
 diff --git a/common/Makefile b/common/Makefile
-index e88f60b6d762..0e7c98ae9d3c 100644
+index e66dc04bd874..fc7ad83d95d7 100644
 --- a/common/Makefile
 +++ b/common/Makefile
 @@ -67,6 +67,7 @@ obj-$(CONFIG_RESET_SOURCE)	+= reset_source.o
@@ -76,7 +76,7 @@ index e88f60b6d762..0e7c98ae9d3c 100644
 +obj-$(CONFIG_TLV)		+= tlv/
  obj-$(CONFIG_RATP)		+= ratp/
  obj-$(CONFIG_BOOTCHOOSER)	+= bootchooser.o
- obj-$(CONFIG_UIMAGE)		+= image.o uimage.o
+ obj-$(CONFIG_UIMAGE)		+= uimage_types.o uimage.o
 diff --git a/common/tlv/Makefile b/common/tlv/Makefile
 new file mode 100644
 index 000000000000..ea982f229a08

diff --git a/...xatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch b/...xatac-bsp/recipes-bsp/barebox/files/patches/0010-commands-add-TLV-debugging-command.patch
@@ -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 0c1de7606ea1..197b97042720 100644
+index 4a0486861186..cc3c95def257 100644
 --- a/commands/Kconfig
 +++ b/commands/Kconfig
 @@ -2466,6 +2466,18 @@ config CMD_STATE

diff --git a/...p/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch b/...p/recipes-bsp/barebox/files/patches/0102-ARM-stm32mp-add-Linux-Automation-TAC-board.patch
@@ -14,15 +14,15 @@ Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
 ---
  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 +
+ 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                   |   4 +
- 10 files changed, 349 insertions(+)
+ 10 files changed, 312 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
@@ -179,7 +179,7 @@ index 000000000000..bb0600b4d66c
 +	select_fdt_and_start((void *)r2);
 +}
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 68585e1e4b1d..9c9e211728e6 100644
+index 3b3236b4165f..1bac17112340 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
 @@ -149,6 +149,7 @@ lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb.
@@ -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 = <STM32_PINMUX('E',  7, GPIO)>, /* USER_BTN2 */
-+				<STM32_PINMUX('I', 11, GPIO)>; /* USER_BTN */
-+			bias-pull-up;
-+		};
-+	};
-+};
-+
 +&baseboard_eeprom {
 +	#address-cells = <1>;
 +	#size-cells = <1>;

diff --git a/...es-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch b/...es-bsp/barebox/files/patches/0103-ARM-stm32mp-add-Linux-Automation-TAC-Generation-3.patch
@@ -68,7 +68,7 @@ index bb0600b4d66c..bfb7aca29917 100644
 
  	stm32mp1_barebox_entry(fdt);
 diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
-index 9c9e211728e6..a260eb2ef34b 100644
+index 1bac17112340..bcdc8d607c35 100644
 --- a/arch/arm/dts/Makefile
 +++ b/arch/arm/dts/Makefile
 @@ -149,7 +149,8 @@ lwl-$(CONFIG_MACH_STM32MP15XX_DKX) += stm32mp157c-dk2.dtb.o stm32mp157a-dk1.dtb.

diff --git a/...4.09.0-customers-lxa-tac-20240919-1.patch → ...4.10.0-customers-lxa-tac-20241018-1.patch b/...4.09.0-customers-lxa-tac-20240919-1.patch → ...4.10.0-customers-lxa-tac-20241018-1.patch
@@ -1,21 +1,21 @@
 From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= <l.goehrs@pengutronix.de>
-Date: Thu, 19 Sep 2024 14:21:41 +0200
-Subject: [PATCH] Release 2024.09.0/customers/lxa/tac/20240919-1
+Date: Fri, 18 Oct 2024 15:31:31 +0200
+Subject: [PATCH] Release 2024.10.0/customers/lxa/tac/20241018-1
 
 ---
  Makefile | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Makefile b/Makefile
-index 29d94792ffae..fb62e525f9c5 100644
+index 9ef8ea726d19..4c37ef4b2c58 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -2,7 +2,7 @@
  VERSION = 2024
- PATCHLEVEL = 09
+ PATCHLEVEL = 10
  SUBLEVEL = 0
 -EXTRAVERSION =
-+EXTRAVERSION =-20240919-1
++EXTRAVERSION =-20241018-1
  NAME = None
 
  # *DOCUMENTATION*
diff --git a/...bsp/barebox/files/patches/0201-fastboot-print-all-variables-only-on-getvar-all-and-.patch b/...bsp/barebox/files/patches/0201-fastboot-print-all-variables-only-on-getvar-all-and-.patch
diff --git a/...bsp/barebox/files/patches/0202-fastboot-retire-strcmp_l1-in-favor-of-str_has_prefix.patch b/...bsp/barebox/files/patches/0202-fastboot-retire-strcmp_l1-in-favor-of-str_has_prefix.patch