[DistroKit] [PATCH 00/14] Mainline TF-A support and blspec-entry cleanups

[DistroKit] [PATCH 00/14] Mainline TF-A support and blspec-entry cleanups

[Marco Felsch]

Hi,

the main purpose of this patchset is to use the mainline tf-a for the
i.mx8m* platforms.

I also cleaned up the blspec entry creation for the platform-v7a/v8a.
For those platforms the entries are now created based on the devicetrees
specified within the platformconfig. We just had to add the support for
the 'linux-appendroot true' option to the blspec-entry package, this
patch has also been sent to the ptxdist-ml [1].

[1] https://lore.ptxdist.org/ptxdist/20230210192144.2133757-1-m.felsch@pengutronix.de/T/#u

Regards,
  Marco

Marco Felsch (14):
  v7a: tf-a: version bump v2.7 ->
    2.8/customers/pengutronix/distrokit/20230210-1
  v8a: tf-a: enable package
  v8a: replace imx-atf with tf-a
  v8a: firmware-imx: fix dest path
  v8a: firmware-imx: fix destition path
  v8a: barebox-imx8m: fix firmware-imx dependencies
  v8a: barebox-imx8m: make use of the INJECT_FILES mechanism
  v8a: barebox: version sync to 2023.01.0
  blspec-entry: import from upstream ptxdist-2022.12.0
  blspec-entry: add linux-appendroot support
  v8a: blspec: switch to default blspec entry
  v7a: blspec: drop incomplete Gute Fee support
  v7a: vexpress: remove console from blspec config
  v7a: blspec: convert to ptxdist default entries

 configs/platform-v7a/platformconfig           |  28 +---
 .../platforms/blspec-boneblack.in             |   5 -
 .../platforms/blspec-bonewhite.in             |   5 -
 configs/platform-v7a/platforms/blspec-gf.in   |   5 -
 .../platform-v7a/platforms/blspec-lxa-mc1.in  |   5 -
 .../platforms/blspec-nitrogen6max.in          |   5 -
 .../platforms/blspec-nitrogen6x.in            |   5 -
 .../platforms/blspec-riotboard.in             |   5 -
 configs/platform-v7a/platforms/blspec-rpi2.in |   5 -
 configs/platform-v7a/platforms/blspec-rpi3.in |   5 -
 .../platform-v7a/platforms/blspec-rpicm3.in   |   5 -
 .../platforms/blspec-sabrelite.in             |   5 -
 .../platforms/blspec-sama5d27-giantboard.in   |   5 -
 .../platforms/blspec-sama5d27-som1-ek.in      |   5 -
 .../platforms/blspec-stm32mp157c-dk2.in       |   5 -
 .../platforms/blspec-stm32mp157c-ev1.in       |   5 -
 .../platform-v7a/platforms/blspec-udoo-neo.in |   5 -
 .../platform-v7a/platforms/blspec-vexpress.in |   5 -
 .../projectroot/loader/entries/boneblack.conf |   6 -
 .../projectroot/loader/entries/bonewhite.conf |   6 -
 .../projectroot/loader/entries/gf.conf        |   6 -
 .../projectroot/loader/entries/lxa-mc1.conf   |   6 -
 .../loader/entries/nitrogen6max.conf          |   6 -
 .../loader/entries/nitrogen6x.conf            |   6 -
 .../projectroot/loader/entries/riotboard.conf |   6 -
 .../projectroot/loader/entries/rpi2.conf      |   6 -
 .../projectroot/loader/entries/rpi3.conf      |   6 -
 .../projectroot/loader/entries/rpicm3.conf    |   6 -
 .../projectroot/loader/entries/sabrelite.conf |   6 -
 .../loader/entries/sama5d27-giantboard.conf   |   6 -
 .../loader/entries/sama5d27-som1-ek.conf      |   6 -
 .../loader/entries/stm32mp157c-dk2.conf       |   6 -
 .../loader/entries/stm32mp157c-ev1.conf       |   6 -
 .../projectroot/loader/entries/udoo-neo.conf  |   6 -
 .../projectroot/loader/entries/vexpress.conf  |   6 -
 .../platform-v7a/rules/blspec-boneblack.make  |  36 -----
 .../platform-v7a/rules/blspec-bonewhite.make  |  36 -----
 .../platform-v7a/rules/blspec-lxa-mc1.make    |  36 -----
 .../rules/blspec-nitrogen6max.make            |  36 -----
 .../platform-v7a/rules/blspec-nitrogen6x.make |  36 -----
 .../platform-v7a/rules/blspec-riotboard.make  |  36 -----
 configs/platform-v7a/rules/blspec-rpi2.make   |  36 -----
 configs/platform-v7a/rules/blspec-rpi3.make   |  36 -----
 configs/platform-v7a/rules/blspec-rpicm3.make |  36 -----
 .../platform-v7a/rules/blspec-sabrelite.make  |  36 -----
 .../rules/blspec-sama5d27-giantboard.make     |  36 -----
 .../rules/blspec-sama5d27-som1-ek.make        |  36 -----
 .../rules/blspec-stm32mp157c-dk2.make         |  36 -----
 .../rules/blspec-stm32mp157c-ev1.make         |  36 -----
 .../platform-v7a/rules/blspec-udoo-neo.make   |  36 -----
 .../platform-v7a/rules/blspec-vexpress.make   |  36 -----
 configs/platform-v8a/barebox-imx8m.config     | 124 +++++++++++++++---
 configs/platform-v8a/barebox-rockchip.config  |  14 +-
 configs/platform-v8a/platformconfig           |  33 +++--
 .../platform-v8a/platforms/barebox-imx8m.in   |   3 +-
 .../platforms/blspec-imx8mm-evk.in            |   5 -
 .../platforms/blspec-imx8mp-evk.in            |   5 -
 .../platforms/blspec-imx8mq-evk.in            |   5 -
 .../platform-v8a/platforms/blspec-rock3a.in   |   5 -
 .../loader/entries/imx8mm-evk.conf            |   6 -
 .../loader/entries/imx8mp-evk.conf            |   6 -
 .../loader/entries/imx8mq-evk.conf            |   6 -
 .../projectroot/loader/entries/rock3a.conf    |   6 -
 configs/platform-v8a/rules/barebox-imx8m.make |  28 ++--
 .../platform-v8a/rules/barebox-rockchip.make  |   4 +-
 .../platform-v8a/rules/blspec-imx8mm-evk.make |  38 ------
 .../platform-v8a/rules/blspec-imx8mp-evk.make |  38 ------
 .../platform-v8a/rules/blspec-imx8mq-evk.make |  38 ------
 configs/platform-v8a/rules/blspec-rock3a.make |  38 ------
 configs/platform-v8a/rules/firmware-imx.make  |   6 +-
 configs/platform-v8a/rules/imx-atf.in         |   7 -
 configs/platform-v8a/rules/imx-atf.make       |  87 ------------
 ...-add-helper-to-detect-linker-options.patch |  38 ------
 ...void-gcc-warning-that-triggers-with-.patch |  48 -------
 ...dd-support-for-new-binutils-versions.patch |  38 ------
 ...004-makefile-link-with-z-noexecstack.patch |  38 ------
 patches/imx-atf-imx_5.4.24_2.1.0/series       |   4 -
 ...s-stm32mp1-align-DDR-regulators-with.patch | 105 ---------------
 ...dd-support-for-new-binutils-versions.patch |  38 ------
 ...004-makefile-link-with-z-noexecstack.patch |  39 ------
 patches/tf-a-v2.7/series                      |   4 -
 ...add-helper-to-detect-linker-options.patch} |   8 +-
 ...dd-support-for-new-binutils-versions.patch |  54 ++++++++
 ...-IMX_BOOT_UART_BASE-configurable-via.patch |  41 ++++++
 ...remove-empty-bl31_plat_runtime_setup.patch |  30 +++++
 ...03-feat-imx8mq-always-set-up-console.patch |  51 +++++++
 ...imx8mq-make-use-of-setup_page_tables.patch |  53 ++++++++
 ...-refactor-imx8mq-introduce-BL31_SIZE.patch |  54 ++++++++
 ...106-feat-imx8mq-add-BL31-PIE-support.patch |  55 ++++++++
 ...feat-imx8mq-add-support-for-gcc-12.x.patch |  45 +++++++
 ...omers-pengutronix-distrokit-20230210.patch |  21 +++
 patches/tf-a-v2.8/series                      |  22 ++++
 platforms/blspec-entry.in                     |  27 ++++
 projectroot/loader/entries/default.conf       |   6 +
 rules/blspec-entry.make                       |  73 +++++++++++
 95 files changed, 702 insertions(+), 1483 deletions(-)
 delete mode 100644 configs/platform-v7a/platforms/blspec-boneblack.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-bonewhite.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-gf.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-lxa-mc1.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-nitrogen6max.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-nitrogen6x.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-riotboard.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-rpi2.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-rpi3.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-rpicm3.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-sabrelite.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-sama5d27-giantboard.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-sama5d27-som1-ek.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-stm32mp157c-dk2.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-stm32mp157c-ev1.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-udoo-neo.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-vexpress.in
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/boneblack.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/bonewhite.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/gf.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/riotboard.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/rpi2.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/rpi3.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/rpicm3.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/sabrelite.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/sama5d27-giantboard.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/sama5d27-som1-ek.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/stm32mp157c-dk2.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/stm32mp157c-ev1.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/udoo-neo.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/vexpress.conf
 delete mode 100644 configs/platform-v7a/rules/blspec-boneblack.make
 delete mode 100644 configs/platform-v7a/rules/blspec-bonewhite.make
 delete mode 100644 configs/platform-v7a/rules/blspec-lxa-mc1.make
 delete mode 100644 configs/platform-v7a/rules/blspec-nitrogen6max.make
 delete mode 100644 configs/platform-v7a/rules/blspec-nitrogen6x.make
 delete mode 100644 configs/platform-v7a/rules/blspec-riotboard.make
 delete mode 100644 configs/platform-v7a/rules/blspec-rpi2.make
 delete mode 100644 configs/platform-v7a/rules/blspec-rpi3.make
 delete mode 100644 configs/platform-v7a/rules/blspec-rpicm3.make
 delete mode 100644 configs/platform-v7a/rules/blspec-sabrelite.make
 delete mode 100644 configs/platform-v7a/rules/blspec-sama5d27-giantboard.make
 delete mode 100644 configs/platform-v7a/rules/blspec-sama5d27-som1-ek.make
 delete mode 100644 configs/platform-v7a/rules/blspec-stm32mp157c-dk2.make
 delete mode 100644 configs/platform-v7a/rules/blspec-stm32mp157c-ev1.make
 delete mode 100644 configs/platform-v7a/rules/blspec-udoo-neo.make
 delete mode 100644 configs/platform-v7a/rules/blspec-vexpress.make
 delete mode 100644 configs/platform-v8a/platforms/blspec-imx8mm-evk.in
 delete mode 100644 configs/platform-v8a/platforms/blspec-imx8mp-evk.in
 delete mode 100644 configs/platform-v8a/platforms/blspec-imx8mq-evk.in
 delete mode 100644 configs/platform-v8a/platforms/blspec-rock3a.in
 delete mode 100644 configs/platform-v8a/projectroot/loader/entries/imx8mm-evk.conf
 delete mode 100644 configs/platform-v8a/projectroot/loader/entries/imx8mp-evk.conf
 delete mode 100644 configs/platform-v8a/projectroot/loader/entries/imx8mq-evk.conf
 delete mode 100644 configs/platform-v8a/projectroot/loader/entries/rock3a.conf
 delete mode 100644 configs/platform-v8a/rules/blspec-imx8mm-evk.make
 delete mode 100644 configs/platform-v8a/rules/blspec-imx8mp-evk.make
 delete mode 100644 configs/platform-v8a/rules/blspec-imx8mq-evk.make
 delete mode 100644 configs/platform-v8a/rules/blspec-rock3a.make
 delete mode 100644 configs/platform-v8a/rules/imx-atf.in
 delete mode 100644 configs/platform-v8a/rules/imx-atf.make
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/0001-build-makefile-add-helper-to-detect-linker-options.patch
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/0002-build-makefile-avoid-gcc-warning-that-triggers-with-.patch
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/0003-feat-build-add-support-for-new-binutils-versions.patch
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/0004-makefile-link-with-z-noexecstack.patch
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/series
 delete mode 100644 patches/tf-a-v2.7/0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch
 delete mode 100644 patches/tf-a-v2.7/0003-feat-build-add-support-for-new-binutils-versions.patch
 delete mode 100644 patches/tf-a-v2.7/0004-makefile-link-with-z-noexecstack.patch
 delete mode 100644 patches/tf-a-v2.7/series
 rename patches/{tf-a-v2.7/0002-build-makefile-add-helper-to-detect-linker-options.patch => tf-a-v2.8/0001-build-makefile-add-helper-to-detect-linker-options.patch} (85%)
 create mode 100644 patches/tf-a-v2.8/0002-feat-build-add-support-for-new-binutils-versions.patch
 create mode 100644 patches/tf-a-v2.8/0101-feat-imx8mq-make-IMX_BOOT_UART_BASE-configurable-via.patch
 create mode 100644 patches/tf-a-v2.8/0102-feat-imx8mq-remove-empty-bl31_plat_runtime_setup.patch
 create mode 100644 patches/tf-a-v2.8/0103-feat-imx8mq-always-set-up-console.patch
 create mode 100644 patches/tf-a-v2.8/0104-refactor-imx8mq-make-use-of-setup_page_tables.patch
 create mode 100644 patches/tf-a-v2.8/0105-refactor-imx8mq-introduce-BL31_SIZE.patch
 create mode 100644 patches/tf-a-v2.8/0106-feat-imx8mq-add-BL31-PIE-support.patch
 create mode 100644 patches/tf-a-v2.8/0107-feat-imx8mq-add-support-for-gcc-12.x.patch
 create mode 100644 patches/tf-a-v2.8/0201-Release-2.8-customers-pengutronix-distrokit-20230210.patch
 create mode 100644 patches/tf-a-v2.8/series
 create mode 100644 platforms/blspec-entry.in
 create mode 100644 projectroot/loader/entries/default.conf
 create mode 100644 rules/blspec-entry.make

-- 
2.30.2

[DistroKit] [PATCH 01/14] v7a: tf-a: version bump v2.7 -> 2.8/customers/pengutronix/distrokit/20230210-1

[Marco Felsch]

Do mainline version bump v2.7 -> v2.8

Drop upstreamed patch:
 - 0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch

Squash patches:
 - 0003-feat-build-add-support-for-new-binutils-versions.patch
 - 0004-makefile-link-with-z-noexecstack.patch

Added patches:
 - i.MX8MQ PIE support
 - i.MX8MQ GCC-12 build fixes

Finally make use of umpf [1] for the patchstack management.

[1] https://github.com/pengutronix/umpf/pull/10

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v7a/platformconfig           |   4 +-
 ...s-stm32mp1-align-DDR-regulators-with.patch | 105 ------------------
 ...dd-support-for-new-binutils-versions.patch |  38 -------
 ...004-makefile-link-with-z-noexecstack.patch |  39 -------
 patches/tf-a-v2.7/series                      |   4 -
 ...add-helper-to-detect-linker-options.patch} |   8 +-
 ...dd-support-for-new-binutils-versions.patch |  54 +++++++++
 ...-IMX_BOOT_UART_BASE-configurable-via.patch |  41 +++++++
 ...remove-empty-bl31_plat_runtime_setup.patch |  30 +++++
 ...03-feat-imx8mq-always-set-up-console.patch |  51 +++++++++
 ...imx8mq-make-use-of-setup_page_tables.patch |  53 +++++++++
 ...-refactor-imx8mq-introduce-BL31_SIZE.patch |  54 +++++++++
 ...106-feat-imx8mq-add-BL31-PIE-support.patch |  55 +++++++++
 ...feat-imx8mq-add-support-for-gcc-12.x.patch |  45 ++++++++
 ...omers-pengutronix-distrokit-20230210.patch |  21 ++++
 patches/tf-a-v2.8/series                      |  22 ++++
 16 files changed, 430 insertions(+), 194 deletions(-)
 delete mode 100644 patches/tf-a-v2.7/0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch
 delete mode 100644 patches/tf-a-v2.7/0003-feat-build-add-support-for-new-binutils-versions.patch
 delete mode 100644 patches/tf-a-v2.7/0004-makefile-link-with-z-noexecstack.patch
 delete mode 100644 patches/tf-a-v2.7/series
 rename patches/{tf-a-v2.7/0002-build-makefile-add-helper-to-detect-linker-options.patch => tf-a-v2.8/0001-build-makefile-add-helper-to-detect-linker-options.patch} (85%)
 create mode 100644 patches/tf-a-v2.8/0002-feat-build-add-support-for-new-binutils-versions.patch
 create mode 100644 patches/tf-a-v2.8/0101-feat-imx8mq-make-IMX_BOOT_UART_BASE-configurable-via.patch
 create mode 100644 patches/tf-a-v2.8/0102-feat-imx8mq-remove-empty-bl31_plat_runtime_setup.patch
 create mode 100644 patches/tf-a-v2.8/0103-feat-imx8mq-always-set-up-console.patch
 create mode 100644 patches/tf-a-v2.8/0104-refactor-imx8mq-make-use-of-setup_page_tables.patch
 create mode 100644 patches/tf-a-v2.8/0105-refactor-imx8mq-introduce-BL31_SIZE.patch
 create mode 100644 patches/tf-a-v2.8/0106-feat-imx8mq-add-BL31-PIE-support.patch
 create mode 100644 patches/tf-a-v2.8/0107-feat-imx8mq-add-support-for-gcc-12.x.patch
 create mode 100644 patches/tf-a-v2.8/0201-Release-2.8-customers-pengutronix-distrokit-20230210.patch
 create mode 100644 patches/tf-a-v2.8/series

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index ac43dbf..8e90a32 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -198,8 +198,8 @@ PTXCONF_BOOTLOADER=y
 # PTXCONF_OPTEE is not set
 PTXCONF_TF_A=y
 PTXCONF_TF_A_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot"
-PTXCONF_TF_A_VERSION="v2.7"
-PTXCONF_TF_A_MD5="1d609ceb2bc01d650366118c58ca7336"
+PTXCONF_TF_A_VERSION="v2.8"
+PTXCONF_TF_A_MD5="784a1e94d4b1e938927372e3bc12d12e"
 PTXCONF_TF_A_ARCH_STRING="aarch32"
 PTXCONF_TF_A_ARM_ARCH_MAJOR_7=y
 # PTXCONF_TF_A_ARM_ARCH_MAJOR_8_32_BIT is not set
diff --git a/patches/tf-a-v2.7/0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch b/patches/tf-a-v2.7/0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch
deleted file mode 100644
index 3ee7268..0000000
--- a/patches/tf-a-v2.7/0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 02e0e6ae14a747031c6ba67517c9eee744f4d51d Mon Sep 17 00:00:00 2001
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Date: Thu, 2 Jun 2022 06:28:31 +0200
-Subject: [PATCH 1/4] fix(stm32mp1): fdts: stm32mp1: align DDR regulators with
- new driver
-
-With recent changes, TF-A now panics on LXA MC1, Avernger96 and Odyssey:
-
-  NOTICE:  CPU: STM32MP157C?? Rev.B
-  NOTICE:  Model: Linux Automation MC-1 board
-  ERROR:   regul ldo3: max value 750 is invalid
-  PANIC at PC : 0x2ffeebb7
-
-as the driver takes great offense at the content of the device
-tree. The parts in question were copy-pasted from ST DTs, but those
-ST DTs were fixed by commit 67d95409baae
-("refactor(stm32mp1-fdts): update regulator description").
-
-Fix the breakage by transplanting the same changes into all STM32MP1 DTs.
-
-Fixes: bba9fdee589f ("feat(stm32mp1): add regulator framework compilation")
-Change-Id: I143d0091625f62c313b3b71449c9ad99583d01c8
-Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
-Origin: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/15370
----
- fdts/stm32mp157a-avenger96.dts    | 4 +---
- fdts/stm32mp157c-odyssey-som.dtsi | 4 +---
- fdts/stm32mp15xx-osd32.dtsi       | 4 +---
- 3 files changed, 3 insertions(+), 9 deletions(-)
-
-diff --git a/fdts/stm32mp157a-avenger96.dts b/fdts/stm32mp157a-avenger96.dts
-index b967736e4786..6ae97c7581d1 100644
---- a/fdts/stm32mp157a-avenger96.dts
-+++ b/fdts/stm32mp157a-avenger96.dts
-@@ -115,10 +115,9 @@
- 
- 			vtt_ddr: ldo3 {
- 				regulator-name = "vtt_ddr";
--				regulator-min-microvolt = <500000>;
--				regulator-max-microvolt = <750000>;
- 				regulator-always-on;
- 				regulator-over-current-protection;
-+				st,regulator-sink-source;
- 			};
- 
- 			vdd_usb: ldo4 {
-@@ -143,7 +142,6 @@
- 			vref_ddr: vref_ddr {
- 				regulator-name = "vref_ddr";
- 				regulator-always-on;
--				regulator-over-current-protection;
- 			};
- 
- 			bst_out: boost {
-diff --git a/fdts/stm32mp157c-odyssey-som.dtsi b/fdts/stm32mp157c-odyssey-som.dtsi
-index 6bed33968f73..c4e13985a3f7 100644
---- a/fdts/stm32mp157c-odyssey-som.dtsi
-+++ b/fdts/stm32mp157c-odyssey-som.dtsi
-@@ -140,10 +140,9 @@
- 
- 			vtt_ddr: ldo3 {
- 				regulator-name = "vtt_ddr";
--				regulator-min-microvolt = <500000>;
--				regulator-max-microvolt = <750000>;
- 				regulator-always-on;
- 				regulator-over-current-protection;
-+				st,regulator-sink-source;
- 			};
- 
- 			vdd_usb: ldo4 {
-@@ -170,7 +169,6 @@
- 			vref_ddr: vref_ddr {
- 				regulator-name = "vref_ddr";
- 				regulator-always-on;
--				regulator-over-current-protection;
- 			};
- 
- 			bst_out: boost {
-diff --git a/fdts/stm32mp15xx-osd32.dtsi b/fdts/stm32mp15xx-osd32.dtsi
-index 76a25613a14d..ca672356293c 100644
---- a/fdts/stm32mp15xx-osd32.dtsi
-+++ b/fdts/stm32mp15xx-osd32.dtsi
-@@ -81,10 +81,9 @@
- 
- 			vtt_ddr: ldo3 {
- 				regulator-name = "vtt_ddr";
--				regulator-min-microvolt = <500000>;
--				regulator-max-microvolt = <750000>;
- 				regulator-always-on;
- 				regulator-over-current-protection;
-+				st,regulator-sink-source;
- 			};
- 
- 			vdd_usb: ldo4 {
-@@ -110,7 +109,6 @@
- 			vref_ddr: vref_ddr {
- 				regulator-name = "vref_ddr";
- 				regulator-always-on;
--				regulator-over-current-protection;
- 			};
- 
- 			bst_out: boost {
--- 
-2.30.2
-
diff --git a/patches/tf-a-v2.7/0003-feat-build-add-support-for-new-binutils-versions.patch b/patches/tf-a-v2.7/0003-feat-build-add-support-for-new-binutils-versions.patch
deleted file mode 100644
index 35b2be9..0000000
--- a/patches/tf-a-v2.7/0003-feat-build-add-support-for-new-binutils-versions.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b102865225c8db6a4ef60f346aded5959acc4d1c Mon Sep 17 00:00:00 2001
-From: Marco Felsch <m.felsch@pengutronix.de>
-Date: Wed, 9 Nov 2022 12:59:09 +0100
-Subject: [PATCH 3/4] feat(build): add support for new binutils versions
-
-The new ld.bfd linker version has added new warnings which are enabled by
-default to secure elf binaries:
- - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
- - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774
-
-Since the tf-a handles every warning as error we need to tell the linker
-to not warn about this. This is required to make the bl31 target
-buildable with newer toolchain versions.
-
-Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
-Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617
----
- Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 3941f869800a..af7fd1535694 100644
---- a/Makefile
-+++ b/Makefile
-@@ -444,6 +444,10 @@ TF_LDFLAGS		+=	$(TF_LDFLAGS_$(ARCH))
- endif
- endif
- 
-+# With ld.bfd version 2.29 and newer new warnings are added. Skip those since we
-+# are not loaded by a elf loader.
-+TF_LDFLAGS		+=	$(call ld_option, --no-warn-rwx-segments)
-+
- DTC_FLAGS		+=	-I dts -O dtb
- DTC_CPPFLAGS		+=	-P -nostdinc -Iinclude -Ifdts -undef \
- 				-x assembler-with-cpp $(DEFINES)
--- 
-2.30.2
-
diff --git a/patches/tf-a-v2.7/0004-makefile-link-with-z-noexecstack.patch b/patches/tf-a-v2.7/0004-makefile-link-with-z-noexecstack.patch
deleted file mode 100644
index 5c66e97..0000000
--- a/patches/tf-a-v2.7/0004-makefile-link-with-z-noexecstack.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 943df16d58ec8e31cb3e1726998ac6e4cd195284 Mon Sep 17 00:00:00 2001
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Wed, 23 Nov 2022 09:02:59 +0100
-Subject: [PATCH 4/4] makefile: link with -z noexecstack
-
-Starting with binutils 2.39+, there is a new warning:
-
-  ld: warning: vmlinux: missing .note.GNU-stack section implies executable stack
-  ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
-  ld: warning: vmlinux has a LOAD segment with RWX permissions
-
-Fix it in a similar way to what the Linux kernel does, see:
-https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/
-
-Following the reasoning there, we set "-z noexecstack" for all linkers
-(although LLVM's LLD defaults to it).
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- Makefile | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index af7fd1535694..e4cc77cd41ca 100644
---- a/Makefile
-+++ b/Makefile
-@@ -409,6 +409,9 @@ endif
- 
- GCC_V_OUTPUT		:=	$(shell $(CC) -v 2>&1)
- 
-+
-+TF_LDFLAGS		+=	-z noexecstack
-+
- # LD = armlink
- ifneq ($(findstring armlink,$(notdir $(LD))),)
- TF_LDFLAGS		+=	--diag_error=warning --lto_level=O1
--- 
-2.30.2
-
diff --git a/patches/tf-a-v2.7/series b/patches/tf-a-v2.7/series
deleted file mode 100644
index 4097cf1..0000000
--- a/patches/tf-a-v2.7/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-fix-stm32mp1-fdts-stm32mp1-align-DDR-regulators-with.patch
-0002-build-makefile-add-helper-to-detect-linker-options.patch
-0003-feat-build-add-support-for-new-binutils-versions.patch
-0004-makefile-link-with-z-noexecstack.patch
diff --git a/patches/tf-a-v2.7/0002-build-makefile-add-helper-to-detect-linker-options.patch b/patches/tf-a-v2.8/0001-build-makefile-add-helper-to-detect-linker-options.patch
similarity index 85%
rename from patches/tf-a-v2.7/0002-build-makefile-add-helper-to-detect-linker-options.patch
rename to patches/tf-a-v2.8/0001-build-makefile-add-helper-to-detect-linker-options.patch
index d391112..e86f31b 100644
--- a/patches/tf-a-v2.7/0002-build-makefile-add-helper-to-detect-linker-options.patch
+++ b/patches/tf-a-v2.8/0001-build-makefile-add-helper-to-detect-linker-options.patch
@@ -1,7 +1,6 @@
-From e4e456405177add4df5e21528caa3d873847056a Mon Sep 17 00:00:00 2001
 From: Marco Felsch <m.felsch@pengutronix.de>
 Date: Thu, 24 Nov 2022 11:02:05 +0100
-Subject: [PATCH 2/4] build(makefile): add helper to detect linker options
+Subject: [PATCH] build(makefile): add helper to detect linker options
 
 This is a small helper to check for possible linker options. If the
 linker supports the requested option it is returned and if not nothing
@@ -18,7 +17,7 @@ Change-Id: I236800852ece49948ff53a0b91fddba53c8f0f95
  1 file changed, 6 insertions(+)
 
 diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
-index a58caf565163..06caeea19787 100644
+index 426e344941d9..7d0b0a511226 100644
 --- a/make_helpers/build_macros.mk
 +++ b/make_helpers/build_macros.mk
 @@ -86,6 +86,12 @@ define assert_numerics
@@ -34,6 +33,3 @@ index a58caf565163..06caeea19787 100644
  # CREATE_SEQ is a recursive function to create sequence of numbers from 1 to
  # $(2) and assign the sequence to $(1)
  define CREATE_SEQ
--- 
-2.30.2
-
diff --git a/patches/tf-a-v2.8/0002-feat-build-add-support-for-new-binutils-versions.patch b/patches/tf-a-v2.8/0002-feat-build-add-support-for-new-binutils-versions.patch
new file mode 100644
index 0000000..b254a57
--- /dev/null
+++ b/patches/tf-a-v2.8/0002-feat-build-add-support-for-new-binutils-versions.patch
@@ -0,0 +1,54 @@
+From: Marco Felsch <m.felsch@pengutronix.de>
+Date: Wed, 9 Nov 2022 12:59:09 +0100
+Subject: [PATCH] feat(build): add support for new binutils versions
+
+Users of GNU ld (BPF) from binutils 2.39+ will observe multiple instaces
+of a new warning when linking the bl*.elf in the form:
+
+  ld.bfd: warning: stm32mp1_helper.o: missing .note.GNU-stack section implies executable stack
+  ld.bfd: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
+  ld.bfd: warning: bl2.elf has a LOAD segment with RWX permissions
+  ld.bfd: warning: bl32.elf has a LOAD segment with RWX permissions
+
+These new warnings are enbaled by default to secure elf binaries:
+ - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
+ - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774
+
+Fix it in a similar way to what the Linux kernel does, see:
+https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/
+
+Following the reasoning there, we set "-z noexecstack" for all linkers
+(although LLVM's LLD defaults to it) and optional add
+--no-warn-rwx-segments since this a ld.bfd related.
+
+Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
+Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
+Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617
+---
+ Makefile | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 1ddb7b84417d..1bfff716485a 100644
+--- a/Makefile
++++ b/Makefile
+@@ -416,6 +416,8 @@ endif
+ 
+ GCC_V_OUTPUT		:=	$(shell $(CC) -v 2>&1)
+ 
++TF_LDFLAGS		+=	-z noexecstack
++
+ # LD = armlink
+ ifneq ($(findstring armlink,$(notdir $(LD))),)
+ TF_LDFLAGS		+=	--diag_error=warning --lto_level=O1
+@@ -451,6 +453,10 @@ TF_LDFLAGS		+=	$(TF_LDFLAGS_$(ARCH))
+ endif
+ endif
+ 
++# With ld.bfd version 2.29 and newer new warnings are added. Skip those since we
++# are not loaded by a elf loader.
++TF_LDFLAGS		+=	$(call ld_option, --no-warn-rwx-segments)
++
+ DTC_FLAGS		+=	-I dts -O dtb
+ DTC_CPPFLAGS		+=	-P -nostdinc -Iinclude -Ifdts -undef \
+ 				-x assembler-with-cpp $(DEFINES)
diff --git a/patches/tf-a-v2.8/0101-feat-imx8mq-make-IMX_BOOT_UART_BASE-configurable-via.patch b/patches/tf-a-v2.8/0101-feat-imx8mq-make-IMX_BOOT_UART_BASE-configurable-via.patch
new file mode 100644
index 0000000..958b7fd
--- /dev/null
+++ b/patches/tf-a-v2.8/0101-feat-imx8mq-make-IMX_BOOT_UART_BASE-configurable-via.patch
@@ -0,0 +1,41 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Thu, 8 Dec 2022 15:54:26 +0100
+Subject: [PATCH] feat(imx8mq): make IMX_BOOT_UART_BASE configurable via build
+ parameter
+
+This aligns the i.MX8MQ build with the other i.MX8M platforms by allowing
+to override the default IMX_BOOT_UART_BASE value via a make parameter.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Change-Id: Iad9b844517209fc7d051c61767f71ac9fa2b55c7
+---
+ plat/imx/imx8m/imx8mq/include/platform_def.h | 1 -
+ plat/imx/imx8m/imx8mq/platform.mk            | 3 +++
+ 2 files changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/plat/imx/imx8m/imx8mq/include/platform_def.h b/plat/imx/imx8m/imx8mq/include/platform_def.h
+index 1dd22d952305..4671cd3afa40 100644
+--- a/plat/imx/imx8m/imx8mq/include/platform_def.h
++++ b/plat/imx/imx8m/imx8mq/include/platform_def.h
+@@ -54,7 +54,6 @@
+ 
+ #define HAB_RVT_BASE			U(0x00000880) /* HAB_RVT for i.MX8MQ */
+ 
+-#define IMX_BOOT_UART_BASE		U(0x30860000)
+ #define IMX_BOOT_UART_CLK_IN_HZ		25000000 /* Select 25Mhz oscillator */
+ #define PLAT_CRASH_UART_BASE		IMX_BOOT_UART_BASE
+ #define PLAT_CRASH_UART_CLK_IN_HZ	25000000
+diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk
+index 7b6df920c924..f62d3aa5be15 100644
+--- a/plat/imx/imx8m/imx8mq/platform.mk
++++ b/plat/imx/imx8m/imx8mq/platform.mk
+@@ -52,6 +52,9 @@ $(eval $(call add_define,BL32_BASE))
+ BL32_SIZE		?=	0x2000000
+ $(eval $(call add_define,BL32_SIZE))
+ 
++IMX_BOOT_UART_BASE	?=	0x30860000
++$(eval $(call add_define,IMX_BOOT_UART_BASE))
++
+ ifeq (${SPD},trusty)
+ 	BL31_CFLAGS    +=      -DPLAT_XLAT_TABLES_DYNAMIC=1
+ endif
diff --git a/patches/tf-a-v2.8/0102-feat-imx8mq-remove-empty-bl31_plat_runtime_setup.patch b/patches/tf-a-v2.8/0102-feat-imx8mq-remove-empty-bl31_plat_runtime_setup.patch
new file mode 100644
index 0000000..0b1bc7e
--- /dev/null
+++ b/patches/tf-a-v2.8/0102-feat-imx8mq-remove-empty-bl31_plat_runtime_setup.patch
@@ -0,0 +1,30 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Thu, 8 Dec 2022 17:51:17 +0100
+Subject: [PATCH] feat(imx8mq): remove empty bl31_plat_runtime_setup
+
+Having this empty definition is actively harmful, as it prevents the
+default weak function to be used, which does a switch of the console
+state.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Change-Id: I3b78e0c524c4907714036dba573a44d8f9c48b09
+---
+ plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+index 59c3779abb7f..0feb6d7fbad2 100644
+--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
++++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+@@ -227,11 +227,6 @@ unsigned int plat_get_syscnt_freq2(void)
+ 	return COUNTER_FREQUENCY;
+ }
+ 
+-void bl31_plat_runtime_setup(void)
+-{
+-	return;
+-}
+-
+ #ifdef SPD_trusty
+ void plat_trusty_set_boot_args(aapcs64_params_t *args)
+ {
diff --git a/patches/tf-a-v2.8/0103-feat-imx8mq-always-set-up-console.patch b/patches/tf-a-v2.8/0103-feat-imx8mq-always-set-up-console.patch
new file mode 100644
index 0000000..3a44ae3
--- /dev/null
+++ b/patches/tf-a-v2.8/0103-feat-imx8mq-always-set-up-console.patch
@@ -0,0 +1,51 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Thu, 8 Dec 2022 16:00:04 +0100
+Subject: [PATCH] feat(imx8mq): always set up console
+
+This aligns the i.MX8MQ platform behaviour with the other i.MX8M*
+platforms by always setting up the console UART.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Change-Id: I1279d9cb4feb6e789422b9844cab711b8daae74e
+---
+ plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c    | 7 +++----
+ plat/imx/imx8m/imx8mq/include/platform_def.h | 1 -
+ 2 files changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+index 0feb6d7fbad2..0972c35e9554 100644
+--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
++++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+@@ -124,6 +124,7 @@ static void bl31_tz380_setup(void)
+ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
+ 			u_register_t arg2, u_register_t arg3)
+ {
++	static console_t console;
+ 	int i;
+ 	/* enable CSU NS access permission */
+ 	for (i = 0; i < 64; i++) {
+@@ -132,12 +133,10 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
+ 
+ 	imx_aipstz_init(aipstz);
+ 
+-#if DEBUG_CONSOLE
+-	static console_t console;
+-
+ 	console_imx_uart_register(IMX_BOOT_UART_BASE, IMX_BOOT_UART_CLK_IN_HZ,
+ 		IMX_CONSOLE_BAUDRATE, &console);
+-#endif
++	/* This console is only used for boot stage */
++	console_set_scope(&console, CONSOLE_FLAG_BOOT);
+ 
+ 	imx8m_caam_init();
+ 
+diff --git a/plat/imx/imx8m/imx8mq/include/platform_def.h b/plat/imx/imx8m/imx8mq/include/platform_def.h
+index 4671cd3afa40..103f2e4087e2 100644
+--- a/plat/imx/imx8m/imx8mq/include/platform_def.h
++++ b/plat/imx/imx8m/imx8mq/include/platform_def.h
+@@ -127,5 +127,4 @@
+ 
+ #define COUNTER_FREQUENCY		8333333 /* 25MHz / 3 */
+ 
+-#define DEBUG_CONSOLE			0
+ #define IMX_WDOG_B_RESET
diff --git a/patches/tf-a-v2.8/0104-refactor-imx8mq-make-use-of-setup_page_tables.patch b/patches/tf-a-v2.8/0104-refactor-imx8mq-make-use-of-setup_page_tables.patch
new file mode 100644
index 0000000..6cf2dc1
--- /dev/null
+++ b/patches/tf-a-v2.8/0104-refactor-imx8mq-make-use-of-setup_page_tables.patch
@@ -0,0 +1,53 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Thu, 8 Dec 2022 16:35:11 +0100
+Subject: [PATCH] refactor(imx8mq): make use of setup_page_tables()
+
+Improve code readability and align with other i.MX8M* platforms.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Change-Id: Ifd29b74872e3a567288d208de4827403078164e9
+---
+ plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 28 +++++++++++++---------------
+ 1 file changed, 13 insertions(+), 15 deletions(-)
+
+diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+index 0972c35e9554..c7eddf430197 100644
+--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
++++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+@@ -175,23 +175,21 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
+ 
+ void bl31_plat_arch_setup(void)
+ {
+-	mmap_add_region(BL31_BASE, BL31_BASE, (BL31_LIMIT - BL31_BASE),
+-		MT_MEMORY | MT_RW | MT_SECURE);
+-	mmap_add_region(BL_CODE_BASE, BL_CODE_BASE, (BL_CODE_END - BL_CODE_BASE),
+-		MT_MEMORY | MT_RO | MT_SECURE);
+-
+-	/* Map TEE memory */
+-	mmap_add_region(BL32_BASE, BL32_BASE, BL32_SIZE, MT_MEMORY | MT_RW);
+-
+-	mmap_add(imx_mmap);
+-
++	const mmap_region_t bl_regions[] = {
++        	MAP_REGION_FLAT(BL31_BASE, BL31_LIMIT - BL31_BASE,
++				MT_MEMORY | MT_RW | MT_SECURE),
++		MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE,
++				MT_MEMORY | MT_RO | MT_SECURE),
+ #if USE_COHERENT_MEM
+-	mmap_add_region(BL_COHERENT_RAM_BASE, BL_COHERENT_RAM_BASE,
+-		BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE,
+-		MT_DEVICE | MT_RW | MT_SECURE);
++		MAP_REGION_FLAT(BL_COHERENT_RAM_BASE,
++				BL_COHERENT_RAM_END - BL_COHERENT_RAM_BASE,
++				MT_DEVICE | MT_RW | MT_SECURE),
+ #endif
+-	/* setup xlat table */
+-	init_xlat_tables();
++		MAP_REGION_FLAT(BL32_BASE, BL32_SIZE, MT_MEMORY | MT_RW),
++		{0},
++	};
++
++	setup_page_tables(bl_regions, imx_mmap);
+ 	/* enable the MMU */
+ 	enable_mmu_el3(0);
+ }
diff --git a/patches/tf-a-v2.8/0105-refactor-imx8mq-introduce-BL31_SIZE.patch b/patches/tf-a-v2.8/0105-refactor-imx8mq-introduce-BL31_SIZE.patch
new file mode 100644
index 0000000..960d726
--- /dev/null
+++ b/patches/tf-a-v2.8/0105-refactor-imx8mq-introduce-BL31_SIZE.patch
@@ -0,0 +1,54 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Thu, 8 Dec 2022 16:37:44 +0100
+Subject: [PATCH] refactor(imx8mq): introduce BL31_SIZE
+
+No functional change.
+
+Introduce BL31_SIZE define and calculate the limits based on the
+BL31_BASE and the BL31_SIZE define. Also make use of SZ_64K to make it
+easier to read. This is required for later BL31 PIE support since it
+drops the calculation based on the BL31_LIMIT and BL31_BASE.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Change-Id: I517074b866b5bf11841b51777f87c926b304488d
+---
+ plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c    | 2 +-
+ plat/imx/imx8m/imx8mq/include/platform_def.h | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+index c7eddf430197..bbdb4d899a39 100644
+--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
++++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+@@ -176,7 +176,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
+ void bl31_plat_arch_setup(void)
+ {
+ 	const mmap_region_t bl_regions[] = {
+-        	MAP_REGION_FLAT(BL31_BASE, BL31_LIMIT - BL31_BASE,
++        	MAP_REGION_FLAT(BL31_BASE, BL31_SIZE,
+ 				MT_MEMORY | MT_RW | MT_SECURE),
+ 		MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE,
+ 				MT_MEMORY | MT_RO | MT_SECURE),
+diff --git a/plat/imx/imx8m/imx8mq/include/platform_def.h b/plat/imx/imx8m/imx8mq/include/platform_def.h
+index 103f2e4087e2..bb570748f573 100644
+--- a/plat/imx/imx8m/imx8mq/include/platform_def.h
++++ b/plat/imx/imx8m/imx8mq/include/platform_def.h
+@@ -4,6 +4,8 @@
+  * SPDX-License-Identifier: BSD-3-Clause
+  */
+ 
++#include <plat/common/common_def.h>
++
+ #define PLATFORM_LINKER_FORMAT		"elf64-littleaarch64"
+ #define PLATFORM_LINKER_ARCH		aarch64
+ 
+@@ -31,7 +33,8 @@
+ #define PLAT_STOP_OFF_STATE		U(3)
+ 
+ #define BL31_BASE			U(0x910000)
+-#define BL31_LIMIT			U(0x920000)
++#define BL31_SIZE			SZ_64K
++#define BL31_LIMIT			(BL31_BASE + BL31_SIZE)
+ 
+ /* non-secure uboot base */
+ #define PLAT_NS_IMAGE_OFFSET		U(0x40200000)
diff --git a/patches/tf-a-v2.8/0106-feat-imx8mq-add-BL31-PIE-support.patch b/patches/tf-a-v2.8/0106-feat-imx8mq-add-BL31-PIE-support.patch
new file mode 100644
index 0000000..25d2aaa
--- /dev/null
+++ b/patches/tf-a-v2.8/0106-feat-imx8mq-add-BL31-PIE-support.patch
@@ -0,0 +1,55 @@
+From: Lucas Stach <l.stach@pengutronix.de>
+Date: Thu, 8 Dec 2022 16:44:00 +0100
+Subject: [PATCH] feat(imx8mq): add BL31 PIE support
+
+Enable PIE support so the BL31 firmware can be loaded from anywhere
+within the OCRAM (SRAM). For the PIE support we only need to replace the
+BL31_BASE define by the BL31_START symbol which is a relocatable and we
+need to enable it by setting ENABLE_PIE := 1.
+
+Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
+Change-Id: Ie6a13e4ae0fdc6627a94798d7a86df7d5b310896
+---
+ plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c | 2 +-
+ plat/imx/imx8m/imx8mq/imx8mq_psci.c       | 2 +-
+ plat/imx/imx8m/imx8mq/platform.mk         | 1 +
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+index bbdb4d899a39..3c2d223fef21 100644
+--- a/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
++++ b/plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
+@@ -176,7 +176,7 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
+ void bl31_plat_arch_setup(void)
+ {
+ 	const mmap_region_t bl_regions[] = {
+-        	MAP_REGION_FLAT(BL31_BASE, BL31_SIZE,
++        	MAP_REGION_FLAT(BL31_START, BL31_SIZE,
+ 				MT_MEMORY | MT_RW | MT_SECURE),
+ 		MAP_REGION_FLAT(BL_CODE_BASE, BL_CODE_END - BL_CODE_BASE,
+ 				MT_MEMORY | MT_RO | MT_SECURE),
+diff --git a/plat/imx/imx8m/imx8mq/imx8mq_psci.c b/plat/imx/imx8m/imx8mq/imx8mq_psci.c
+index 662017d6fe4a..01582afe490c 100644
+--- a/plat/imx/imx8m/imx8mq/imx8mq_psci.c
++++ b/plat/imx/imx8m/imx8mq/imx8mq_psci.c
+@@ -41,7 +41,7 @@ int imx_validate_power_state(unsigned int power_state,
+ 
+ void imx_domain_suspend(const psci_power_state_t *target_state)
+ {
+-	uint64_t base_addr = BL31_BASE;
++	uint64_t base_addr = BL31_START;
+ 	uint64_t mpidr = read_mpidr_el1();
+ 	unsigned int core_id = MPIDR_AFFLVL0_VAL(mpidr);
+ 
+diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk
+index f62d3aa5be15..901a974a591e 100644
+--- a/plat/imx/imx8m/imx8mq/platform.mk
++++ b/plat/imx/imx8m/imx8mq/platform.mk
+@@ -38,6 +38,7 @@ BL31_SOURCES		+=	plat/imx/common/imx8_helpers.S			\
+ 				${XLAT_TABLES_LIB_SRCS}				\
+ 				${IMX_GIC_SOURCES}
+ 
++ENABLE_PIE		:=	1
+ USE_COHERENT_MEM	:=	1
+ RESET_TO_BL31		:=	1
+ A53_DISABLE_NON_TEMPORAL_HINT := 0
diff --git a/patches/tf-a-v2.8/0107-feat-imx8mq-add-support-for-gcc-12.x.patch b/patches/tf-a-v2.8/0107-feat-imx8mq-add-support-for-gcc-12.x.patch
new file mode 100644
index 0000000..24a5b80
--- /dev/null
+++ b/patches/tf-a-v2.8/0107-feat-imx8mq-add-support-for-gcc-12.x.patch
@@ -0,0 +1,45 @@
+From: Marco Felsch <m.felsch@pengutronix.de>
+Date: Fri, 10 Feb 2023 12:14:26 +0100
+Subject: [PATCH] feat(imx8mq): add support for gcc >= 12.x
+
+Starting with GCC >= 12.x the -Wall option includes -Werror=array-bounds
+checks. Per default GCC threads all memory accesses below 4096 as NULL,
+so access to ROMAPI causes the following warning:
+
+In file included from plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:20:
+In function 'mmio_read_8',
+    inlined from 'imx8mq_soc_info_init' at plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:70:16,
+    inlined from 'bl31_platform_setup' at plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:206:2:
+include/lib/mmio.h:19:16: error: array subscript 0 is outside array bounds of 'volatile uint8_t[0]' {aka 'volatile unsigned char[]'} [-Werror=array-bounds]
+   19 |         return *(volatile uint8_t*)addr;
+      |                ^~~~~~~~~~~~~~~~~~~~~~~~
+In function 'mmio_read_8',
+    inlined from 'imx8mq_soc_info_init' at plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:74:16,
+    inlined from 'bl31_platform_setup' at plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:206:2:
+include/lib/mmio.h:19:16: error: array subscript 0 is outside array bounds of 'volatile uint8_t[0]' {aka 'volatile unsigned char[]'} [-Werror=array-bounds]
+   19 |         return *(volatile uint8_t*)addr;
+      |                ^~~~~~~~~~~~~~~~~~~~~~~~
+cc1: all warnings being treated as errors
+
+Fix this by setting the default min-pagesize to 0 instead of 4096, so
+the ROMAPI access will not trigger the warning. Don't set this option
+for all files since it is unkown how it affects code
+generation/optimizations.
+
+Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
+Change-Id: Ibcca65ca69750e1a1bca3d528c80e5b445d2f90f
+---
+ plat/imx/imx8m/imx8mq/platform.mk | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/plat/imx/imx8m/imx8mq/platform.mk b/plat/imx/imx8m/imx8mq/platform.mk
+index 901a974a591e..985be71725f7 100644
+--- a/plat/imx/imx8m/imx8mq/platform.mk
++++ b/plat/imx/imx8m/imx8mq/platform.mk
+@@ -59,3 +59,6 @@ $(eval $(call add_define,IMX_BOOT_UART_BASE))
+ ifeq (${SPD},trusty)
+ 	BL31_CFLAGS    +=      -DPLAT_XLAT_TABLES_DYNAMIC=1
+ endif
++
++# Required with gcc version >= 12
++$(BUILD_PLAT)/bl31/imx8mq_bl31_setup.o: CFLAGS += --param=min-pagesize=0
diff --git a/patches/tf-a-v2.8/0201-Release-2.8-customers-pengutronix-distrokit-20230210.patch b/patches/tf-a-v2.8/0201-Release-2.8-customers-pengutronix-distrokit-20230210.patch
new file mode 100644
index 0000000..f230656
--- /dev/null
+++ b/patches/tf-a-v2.8/0201-Release-2.8-customers-pengutronix-distrokit-20230210.patch
@@ -0,0 +1,21 @@
+From: Marco Felsch <m.felsch@pengutronix.de>
+Date: Fri, 10 Feb 2023 12:51:49 +0100
+Subject: [PATCH] Release 2.8/customers/pengutronix/distrokit/20230210-1
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 1bfff716485a..cf80e5cac8f3 100644
+--- a/Makefile
++++ b/Makefile
+@@ -327,7 +327,7 @@ endif
+ ifeq (${BUILD_STRING},)
+         BUILD_STRING  :=  $(shell git describe --always --dirty --tags 2> /dev/null)
+ endif
+-VERSION_STRING    :=  v${VERSION}(${BUILD_TYPE}):${BUILD_STRING}
++VERSION_STRING    :=  v${VERSION}(${BUILD_TYPE}):${BUILD_STRING}-20230210-1
+ 
+ ifeq (${AARCH32_INSTRUCTION_SET},A32)
+ TF_CFLAGS_aarch32	+=	-marm
diff --git a/patches/tf-a-v2.8/series b/patches/tf-a-v2.8/series
new file mode 100644
index 0000000..a29319d
--- /dev/null
+++ b/patches/tf-a-v2.8/series
@@ -0,0 +1,22 @@
+# umpf-base: v2.8
+# umpf-name: 2.8/customers/pengutronix/distrokit
+# umpf-version: 2.8/customers/pengutronix/distrokit/20230210-1
+# umpf-topic: v2.8/topic/fix-build-warnings
+# umpf-hashinfo: 4730b4b80206cf2fc27787f43cefd3169a6f8a2f
+# umpf-topic-range: 9881bb93a3bc0a3ea37e9f093e09ab4b360a9e48..da1b5e74dc7c2b3e7a2d9a1adb7e23beeba079e3
+0001-build-makefile-add-helper-to-detect-linker-options.patch
+0002-feat-build-add-support-for-new-binutils-versions.patch
+# umpf-topic: v2.8/topic/imx8mq
+# umpf-hashinfo: 651310b67fd269e8118285e9ed44e8ad6cc52941
+# umpf-topic-range: da1b5e74dc7c2b3e7a2d9a1adb7e23beeba079e3..be7bcbebf5b22958e8b88564ca0865b4591263e7
+0101-feat-imx8mq-make-IMX_BOOT_UART_BASE-configurable-via.patch
+0102-feat-imx8mq-remove-empty-bl31_plat_runtime_setup.patch
+0103-feat-imx8mq-always-set-up-console.patch
+0104-refactor-imx8mq-make-use-of-setup_page_tables.patch
+0105-refactor-imx8mq-introduce-BL31_SIZE.patch
+0106-feat-imx8mq-add-BL31-PIE-support.patch
+0107-feat-imx8mq-add-support-for-gcc-12.x.patch
+# umpf-release: 2.8/customers/pengutronix/distrokit/20230210-1
+# umpf-topic-range: be7bcbebf5b22958e8b88564ca0865b4591263e7..827865ee983d0c7cd4bb99d85d46f972386e5ea9
+0201-Release-2.8-customers-pengutronix-distrokit-20230210.patch
+# umpf-end
-- 
2.30.2

[DistroKit] [PATCH 02/14] v8a: tf-a: enable package

[Marco Felsch]

Enable the upstream tf-a support which will replace the imx-atf later
on.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v8a/platformconfig | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index 785a1a2..c5cd8fb 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -179,10 +179,27 @@ PTXCONF_BAREBOX_ROCKCHIP=y
 PTXCONF_BAREBOX_ARCH_STRING="arm"
 # PTXCONF_BAREBOX is not set
 # PTXCONF_BAREBOX_MLO is not set
+PTXCONF_BOOTLOADER=y
 # PTXCONF_GRUB is not set
 # PTXCONF_HOST_MXS_UTILS is not set
 PTXCONF_IMX_ATF=y
-# PTXCONF_TF_A is not set
+PTXCONF_TF_A=y
+PTXCONF_TF_A_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot"
+PTXCONF_TF_A_VERSION="v2.8"
+PTXCONF_TF_A_MD5="784a1e94d4b1e938927372e3bc12d12e"
+PTXCONF_TF_A_ARCH_STRING="aarch64"
+PTXCONF_TF_A_ARM_ARCH_MAJOR_8=y
+PTXCONF_TF_A_ARM_ARCH_MAJOR=8
+PTXCONF_TF_A_PLATFORMS="imx8mq imx8mm imx8mp"
+PTXCONF_TF_A_ARM_ARCH_MINOR=0
+PTXCONF_TF_A_EXTRA_ARGS=""
+PTXCONF_TF_A_ARTIFACTS="bl31.bin"
+
+#
+# Payloads
+#
+PTXCONF_TF_A_BL32_NONE=y
+# PTXCONF_TF_A_BL32_TSP is not set
 # PTXCONF_U_BOOT is not set
 # end of bootloaders                   
 
-- 
2.30.2

[DistroKit] [PATCH 03/14] v8a: replace imx-atf with tf-a

[Marco Felsch]

Replace the downstream imx-atf version with the most recent upstream
version already used by the v7a platform.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v8a/platformconfig           |  1 -
 .../platform-v8a/platforms/barebox-imx8m.in   |  2 +-
 configs/platform-v8a/rules/barebox-imx8m.make |  2 +-
 configs/platform-v8a/rules/imx-atf.in         |  7 --
 configs/platform-v8a/rules/imx-atf.make       | 87 -------------------
 ...-add-helper-to-detect-linker-options.patch | 38 --------
 ...void-gcc-warning-that-triggers-with-.patch | 48 ----------
 ...dd-support-for-new-binutils-versions.patch | 38 --------
 ...004-makefile-link-with-z-noexecstack.patch | 38 --------
 patches/imx-atf-imx_5.4.24_2.1.0/series       |  4 -
 10 files changed, 2 insertions(+), 263 deletions(-)
 delete mode 100644 configs/platform-v8a/rules/imx-atf.in
 delete mode 100644 configs/platform-v8a/rules/imx-atf.make
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/0001-build-makefile-add-helper-to-detect-linker-options.patch
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/0002-build-makefile-avoid-gcc-warning-that-triggers-with-.patch
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/0003-feat-build-add-support-for-new-binutils-versions.patch
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/0004-makefile-link-with-z-noexecstack.patch
 delete mode 100644 patches/imx-atf-imx_5.4.24_2.1.0/series

diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index c5cd8fb..634698d 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -182,7 +182,6 @@ PTXCONF_BAREBOX_ARCH_STRING="arm"
 PTXCONF_BOOTLOADER=y
 # PTXCONF_GRUB is not set
 # PTXCONF_HOST_MXS_UTILS is not set
-PTXCONF_IMX_ATF=y
 PTXCONF_TF_A=y
 PTXCONF_TF_A_URL="https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot"
 PTXCONF_TF_A_VERSION="v2.8"
diff --git a/configs/platform-v8a/platforms/barebox-imx8m.in b/configs/platform-v8a/platforms/barebox-imx8m.in
index ca11fe2..edba6ac 100644
--- a/configs/platform-v8a/platforms/barebox-imx8m.in
+++ b/configs/platform-v8a/platforms/barebox-imx8m.in
@@ -2,7 +2,7 @@
 
 config BAREBOX_IMX8M
 	select FIRMWARE_IMX
-	select IMX_ATF
+	select TF_A
 	tristate
 	prompt "Barebox (imx8m)"
 	help
diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make
index da1adfa..c96c10d 100644
--- a/configs/platform-v8a/rules/barebox-imx8m.make
+++ b/configs/platform-v8a/rules/barebox-imx8m.make
@@ -71,7 +71,7 @@ $(STATEDIR)/barebox-imx8m.prepare: $(BAREBOX_IMX8M_CONFIG)
 	done
 
 	@for i in m p q; do \
-		cp $(PTXCONF_SYSROOT_TARGET)/usr/lib/atf/imx8m$$i-bl31.bin \
+		cp $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/imx8m$$i-bl31.bin \
 			$(BAREBOX_IMX8M_DIR)/firmware/; \
 	done
 
diff --git a/configs/platform-v8a/rules/imx-atf.in b/configs/platform-v8a/rules/imx-atf.in
deleted file mode 100644
index 10c29b2..0000000
--- a/configs/platform-v8a/rules/imx-atf.in
+++ /dev/null
@@ -1,7 +0,0 @@
-## SECTION=bootloader
-
-config IMX_ATF
-	tristate
-	prompt "imx-atf"
-	help
-	  ARM trusted firmware for i.MX SoCs.
diff --git a/configs/platform-v8a/rules/imx-atf.make b/configs/platform-v8a/rules/imx-atf.make
deleted file mode 100644
index 7e0a30f..0000000
--- a/configs/platform-v8a/rules/imx-atf.make
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2019 by Lucas Stach <l.stach@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_IMX_ATF) += imx-atf
-
-#
-# Paths and names
-#
-IMX_ATF_VERSION	:= imx_5.4.24_2.1.0
-IMX_ATF_MD5	:= f60e3f42e90d552227d6fc1278761637
-IMX_ATF		:= imx-atf-$(IMX_ATF_VERSION)
-IMX_ATF_SUFFIX	:= tar.xz
-IMX_ATF_URL	:= https://source.codeaurora.org/external/imx/imx-atf.git;tag=rel_$(IMX_ATF_VERSION)
-IMX_ATF_SOURCE	:= $(SRCDIR)/$(IMX_ATF).$(IMX_ATF_SUFFIX)
-IMX_ATF_DIR	:= $(BUILDDIR)/$(IMX_ATF)
-IMX_ATF_LICENSE	:= BSD-3-clause
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-IMX_ATF_WRAPPER_BLACKLIST := \
-	TARGET_HARDEN_RELRO \
-	TARGET_HARDEN_BINDNOW \
-	TARGET_HARDEN_PIE \
-	TARGET_DEBUG \
-	TARGET_BUILD_ID
-
-IMX_ATF_CONF_TOOL := NO
-
-IMX_ATF_CONF_OPT := \
-	CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE)
-
-IMX_ATF_PLATFORMS := imx8mq imx8mm imx8mp
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-IMX_ATF_MAKE_OPT := $(IMX_ATF_CONF_OPT)
-
-$(STATEDIR)/imx-atf.compile:
-	@$(call targetinfo)
-
-	@$(foreach plat, $(IMX_ATF_PLATFORMS), \
-		$(call compile, IMX_ATF, \
-		$(IMX_ATF_MAKE_OPT) PLAT=$(plat) bl31)$(ptx/nl))
-
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/imx-atf.install:
-	@$(call targetinfo)
-
-	@$(foreach plat, $(IMX_ATF_PLATFORMS), \
-		install -v -D -m644 $(IMX_ATF_DIR)/build/$(plat)/release/bl31.bin \
-		$(PTXCONF_SYSROOT_TARGET)/usr/lib/atf/$(plat)-bl31.bin;)
-
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/imx-atf.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, imx-atf)
-	@$(call install_fixup, imx-atf,PRIORITY,optional)
-	@$(call install_fixup, imx-atf,SECTION,base)
-	@$(call install_fixup, imx-atf,AUTHOR,"Lucas Stach <l.stach@pengutronix.de>")
-	@$(call install_fixup, imx-atf,DESCRIPTION,missing)
-
-	@$(call install_finish, imx-atf)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/patches/imx-atf-imx_5.4.24_2.1.0/0001-build-makefile-add-helper-to-detect-linker-options.patch b/patches/imx-atf-imx_5.4.24_2.1.0/0001-build-makefile-add-helper-to-detect-linker-options.patch
deleted file mode 100644
index 164f199..0000000
--- a/patches/imx-atf-imx_5.4.24_2.1.0/0001-build-makefile-add-helper-to-detect-linker-options.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 456257d346b295982761d33f4e24e07a9feee74d Mon Sep 17 00:00:00 2001
-From: Marco Felsch <mfe@pengutronix.de>
-Date: Sat, 26 Nov 2022 08:00:39 +0100
-Subject: [PATCH 1/2] build(makefile): add helper to detect linker options
-
-This is a small helper to check for possible linker options. If the
-linker supports the requested option it is returned and if not nothing
-will be returned, e.g.:
-
-  TF_LDFLAGS += $(call ld_option, --no-warn-rwx-segments)
-
-can be called unconditional.
-
-Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
----
- make_helpers/build_macros.mk | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/make_helpers/build_macros.mk b/make_helpers/build_macros.mk
-index b89d87ea6087..9f4f70dbe42f 100644
---- a/make_helpers/build_macros.mk
-+++ b/make_helpers/build_macros.mk
-@@ -67,6 +67,12 @@ $(foreach d,$(0-9),$(eval __numeric := $(subst $(d),,$(__numeric))))
- $(if $(__numeric),$(error $(1) must be numeric))
- endef
- 
-+# Convenience function to check for a given linker option. An call to
-+# $(call ld_option, --no-XYZ) will return --no-XYZ if supported by the linker
-+define ld_option
-+	$(shell if $(LD) $(1) -v >/dev/null 2>&1; then echo $(1); fi )
-+endef
-+
- # IMG_LINKERFILE defines the linker script corresponding to a BL stage
- #   $(1) = BL stage (2, 30, 31, 32, 33)
- define IMG_LINKERFILE
--- 
-2.30.2
-
diff --git a/patches/imx-atf-imx_5.4.24_2.1.0/0002-build-makefile-avoid-gcc-warning-that-triggers-with-.patch b/patches/imx-atf-imx_5.4.24_2.1.0/0002-build-makefile-avoid-gcc-warning-that-triggers-with-.patch
deleted file mode 100644
index a433800..0000000
--- a/patches/imx-atf-imx_5.4.24_2.1.0/0002-build-makefile-avoid-gcc-warning-that-triggers-with-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 710c027045df0d51e3d83bd26ec954b08108d836 Mon Sep 17 00:00:00 2001
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Sat, 26 Nov 2022 08:06:40 +0100
-Subject: [PATCH 2/2] build(makefile): avoid gcc warning that triggers with
- -Werror=array-bounds
-
-With gcc 12, we get these warnings:
-
-make: Entering directory 'imx-atf-imx_5.4.24_2.1.0'
-  CC      plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c
-In file included from plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:20:
-In function 'mmio_read_8',
-    inlined from 'imx8mq_soc_info_init' at plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:82:16,
-    inlined from 'bl31_platform_setup' at plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:224:2:
-include/lib/mmio.h:19:16: error: array subscript 0 is outside array bounds of 'volatile uint8_t[0]' {aka 'volatile unsigned char[]'} [-Werror=array-bounds]
-   19 |         return *(volatile uint8_t*)addr;
-      |                ^~~~~~~~~~~~~~~~~~~~~~~~
-In function 'mmio_read_8',
-    inlined from 'imx8mq_soc_info_init' at plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:86:16,
-    inlined from 'bl31_platform_setup' at plat/imx/imx8m/imx8mq/imx8mq_bl31_setup.c:224:2:
-include/lib/mmio.h:19:16: error: array subscript 0 is outside array bounds of 'volatile uint8_t[0]' {aka 'volatile unsigned char[]'} [-Werror=array-bounds]
-   19 |         return *(volatile uint8_t*)addr;
-      |                ^~~~~~~~~~~~~~~~~~~~~~~~
-cc1: all warnings being treated as errors
-
-According to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523#c9, this
-is the right fix for TF-A, as it is a firmware that has memory at 0.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- Makefile | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Makefile b/Makefile
-index 2ae12fda741a..555b46e7b361 100644
---- a/Makefile
-+++ b/Makefile
-@@ -284,6 +284,7 @@ CPPFLAGS		=	${DEFINES} ${INCLUDES} ${MBEDTLS_INC} -nostdinc		\
- ASFLAGS			+=	$(CPPFLAGS) $(ASFLAGS_$(ARCH))			\
- 				-ffreestanding -Wa,--fatal-warnings
- TF_CFLAGS		+=	$(CPPFLAGS) $(TF_CFLAGS_$(ARCH))		\
-+				--param=min-pagesize=0				\
- 				-ffreestanding -fno-builtin -Wall -std=gnu99	\
- 				-Os -ffunction-sections -fdata-sections
- 
--- 
-2.30.2
-
diff --git a/patches/imx-atf-imx_5.4.24_2.1.0/0003-feat-build-add-support-for-new-binutils-versions.patch b/patches/imx-atf-imx_5.4.24_2.1.0/0003-feat-build-add-support-for-new-binutils-versions.patch
deleted file mode 100644
index 35b2be9..0000000
--- a/patches/imx-atf-imx_5.4.24_2.1.0/0003-feat-build-add-support-for-new-binutils-versions.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b102865225c8db6a4ef60f346aded5959acc4d1c Mon Sep 17 00:00:00 2001
-From: Marco Felsch <m.felsch@pengutronix.de>
-Date: Wed, 9 Nov 2022 12:59:09 +0100
-Subject: [PATCH 3/4] feat(build): add support for new binutils versions
-
-The new ld.bfd linker version has added new warnings which are enabled by
-default to secure elf binaries:
- - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
- - https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=0d38576a34ec64a1b4500c9277a8e9d0f07e6774
-
-Since the tf-a handles every warning as error we need to tell the linker
-to not warn about this. This is required to make the bl31 target
-buildable with newer toolchain versions.
-
-Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
-Change-Id: I9430f5fa5036ca88da46cd3b945754d62616b617
----
- Makefile | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 3941f869800a..af7fd1535694 100644
---- a/Makefile
-+++ b/Makefile
-@@ -444,6 +444,10 @@ TF_LDFLAGS		+=	$(TF_LDFLAGS_$(ARCH))
- endif
- endif
- 
-+# With ld.bfd version 2.29 and newer new warnings are added. Skip those since we
-+# are not loaded by a elf loader.
-+TF_LDFLAGS		+=	$(call ld_option, --no-warn-rwx-segments)
-+
- DTC_FLAGS		+=	-I dts -O dtb
- DTC_CPPFLAGS		+=	-P -nostdinc -Iinclude -Ifdts -undef \
- 				-x assembler-with-cpp $(DEFINES)
--- 
-2.30.2
-
diff --git a/patches/imx-atf-imx_5.4.24_2.1.0/0004-makefile-link-with-z-noexecstack.patch b/patches/imx-atf-imx_5.4.24_2.1.0/0004-makefile-link-with-z-noexecstack.patch
deleted file mode 100644
index 727f8af..0000000
--- a/patches/imx-atf-imx_5.4.24_2.1.0/0004-makefile-link-with-z-noexecstack.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f77451f77ff01dda1a5239a65901ed0b666116b3 Mon Sep 17 00:00:00 2001
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Sat, 26 Nov 2022 08:24:50 +0100
-Subject: [PATCH 4/4] makefile: link with -z noexecstack
-
-Starting with binutils 2.39+, there is a new warning:
-
-  ld: warning: vmlinux: missing .note.GNU-stack section implies executable stack
-  ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
-  ld: warning: vmlinux has a LOAD segment with RWX permissions
-
-Fix it in a similar way to what the Linux kernel does, see:
-https://lore.kernel.org/all/20220810222442.2296651-1-ndesaulniers@google.com/
-
-Following the reasoning there, we set "-z noexecstack" for all linkers
-(although LLVM's LLD defaults to it).
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 54072a4543ce..86be2e68da3e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -298,6 +298,8 @@ endif
- 
- GCC_V_OUTPUT		:=	$(shell $(CC) -v 2>&1)
- 
-+TF_LDFLAGS		+=	-z noexecstack
-+
- ifneq ($(findstring armlink,$(notdir $(LD))),)
- TF_LDFLAGS		+=	--diag_error=warning --lto_level=O1
- TF_LDFLAGS		+=	--remove --info=unused,unusedsymbols
--- 
-2.30.2
-
diff --git a/patches/imx-atf-imx_5.4.24_2.1.0/series b/patches/imx-atf-imx_5.4.24_2.1.0/series
deleted file mode 100644
index c731f9c..0000000
--- a/patches/imx-atf-imx_5.4.24_2.1.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-0001-build-makefile-add-helper-to-detect-linker-options.patch
-0002-build-makefile-avoid-gcc-warning-that-triggers-with-.patch
-0003-feat-build-add-support-for-new-binutils-versions.patch
-0004-makefile-link-with-z-noexecstack.patch
-- 
2.30.2

[DistroKit] [PATCH 04/14] v8a: firmware-imx: fix dest path

[Marco Felsch]

The barebox-imx8m package searches for firmware within
<sysroot-target>/firmware/ddr/synopsys and not within
<sysroot-target>/firmware/imx so fix this.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v8a/rules/firmware-imx.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configs/platform-v8a/rules/firmware-imx.make b/configs/platform-v8a/rules/firmware-imx.make
index 37ce1f0..829bc13 100644
--- a/configs/platform-v8a/rules/firmware-imx.make
+++ b/configs/platform-v8a/rules/firmware-imx.make
@@ -46,11 +46,11 @@ ifdef PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX8
 	@$(foreach f, lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_imem.bin \
 	              lpddr4_pmu_train_2d_dmem.bin lpddr4_pmu_train_2d_imem.bin, \
 		install -v -D -m644 $(FIRMWARE_IMX_PKGDIR)/firmware/ddr/synopsys/$(f) \
-		$(PTXCONF_SYSROOT_TARGET)/firmware/imx/$(f);)
+		$(PTXCONF_SYSROOT_TARGET)/firmware/ddr/synopsys/$(f);)
 
 	@$(foreach f, signed_dp_imx8m.bin signed_hdmi_imx8m.bin, \
 		install -v -D -m644 $(FIRMWARE_IMX_PKGDIR)/firmware/hdmi/cadence/$(f) \
-		$(PTXCONF_SYSROOT_TARGET)/firmware/imx/$(f);)
+		$(PTXCONF_SYSROOT_TARGET)/firmware/hdmi/cadence/$(f);)
 endif
 
 	@$(call touch)
-- 
2.30.2

[DistroKit] [PATCH 05/14] v8a: firmware-imx: fix destition path

[Marco Felsch]

The linux firmware search path is /lib/firmware, so adapt it
accordingly. Add the /usr prefix since DistroKit already applied the
/usr merge.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v8a/rules/barebox-imx8m.make | 2 +-
 configs/platform-v8a/rules/firmware-imx.make  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make
index c96c10d..0d88f46 100644
--- a/configs/platform-v8a/rules/barebox-imx8m.make
+++ b/configs/platform-v8a/rules/barebox-imx8m.make
@@ -67,7 +67,7 @@ $(STATEDIR)/barebox-imx8m.prepare: $(BAREBOX_IMX8M_CONFIG)
 
 	@for i in lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_imem.bin \
 			lpddr4_pmu_train_2d_dmem.bin lpddr4_pmu_train_2d_imem.bin ; do \
-		cp $(PTXCONF_SYSROOT_TARGET)/firmware/ddr/synopsys/$$i $(BAREBOX_IMX8M_DIR)/firmware/; \
+		cp $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/ddr/synopsys/$$i $(BAREBOX_IMX8M_DIR)/firmware/; \
 	done
 
 	@for i in m p q; do \
diff --git a/configs/platform-v8a/rules/firmware-imx.make b/configs/platform-v8a/rules/firmware-imx.make
index 829bc13..fbdd93a 100644
--- a/configs/platform-v8a/rules/firmware-imx.make
+++ b/configs/platform-v8a/rules/firmware-imx.make
@@ -46,11 +46,11 @@ ifdef PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX8
 	@$(foreach f, lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_imem.bin \
 	              lpddr4_pmu_train_2d_dmem.bin lpddr4_pmu_train_2d_imem.bin, \
 		install -v -D -m644 $(FIRMWARE_IMX_PKGDIR)/firmware/ddr/synopsys/$(f) \
-		$(PTXCONF_SYSROOT_TARGET)/firmware/ddr/synopsys/$(f);)
+		$(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/ddr/synopsys/$(f);)
 
 	@$(foreach f, signed_dp_imx8m.bin signed_hdmi_imx8m.bin, \
 		install -v -D -m644 $(FIRMWARE_IMX_PKGDIR)/firmware/hdmi/cadence/$(f) \
-		$(PTXCONF_SYSROOT_TARGET)/firmware/hdmi/cadence/$(f);)
+		$(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/hdmi/cadence/$(f);)
 endif
 
 	@$(call touch)
@@ -75,7 +75,7 @@ $(STATEDIR)/firmware-imx.targetinstall:
 	@$(call install_fixup, firmware-imx,DESCRIPTION,missing)
 	@for f in $(FIRMWARE_IMX_INSTALL-y); do \
 		$(call install_copy, firmware-imx, 0, 0, 0644, \
-		$(FIRMWARE_IMX_PKGDIR)/firmware/vpu/$$f, /lib/firmware/$$f); \
+		$(FIRMWARE_IMX_PKGDIR)/firmware/vpu/$$f, /usr/lib/firmware/$$f); \
 	done
 	@$(call install_finish, firmware-imx)
 
-- 
2.30.2

[DistroKit] [PATCH 06/14] v8a: barebox-imx8m: fix firmware-imx dependencies

[Marco Felsch]

Select the required sub-option so the required binaries are installed.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v8a/platformconfig             | 2 +-
 configs/platform-v8a/platforms/barebox-imx8m.in | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index 634698d..b308cf3 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -284,7 +284,7 @@ PTXCONF_FIRMWARE_IMX=y
 # PTXCONF_FIRMWARE_IMX_VPU_IMX53 is not set
 # PTXCONF_FIRMWARE_IMX_VPU_IMX6DL is not set
 # PTXCONF_FIRMWARE_IMX_VPU_IMX6Q is not set
-# PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX8 is not set
+PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX8=y
 
 #
 # non-free firmware blobs       
diff --git a/configs/platform-v8a/platforms/barebox-imx8m.in b/configs/platform-v8a/platforms/barebox-imx8m.in
index edba6ac..6f474ea 100644
--- a/configs/platform-v8a/platforms/barebox-imx8m.in
+++ b/configs/platform-v8a/platforms/barebox-imx8m.in
@@ -2,6 +2,7 @@
 
 config BAREBOX_IMX8M
 	select FIRMWARE_IMX
+	select FIRMWARE_IMX_BOOTIMAGE_IMX8
 	select TF_A
 	tristate
 	prompt "Barebox (imx8m)"
-- 
2.30.2

[DistroKit] [PATCH 07/14] v8a: barebox-imx8m: make use of the INJECT_FILES mechanism

[Marco Felsch]

Use the mainline available mechanism to copy the required firmware
artifacts. This also align the code with the barebox-rockchip.make file.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v8a/rules/barebox-imx8m.make | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make
index 0d88f46..4fac9d4 100644
--- a/configs/platform-v8a/rules/barebox-imx8m.make
+++ b/configs/platform-v8a/rules/barebox-imx8m.make
@@ -31,6 +31,19 @@ BAREBOX_IMX8M_BUILD_OOT	:= KEEP
 # Prepare
 # ----------------------------------------------------------------------------
 
+BAREBOX_IMX8M_INJECT_PATH	:= ${PTXDIST_SYSROOT_TARGET}/usr/lib
+
+# TF-A firmware blobs
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/imx8mm-bl31.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/imx8mp-bl31.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/imx8mq-bl31.bin
+
+# DRAM firmware blobs
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/ddr/synopsys/lpddr4_pmu_train_1d_dmem.bin:firmware/lpddr4_pmu_train_1d_dmem.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/ddr/synopsys/lpddr4_pmu_train_1d_imem.bin:firmware/lpddr4_pmu_train_1d_imem.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/ddr/synopsys/lpddr4_pmu_train_2d_dmem.bin:firmware/lpddr4_pmu_train_2d_dmem.bin
+BAREBOX_IMX8M_INJECT_FILES	+= firmware/ddr/synopsys/lpddr4_pmu_train_2d_imem.bin:firmware/lpddr4_pmu_train_2d_imem.bin
+
 # use host pkg-config for host tools
 BAREBOX_IMX8M_PATH := PATH=$(HOST_PATH)
 
@@ -64,16 +77,7 @@ endif
 $(STATEDIR)/barebox-imx8m.prepare: $(BAREBOX_IMX8M_CONFIG)
 	@$(call targetinfo)
 	@$(call world/prepare, BAREBOX_IMX8M)
-
-	@for i in lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_imem.bin \
-			lpddr4_pmu_train_2d_dmem.bin lpddr4_pmu_train_2d_imem.bin ; do \
-		cp $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/ddr/synopsys/$$i $(BAREBOX_IMX8M_DIR)/firmware/; \
-	done
-
-	@for i in m p q; do \
-		cp $(PTXCONF_SYSROOT_TARGET)/usr/lib/firmware/imx8m$$i-bl31.bin \
-			$(BAREBOX_IMX8M_DIR)/firmware/; \
-	done
+	@$(call world/inject, BAREBOX_IMX8M)
 
 	@rm -f "$(BAREBOX_IMX8M_BUILD_DIR)/.ptxdist-defaultenv"
 	@ln -s "$(call ptx/in-platformconfigdir, barebox-common-defaultenv)" \
-- 
2.30.2

[DistroKit] [PATCH 08/14] v8a: barebox: version sync to 2023.01.0

[Marco Felsch]

Sync both barebox versions to the most recent available mainline
version.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v8a/barebox-imx8m.config     | 124 +++++++++++++++---
 configs/platform-v8a/barebox-rockchip.config  |  14 +-
 configs/platform-v8a/rules/barebox-imx8m.make |   4 +-
 .../platform-v8a/rules/barebox-rockchip.make  |   4 +-
 4 files changed, 118 insertions(+), 28 deletions(-)

diff --git a/configs/platform-v8a/barebox-imx8m.config b/configs/platform-v8a/barebox-imx8m.config
index 33c992a..d28f475 100644
--- a/configs/platform-v8a/barebox-imx8m.config
+++ b/configs/platform-v8a/barebox-imx8m.config
@@ -1,9 +1,10 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2021.02.0 Configuration
+# Barebox/arm 2023.01.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
+CONFIG_ARM_USE_COMPRESSED_DTB=y
 CONFIG_TEXT_BASE=0x0
 
 #
@@ -15,7 +16,6 @@ CONFIG_TEXT_BASE=0x0
 # CONFIG_ARCH_DAVINCI is not set
 # CONFIG_ARCH_DIGIC is not set
 # CONFIG_ARCH_EP93XX is not set
-# CONFIG_ARCH_HIGHBANK is not set
 CONFIG_ARCH_IMX=y
 # CONFIG_ARCH_LAYERSCAPE is not set
 # CONFIG_ARCH_MVEBU is not set
@@ -35,7 +35,7 @@ CONFIG_ARCH_IMX=y
 # CONFIG_ARCH_UEMD is not set
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCH_ZYNQMP is not set
-# CONFIG_ARCH_QEMU is not set
+# CONFIG_ARCH_ARM64_VIRT is not set
 
 #
 # Processor Type
@@ -49,9 +49,7 @@ CONFIG_CPU_64v8=y
 # processor features
 #
 # CONFIG_BOOT_ENDIANNESS_SWITCH is not set
-CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
 CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
-CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
 CONFIG_ARCH_IMX_IMXIMAGE=y
 
 #
@@ -79,6 +77,8 @@ CONFIG_IMX_MULTI_BOARDS=y
 # CONFIG_MACH_TX53 is not set
 # CONFIG_MACH_PHYTEC_SOM_IMX6 is not set
 # CONFIG_MACH_PROTONIC_IMX6 is not set
+# CONFIG_MACH_PROTONIC_IMX8M is not set
+# CONFIG_MACH_INNOCOMM_WB15 is not set
 # CONFIG_MACH_KONTRON_SAMX6I is not set
 # CONFIG_MACH_DFI_FS700_M60 is not set
 # CONFIG_MACH_GUF_SANTARO is not set
@@ -86,6 +86,7 @@ CONFIG_IMX_MULTI_BOARDS=y
 # CONFIG_MACH_GK802 is not set
 # CONFIG_MACH_ELTEC_HIPERCAM is not set
 # CONFIG_MACH_TQMA6X is not set
+# CONFIG_MACH_TQMA6UL is not set
 # CONFIG_MACH_TX6X is not set
 # CONFIG_MACH_SABRELITE is not set
 # CONFIG_MACH_SABRESD is not set
@@ -104,6 +105,7 @@ CONFIG_IMX_MULTI_BOARDS=y
 # CONFIG_MACH_ADVANTECH_ROM_742X is not set
 # CONFIG_MACH_WARP7 is not set
 # CONFIG_MACH_AC_SXB is not set
+# CONFIG_MACH_MEERKAT96 is not set
 # CONFIG_MACH_VF610_TWR is not set
 # CONFIG_MACH_ZII_RDU1 is not set
 # CONFIG_MACH_ZII_RDU2 is not set
@@ -112,15 +114,19 @@ CONFIG_IMX_MULTI_BOARDS=y
 # CONFIG_MACH_ZII_IMX7D_DEV is not set
 # CONFIG_MACH_PHYTEC_PHYCORE_IMX7 is not set
 # CONFIG_MACH_FREESCALE_MX7_SABRESD is not set
+# CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR is not set
 # CONFIG_MACH_NXP_IMX6ULL_EVK is not set
 CONFIG_MACH_NXP_IMX8MM_EVK=y
+# CONFIG_MACH_NXP_IMX8MN_EVK is not set
 CONFIG_MACH_NXP_IMX8MP_EVK=y
 CONFIG_MACH_NXP_IMX8MQ_EVK=y
 CONFIG_MACH_PHYTEC_SOM_IMX8MQ=y
+# CONFIG_MACH_TQ_MBA8MPXL is not set
 # CONFIG_MACH_GRINN_LITEBOARD is not set
 # CONFIG_MACH_DIGI_CCIMX6ULSBCPRO is not set
 # CONFIG_MACH_WEBASTO_CCBV2 is not set
 # CONFIG_MACH_MNT_REFORM is not set
+# CONFIG_MACH_SKOV_IMX6 is not set
 
 #
 # Board specific settings
@@ -131,6 +137,7 @@ CONFIG_MACH_PHYTEC_SOM_IMX8MQ=y
 # i.MX specific settings
 #
 # CONFIG_IMX_IIM is not set
+CONFIG_IMX_SAVE_BOOTROM_LOG=y
 # CONFIG_HABV4 is not set
 # end of i.MX specific settings
 
@@ -152,6 +159,7 @@ CONFIG_GREGORIAN_CALENDER=y
 CONFIG_HAS_KALLSYMS=y
 CONFIG_HAS_CACHE=y
 CONFIG_HAS_DMA=y
+CONFIG_ARCH_HAS_SJLJ=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_BLOCK=y
 CONFIG_BLOCK_WRITE=y
@@ -161,7 +169,6 @@ CONFIG_UIMAGE=y
 CONFIG_LOGBUF=y
 CONFIG_STDDEV=y
 CONFIG_MENUTREE=y
-CONFIG_FILE_LIST=y
 CONFIG_ARCH_DMA_ADDR_T_64BIT=y
 CONFIG_USBGADGET_START=y
 CONFIG_BOOT=y
@@ -186,6 +193,7 @@ CONFIG_HAVE_PBL_MULTI_IMAGES=y
 CONFIG_HAVE_IMAGE_COMPRESSION=y
 CONFIG_PBL_IMAGE=y
 CONFIG_PBL_MULTI_IMAGES=y
+CONFIG_USE_COMPRESSED_DTB=y
 CONFIG_PBL_RELOCATABLE=y
 CONFIG_IMAGE_COMPRESSION=y
 # CONFIG_IMAGE_COMPRESSION_LZ4 is not set
@@ -195,6 +203,7 @@ CONFIG_IMAGE_COMPRESSION_LZO=y
 # CONFIG_IMAGE_COMPRESSION_NONE is not set
 CONFIG_MMU=y
 CONFIG_MMU_EARLY=y
+CONFIG_BAREBOX_MAX_IMAGE_SIZE=0xffffffff
 CONFIG_BAREBOX_MAX_PBL_SIZE=0xffffffff
 CONFIG_BAREBOX_MAX_BARE_INIT_SIZE=0xffffffff
 CONFIG_STACK_SIZE=0x8000
@@ -235,10 +244,10 @@ CONFIG_BOOTM_OFTREE_UIMAGE=y
 # CONFIG_BOOTM_FITIMAGE is not set
 CONFIG_BLSPEC=y
 CONFIG_FLEXIBLE_BOOTARGS=y
+CONFIG_MMCBLKDEV_ROOTARG=y
 CONFIG_BAREBOX_UPDATE=y
+# CONFIG_SYSTEM_PARTITIONS is not set
 CONFIG_IMD=y
-# CONFIG_IMD_TARGET is not set
-# CONFIG_KERNEL_INSTALL_TARGET is not set
 CONFIG_CONSOLE_FULL=y
 # CONFIG_CONSOLE_SIMPLE is not set
 # CONFIG_CONSOLE_NONE is not set
@@ -246,6 +255,7 @@ CONFIG_CONSOLE_FULL=y
 # CONFIG_CONSOLE_ACTIVATE_ALL is not set
 CONFIG_CONSOLE_ACTIVATE_NONE=y
 # CONFIG_CONSOLE_ALLOW_COLOR is not set
+# CONFIG_CONSOLE_DISABLE_INPUT is not set
 CONFIG_PBL_CONSOLE=y
 CONFIG_CONSOLE_RATP=y
 # CONFIG_RATP_CMD_I2C is not set
@@ -258,19 +268,19 @@ CONFIG_PARTITION_DISK_EFI_GPT_NO_FORCE=y
 CONFIG_PARTITION_DISK_EFI_GPT_COMPARE=y
 CONFIG_ENV_HANDLING=y
 CONFIG_DEFAULT_ENVIRONMENT=y
-# CONFIG_DEFAULT_COMPRESSION_GZIP is not set
-# CONFIG_DEFAULT_COMPRESSION_LZO is not set
 CONFIG_DEFAULT_COMPRESSION_NONE=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
 CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_MENU=y
+# CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW_IKCONFIG is not set
 CONFIG_DEFAULT_ENVIRONMENT_PATH="$(objtree)/.ptxdist-defaultenv"
-# CONFIG_BAREBOXENV_TARGET is not set
-# CONFIG_BAREBOXCRC32_TARGET is not set
+CONFIG_HAS_SCHED=y
 CONFIG_POLLER=y
+# CONFIG_BTHREAD is not set
 # CONFIG_STATE is not set
 # CONFIG_BOOTCHOOSER is not set
 CONFIG_RESET_SOURCE=y
 # CONFIG_SYSTEMD_OF_WATCHDOG is not set
+CONFIG_EXTERNAL_DTS_FRAGMENTS=""
 
 #
 # OP-TEE loading
@@ -295,7 +305,9 @@ CONFIG_DEFAULT_LOGLEVEL=7
 # CONFIG_DEBUG_LL is not set
 CONFIG_DEBUG_IMX_UART_PORT=1
 # CONFIG_DEBUG_INITCALLS is not set
+# CONFIG_DEBUG_PROBES is not set
 # CONFIG_PBL_BREAK is not set
+# CONFIG_PRINTF_FULL is not set
 # CONFIG_UBSAN is not set
 CONFIG_HAVE_ARCH_KASAN=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
@@ -303,6 +315,11 @@ CONFIG_CC_HAS_KASAN_GENERIC=y
 # CONFIG_COMPILE_TEST is not set
 # end of Debugging
 
+#
+# EFI (Extensible Firmware Interface) Support
+#
+# end of EFI (Extensible Firmware Interface) Support
+
 CONFIG_HAS_DEBUG_LL=y
 CONFIG_COMMAND_SUPPORT=y
 CONFIG_COMPILE_HASH=y
@@ -314,8 +331,12 @@ CONFIG_COMPILE_HASH=y
 #
 # Information
 #
+# CONFIG_CMD_TUTORIAL is not set
 CONFIG_CMD_ARM_CPUINFO=y
+CONFIG_CMD_BOOTROM=y
 CONFIG_CMD_DEVINFO=y
+# CONFIG_CMD_DEVLOOKUP is not set
+# CONFIG_CMD_DEVUNBIND is not set
 CONFIG_CMD_DMESG=y
 CONFIG_CMD_DRVINFO=y
 CONFIG_CMD_HELP=y
@@ -324,6 +345,8 @@ CONFIG_CMD_IOMEM=y
 CONFIG_CMD_IMD=y
 CONFIG_CMD_MEMINFO=y
 CONFIG_CMD_REGULATOR=y
+# CONFIG_CMD_PM_DOMAIN is not set
+# CONFIG_CMD_NVMEM is not set
 CONFIG_CMD_VERSION=y
 # CONFIG_CMD_MMC is not set
 CONFIG_CMD_MMC_EXTCSD=y
@@ -381,6 +404,7 @@ CONFIG_CMD_DIRNAME=y
 CONFIG_CMD_FILETYPE=y
 CONFIG_CMD_LN=y
 CONFIG_CMD_LS=y
+# CONFIG_CMD_STAT is not set
 CONFIG_CMD_MD5SUM=y
 CONFIG_CMD_MKDIR=y
 CONFIG_CMD_PWD=y
@@ -418,6 +442,7 @@ CONFIG_CMD_MIITOOL=y
 CONFIG_CMD_PING=y
 # CONFIG_CMD_TFTP is not set
 CONFIG_CMD_IP_ROUTE_GET=y
+# CONFIG_CMD_ETHLOG is not set
 # end of Network
 
 #
@@ -486,6 +511,7 @@ CONFIG_CMD_OF_PROPERTY=y
 # CONFIG_CMD_OF_OVERLAY is not set
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_TIME=y
+# CONFIG_CMD_UPTIME is not set
 # CONFIG_CMD_DHRYSTONE is not set
 # CONFIG_CMD_SPD_DECODE is not set
 # CONFIG_CMD_SEED is not set
@@ -505,10 +531,12 @@ CONFIG_NET_DHCP=y
 # Drivers
 #
 CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_FEATURE_CONTROLLER=y
 CONFIG_OFTREE=y
 CONFIG_OFTREE_MEM_GENERIC=y
 CONFIG_DTC=y
 CONFIG_OFDEVICE=y
+CONFIG_FEATURE_CONTROLLER_FIXUP=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_BAREBOX_DRIVERS=y
 # CONFIG_OF_BAREBOX_ENV_IN_FS is not set
@@ -522,6 +550,7 @@ CONFIG_SERIAL_DEV_BUS=y
 CONFIG_DRIVER_SERIAL_IMX=y
 # CONFIG_DRIVER_SERIAL_NS16550 is not set
 # CONFIG_DRIVER_SERIAL_CADENCE is not set
+# CONFIG_SERIAL_SIFIVE is not set
 # end of serial drivers
 
 CONFIG_ARCH_HAS_FEC_IMX=y
@@ -530,10 +559,8 @@ CONFIG_PHYLIB=y
 #
 # Network drivers
 #
-# CONFIG_DRIVER_NET_ARC_EMAC is not set
-# CONFIG_DRIVER_NET_CALXEDA_XGMAC is not set
-# CONFIG_DRIVER_NET_DESIGNWARE is not set
-# CONFIG_DRIVER_NET_DESIGNWARE_EQOS is not set
+# CONFIG_DRIVER_NET_BCMGENET is not set
+# CONFIG_DRIVER_NET_DESIGNWARE_GENERIC is not set
 # CONFIG_DRIVER_NET_ENC28J60 is not set
 CONFIG_DRIVER_NET_FEC_IMX=y
 # CONFIG_DRIVER_NET_FSL_FMAN is not set
@@ -541,6 +568,7 @@ CONFIG_DRIVER_NET_FEC_IMX=y
 # CONFIG_DRIVER_NET_MICREL is not set
 # CONFIG_DRIVER_NET_SMC911X is not set
 # CONFIG_DRIVER_NET_SMC91111 is not set
+# CONFIG_DRIVER_NET_LITEETH is not set
 
 #
 # phylib
@@ -553,6 +581,7 @@ CONFIG_DRIVER_NET_FEC_IMX=y
 # CONFIG_AT803X_PHY is not set
 # CONFIG_DAVICOM_PHY is not set
 CONFIG_DP83867_PHY=y
+# CONFIG_DP83TD510_PHY is not set
 # CONFIG_LXT_PHY is not set
 # CONFIG_MARVELL_PHY is not set
 CONFIG_MICREL_PHY=y
@@ -574,6 +603,8 @@ CONFIG_NET_USB=y
 CONFIG_NET_USB_ASIX=y
 # CONFIG_USB_NET_AX88179_178A is not set
 CONFIG_NET_USB_SMSC95XX=y
+# CONFIG_NET_USB_RTL8152 is not set
+# CONFIG_DSA is not set
 # end of Network drivers
 
 #
@@ -585,6 +616,8 @@ CONFIG_SPI_MEM=y
 # CONFIG_DRIVER_SPI_GPIO is not set
 CONFIG_DRIVER_SPI_IMX=y
 CONFIG_DRIVER_SPI_IMX_2_3=y
+# CONFIG_DRIVER_SPI_LITEX_SPIFLASH is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
 # end of SPI drivers
 
 CONFIG_I2C=y
@@ -659,9 +692,9 @@ CONFIG_USB_STORAGE=y
 #
 # CONFIG_USB_HUB_USB251XB is not set
 CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_DRIVER_ARC_PBL=y
 CONFIG_USB_GADGET_DUALSPEED=y
 CONFIG_USB_GADGET_DRIVER_ARC=y
-CONFIG_USB_GADGET_DRIVER_ARC_PBL=y
 CONFIG_USB_GADGET_AUTOSTART=y
 
 #
@@ -670,8 +703,10 @@ CONFIG_USB_GADGET_AUTOSTART=y
 # CONFIG_USB_GADGET_DFU is not set
 CONFIG_USB_GADGET_SERIAL=y
 CONFIG_USB_GADGET_FASTBOOT=y
+# CONFIG_USB_GADGET_MASS_STORAGE is not set
 # CONFIG_USB_MUSB is not set
 # CONFIG_VIDEO is not set
+# CONFIG_SOUND is not set
 CONFIG_MCI_SDHCI=y
 CONFIG_MCI=y
 
@@ -688,6 +723,7 @@ CONFIG_MCI_MMC_BOOT_PARTITIONS=y
 # --- MCI host drivers ---
 #
 # CONFIG_MCI_DW is not set
+# CONFIG_MCI_ROCKCHIP_DWCMSHC is not set
 CONFIG_MCI_IMX_ESDHC=y
 # CONFIG_MCI_IMX_ESDHC_PIO is not set
 # CONFIG_MCI_ARASAN is not set
@@ -722,7 +758,10 @@ CONFIG_CLOCKSOURCE_ARM_ARCHITECTED_TIMER=y
 # CONFIG_MFD_TWL6030 is not set
 CONFIG_RAVE_SP_CORE=y
 # CONFIG_MFD_STPMIC1 is not set
+# CONFIG_MFD_RN568PMIC is not set
 # CONFIG_MFD_ATMEL_FLEXCOM is not set
+# CONFIG_MFD_RK808 is not set
+# CONFIG_MFD_AXP20X_I2C is not set
 # end of Multifunction device drivers
 
 #
@@ -732,6 +771,7 @@ CONFIG_RAVE_SP_CORE=y
 # CONFIG_SRAM is not set
 CONFIG_DEV_MEM=y
 # CONFIG_UBOOTVAR is not set
+# CONFIG_STORAGE_BY_UUID is not set
 # end of Misc devices
 
 CONFIG_LED=y
@@ -765,6 +805,7 @@ CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_DW is not set
 CONFIG_WATCHDOG_IMX=y
 CONFIG_RAVE_SP_WATCHDOG=y
+# CONFIG_GPIO_WATCHDOG is not set
 # CONFIG_PWM is not set
 # CONFIG_HWRNG is not set
 
@@ -779,12 +820,15 @@ CONFIG_GPIOLIB=y
 # GPIO
 #
 # CONFIG_GPIO_74164 is not set
+# CONFIG_GPIO_74XX_MMIO is not set
 # CONFIG_GPIO_GENERIC_PLATFORM is not set
 CONFIG_GPIO_IMX=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_DESIGNWARE is not set
 # CONFIG_GPIO_SX150X is not set
+# CONFIG_GPIO_SIFIVE is not set
+# CONFIG_GPIO_LATCH is not set
 # end of GPIO
 
 # CONFIG_W1 is not set
@@ -798,6 +842,7 @@ CONFIG_PINCTRL_IMX_IOMUX_V3=y
 # end of Pin controllers
 
 CONFIG_NVMEM=y
+# CONFIG_NVMEM_RMEM is not set
 # CONFIG_NVMEM_SNVS_LPGPR is not set
 CONFIG_IMX_OCOTP=y
 # CONFIG_IMX_OCOTP_WRITE is not set
@@ -828,6 +873,7 @@ CONFIG_HW_HAS_PCI=y
 #
 # CONFIG_PCI is not set
 # CONFIG_PCI_IMX6 is not set
+# CONFIG_PCI_ECAM_GENERIC is not set
 # end of PCI bus options
 
 CONFIG_RTC_LIB=y
@@ -838,14 +884,22 @@ CONFIG_RTC_CLASS=y
 #
 CONFIG_RTC_DRV_DS1307=y
 # CONFIG_RTC_DRV_ABRACON is not set
+# CONFIG_RTC_DRV_PCF85363 is not set
 # CONFIG_RTC_DRV_IMXDI is not set
 
 #
 # Firmware Drivers
 #
 # CONFIG_FIRMWARE_ALTERA_SERIAL is not set
+# CONFIG_ARM_SCMI_PROTOCOL is not set
 # end of Firmware Drivers
 
+#
+# FPGA Configuration Support
+#
+# CONFIG_FPGA is not set
+# end of FPGA Configuration Support
+
 CONFIG_GENERIC_PHY=y
 CONFIG_USB_NOP_XCEIV=y
 CONFIG_PHY_FSL_IMX8MQ_USB=y
@@ -856,12 +910,23 @@ CONFIG_PHY_FSL_IMX8MQ_USB=y
 #
 # end of Memory controller drivers
 
+#
+# SoC drivers
+#
+
 #
 # i.MX SoC drivers
 #
 CONFIG_IMX_GPCV2_PM_DOMAINS=y
+CONFIG_IMX8M_FEATCTRL=y
 # end of i.MX SoC drivers
 
+#
+# KVX SoC drivers
+#
+# end of KVX SoC drivers
+# end of SoC drivers
+
 #
 # NVME Support
 #
@@ -872,6 +937,13 @@ CONFIG_IMX_GPCV2_PM_DOMAINS=y
 #
 CONFIG_IMX8M_DRAM=y
 # end of i.MX8M DDR controllers
+
+# CONFIG_NVMEM_REBOOT_MODE is not set
+# CONFIG_POWER_RESET_SYSCON is not set
+# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set
+# CONFIG_POWER_RESET_GPIO is not set
+# CONFIG_POWER_RESET_GPIO_RESTART is not set
+# CONFIG_VIRTIO_MENU is not set
 # end of Drivers
 
 #
@@ -893,6 +965,7 @@ CONFIG_FS_EXT4=y
 CONFIG_FS_RAMFS=y
 CONFIG_FS_DEVFS=y
 CONFIG_FS_TFTP=y
+CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128
 CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
@@ -952,7 +1025,6 @@ CONFIG_CRC_CCITT=y
 #
 # end of Library gui routines
 
-# CONFIG_BAREBOX_LOGO is not set
 CONFIG_PRINTF_UUID=y
 # CONFIG_NLS is not set
 # CONFIG_BLOBGEN is not set
@@ -967,7 +1039,7 @@ CONFIG_ARCH_HAS_ZERO_PAGE=y
 CONFIG_CRC32=y
 CONFIG_CRC_ITU_T=y
 CONFIG_DIGEST=y
-CONFIG_MD5=y
+CONFIG_HAVE_DIGEST_MD5=y
 # CONFIG_DIGEST_CRC32_GENERIC is not set
 CONFIG_DIGEST_MD5_GENERIC=y
 # CONFIG_DIGEST_SHA1_GENERIC is not set
@@ -976,8 +1048,6 @@ CONFIG_DIGEST_MD5_GENERIC=y
 # CONFIG_DIGEST_SHA384_GENERIC is not set
 # CONFIG_DIGEST_SHA512_GENERIC is not set
 # CONFIG_DIGEST_HMAC_GENERIC is not set
-# CONFIG_DIGEST_SHA1_ARM is not set
-# CONFIG_DIGEST_SHA256_ARM is not set
 # CONFIG_CRYPTO_KEYSTORE is not set
 # end of Crypto support
 
@@ -997,3 +1067,15 @@ CONFIG_FIRMWARE_IMX8MQ_ATF=y
 # CONFIG_COMPILE_HOST_TOOLS is not set
 # CONFIG_ARCH_IMX_USBLOADER is not set
 # end of Host Tools
+
+#
+# Target Tools
+#
+# CONFIG_IMD_TARGET is not set
+# CONFIG_KERNEL_INSTALL_TARGET is not set
+# CONFIG_BAREBOXENV_TARGET is not set
+# CONFIG_BAREBOXCRC32_TARGET is not set
+# CONFIG_MVEBU_KWBOOT_TARGET is not set
+# end of Target Tools
+
+# CONFIG_TEST is not set
diff --git a/configs/platform-v8a/barebox-rockchip.config b/configs/platform-v8a/barebox-rockchip.config
index cca9d4a..109f55c 100644
--- a/configs/platform-v8a/barebox-rockchip.config
+++ b/configs/platform-v8a/barebox-rockchip.config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Barebox/arm 2022.10.0 Configuration
+# Barebox/arm 2023.01.0 Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_LINUX=y
@@ -94,7 +94,7 @@ CONFIG_GREGORIAN_CALENDER=y
 CONFIG_HAS_KALLSYMS=y
 CONFIG_HAS_CACHE=y
 CONFIG_HAS_DMA=y
-CONFIG_HAS_ARCH_SJLJ=y
+CONFIG_ARCH_HAS_SJLJ=y
 CONFIG_GENERIC_GPIO=y
 CONFIG_BLOCK=y
 CONFIG_BLOCK_WRITE=y
@@ -337,6 +337,7 @@ CONFIG_CMD_DIRNAME=y
 CONFIG_CMD_FILETYPE=y
 CONFIG_CMD_LN=y
 CONFIG_CMD_LS=y
+# CONFIG_CMD_STAT is not set
 CONFIG_CMD_MD5SUM=y
 CONFIG_CMD_MKDIR=y
 CONFIG_CMD_PWD=y
@@ -442,6 +443,7 @@ CONFIG_CMD_OF_PROPERTY=y
 CONFIG_CMD_OF_OVERLAY=y
 CONFIG_CMD_OFTREE=y
 CONFIG_CMD_TIME=y
+# CONFIG_CMD_UPTIME is not set
 CONFIG_CMD_STATE=y
 # CONFIG_CMD_DHRYSTONE is not set
 # CONFIG_CMD_SPD_DECODE is not set
@@ -705,6 +707,7 @@ CONFIG_GPIO_GENERIC=y
 # CONFIG_GPIO_DESIGNWARE is not set
 # CONFIG_GPIO_SX150X is not set
 # CONFIG_GPIO_SIFIVE is not set
+# CONFIG_GPIO_LATCH is not set
 # end of GPIO
 
 # CONFIG_W1 is not set
@@ -778,6 +781,12 @@ CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=y
 # KVX SoC drivers
 #
 # end of KVX SoC drivers
+
+#
+# Rockchip SoC drivers
+#
+# CONFIG_ROCKCHIP_IODOMAIN is not set
+# end of Rockchip SoC drivers
 # end of SoC drivers
 
 #
@@ -814,7 +823,6 @@ CONFIG_FS_RAMFS=y
 CONFIG_FS_DEVFS=y
 CONFIG_FS_TFTP=y
 CONFIG_FS_TFTP_MAX_WINDOW_SIZE=128
-CONFIG_FS_TFTP_REORDER_CACHE_SIZE=16
 CONFIG_FS_NFS=y
 CONFIG_FS_FAT=y
 CONFIG_FS_FAT_WRITE=y
diff --git a/configs/platform-v8a/rules/barebox-imx8m.make b/configs/platform-v8a/rules/barebox-imx8m.make
index 4fac9d4..f068865 100644
--- a/configs/platform-v8a/rules/barebox-imx8m.make
+++ b/configs/platform-v8a/rules/barebox-imx8m.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_IMX8M) += barebox-imx8m
 #
 # Paths and names
 #
-BAREBOX_IMX8M_VERSION	:= 2021.02.0
-BAREBOX_IMX8M_MD5	:= 07045e34faa1135d9cd18503186b2d7f
+BAREBOX_IMX8M_VERSION	:= 2023.01.0
+BAREBOX_IMX8M_MD5	:= 884680a110d252e3ae18589b18848ed9
 BAREBOX_IMX8M		:= barebox-imx8m-$(BAREBOX_IMX8M_VERSION)
 BAREBOX_IMX8M_SUFFIX	:= tar.bz2
 BAREBOX_IMX8M_URL	:= $(call barebox-url, BAREBOX_IMX8M)
diff --git a/configs/platform-v8a/rules/barebox-rockchip.make b/configs/platform-v8a/rules/barebox-rockchip.make
index eb652e5..87ea473 100644
--- a/configs/platform-v8a/rules/barebox-rockchip.make
+++ b/configs/platform-v8a/rules/barebox-rockchip.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_BAREBOX_ROCKCHIP) += barebox-rockchip
 #
 # Paths and names
 #
-BAREBOX_ROCKCHIP_VERSION	:= 2022.10.0
-BAREBOX_ROCKCHIP_MD5		:= c7d0b3f6a32ed1865228e991e39d240d
+BAREBOX_ROCKCHIP_VERSION	:= 2023.01.0
+BAREBOX_ROCKCHIP_MD5		:= 884680a110d252e3ae18589b18848ed9
 BAREBOX_ROCKCHIP		:= barebox-rockchip-$(BAREBOX_ROCKCHIP_VERSION)
 BAREBOX_ROCKCHIP_SUFFIX		:= tar.bz2
 BAREBOX_ROCKCHIP_URL		:= $(call barebox-url, BAREBOX_ROCKCHIP)
-- 
2.30.2

[DistroKit] [PATCH 09/14] blspec-entry: import from upstream ptxdist-2022.12.0

[Marco Felsch]

Import all required files from upstream ptxdist-2022.12.0 for further
adaptions. No functional changes done.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 platforms/blspec-entry.in               | 19 ++++++++
 projectroot/loader/entries/default.conf |  5 ++
 rules/blspec-entry.make                 | 65 +++++++++++++++++++++++++
 3 files changed, 89 insertions(+)
 create mode 100644 platforms/blspec-entry.in
 create mode 100644 projectroot/loader/entries/default.conf
 create mode 100644 rules/blspec-entry.make

diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
new file mode 100644
index 0000000..aed65d4
--- /dev/null
+++ b/platforms/blspec-entry.in
@@ -0,0 +1,19 @@
+## SECTION=blspec
+
+menuconfig BLSPEC_ENTRY
+	tristate
+	select KERNEL
+	select KERNEL_INSTALL if !KERNEL_FIT
+	prompt "default bootloader spec entry "
+
+if BLSPEC_ENTRY
+
+config BLSPEC_ENTRY_DEVICETREE
+	bool
+	default KERNEL_DTB && !KERNEL_FIT
+
+config BLSPEC_ENTRY_CMDLINE
+	string
+	prompt "kernel command-line"
+
+endif
diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
new file mode 100644
index 0000000..5650907
--- /dev/null
+++ b/projectroot/loader/entries/default.conf
@@ -0,0 +1,5 @@
+title		@TITLE@
+version		@VERSION@
+options		@CMDLINE@
+linux		@KERNEL@
+@DEVICETREE@
diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
new file mode 100644
index 0000000..f393b1b
--- /dev/null
+++ b/rules/blspec-entry.make
@@ -0,0 +1,65 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2014 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_BLSPEC_ENTRY) += blspec-entry
+
+BLSPEC_ENTRY_VERSION	:= $(KERNEL_VERSION)
+
+# ----------------------------------------------------------------------------
+# Target-Install
+# ----------------------------------------------------------------------------
+
+BLSPEC_ENTRY_TITLE	:= PTXdist - $(call remove_quotes,$(PTXCONF_PROJECT_VENDOR)-$(PTXCONF_PROJECT))
+ifdef PTXCONF_BLSPEC_ENTRY_DEVICETREE
+BLSPEC_ENTRY_NAMES	= $(basename $(notdir $(KERNEL_DTS)))
+blspec/title		= $(BLSPEC_ENTRY_TITLE) $(strip $(1))
+blspec/devicetree	= devicetree\t/boot/$(strip $(1)).dtb
+else
+BLSPEC_ENTRY_NAMES	= default
+blspec/title		= $(BLSPEC_ENTRY_TITLE)
+blspec/devicetree	=
+endif
+BLSPEC_ENTRY_LICENSE	= ignore
+
+ifdef PTXCONF_KERNEL_FIT
+BLSPEC_KERNEL_IMAGE	= /boot/linux.fit
+else
+BLSPEC_KERNEL_IMAGE	= $(KERNEL_IMAGE)
+endif
+
+$(STATEDIR)/blspec-entry.targetinstall:
+	@$(call targetinfo)
+
+	@$(call install_init, blspec-entry)
+	@$(call install_fixup,blspec-entry,PRIORITY,optional)
+	@$(call install_fixup,blspec-entry,SECTION,base)
+	@$(call install_fixup,blspec-entry,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
+	@$(call install_fixup,blspec-entry,DESCRIPTION,missing)
+
+	@$(foreach name, $(BLSPEC_ENTRY_NAMES), \
+		$(call install_alternative, blspec-entry, 0, 0, 0644, \
+			/loader/entries/default.conf,n,/loader/entries/$(name).conf)$(ptx/nl) \
+		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
+			@TITLE@,'$(call blspec/title,$(name))')$(ptx/nl) \
+		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
+			@VERSION@,'$(BLSPEC_ENTRY_VERSION)')$(ptx/nl) \
+		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
+			@CMDLINE@,$(PTXCONF_BLSPEC_ENTRY_CMDLINE))$(ptx/nl) \
+		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
+			@KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \
+		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
+			@DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl))
+
+	@$(call install_finish,blspec-entry)
+
+	@$(call touch)
+
+# vim: syntax=make
-- 
2.30.2

[DistroKit] [PATCH 10/14] blspec-entry: add linux-appendroot support

[Marco Felsch]

Add the option to add the 'linux-appendroot true' to blspec config file
which is very useful in case of using barebox as bootlaoder.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 platforms/blspec-entry.in               |  8 ++++++++
 projectroot/loader/entries/default.conf |  1 +
 rules/blspec-entry.make                 | 10 +++++++++-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
index aed65d4..c2aea36 100644
--- a/platforms/blspec-entry.in
+++ b/platforms/blspec-entry.in
@@ -16,4 +16,12 @@ config BLSPEC_ENTRY_CMDLINE
 	string
 	prompt "kernel command-line"
 
+config BLSPEC_ENTRY_APPENDROOT
+	bool
+	prompt "Add 'linux-appendroot true'"
+	help
+	  If enabled this options adds 'linux-appendroot true' to the blspec
+	  entry. This is a barebox specific blspec option which tells barebox
+	  to add the 'root=' kernel command line automatically if set.
+
 endif
diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
index 5650907..d281569 100644
--- a/projectroot/loader/entries/default.conf
+++ b/projectroot/loader/entries/default.conf
@@ -3,3 +3,4 @@ version		@VERSION@
 options		@CMDLINE@
 linux		@KERNEL@
 @DEVICETREE@
+@LINUXAPPENDROOT@
diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
index f393b1b..7523009 100644
--- a/rules/blspec-entry.make
+++ b/rules/blspec-entry.make
@@ -35,6 +35,12 @@ else
 BLSPEC_KERNEL_IMAGE	= $(KERNEL_IMAGE)
 endif
 
+ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT
+BLSPEC_APPENDROOT	= linux-appendroot\ttrue
+else
+BLSPEC_APPENDROOT	=
+endif
+
 $(STATEDIR)/blspec-entry.targetinstall:
 	@$(call targetinfo)
 
@@ -56,7 +62,9 @@ $(STATEDIR)/blspec-entry.targetinstall:
 		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
 			@KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \
 		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
-			@DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl))
+			@DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl) \
+		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
+			@LINUXAPPENDROOT@,'$(BLSPEC_APPENDROOT)')$(ptx/nl))
 
 	@$(call install_finish,blspec-entry)
 
-- 
2.30.2

[DistroKit] [PATCH 11/14] v8a: blspec: switch to default blspec entry

[Marco Felsch]

PTXdist will create a blspec config for each specified devicetree. Since
this mechanism supports the 'linux-appendroot true' feature now we can
use it to generate all blspecs entries, so seperate blspec packages for
each platform are not longer needed.

Enable this mechanism for all supported v8a platforms and remove the
dedicated packages execpt for the RPi.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v8a/platformconfig           | 11 +++---
 .../platforms/blspec-imx8mm-evk.in            |  5 ---
 .../platforms/blspec-imx8mp-evk.in            |  5 ---
 .../platforms/blspec-imx8mq-evk.in            |  5 ---
 .../platform-v8a/platforms/blspec-rock3a.in   |  5 ---
 .../loader/entries/imx8mm-evk.conf            |  6 ---
 .../loader/entries/imx8mp-evk.conf            |  6 ---
 .../loader/entries/imx8mq-evk.conf            |  6 ---
 .../projectroot/loader/entries/rock3a.conf    |  6 ---
 .../platform-v8a/rules/blspec-imx8mm-evk.make | 38 -------------------
 .../platform-v8a/rules/blspec-imx8mp-evk.make | 38 -------------------
 .../platform-v8a/rules/blspec-imx8mq-evk.make | 38 -------------------
 configs/platform-v8a/rules/blspec-rock3a.make | 38 -------------------
 13 files changed, 5 insertions(+), 202 deletions(-)
 delete mode 100644 configs/platform-v8a/platforms/blspec-imx8mm-evk.in
 delete mode 100644 configs/platform-v8a/platforms/blspec-imx8mp-evk.in
 delete mode 100644 configs/platform-v8a/platforms/blspec-imx8mq-evk.in
 delete mode 100644 configs/platform-v8a/platforms/blspec-rock3a.in
 delete mode 100644 configs/platform-v8a/projectroot/loader/entries/imx8mm-evk.conf
 delete mode 100644 configs/platform-v8a/projectroot/loader/entries/imx8mp-evk.conf
 delete mode 100644 configs/platform-v8a/projectroot/loader/entries/imx8mq-evk.conf
 delete mode 100644 configs/platform-v8a/projectroot/loader/entries/rock3a.conf
 delete mode 100644 configs/platform-v8a/rules/blspec-imx8mm-evk.make
 delete mode 100644 configs/platform-v8a/rules/blspec-imx8mp-evk.make
 delete mode 100644 configs/platform-v8a/rules/blspec-imx8mq-evk.make
 delete mode 100644 configs/platform-v8a/rules/blspec-rock3a.make

diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index b308cf3..71eab02 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -205,12 +205,11 @@ PTXCONF_TF_A_BL32_NONE=y
 #
 # bootloader spec entries       
 #
-# PTXCONF_BLSPEC_ENTRY is not set
-PTXCONF_BLSPEC_IMX8MM_EVK=y
-PTXCONF_BLSPEC_IMX8MP_EVK=y
-PTXCONF_BLSPEC_IMX8MQ_EVK=y
-PTXCONF_BLSPEC_ROCK3A=y
-# PTXCONF_BLSPEC_RPI4 is not set
+PTXCONF_BLSPEC_ENTRY=y
+PTXCONF_BLSPEC_ENTRY_DEVICETREE=y
+PTXCONF_BLSPEC_ENTRY_CMDLINE="rootwait"
+PTXCONF_BLSPEC_ENTRY_APPENDROOT=y
+PTXCONF_BLSPEC_RPI4=y
 # end of bootloader spec entries       
 
 #
diff --git a/configs/platform-v8a/platforms/blspec-imx8mm-evk.in b/configs/platform-v8a/platforms/blspec-imx8mm-evk.in
deleted file mode 100644
index 407eb01..0000000
--- a/configs/platform-v8a/platforms/blspec-imx8mm-evk.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_IMX8MM_EVK
-	tristate
-	prompt "/loader/entries/imx8mm-evk.conf bootloader spec entry"
diff --git a/configs/platform-v8a/platforms/blspec-imx8mp-evk.in b/configs/platform-v8a/platforms/blspec-imx8mp-evk.in
deleted file mode 100644
index c911c83..0000000
--- a/configs/platform-v8a/platforms/blspec-imx8mp-evk.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_IMX8MP_EVK
-	tristate
-	prompt "/loader/entries/imx8mp-evk.conf bootloader spec entry"
diff --git a/configs/platform-v8a/platforms/blspec-imx8mq-evk.in b/configs/platform-v8a/platforms/blspec-imx8mq-evk.in
deleted file mode 100644
index 9ef3082..0000000
--- a/configs/platform-v8a/platforms/blspec-imx8mq-evk.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_IMX8MQ_EVK
-	tristate
-	prompt "/loader/entries/imx8mq-evk.conf bootloader spec entry"
diff --git a/configs/platform-v8a/platforms/blspec-rock3a.in b/configs/platform-v8a/platforms/blspec-rock3a.in
deleted file mode 100644
index e54a102..0000000
--- a/configs/platform-v8a/platforms/blspec-rock3a.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_ROCK3A
-	tristate
-	prompt "/loader/entries/rock3a.conf bootloader spec entry"
diff --git a/configs/platform-v8a/projectroot/loader/entries/imx8mm-evk.conf b/configs/platform-v8a/projectroot/loader/entries/imx8mm-evk.conf
deleted file mode 100644
index 006691a..0000000
--- a/configs/platform-v8a/projectroot/loader/entries/imx8mm-evk.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit - i.MX8MM-EVK
-version		@VERSION@
-options		rootwait
-linux		/boot/Image
-devicetree	/boot/imx8mm-evk.dtb
-linux-appendroot	true
diff --git a/configs/platform-v8a/projectroot/loader/entries/imx8mp-evk.conf b/configs/platform-v8a/projectroot/loader/entries/imx8mp-evk.conf
deleted file mode 100644
index 6165ed3..0000000
--- a/configs/platform-v8a/projectroot/loader/entries/imx8mp-evk.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit - i.MX8MP-EVK
-version		@VERSION@
-options		rootwait
-linux		/boot/Image
-devicetree	/boot/imx8mp-evk.dtb
-linux-appendroot	true
diff --git a/configs/platform-v8a/projectroot/loader/entries/imx8mq-evk.conf b/configs/platform-v8a/projectroot/loader/entries/imx8mq-evk.conf
deleted file mode 100644
index 17772d8..0000000
--- a/configs/platform-v8a/projectroot/loader/entries/imx8mq-evk.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit - i.MX8MQ-EVK
-version		@VERSION@
-options		rootwait
-linux		/boot/Image
-devicetree	/boot/imx8mq-evk.dtb
-linux-appendroot	true
diff --git a/configs/platform-v8a/projectroot/loader/entries/rock3a.conf b/configs/platform-v8a/projectroot/loader/entries/rock3a.conf
deleted file mode 100644
index 128e25a..0000000
--- a/configs/platform-v8a/projectroot/loader/entries/rock3a.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit - ROCK-3A
-version		@VERSION@
-options		rootwait
-linux		/boot/Image
-devicetree	/boot/rk3568-rock-3a.dtb
-linux-appendroot	true
diff --git a/configs/platform-v8a/rules/blspec-imx8mm-evk.make b/configs/platform-v8a/rules/blspec-imx8mm-evk.make
deleted file mode 100644
index 0850127..0000000
--- a/configs/platform-v8a/rules/blspec-imx8mm-evk.make
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2020 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_IMX8MM_EVK) += blspec-imx8mm-evk
-
-BLSPEC_IMX8MM_EVK_VERSION	:= 5.6.2
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-imx8mm-evk.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-imx8mm-evk)
-	@$(call install_fixup,blspec-imx8mm-evk,PRIORITY,optional)
-	@$(call install_fixup,blspec-imx8mm-evk,SECTION,base)
-	@$(call install_fixup,blspec-imx8mm-evk,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>")
-	@$(call install_fixup,blspec-imx8mm-evk,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-imx8mm-evk, 0, 0, 0644, \
-		/loader/entries/imx8mm-evk.conf)
-	@$(call install_replace, blspec-imx8mm-evk, /loader/entries/imx8mm-evk.conf, \
-		@VERSION@,'$(PTXDIST_BSP_AUTOVERSION)')$(ptx/nl)
-
-	@$(call install_finish,blspec-imx8mm-evk)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v8a/rules/blspec-imx8mp-evk.make b/configs/platform-v8a/rules/blspec-imx8mp-evk.make
deleted file mode 100644
index cf5360f..0000000
--- a/configs/platform-v8a/rules/blspec-imx8mp-evk.make
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2020 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_IMX8MP_EVK) += blspec-imx8mp-evk
-
-BLSPEC_IMX8MP_EVK_VERSION	:= 5.6.2
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-imx8mp-evk.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-imx8mp-evk)
-	@$(call install_fixup,blspec-imx8mp-evk,PRIORITY,optional)
-	@$(call install_fixup,blspec-imx8mp-evk,SECTION,base)
-	@$(call install_fixup,blspec-imx8mp-evk,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>")
-	@$(call install_fixup,blspec-imx8mp-evk,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-imx8mp-evk, 0, 0, 0644, \
-		/loader/entries/imx8mp-evk.conf)
-	@$(call install_replace, blspec-imx8mp-evk, /loader/entries/imx8mp-evk.conf, \
-                        @VERSION@,'$(PTXDIST_BSP_AUTOVERSION)')$(ptx/nl)
-
-	@$(call install_finish,blspec-imx8mp-evk)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v8a/rules/blspec-imx8mq-evk.make b/configs/platform-v8a/rules/blspec-imx8mq-evk.make
deleted file mode 100644
index 463eeb2..0000000
--- a/configs/platform-v8a/rules/blspec-imx8mq-evk.make
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2020 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_IMX8MQ_EVK) += blspec-imx8mq-evk
-
-BLSPEC_IMX8MQ_EVK_VERSION	:= 5.6.2
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-imx8mq-evk.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-imx8mq-evk)
-	@$(call install_fixup,blspec-imx8mq-evk,PRIORITY,optional)
-	@$(call install_fixup,blspec-imx8mq-evk,SECTION,base)
-	@$(call install_fixup,blspec-imx8mq-evk,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>")
-	@$(call install_fixup,blspec-imx8mq-evk,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-imx8mq-evk, 0, 0, 0644, \
-		/loader/entries/imx8mq-evk.conf)
-	@$(call install_replace, blspec-imx8mq-evk, /loader/entries/imx8mq-evk.conf, \
-		@VERSION@,'$(PTXDIST_BSP_AUTOVERSION)')$(ptx/nl)
-
-	@$(call install_finish,blspec-imx8mq-evk)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v8a/rules/blspec-rock3a.make b/configs/platform-v8a/rules/blspec-rock3a.make
deleted file mode 100644
index eeaf82b..0000000
--- a/configs/platform-v8a/rules/blspec-rock3a.make
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2020 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_ROCK3A) += blspec-rock3a
-
-BLSPEC_ROCK3A_VERSION	:= 5.6.2
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-rock3a.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-rock3a)
-	@$(call install_fixup,blspec-rock3a,PRIORITY,optional)
-	@$(call install_fixup,blspec-rock3a,SECTION,base)
-	@$(call install_fixup,blspec-rock3a,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>")
-	@$(call install_fixup,blspec-rock3a,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-rock3a, 0, 0, 0644, \
-		/loader/entries/rock3a.conf)
-	@$(call install_replace, blspec-rock3a, /loader/entries/rock3a.conf, \
-		@VERSION@,'$(PTXDIST_BSP_AUTOVERSION)')$(ptx/nl)
-
-	@$(call install_finish,blspec-rock3a)
-
-	@$(call touch)
-
-# vim: syntax=make
-- 
2.30.2

[DistroKit] [PATCH 12/14] v7a: blspec: drop incomplete Gute Fee support

[Marco Felsch]

The blspec support for the Gute Fee HW was incomplete since the actual
makefile is missing as well as the devicetree, so drop the blspec boot
support.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v7a/platformconfig                     | 1 -
 configs/platform-v7a/platforms/blspec-gf.in             | 5 -----
 configs/platform-v7a/projectroot/loader/entries/gf.conf | 6 ------
 3 files changed, 12 deletions(-)
 delete mode 100644 configs/platform-v7a/platforms/blspec-gf.in
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/gf.conf

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 8e90a32..5ad1fbf 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -223,7 +223,6 @@ PTXCONF_TF_A_BL32_SP_MIN=y
 PTXCONF_BLSPEC_BONEBLACK=y
 PTXCONF_BLSPEC_BONEWHITE=y
 # PTXCONF_BLSPEC_ENTRY is not set
-PTXCONF_BLSPEC_GF=y
 PTXCONF_BLSPEC_LXA_MC1=y
 PTXCONF_BLSPEC_NITROGEN6MAX=y
 PTXCONF_BLSPEC_NITROGEN6X=y
diff --git a/configs/platform-v7a/platforms/blspec-gf.in b/configs/platform-v7a/platforms/blspec-gf.in
deleted file mode 100644
index 7d7895b..0000000
--- a/configs/platform-v7a/platforms/blspec-gf.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_GF
-	tristate
-	prompt "/loader/entries/gf.conf bootloader spec entry"
diff --git a/configs/platform-v7a/projectroot/loader/entries/gf.conf b/configs/platform-v7a/projectroot/loader/entries/gf.conf
deleted file mode 100644
index b114645..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/gf.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		Gute Fee - Pengutronix-DistroKit
-version		4.6
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/am335x-afi-gf.dtb
-linux-appendroot true
-- 
2.30.2

[DistroKit] [PATCH 13/14] v7a: vexpress: remove console from blspec config

[Marco Felsch]

The console setup and linux command line passing is now done within
barebox:

| commit 319e387dbf72c7aea4b5159af9a43b5399c6431b
| Author: Lucas Stach <dev@lynxeye.de>
| Date:   Sun Aug 16 23:42:40 2020 +0200
|
|     ARM: vexpress: set stdout path
|
|     This ensures that the correct console gets activated independent
|     of the device probe order.
|
|     Signed-off-by: Lucas Stach <dev@lynxeye.de>
|     Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

The commit is part of mainline barebox since version v2020.09.0, so drop
the console option. Drop the rootfstype as well while on it since the
kernel will do an autodetection.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v7a/projectroot/loader/entries/vexpress.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/platform-v7a/projectroot/loader/entries/vexpress.conf b/configs/platform-v7a/projectroot/loader/entries/vexpress.conf
index a60a019..e2e2877 100644
--- a/configs/platform-v7a/projectroot/loader/entries/vexpress.conf
+++ b/configs/platform-v7a/projectroot/loader/entries/vexpress.conf
@@ -1,6 +1,6 @@
 title		PTXdist - Pengutronix-DistroKit
 version		4.11
-options		rootwait rootfstype=ext4 console=ttyAMA0,115200
+options		rootwait
 linux		/boot/zImage
 devicetree	/boot/vexpress-v2p-ca9.dtb
 linux-appendroot true
-- 
2.30.2

[DistroKit] [PATCH 14/14] v7a: blspec: convert to ptxdist default entries

[Marco Felsch]

Adding new board support always included adding a special blspec package
for this new board. Most of the blspec entries are the same except for
the used devicetree blob. Since the blspec-entry package is able to the
add the barebox 'linux-appendroot true' option as well can move to the
buildin blspec-entry creation. This lowers the burden of adding new
board support since ptxdist will create a blspec entry for devicetree
each listed within the platformconfig.

I added the 'rootwait rw' kernel command line options since most blspec
entries used these options, albeit the 'rw' support should be
reconsidered.

Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
 configs/platform-v7a/platformconfig           | 23 +++---------
 .../platforms/blspec-boneblack.in             |  5 ---
 .../platforms/blspec-bonewhite.in             |  5 ---
 .../platform-v7a/platforms/blspec-lxa-mc1.in  |  5 ---
 .../platforms/blspec-nitrogen6max.in          |  5 ---
 .../platforms/blspec-nitrogen6x.in            |  5 ---
 .../platforms/blspec-riotboard.in             |  5 ---
 configs/platform-v7a/platforms/blspec-rpi2.in |  5 ---
 configs/platform-v7a/platforms/blspec-rpi3.in |  5 ---
 .../platform-v7a/platforms/blspec-rpicm3.in   |  5 ---
 .../platforms/blspec-sabrelite.in             |  5 ---
 .../platforms/blspec-sama5d27-giantboard.in   |  5 ---
 .../platforms/blspec-sama5d27-som1-ek.in      |  5 ---
 .../platforms/blspec-stm32mp157c-dk2.in       |  5 ---
 .../platforms/blspec-stm32mp157c-ev1.in       |  5 ---
 .../platform-v7a/platforms/blspec-udoo-neo.in |  5 ---
 .../platform-v7a/platforms/blspec-vexpress.in |  5 ---
 .../projectroot/loader/entries/boneblack.conf |  6 ----
 .../projectroot/loader/entries/bonewhite.conf |  6 ----
 .../projectroot/loader/entries/lxa-mc1.conf   |  6 ----
 .../loader/entries/nitrogen6max.conf          |  6 ----
 .../loader/entries/nitrogen6x.conf            |  6 ----
 .../projectroot/loader/entries/riotboard.conf |  6 ----
 .../projectroot/loader/entries/rpi2.conf      |  6 ----
 .../projectroot/loader/entries/rpi3.conf      |  6 ----
 .../projectroot/loader/entries/rpicm3.conf    |  6 ----
 .../projectroot/loader/entries/sabrelite.conf |  6 ----
 .../loader/entries/sama5d27-giantboard.conf   |  6 ----
 .../loader/entries/sama5d27-som1-ek.conf      |  6 ----
 .../loader/entries/stm32mp157c-dk2.conf       |  6 ----
 .../loader/entries/stm32mp157c-ev1.conf       |  6 ----
 .../projectroot/loader/entries/udoo-neo.conf  |  6 ----
 .../projectroot/loader/entries/vexpress.conf  |  6 ----
 .../platform-v7a/rules/blspec-boneblack.make  | 36 -------------------
 .../platform-v7a/rules/blspec-bonewhite.make  | 36 -------------------
 .../platform-v7a/rules/blspec-lxa-mc1.make    | 36 -------------------
 .../rules/blspec-nitrogen6max.make            | 36 -------------------
 .../platform-v7a/rules/blspec-nitrogen6x.make | 36 -------------------
 .../platform-v7a/rules/blspec-riotboard.make  | 36 -------------------
 configs/platform-v7a/rules/blspec-rpi2.make   | 36 -------------------
 configs/platform-v7a/rules/blspec-rpi3.make   | 36 -------------------
 configs/platform-v7a/rules/blspec-rpicm3.make | 36 -------------------
 .../platform-v7a/rules/blspec-sabrelite.make  | 36 -------------------
 .../rules/blspec-sama5d27-giantboard.make     | 36 -------------------
 .../rules/blspec-sama5d27-som1-ek.make        | 36 -------------------
 .../rules/blspec-stm32mp157c-dk2.make         | 36 -------------------
 .../rules/blspec-stm32mp157c-ev1.make         | 36 -------------------
 .../platform-v7a/rules/blspec-udoo-neo.make   | 36 -------------------
 .../platform-v7a/rules/blspec-vexpress.make   | 36 -------------------
 49 files changed, 5 insertions(+), 770 deletions(-)
 delete mode 100644 configs/platform-v7a/platforms/blspec-boneblack.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-bonewhite.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-lxa-mc1.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-nitrogen6max.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-nitrogen6x.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-riotboard.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-rpi2.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-rpi3.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-rpicm3.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-sabrelite.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-sama5d27-giantboard.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-sama5d27-som1-ek.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-stm32mp157c-dk2.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-stm32mp157c-ev1.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-udoo-neo.in
 delete mode 100644 configs/platform-v7a/platforms/blspec-vexpress.in
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/boneblack.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/bonewhite.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/riotboard.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/rpi2.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/rpi3.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/rpicm3.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/sabrelite.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/sama5d27-giantboard.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/sama5d27-som1-ek.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/stm32mp157c-dk2.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/stm32mp157c-ev1.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/udoo-neo.conf
 delete mode 100644 configs/platform-v7a/projectroot/loader/entries/vexpress.conf
 delete mode 100644 configs/platform-v7a/rules/blspec-boneblack.make
 delete mode 100644 configs/platform-v7a/rules/blspec-bonewhite.make
 delete mode 100644 configs/platform-v7a/rules/blspec-lxa-mc1.make
 delete mode 100644 configs/platform-v7a/rules/blspec-nitrogen6max.make
 delete mode 100644 configs/platform-v7a/rules/blspec-nitrogen6x.make
 delete mode 100644 configs/platform-v7a/rules/blspec-riotboard.make
 delete mode 100644 configs/platform-v7a/rules/blspec-rpi2.make
 delete mode 100644 configs/platform-v7a/rules/blspec-rpi3.make
 delete mode 100644 configs/platform-v7a/rules/blspec-rpicm3.make
 delete mode 100644 configs/platform-v7a/rules/blspec-sabrelite.make
 delete mode 100644 configs/platform-v7a/rules/blspec-sama5d27-giantboard.make
 delete mode 100644 configs/platform-v7a/rules/blspec-sama5d27-som1-ek.make
 delete mode 100644 configs/platform-v7a/rules/blspec-stm32mp157c-dk2.make
 delete mode 100644 configs/platform-v7a/rules/blspec-stm32mp157c-ev1.make
 delete mode 100644 configs/platform-v7a/rules/blspec-udoo-neo.make
 delete mode 100644 configs/platform-v7a/rules/blspec-vexpress.make

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 5ad1fbf..bcd7f21 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -220,24 +220,11 @@ PTXCONF_TF_A_BL32_SP_MIN=y
 #
 # bootloader spec entries       
 #
-PTXCONF_BLSPEC_BONEBLACK=y
-PTXCONF_BLSPEC_BONEWHITE=y
-# PTXCONF_BLSPEC_ENTRY is not set
-PTXCONF_BLSPEC_LXA_MC1=y
-PTXCONF_BLSPEC_NITROGEN6MAX=y
-PTXCONF_BLSPEC_NITROGEN6X=y
-PTXCONF_BLSPEC_RIOTBOARD=y
-PTXCONF_BLSPEC_RPI2=y
-PTXCONF_BLSPEC_RPI3=y
-PTXCONF_BLSPEC_RPI4=y
-PTXCONF_BLSPEC_RPICM3=y
-PTXCONF_BLSPEC_SABRELITE=y
-PTXCONF_BLSPEC_SAMA5D27_GIANTBOARD=y
-PTXCONF_BLSPEC_SAMA5D27_SOM1_EK=y
-PTXCONF_BLSPEC_STM32MP157C_DK2=y
-PTXCONF_BLSPEC_STM32MP157C_EV1=y
-PTXCONF_BLSPEC_UDOO_NEO=y
-PTXCONF_BLSPEC_VEXPRESS=y
+PTXCONF_BLSPEC_ENTRY=y
+PTXCONF_BLSPEC_ENTRY_DEVICETREE=y
+PTXCONF_BLSPEC_ENTRY_CMDLINE="rootwait rw"
+PTXCONF_BLSPEC_ENTRY_APPENDROOT=y
+# PTXCONF_BLSPEC_RPI4 is not set
 # end of bootloader spec entries       
 
 #
diff --git a/configs/platform-v7a/platforms/blspec-boneblack.in b/configs/platform-v7a/platforms/blspec-boneblack.in
deleted file mode 100644
index a4eda10..0000000
--- a/configs/platform-v7a/platforms/blspec-boneblack.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_BONEBLACK
-	tristate
-	prompt "/loader/entries/boneblack.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-bonewhite.in b/configs/platform-v7a/platforms/blspec-bonewhite.in
deleted file mode 100644
index 8408cd8..0000000
--- a/configs/platform-v7a/platforms/blspec-bonewhite.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_BONEWHITE
-	tristate
-	prompt "/loader/entries/bonewhite.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-lxa-mc1.in b/configs/platform-v7a/platforms/blspec-lxa-mc1.in
deleted file mode 100644
index 87dcc9b..0000000
--- a/configs/platform-v7a/platforms/blspec-lxa-mc1.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_LXA_MC1
-	tristate
-	prompt "/loader/entries/lxa-mc1.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-nitrogen6max.in b/configs/platform-v7a/platforms/blspec-nitrogen6max.in
deleted file mode 100644
index ddeff46..0000000
--- a/configs/platform-v7a/platforms/blspec-nitrogen6max.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_NITROGEN6MAX
-	tristate
-	prompt "/loader/entries/nitrogen6max.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-nitrogen6x.in b/configs/platform-v7a/platforms/blspec-nitrogen6x.in
deleted file mode 100644
index ec7116f..0000000
--- a/configs/platform-v7a/platforms/blspec-nitrogen6x.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_NITROGEN6X
-	tristate
-	prompt "/loader/entries/nitrogen6x.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-riotboard.in b/configs/platform-v7a/platforms/blspec-riotboard.in
deleted file mode 100644
index 6a38c21..0000000
--- a/configs/platform-v7a/platforms/blspec-riotboard.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_RIOTBOARD
-	tristate
-	prompt "/loader/entries/riotboard.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-rpi2.in b/configs/platform-v7a/platforms/blspec-rpi2.in
deleted file mode 100644
index e5b0952..0000000
--- a/configs/platform-v7a/platforms/blspec-rpi2.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_RPI2
-	tristate
-	prompt "/loader/entries/rpi2.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-rpi3.in b/configs/platform-v7a/platforms/blspec-rpi3.in
deleted file mode 100644
index 21b3d44..0000000
--- a/configs/platform-v7a/platforms/blspec-rpi3.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_RPI3
-	tristate
-	prompt "/loader/entries/rpi3.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-rpicm3.in b/configs/platform-v7a/platforms/blspec-rpicm3.in
deleted file mode 100644
index 430346c..0000000
--- a/configs/platform-v7a/platforms/blspec-rpicm3.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_RPICM3
-	tristate
-	prompt "/loader/entries/rpicm3.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-sabrelite.in b/configs/platform-v7a/platforms/blspec-sabrelite.in
deleted file mode 100644
index ccf1b39..0000000
--- a/configs/platform-v7a/platforms/blspec-sabrelite.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_SABRELITE
-	tristate
-	prompt "/loader/entries/sabrelite.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-sama5d27-giantboard.in b/configs/platform-v7a/platforms/blspec-sama5d27-giantboard.in
deleted file mode 100644
index 9ed66c0..0000000
--- a/configs/platform-v7a/platforms/blspec-sama5d27-giantboard.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_SAMA5D27_GIANTBOARD
-	tristate
-	prompt "/loader/entries/sama5d27-giantboard.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-sama5d27-som1-ek.in b/configs/platform-v7a/platforms/blspec-sama5d27-som1-ek.in
deleted file mode 100644
index 942fc77..0000000
--- a/configs/platform-v7a/platforms/blspec-sama5d27-som1-ek.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_SAMA5D27_SOM1_EK
-	tristate
-	prompt "/loader/entries/sama5d27-som1-ek.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-stm32mp157c-dk2.in b/configs/platform-v7a/platforms/blspec-stm32mp157c-dk2.in
deleted file mode 100644
index fc14295..0000000
--- a/configs/platform-v7a/platforms/blspec-stm32mp157c-dk2.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_STM32MP157C_DK2
-	tristate
-	prompt "/loader/entries/stm32mp157c-dk2.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-stm32mp157c-ev1.in b/configs/platform-v7a/platforms/blspec-stm32mp157c-ev1.in
deleted file mode 100644
index 02f6901..0000000
--- a/configs/platform-v7a/platforms/blspec-stm32mp157c-ev1.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_STM32MP157C_EV1
-	tristate
-	prompt "/loader/entries/stm32mp157c-ev1.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-udoo-neo.in b/configs/platform-v7a/platforms/blspec-udoo-neo.in
deleted file mode 100644
index 727ac27..0000000
--- a/configs/platform-v7a/platforms/blspec-udoo-neo.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_UDOO_NEO
-	tristate
-	prompt "/loader/entries/udoo-neo.conf bootloader spec entry"
diff --git a/configs/platform-v7a/platforms/blspec-vexpress.in b/configs/platform-v7a/platforms/blspec-vexpress.in
deleted file mode 100644
index 5c4f677..0000000
--- a/configs/platform-v7a/platforms/blspec-vexpress.in
+++ /dev/null
@@ -1,5 +0,0 @@
-## SECTION=blspec
-
-config BLSPEC_VEXPRESS
-	tristate
-	prompt "/loader/entries/vexpress.conf bootloader spec entry"
diff --git a/configs/platform-v7a/projectroot/loader/entries/boneblack.conf b/configs/platform-v7a/projectroot/loader/entries/boneblack.conf
deleted file mode 100644
index faa52b5..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/boneblack.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		BeagleBone Black - Pengutronix-DistroKit
-version		4.6
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/am335x-boneblack.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/bonewhite.conf b/configs/platform-v7a/projectroot/loader/entries/bonewhite.conf
deleted file mode 100644
index 3e13459..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/bonewhite.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		BeagleBone White - Pengutronix-DistroKit
-version		4.6
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/am335x-bone.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf b/configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf
deleted file mode 100644
index 5718be4..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/lxa-mc1.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit
-version		5.5
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/stm32mp157c-lxa-mc1.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf b/configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf
deleted file mode 100644
index 083d9b0..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/nitrogen6max.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		Nitrogen6 MAX - Pengutronix-DistroKit
-version		5.3
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/imx6qp-nitrogen6_max.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf b/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
deleted file mode 100644
index b9528a2..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/nitrogen6x.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		Nitrogen6x - Pengutronix-DistroKit
-version		4.12
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/imx6q-nitrogen6x.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/riotboard.conf b/configs/platform-v7a/projectroot/loader/entries/riotboard.conf
deleted file mode 100644
index d4bf87a..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/riotboard.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit
-version		4.11
-options		rootwait
-linux		/boot/zImage
-devicetree	/boot/imx6dl-riotboard.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/rpi2.conf b/configs/platform-v7a/projectroot/loader/entries/rpi2.conf
deleted file mode 100644
index 2cbd457..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/rpi2.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		Raspberry Pi 2 - Pengutronix-DistroKit
-version		4.6
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/bcm2836-rpi-2-b.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/rpi3.conf b/configs/platform-v7a/projectroot/loader/entries/rpi3.conf
deleted file mode 100644
index 0a9ef8c..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/rpi3.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		Raspberry Pi 3 - Pengutronix-DistroKit
-version		4.6
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/bcm2837-rpi-3-b.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/rpicm3.conf b/configs/platform-v7a/projectroot/loader/entries/rpicm3.conf
deleted file mode 100644
index ada8d99..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/rpicm3.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		Raspberry Pi CM3 - Pengutronix-DistroKit
-version		4.6
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/bcm2837-rpi-cm3-io3.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/sabrelite.conf b/configs/platform-v7a/projectroot/loader/entries/sabrelite.conf
deleted file mode 100644
index 4b81e97..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/sabrelite.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit
-version		4.11
-options		rootwait
-linux		/boot/zImage
-devicetree	/boot/imx6q-sabrelite.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/sama5d27-giantboard.conf b/configs/platform-v7a/projectroot/loader/entries/sama5d27-giantboard.conf
deleted file mode 100644
index 636e241..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/sama5d27-giantboard.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit
-version		@VERSION@
-options		rootwait
-linux		/boot/zImage
-devicetree	/boot/at91-sama5d27_giantboard.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/sama5d27-som1-ek.conf b/configs/platform-v7a/projectroot/loader/entries/sama5d27-som1-ek.conf
deleted file mode 100644
index 3cbcf54..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/sama5d27-som1-ek.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit
-version		@VERSION@
-options		rootwait
-linux		/boot/zImage
-devicetree	/boot/at91-sama5d27_som1_ek.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/stm32mp157c-dk2.conf b/configs/platform-v7a/projectroot/loader/entries/stm32mp157c-dk2.conf
deleted file mode 100644
index 1fbba65..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/stm32mp157c-dk2.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit
-version		5.3
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/stm32mp157c-dk2.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/stm32mp157c-ev1.conf b/configs/platform-v7a/projectroot/loader/entries/stm32mp157c-ev1.conf
deleted file mode 100644
index 610e06c..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/stm32mp157c-ev1.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit
-version		5.13
-options		rootwait rw
-linux		/boot/zImage
-devicetree	/boot/stm32mp157c-ev1.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/udoo-neo.conf b/configs/platform-v7a/projectroot/loader/entries/udoo-neo.conf
deleted file mode 100644
index c8fa497..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/udoo-neo.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		Udoo Neo - Pengutronix-DistroKit
-version		4.11
-options		
-linux		/boot/zImage
-devicetree	/boot/imx6sx-udoo-neo-full.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/projectroot/loader/entries/vexpress.conf b/configs/platform-v7a/projectroot/loader/entries/vexpress.conf
deleted file mode 100644
index e2e2877..0000000
--- a/configs/platform-v7a/projectroot/loader/entries/vexpress.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-title		PTXdist - Pengutronix-DistroKit
-version		4.11
-options		rootwait
-linux		/boot/zImage
-devicetree	/boot/vexpress-v2p-ca9.dtb
-linux-appendroot true
diff --git a/configs/platform-v7a/rules/blspec-boneblack.make b/configs/platform-v7a/rules/blspec-boneblack.make
deleted file mode 100644
index 1a09ba9..0000000
--- a/configs/platform-v7a/rules/blspec-boneblack.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2016 by Michael Grzeschik <mgr@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_BONEBLACK) += blspec-boneblack
-
-BLSPEC_BONEBLACK_VERSION	:= 4.6
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-boneblack.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-boneblack)
-	@$(call install_fixup,blspec-boneblack,PRIORITY,optional)
-	@$(call install_fixup,blspec-boneblack,SECTION,base)
-	@$(call install_fixup,blspec-boneblack,AUTHOR,"Michael Grzeschik <mgr@pengutronix.de>")
-	@$(call install_fixup,blspec-boneblack,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-boneblack, 0, 0, 0644, \
-		/loader/entries/boneblack.conf)
-
-	@$(call install_finish,blspec-boneblack)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-bonewhite.make b/configs/platform-v7a/rules/blspec-bonewhite.make
deleted file mode 100644
index 3c4566b..0000000
--- a/configs/platform-v7a/rules/blspec-bonewhite.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2016 by Michael Grzeschik <mgr@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_BONEWHITE) += blspec-bonewhite
-
-BLSPEC_BONEWHITE_VERSION	:= 4.6
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-bonewhite.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-bonewhite)
-	@$(call install_fixup,blspec-bonewhite,PRIORITY,optional)
-	@$(call install_fixup,blspec-bonewhite,SECTION,base)
-	@$(call install_fixup,blspec-bonewhite,AUTHOR,"Michael Grzeschik <mgr@pengutronix.de>")
-	@$(call install_fixup,blspec-bonewhite,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-bonewhite, 0, 0, 0644, \
-		/loader/entries/bonewhite.conf)
-
-	@$(call install_finish,blspec-bonewhite)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-lxa-mc1.make b/configs/platform-v7a/rules/blspec-lxa-mc1.make
deleted file mode 100644
index 62cafb3..0000000
--- a/configs/platform-v7a/rules/blspec-lxa-mc1.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2020 by Ahmad Fatoum <a.fatoum@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_LXA_MC1) += blspec-lxa-mc1
-
-BLSPEC_LXA_MC1_VERSION	:= 5.4
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-lxa-mc1.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-lxa-mc1)
-	@$(call install_fixup,blspec-lxa-mc1,PRIORITY,optional)
-	@$(call install_fixup,blspec-lxa-mc1,SECTION,base)
-	@$(call install_fixup,blspec-lxa-mc1,AUTHOR,"Ahmad Fatoum <a.fatoum@pengutronix.de>")
-	@$(call install_fixup,blspec-lxa-mc1,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-lxa-mc1, 0, 0, 0644, \
-		/loader/entries/lxa-mc1.conf)
-
-	@$(call install_finish,blspec-lxa-mc1)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-nitrogen6max.make b/configs/platform-v7a/rules/blspec-nitrogen6max.make
deleted file mode 100644
index 6fb6466..0000000
--- a/configs/platform-v7a/rules/blspec-nitrogen6max.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2019 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_NITROGEN6MAX) += blspec-nitrogen6max
-
-BLSPEC_NITROGEN6MAX_VERSION	:= 5.3
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-nitrogen6max.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-nitrogen6max)
-	@$(call install_fixup,blspec-nitrogen6max,PRIORITY,optional)
-	@$(call install_fixup,blspec-nitrogen6max,SECTION,base)
-	@$(call install_fixup,blspec-nitrogen6max,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
-	@$(call install_fixup,blspec-nitrogen6max,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-nitrogen6max, 0, 0, 0644, \
-		/loader/entries/nitrogen6max.conf)
-
-	@$(call install_finish,blspec-nitrogen6max)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-nitrogen6x.make b/configs/platform-v7a/rules/blspec-nitrogen6x.make
deleted file mode 100644
index 7ecc7d7..0000000
--- a/configs/platform-v7a/rules/blspec-nitrogen6x.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Roland Hieber <r.hieber@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_NITROGEN6X) += blspec-nitrogen6x
-
-BLSPEC_NITROGEN6X_VERSION	:= 4.12
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-nitrogen6x.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-nitrogen6x)
-	@$(call install_fixup,blspec-nitrogen6x,PRIORITY,optional)
-	@$(call install_fixup,blspec-nitrogen6x,SECTION,base)
-	@$(call install_fixup,blspec-nitrogen6x,AUTHOR,"Roland Hieber <r.hieber@pengutronix.de>")
-	@$(call install_fixup,blspec-nitrogen6x,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-nitrogen6x, 0, 0, 0644, \
-		/loader/entries/nitrogen6x.conf)
-
-	@$(call install_finish,blspec-nitrogen6x)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-riotboard.make b/configs/platform-v7a/rules/blspec-riotboard.make
deleted file mode 100644
index 9a100e7..0000000
--- a/configs/platform-v7a/rules/blspec-riotboard.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Rouven Czerwinski <r.czerwinski@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_RIOTBOARD) += blspec-riotboard
-
-BLSPEC_RIOTBOARD_VERSION	:= 4.11
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-riotboard.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-riotboard)
-	@$(call install_fixup,blspec-riotboard,PRIORITY,optional)
-	@$(call install_fixup,blspec-riotboard,SECTION,base)
-	@$(call install_fixup,blspec-riotboard,AUTHOR,"Rouven Czerwinski <r.czerwinski@pengutronix.de>")
-	@$(call install_fixup,blspec-riotboard,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-riotboard, 0, 0, 0644, \
-		/loader/entries/riotboard.conf)
-
-	@$(call install_finish,blspec-riotboard)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-rpi2.make b/configs/platform-v7a/rules/blspec-rpi2.make
deleted file mode 100644
index f043afd..0000000
--- a/configs/platform-v7a/rules/blspec-rpi2.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2016 by Alexander Aring <aar@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_RPI2) += blspec-rpi2
-
-BLSPEC_RPI2_VERSION	:= 4.6
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-rpi2.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-rpi2)
-	@$(call install_fixup,blspec-rpi2,PRIORITY,optional)
-	@$(call install_fixup,blspec-rpi2,SECTION,base)
-	@$(call install_fixup,blspec-rpi2,AUTHOR,"Alexander Aring <aar@pengutronix.de>")
-	@$(call install_fixup,blspec-rpi2,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-rpi2, 0, 0, 0644, \
-		/loader/entries/rpi2.conf)
-
-	@$(call install_finish,blspec-rpi2)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-rpi3.make b/configs/platform-v7a/rules/blspec-rpi3.make
deleted file mode 100644
index 6614d94..0000000
--- a/configs/platform-v7a/rules/blspec-rpi3.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2018 by Rouven Czerwinski <r.czerwinski@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_RPI3) += blspec-rpi3
-
-BLSPEC_RPI3_VERSION	:= 4.6
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-rpi3.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-rpi3)
-	@$(call install_fixup,blspec-rpi3,PRIORITY,optional)
-	@$(call install_fixup,blspec-rpi3,SECTION,base)
-	@$(call install_fixup,blspec-rpi3,AUTHOR,"Rouven Czerwinski <r.czerwinski@pengutronix.de>")
-	@$(call install_fixup,blspec-rpi3,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-rpi3, 0, 0, 0644, \
-		/loader/entries/rpi3.conf)
-
-	@$(call install_finish,blspec-rpi3)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-rpicm3.make b/configs/platform-v7a/rules/blspec-rpicm3.make
deleted file mode 100644
index 4908a8b..0000000
--- a/configs/platform-v7a/rules/blspec-rpicm3.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2021 by Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_RPICM3) += blspec-rpicm3
-
-BLSPEC_RPICM3_VERSION	:= 4.6
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-rpicm3.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-rpicm3)
-	@$(call install_fixup,blspec-rpicm3,PRIORITY,optional)
-	@$(call install_fixup,blspec-rpicm3,SECTION,base)
-	@$(call install_fixup,blspec-rpicm3,AUTHOR,"Uwe Kleine-König <u.kleine-koenig@pengutronix.de>")
-	@$(call install_fixup,blspec-rpicm3,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-rpicm3, 0, 0, 0644, \
-		/loader/entries/rpicm3.conf)
-
-	@$(call install_finish,blspec-rpicm3)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-sabrelite.make b/configs/platform-v7a/rules/blspec-sabrelite.make
deleted file mode 100644
index 493b4e8..0000000
--- a/configs/platform-v7a/rules/blspec-sabrelite.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_SABRELITE) += blspec-sabrelite
-
-BLSPEC_SABRELITE_VERSION	:= 4.11
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-sabrelite.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-sabrelite)
-	@$(call install_fixup,blspec-sabrelite,PRIORITY,optional)
-	@$(call install_fixup,blspec-sabrelite,SECTION,base)
-	@$(call install_fixup,blspec-sabrelite,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>")
-	@$(call install_fixup,blspec-sabrelite,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-sabrelite, 0, 0, 0644, \
-		/loader/entries/sabrelite.conf)
-
-	@$(call install_finish,blspec-sabrelite)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-sama5d27-giantboard.make b/configs/platform-v7a/rules/blspec-sama5d27-giantboard.make
deleted file mode 100644
index d944d91..0000000
--- a/configs/platform-v7a/rules/blspec-sama5d27-giantboard.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2020 by Ahmad Fatoum <a.fatoum@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_SAMA5D27_GIANTBOARD) += blspec-sama5d27-giantboard
-
-BLSPEC_SAMA5D27_GIANTBOARD_VERSION	:= 5.8
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-sama5d27-giantboard.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-sama5d27-giantboard)
-	@$(call install_fixup,blspec-sama5d27-giantboard,PRIORITY,optional)
-	@$(call install_fixup,blspec-sama5d27-giantboard,SECTION,base)
-	@$(call install_fixup,blspec-sama5d27-giantboard,AUTHOR,"Ahmad Fatoum <afa@pengutronix.de>")
-	@$(call install_fixup,blspec-sama5d27-giantboard,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-sama5d27-giantboard, 0, 0, 0644, \
-		/loader/entries/sama5d27-giantboard.conf)
-
-	@$(call install_finish,blspec-sama5d27-giantboard)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-sama5d27-som1-ek.make b/configs/platform-v7a/rules/blspec-sama5d27-som1-ek.make
deleted file mode 100644
index 1c84bc7..0000000
--- a/configs/platform-v7a/rules/blspec-sama5d27-som1-ek.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2020 by Ahmad Fatoum <a.fatoum@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_SAMA5D27_SOM1_EK) += blspec-sama5d27-som1-ek
-
-BLSPEC_SAMA5D27_SOM1_EK_VERSION	:= 5.8
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-sama5d27-som1-ek.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-sama5d27-som1-ek)
-	@$(call install_fixup,blspec-sama5d27-som1-ek,PRIORITY,optional)
-	@$(call install_fixup,blspec-sama5d27-som1-ek,SECTION,base)
-	@$(call install_fixup,blspec-sama5d27-som1-ek,AUTHOR,"Ahmad Fatoum <afa@pengutronix.de>")
-	@$(call install_fixup,blspec-sama5d27-som1-ek,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-sama5d27-som1-ek, 0, 0, 0644, \
-		/loader/entries/sama5d27-som1-ek.conf)
-
-	@$(call install_finish,blspec-sama5d27-som1-ek)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-stm32mp157c-dk2.make b/configs/platform-v7a/rules/blspec-stm32mp157c-dk2.make
deleted file mode 100644
index e057fa9..0000000
--- a/configs/platform-v7a/rules/blspec-stm32mp157c-dk2.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_STM32MP157C_DK2) += blspec-stm32mp157c-dk2
-
-BLSPEC_STM32MP157C_DK2_VERSION	:= 4.11
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-stm32mp157c-dk2.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-stm32mp157c-dk2)
-	@$(call install_fixup,blspec-stm32mp157c-dk2,PRIORITY,optional)
-	@$(call install_fixup,blspec-stm32mp157c-dk2,SECTION,base)
-	@$(call install_fixup,blspec-stm32mp157c-dk2,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>")
-	@$(call install_fixup,blspec-stm32mp157c-dk2,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-stm32mp157c-dk2, 0, 0, 0644, \
-		/loader/entries/stm32mp157c-dk2.conf)
-
-	@$(call install_finish,blspec-stm32mp157c-dk2)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-stm32mp157c-ev1.make b/configs/platform-v7a/rules/blspec-stm32mp157c-ev1.make
deleted file mode 100644
index 6c3f1ee..0000000
--- a/configs/platform-v7a/rules/blspec-stm32mp157c-ev1.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_STM32MP157C_EV1) += blspec-stm32mp157c-ev1
-
-BLSPEC_STM32MP157C_EV1_VERSION	:= 5.13
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-stm32mp157c-ev1.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-stm32mp157c-ev1)
-	@$(call install_fixup,blspec-stm32mp157c-ev1,PRIORITY,optional)
-	@$(call install_fixup,blspec-stm32mp157c-ev1,SECTION,base)
-	@$(call install_fixup,blspec-stm32mp157c-ev1,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>")
-	@$(call install_fixup,blspec-stm32mp157c-ev1,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-stm32mp157c-ev1, 0, 0, 0644, \
-		/loader/entries/stm32mp157c-ev1.conf)
-
-	@$(call install_finish,blspec-stm32mp157c-ev1)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-udoo-neo.make b/configs/platform-v7a/rules/blspec-udoo-neo.make
deleted file mode 100644
index ffcc8c9..0000000
--- a/configs/platform-v7a/rules/blspec-udoo-neo.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_UDOO_NEO) += blspec-udoo-neo
-
-BLSPEC_UDOO_NEO_VERSION	:= 4.11
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-udoo-neo.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-udoo-neo)
-	@$(call install_fixup,blspec-udoo-neo,PRIORITY,optional)
-	@$(call install_fixup,blspec-udoo-neo,SECTION,base)
-	@$(call install_fixup,blspec-udoo-neo,AUTHOR,"Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>")
-	@$(call install_fixup,blspec-udoo-neo,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-udoo-neo, 0, 0, 0644, \
-		/loader/entries/udoo-neo.conf)
-
-	@$(call install_finish,blspec-udoo-neo)
-
-	@$(call touch)
-
-# vim: syntax=make
diff --git a/configs/platform-v7a/rules/blspec-vexpress.make b/configs/platform-v7a/rules/blspec-vexpress.make
deleted file mode 100644
index 5471a83..0000000
--- a/configs/platform-v7a/rules/blspec-vexpress.make
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2017 by Chris Fiege <c.fiege@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_BLSPEC_VEXPRESS) += blspec-vexpress
-
-BLSPEC_VEXPRESS_VERSION	:= 4.11
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/blspec-vexpress.targetinstall:
-	@$(call targetinfo)
-
-	@$(call install_init, blspec-vexpress)
-	@$(call install_fixup,blspec-vexpress,PRIORITY,optional)
-	@$(call install_fixup,blspec-vexpress,SECTION,base)
-	@$(call install_fixup,blspec-vexpress,AUTHOR,"Chris Fiege <c.fiege@pengutronix.de>")
-	@$(call install_fixup,blspec-vexpress,DESCRIPTION,missing)
-
-	@$(call install_alternative, blspec-vexpress, 0, 0, 0644, \
-		/loader/entries/vexpress.conf)
-
-	@$(call install_finish,blspec-vexpress)
-
-	@$(call touch)
-
-# vim: syntax=make
-- 
2.30.2

Re: [DistroKit] [PATCH 00/14] Mainline TF-A support and blspec-entry cleanups

[Robert Schwebel]

On Fri, Feb 10, 2023 at 08:35:58PM +0100, Marco Felsch wrote:
> the main purpose of this patchset is to use the mainline tf-a for the
> i.mx8m* platforms.

Thanks for the series, I've applied it to next.

rsc
-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |

Re: [DistroKit] [PATCH 10/14] blspec-entry: add linux-appendroot support

[Michael Olbrich]

On Fri, Feb 10, 2023 at 08:36:08PM +0100, Marco Felsch wrote:
> Add the option to add the 'linux-appendroot true' to blspec config file
> which is very useful in case of using barebox as bootlaoder.

You wanted to send a v2 to get this upstream...

Michael

> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> ---
>  platforms/blspec-entry.in               |  8 ++++++++
>  projectroot/loader/entries/default.conf |  1 +
>  rules/blspec-entry.make                 | 10 +++++++++-
>  3 files changed, 18 insertions(+), 1 deletion(-)
> 
> diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
> index aed65d4..c2aea36 100644
> --- a/platforms/blspec-entry.in
> +++ b/platforms/blspec-entry.in
> @@ -16,4 +16,12 @@ config BLSPEC_ENTRY_CMDLINE
>  	string
>  	prompt "kernel command-line"
>  
> +config BLSPEC_ENTRY_APPENDROOT
> +	bool
> +	prompt "Add 'linux-appendroot true'"
> +	help
> +	  If enabled this options adds 'linux-appendroot true' to the blspec
> +	  entry. This is a barebox specific blspec option which tells barebox
> +	  to add the 'root=' kernel command line automatically if set.
> +
>  endif
> diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
> index 5650907..d281569 100644
> --- a/projectroot/loader/entries/default.conf
> +++ b/projectroot/loader/entries/default.conf
> @@ -3,3 +3,4 @@ version		@VERSION@
>  options		@CMDLINE@
>  linux		@KERNEL@
>  @DEVICETREE@
> +@LINUXAPPENDROOT@
> diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
> index f393b1b..7523009 100644
> --- a/rules/blspec-entry.make
> +++ b/rules/blspec-entry.make
> @@ -35,6 +35,12 @@ else
>  BLSPEC_KERNEL_IMAGE	= $(KERNEL_IMAGE)
>  endif
>  
> +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT
> +BLSPEC_APPENDROOT	= linux-appendroot\ttrue
> +else
> +BLSPEC_APPENDROOT	=
> +endif
> +
>  $(STATEDIR)/blspec-entry.targetinstall:
>  	@$(call targetinfo)
>  
> @@ -56,7 +62,9 @@ $(STATEDIR)/blspec-entry.targetinstall:
>  		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
>  			@KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \
>  		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
> -			@DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl))
> +			@DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl) \
> +		$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
> +			@LINUXAPPENDROOT@,'$(BLSPEC_APPENDROOT)')$(ptx/nl))
>  
>  	@$(call install_finish,blspec-entry)
>  
> -- 
> 2.30.2
> 
> 
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [DistroKit] [PATCH 10/14] blspec-entry: add linux-appendroot support

[Marco Felsch]

Hi Michael,

On 23-02-13, Michael Olbrich wrote:
> On Fri, Feb 10, 2023 at 08:36:08PM +0100, Marco Felsch wrote:
> > Add the option to add the 'linux-appendroot true' to blspec config file
> > which is very useful in case of using barebox as bootlaoder.
> 
> You wanted to send a v2 to get this upstream...

https://lore.ptxdist.org/ptxdist/20230210192144.2133757-1-m.felsch@pengutronix.de/T/#u

Regards,
  Marco