开云体育

On 28/03/2024 09:36, Viacheslav wrote:

Builds and run ok.
for related:
Acked-by: Viacheslav Bocharov <adeep@...>

Thanks !

I'll send a v2 with this fix and your ack!

Neil

28/03/2024 10.50, neil.armstrong@... wrote:

Hi,

On 28/03/2024 07:58, Viacheslav wrote:

Hi, Neil!

With this patchset I got wrong fdt link in env with double prefix:

fdtfile=amlogic/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb


but if i remove "amlogic" prefix in config it does not build

--- a/configs/jethub_j80_defconfig
+++ b/configs/jethub_j80_defconfig
-CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s905w-jethome-jethub-j80"
+CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s905w-jethome-jethub-j80"


Error:

make[2]: *** No rule to make target 'dts/upstream/src/arm64/meson-gxl-s905w-jethome-jethub-j80.dtb', needed by 'dtbs'.? Stop.
make[1]: *** [dts/Makefile:54: arch-dtbs] Error 2
make: *** [Makefile:1166: dts/dt.dtb] Error 2

You're right, I forgot to remove the fdtfile prefix, can you retry with:

=====><===========================================
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index efab9a624d..65fa5f3d6d 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -120,6 +120,12 @@

??#include <config_distro_bootcmd.h>

+#ifdef CONFIG_OF_UPSTREAM
+#define FDTFILE_NAME?????????? CONFIG_DEFAULT_DEVICE_TREE ".dtb"
+#else
+#define FDTFILE_NAME?????????? "amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
+#endif
+
??#ifndef CFG_EXTRA_ENV_SETTINGS
??#define CFG_EXTRA_ENV_SETTINGS \
???????? "stdin=" STDIN_CFG "\0" \
@@ -133,7 +139,7 @@
???????? "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \
???????? "fdtoverlay_addr_r=" FDTOVERLAY_ADDR_R "\0" \
???????? "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \
-?????? "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+?????? "fdtfile=" FDTFILE_NAME "\0" \
???????? "dfu_alt_info=fitimage ram " KERNEL_ADDR_R " 0x4000000 \0" \
???????? BOOTENV
??#endif
=====><===========================================

Thanks,
Neil

22/03/2024 12.03, Neil Armstrong:

Hi Viacheslav,

On 19/03/2024 15:42, Neil Armstrong wrote:

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the
DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/
including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory and
drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files
kept in arch/arm/dts directory for these boards.

Keep A1 DTs locally since the architecture is still young.

CI built & tested at:


Signed-off-by: Neil Armstrong <neil.armstrong@...>
---
Neil Armstrong (4):
?????? dts: meson: Switch GXL, GXM & AXG to using upstream DT
?????? dts: meson: Drop redundant GXL, GXM & AXG devicetree files

Could you run a test run on your boards so make sure is still boots fine ?

Thanks,
Neil

?????? dts: meson-g12a: Switch to using upstream DT
?????? dts: meson: Drop redundant G12A, G12B & SM1 devicetree files

? arch/arm/dts/Makefile????????????????????????????? |?? 36 +-
? arch/arm/dts/meson-axg-jethome-jethub-j100.dts???? |? 361 ---
? arch/arm/dts/meson-axg-s400.dts??????????????????? |? 602 -----
? arch/arm/dts/meson-axg.dtsi??????????????????????? | 1957 ---------------
? arch/arm/dts/meson-g12-common.dtsi???????????????? | 2493 --------------------
? arch/arm/dts/meson-g12.dtsi??????????????????????? |? 385 ---
? arch/arm/dts/meson-g12a-radxa-zero.dts???????????? |? 405 ----
? arch/arm/dts/meson-g12a-sei510.dts???????????????? |? 566 -----
? arch/arm/dts/meson-g12a-u200.dts?????????????????? |? 308 ---
? arch/arm/dts/meson-g12a.dtsi?????????????????????? |? 140 --
? arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts???? |?? 33 -
? arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts????? |?? 41 -
? arch/arm/dts/meson-g12b-a311d.dtsi???????????????? |? 149 --
? arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts???? |? 165 --
? arch/arm/dts/meson-g12b-bananapi-cm4.dtsi????????? |? 388 ---
? arch/arm/dts/meson-g12b-bananapi.dtsi????????????? |? 521 ----
? arch/arm/dts/meson-g12b-gsking-x.dts?????????????? |? 133 --
? arch/arm/dts/meson-g12b-gtking-pro.dts???????????? |? 142 --
? arch/arm/dts/meson-g12b-gtking.dts???????????????? |? 163 --
? arch/arm/dts/meson-g12b-khadas-vim3.dtsi?????????? |? 107 -
? arch/arm/dts/meson-g12b-odroid-go-ultra.dts??????? |? 722 ------
? arch/arm/dts/meson-g12b-odroid-n2-plus.dts???????? |?? 31 -
? arch/arm/dts/meson-g12b-odroid-n2.dts????????????? |?? 15 -
? arch/arm/dts/meson-g12b-odroid-n2.dtsi???????????? |? 303 ---
? arch/arm/dts/meson-g12b-odroid-n2l.dts???????????? |? 125 -
? arch/arm/dts/meson-g12b-odroid.dtsi??????????????? |? 445 ----
? arch/arm/dts/meson-g12b-radxa-zero2.dts??????????? |? 489 ----
? arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts???? |?? 14 -
? arch/arm/dts/meson-g12b-s922x.dtsi???????????????? |? 139 --
? arch/arm/dts/meson-g12b-w400.dtsi????????????????? |? 425 ----
? arch/arm/dts/meson-g12b.dtsi?????????????????????? |? 146 --
? arch/arm/dts/meson-gx-libretech-pc.dtsi??????????? |? 447 ----
? arch/arm/dts/meson-gx-mali450.dtsi???????????????? |?? 61 -
? arch/arm/dts/meson-gx-p23x-q20x.dtsi?????????????? |? 324 ---
? arch/arm/dts/meson-gx.dtsi???????????????????????? |? 675 ------
? arch/arm/dts/meson-gxl-mali.dtsi?????????????????? |?? 17 -
? arch/arm/dts/meson-gxl-s805x-libretech-ac.dts????? |? 319 ---
? arch/arm/dts/meson-gxl-s805x.dtsi????????????????? |?? 23 -
? arch/arm/dts/meson-gxl-s905d-libretech-pc.dts????? |?? 16 -
? arch/arm/dts/meson-gxl-s905d.dtsi????????????????? |?? 12 -
? .../arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts |? 247 --
? arch/arm/dts/meson-gxl-s905x-khadas-vim.dts??????? |? 237 --
? arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts?? |? 313 ---
? arch/arm/dts/meson-gxl-s905x-libretech-cc.dts????? |? 356 ---
? arch/arm/dts/meson-gxl-s905x-p212.dts????????????? |? 134 --
? arch/arm/dts/meson-gxl-s905x-p212.dtsi???????????? |? 213 --
? arch/arm/dts/meson-gxl-s905x.dtsi????????????????? |?? 18 -
? arch/arm/dts/meson-gxl.dtsi??????????????????????? |? 940 --------
? arch/arm/dts/meson-gxm-gt1-ultimate.dts??????????? |?? 91 -
? arch/arm/dts/meson-gxm-khadas-vim2.dts???????????? |? 424 ----
? arch/arm/dts/meson-gxm-s912-libretech-pc.dts?????? |?? 62 -
? arch/arm/dts/meson-gxm-wetek-core2.dts???????????? |?? 85 -
? arch/arm/dts/meson-gxm.dtsi??????????????????????? |? 216 --
? arch/arm/dts/meson-khadas-vim3.dtsi??????????????? |? 534 -----
? arch/arm/dts/meson-sm1-bananapi-m2-pro.dts???????? |?? 97 -
? arch/arm/dts/meson-sm1-bananapi-m5.dts???????????? |? 221 --
? arch/arm/dts/meson-sm1-bananapi.dtsi?????????????? |? 435 ----
? arch/arm/dts/meson-sm1-khadas-vim3l.dts??????????? |? 113 -
? arch/arm/dts/meson-sm1-odroid-c4.dts?????????????? |?? 48 -
? arch/arm/dts/meson-sm1-odroid-hc4.dts????????????? |? 140 --
? arch/arm/dts/meson-sm1-odroid.dtsi???????????????? |? 449 ----
? arch/arm/dts/meson-sm1-sei610.dts????????????????? |? 616 -----
? arch/arm/dts/meson-sm1.dtsi??????????????????????? |? 550 -----
? arch/arm/mach-meson/Kconfig??????????????????????? |??? 4 +
? configs/bananapi-cm4-cm4io_defconfig?????????????? |??? 2 +-
? configs/bananapi-m2-pro_defconfig????????????????? |??? 2 +-
? configs/bananapi-m2s_defconfig???????????????????? |??? 2 +-
? configs/bananapi-m5_defconfig????????????????????? |??? 2 +-
? configs/beelink-gsking-x_defconfig???????????????? |??? 2 +-
? configs/beelink-gt1-ultimate_defconfig???????????? |??? 2 +-
? configs/beelink-gtking_defconfig?????????????????? |??? 2 +-
? configs/beelink-gtkingpro_defconfig??????????????? |??? 2 +-
? configs/jethub_j100_defconfig????????????????????? |??? 2 +-
? configs/jethub_j80_defconfig?????????????????????? |??? 2 +-
? configs/khadas-vim2_defconfig????????????????????? |??? 2 +-
? configs/khadas-vim3_android_ab_defconfig?????????? |??? 2 +-
? configs/khadas-vim3_android_defconfig????????????? |??? 2 +-
? configs/khadas-vim3_defconfig????????????????????? |??? 2 +-
? configs/khadas-vim3l_android_ab_defconfig????????? |??? 2 +-
? configs/khadas-vim3l_android_defconfig???????????? |??? 2 +-
? configs/khadas-vim3l_defconfig???????????????????? |??? 2 +-
? configs/khadas-vim_defconfig?????????????????????? |??? 2 +-
? configs/libretech-ac_defconfig???????????????????? |??? 2 +-
? configs/libretech-cc_defconfig???????????????????? |??? 2 +-
? configs/libretech-cc_v2_defconfig????????????????? |??? 2 +-
? configs/libretech-s905d-pc_defconfig?????????????? |??? 2 +-
? configs/libretech-s912-pc_defconfig??????????????? |??? 2 +-
? configs/odroid-c4_defconfig??????????????????????? |??? 2 +-
? configs/odroid-go-ultra_defconfig????????????????? |??? 2 +-
? configs/odroid-hc4_defconfig?????????????????????? |??? 2 +-
? configs/odroid-n2_defconfig??????????????????????? |??? 2 +-
? configs/odroid-n2l_defconfig?????????????????????? |??? 2 +-
? configs/p212_defconfig???????????????????????????? |??? 2 +-
? configs/radxa-zero2_defconfig????????????????????? |??? 2 +-
? configs/radxa-zero_defconfig?????????????????????? |??? 2 +-
? configs/s400_defconfig???????????????????????????? |??? 2 +-
? configs/sei510_defconfig?????????????????????????? |??? 2 +-
? configs/sei610_defconfig?????????????????????????? |??? 2 +-
? configs/u200_defconfig???????????????????????????? |??? 2 +-
? configs/wetek-core2_defconfig????????????????????? |??? 2 +-
? include/dt-bindings/gpio/meson-axg-gpio.h????????? |? 116 -
? include/dt-bindings/gpio/meson-g12a-gpio.h???????? |? 114 -
? include/dt-bindings/gpio/meson-gxbb-gpio.h???????? |? 148 --
? include/dt-bindings/gpio/meson-gxl-gpio.h????????? |? 125 -
? include/dt-bindings/power/meson-axg-power.h??????? |?? 14 -
? include/dt-bindings/power/meson-g12a-power.h?????? |?? 13 -
? include/dt-bindings/power/meson-gxbb-power.h?????? |?? 13 -
? include/dt-bindings/power/meson-sm1-power.h??????? |?? 18 -
? .../reset/amlogic,meson-axg-audio-arb.h??????????? |?? 19 -
? .../dt-bindings/reset/amlogic,meson-axg-reset.h??? |? 123 -
? .../reset/amlogic,meson-g12a-audio-reset.h???????? |?? 53 -
? .../dt-bindings/reset/amlogic,meson-g12a-reset.h?? |? 137 --
? .../dt-bindings/reset/amlogic,meson-gxbb-reset.h?? |? 161 --
? include/dt-bindings/sound/meson-aiu.h????????????? |?? 18 -
? include/dt-bindings/sound/meson-g12a-toacodec.h??? |?? 10 -
? include/dt-bindings/sound/meson-g12a-tohdmitx.h??? |?? 13 -
? 116 files changed, 42 insertions(+), 21511 deletions(-)
---
base-commit: b145877c22b391a4872c875145a8f86f6ffebaba
change-id: 20240319-u-boot-of-upstream-46454fded5ea

Best regards,

--
Best regards,
Viacheslav

Builds and run ok.

for related:
Acked-by: Viacheslav Bocharov <adeep@...>

28/03/2024 10.50, neil.armstrong@... wrote:

Hi,

On jeu., mars 28, 2024 at 09:21, Neil Armstrong <neil.armstrong@...> wrote:

Hi Mattijs,

On 19/03/2024 15:42, Neil Armstrong wrote:

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the
DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/
including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory and
drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files
kept in arch/arm/dts directory for these boards.

Keep A1 DTs locally since the architecture is still young.

CI built & tested at:

Can you check it doesn't break android boot ?

Sorry for the delay. I will test this early next week (Tuesday)

Thank you !

Neil

Signed-off-by: Neil Armstrong <neil.armstrong@...>
---
Neil Armstrong (4):
dts: meson: Switch GXL, GXM & AXG to using upstream DT
dts: meson: Drop redundant GXL, GXM & AXG devicetree files
dts: meson-g12a: Switch to using upstream DT
dts: meson: Drop redundant G12A, G12B & SM1 devicetree files

arch/arm/dts/Makefile | 36 +-
arch/arm/dts/meson-axg-jethome-jethub-j100.dts | 361 ---
arch/arm/dts/meson-axg-s400.dts | 602 -----
arch/arm/dts/meson-axg.dtsi | 1957 ---------------
arch/arm/dts/meson-g12-common.dtsi | 2493 --------------------
arch/arm/dts/meson-g12.dtsi | 385 ---
arch/arm/dts/meson-g12a-radxa-zero.dts | 405 ----
arch/arm/dts/meson-g12a-sei510.dts | 566 -----
arch/arm/dts/meson-g12a-u200.dts | 308 ---
arch/arm/dts/meson-g12a.dtsi | 140 --
arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts | 33 -
arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts | 41 -
arch/arm/dts/meson-g12b-a311d.dtsi | 149 --
arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts | 165 --
arch/arm/dts/meson-g12b-bananapi-cm4.dtsi | 388 ---
arch/arm/dts/meson-g12b-bananapi.dtsi | 521 ----
arch/arm/dts/meson-g12b-gsking-x.dts | 133 --
arch/arm/dts/meson-g12b-gtking-pro.dts | 142 --
arch/arm/dts/meson-g12b-gtking.dts | 163 --
arch/arm/dts/meson-g12b-khadas-vim3.dtsi | 107 -
arch/arm/dts/meson-g12b-odroid-go-ultra.dts | 722 ------
arch/arm/dts/meson-g12b-odroid-n2-plus.dts | 31 -
arch/arm/dts/meson-g12b-odroid-n2.dts | 15 -
arch/arm/dts/meson-g12b-odroid-n2.dtsi | 303 ---
arch/arm/dts/meson-g12b-odroid-n2l.dts | 125 -
arch/arm/dts/meson-g12b-odroid.dtsi | 445 ----
arch/arm/dts/meson-g12b-radxa-zero2.dts | 489 ----
arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts | 14 -
arch/arm/dts/meson-g12b-s922x.dtsi | 139 --
arch/arm/dts/meson-g12b-w400.dtsi | 425 ----
arch/arm/dts/meson-g12b.dtsi | 146 --
arch/arm/dts/meson-gx-libretech-pc.dtsi | 447 ----
arch/arm/dts/meson-gx-mali450.dtsi | 61 -
arch/arm/dts/meson-gx-p23x-q20x.dtsi | 324 ---
arch/arm/dts/meson-gx.dtsi | 675 ------
arch/arm/dts/meson-gxl-mali.dtsi | 17 -
arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 319 ---
arch/arm/dts/meson-gxl-s805x.dtsi | 23 -
arch/arm/dts/meson-gxl-s905d-libretech-pc.dts | 16 -
arch/arm/dts/meson-gxl-s905d.dtsi | 12 -
.../arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts | 247 --
arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 237 --
arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts | 313 ---
arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 356 ---
arch/arm/dts/meson-gxl-s905x-p212.dts | 134 --
arch/arm/dts/meson-gxl-s905x-p212.dtsi | 213 --
arch/arm/dts/meson-gxl-s905x.dtsi | 18 -
arch/arm/dts/meson-gxl.dtsi | 940 --------
arch/arm/dts/meson-gxm-gt1-ultimate.dts | 91 -
arch/arm/dts/meson-gxm-khadas-vim2.dts | 424 ----
arch/arm/dts/meson-gxm-s912-libretech-pc.dts | 62 -
arch/arm/dts/meson-gxm-wetek-core2.dts | 85 -
arch/arm/dts/meson-gxm.dtsi | 216 --
arch/arm/dts/meson-khadas-vim3.dtsi | 534 -----
arch/arm/dts/meson-sm1-bananapi-m2-pro.dts | 97 -
arch/arm/dts/meson-sm1-bananapi-m5.dts | 221 --
arch/arm/dts/meson-sm1-bananapi.dtsi | 435 ----
arch/arm/dts/meson-sm1-khadas-vim3l.dts | 113 -
arch/arm/dts/meson-sm1-odroid-c4.dts | 48 -
arch/arm/dts/meson-sm1-odroid-hc4.dts | 140 --
arch/arm/dts/meson-sm1-odroid.dtsi | 449 ----
arch/arm/dts/meson-sm1-sei610.dts | 616 -----
arch/arm/dts/meson-sm1.dtsi | 550 -----
arch/arm/mach-meson/Kconfig | 4 +
configs/bananapi-cm4-cm4io_defconfig | 2 +-
configs/bananapi-m2-pro_defconfig | 2 +-
configs/bananapi-m2s_defconfig | 2 +-
configs/bananapi-m5_defconfig | 2 +-
configs/beelink-gsking-x_defconfig | 2 +-
configs/beelink-gt1-ultimate_defconfig | 2 +-
configs/beelink-gtking_defconfig | 2 +-
configs/beelink-gtkingpro_defconfig | 2 +-
configs/jethub_j100_defconfig | 2 +-
configs/jethub_j80_defconfig | 2 +-
configs/khadas-vim2_defconfig | 2 +-
configs/khadas-vim3_android_ab_defconfig | 2 +-
configs/khadas-vim3_android_defconfig | 2 +-
configs/khadas-vim3_defconfig | 2 +-
configs/khadas-vim3l_android_ab_defconfig | 2 +-
configs/khadas-vim3l_android_defconfig | 2 +-
configs/khadas-vim3l_defconfig | 2 +-
configs/khadas-vim_defconfig | 2 +-
configs/libretech-ac_defconfig | 2 +-
configs/libretech-cc_defconfig | 2 +-
configs/libretech-cc_v2_defconfig | 2 +-
configs/libretech-s905d-pc_defconfig | 2 +-
configs/libretech-s912-pc_defconfig | 2 +-
configs/odroid-c4_defconfig | 2 +-
configs/odroid-go-ultra_defconfig | 2 +-
configs/odroid-hc4_defconfig | 2 +-
configs/odroid-n2_defconfig | 2 +-
configs/odroid-n2l_defconfig | 2 +-
configs/p212_defconfig | 2 +-
configs/radxa-zero2_defconfig | 2 +-
configs/radxa-zero_defconfig | 2 +-
configs/s400_defconfig | 2 +-
configs/sei510_defconfig | 2 +-
configs/sei610_defconfig | 2 +-
configs/u200_defconfig | 2 +-
configs/wetek-core2_defconfig | 2 +-
include/dt-bindings/gpio/meson-axg-gpio.h | 116 -
include/dt-bindings/gpio/meson-g12a-gpio.h | 114 -
include/dt-bindings/gpio/meson-gxbb-gpio.h | 148 --
include/dt-bindings/gpio/meson-gxl-gpio.h | 125 -
include/dt-bindings/power/meson-axg-power.h | 14 -
include/dt-bindings/power/meson-g12a-power.h | 13 -
include/dt-bindings/power/meson-gxbb-power.h | 13 -
include/dt-bindings/power/meson-sm1-power.h | 18 -
.../reset/amlogic,meson-axg-audio-arb.h | 19 -
.../dt-bindings/reset/amlogic,meson-axg-reset.h | 123 -
.../reset/amlogic,meson-g12a-audio-reset.h | 53 -
.../dt-bindings/reset/amlogic,meson-g12a-reset.h | 137 --
.../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 161 --
include/dt-bindings/sound/meson-aiu.h | 18 -
include/dt-bindings/sound/meson-g12a-toacodec.h | 10 -
include/dt-bindings/sound/meson-g12a-tohdmitx.h | 13 -
116 files changed, 42 insertions(+), 21511 deletions(-)
---
base-commit: b145877c22b391a4872c875145a8f86f6ffebaba
change-id: 20240319-u-boot-of-upstream-46454fded5ea

Best regards,

Hi Mattijs,

On 19/03/2024 15:42, Neil Armstrong wrote:

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the
DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/
including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory and
drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files
kept in arch/arm/dts directory for these boards.
Keep A1 DTs locally since the architecture is still young.
CI built & tested at:

Can you check it doesn't break android boot ?

Neil

Signed-off-by: Neil Armstrong <neil.armstrong@...>
---
Neil Armstrong (4):
dts: meson: Switch GXL, GXM & AXG to using upstream DT
dts: meson: Drop redundant GXL, GXM & AXG devicetree files
dts: meson-g12a: Switch to using upstream DT
dts: meson: Drop redundant G12A, G12B & SM1 devicetree files
arch/arm/dts/Makefile | 36 +-
arch/arm/dts/meson-axg-jethome-jethub-j100.dts | 361 ---
arch/arm/dts/meson-axg-s400.dts | 602 -----
arch/arm/dts/meson-axg.dtsi | 1957 ---------------
arch/arm/dts/meson-g12-common.dtsi | 2493 --------------------
arch/arm/dts/meson-g12.dtsi | 385 ---
arch/arm/dts/meson-g12a-radxa-zero.dts | 405 ----
arch/arm/dts/meson-g12a-sei510.dts | 566 -----
arch/arm/dts/meson-g12a-u200.dts | 308 ---
arch/arm/dts/meson-g12a.dtsi | 140 --
arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts | 33 -
arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts | 41 -
arch/arm/dts/meson-g12b-a311d.dtsi | 149 --
arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts | 165 --
arch/arm/dts/meson-g12b-bananapi-cm4.dtsi | 388 ---
arch/arm/dts/meson-g12b-bananapi.dtsi | 521 ----
arch/arm/dts/meson-g12b-gsking-x.dts | 133 --
arch/arm/dts/meson-g12b-gtking-pro.dts | 142 --
arch/arm/dts/meson-g12b-gtking.dts | 163 --
arch/arm/dts/meson-g12b-khadas-vim3.dtsi | 107 -
arch/arm/dts/meson-g12b-odroid-go-ultra.dts | 722 ------
arch/arm/dts/meson-g12b-odroid-n2-plus.dts | 31 -
arch/arm/dts/meson-g12b-odroid-n2.dts | 15 -
arch/arm/dts/meson-g12b-odroid-n2.dtsi | 303 ---
arch/arm/dts/meson-g12b-odroid-n2l.dts | 125 -
arch/arm/dts/meson-g12b-odroid.dtsi | 445 ----
arch/arm/dts/meson-g12b-radxa-zero2.dts | 489 ----
arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts | 14 -
arch/arm/dts/meson-g12b-s922x.dtsi | 139 --
arch/arm/dts/meson-g12b-w400.dtsi | 425 ----
arch/arm/dts/meson-g12b.dtsi | 146 --
arch/arm/dts/meson-gx-libretech-pc.dtsi | 447 ----
arch/arm/dts/meson-gx-mali450.dtsi | 61 -
arch/arm/dts/meson-gx-p23x-q20x.dtsi | 324 ---
arch/arm/dts/meson-gx.dtsi | 675 ------
arch/arm/dts/meson-gxl-mali.dtsi | 17 -
arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 319 ---
arch/arm/dts/meson-gxl-s805x.dtsi | 23 -
arch/arm/dts/meson-gxl-s905d-libretech-pc.dts | 16 -
arch/arm/dts/meson-gxl-s905d.dtsi | 12 -
.../arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts | 247 --
arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 237 --
arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts | 313 ---
arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 356 ---
arch/arm/dts/meson-gxl-s905x-p212.dts | 134 --
arch/arm/dts/meson-gxl-s905x-p212.dtsi | 213 --
arch/arm/dts/meson-gxl-s905x.dtsi | 18 -
arch/arm/dts/meson-gxl.dtsi | 940 --------
arch/arm/dts/meson-gxm-gt1-ultimate.dts | 91 -
arch/arm/dts/meson-gxm-khadas-vim2.dts | 424 ----
arch/arm/dts/meson-gxm-s912-libretech-pc.dts | 62 -
arch/arm/dts/meson-gxm-wetek-core2.dts | 85 -
arch/arm/dts/meson-gxm.dtsi | 216 --
arch/arm/dts/meson-khadas-vim3.dtsi | 534 -----
arch/arm/dts/meson-sm1-bananapi-m2-pro.dts | 97 -
arch/arm/dts/meson-sm1-bananapi-m5.dts | 221 --
arch/arm/dts/meson-sm1-bananapi.dtsi | 435 ----
arch/arm/dts/meson-sm1-khadas-vim3l.dts | 113 -
arch/arm/dts/meson-sm1-odroid-c4.dts | 48 -
arch/arm/dts/meson-sm1-odroid-hc4.dts | 140 --
arch/arm/dts/meson-sm1-odroid.dtsi | 449 ----
arch/arm/dts/meson-sm1-sei610.dts | 616 -----
arch/arm/dts/meson-sm1.dtsi | 550 -----
arch/arm/mach-meson/Kconfig | 4 +
configs/bananapi-cm4-cm4io_defconfig | 2 +-
configs/bananapi-m2-pro_defconfig | 2 +-
configs/bananapi-m2s_defconfig | 2 +-
configs/bananapi-m5_defconfig | 2 +-
configs/beelink-gsking-x_defconfig | 2 +-
configs/beelink-gt1-ultimate_defconfig | 2 +-
configs/beelink-gtking_defconfig | 2 +-
configs/beelink-gtkingpro_defconfig | 2 +-
configs/jethub_j100_defconfig | 2 +-
configs/jethub_j80_defconfig | 2 +-
configs/khadas-vim2_defconfig | 2 +-
configs/khadas-vim3_android_ab_defconfig | 2 +-
configs/khadas-vim3_android_defconfig | 2 +-
configs/khadas-vim3_defconfig | 2 +-
configs/khadas-vim3l_android_ab_defconfig | 2 +-
configs/khadas-vim3l_android_defconfig | 2 +-
configs/khadas-vim3l_defconfig | 2 +-
configs/khadas-vim_defconfig | 2 +-
configs/libretech-ac_defconfig | 2 +-
configs/libretech-cc_defconfig | 2 +-
configs/libretech-cc_v2_defconfig | 2 +-
configs/libretech-s905d-pc_defconfig | 2 +-
configs/libretech-s912-pc_defconfig | 2 +-
configs/odroid-c4_defconfig | 2 +-
configs/odroid-go-ultra_defconfig | 2 +-
configs/odroid-hc4_defconfig | 2 +-
configs/odroid-n2_defconfig | 2 +-
configs/odroid-n2l_defconfig | 2 +-
configs/p212_defconfig | 2 +-
configs/radxa-zero2_defconfig | 2 +-
configs/radxa-zero_defconfig | 2 +-
configs/s400_defconfig | 2 +-
configs/sei510_defconfig | 2 +-
configs/sei610_defconfig | 2 +-
configs/u200_defconfig | 2 +-
configs/wetek-core2_defconfig | 2 +-
include/dt-bindings/gpio/meson-axg-gpio.h | 116 -
include/dt-bindings/gpio/meson-g12a-gpio.h | 114 -
include/dt-bindings/gpio/meson-gxbb-gpio.h | 148 --
include/dt-bindings/gpio/meson-gxl-gpio.h | 125 -
include/dt-bindings/power/meson-axg-power.h | 14 -
include/dt-bindings/power/meson-g12a-power.h | 13 -
include/dt-bindings/power/meson-gxbb-power.h | 13 -
include/dt-bindings/power/meson-sm1-power.h | 18 -
.../reset/amlogic,meson-axg-audio-arb.h | 19 -
.../dt-bindings/reset/amlogic,meson-axg-reset.h | 123 -
.../reset/amlogic,meson-g12a-audio-reset.h | 53 -
.../dt-bindings/reset/amlogic,meson-g12a-reset.h | 137 --
.../dt-bindings/reset/amlogic,meson-gxbb-reset.h | 161 --
include/dt-bindings/sound/meson-aiu.h | 18 -
include/dt-bindings/sound/meson-g12a-toacodec.h | 10 -
include/dt-bindings/sound/meson-g12a-tohdmitx.h | 13 -
116 files changed, 42 insertions(+), 21511 deletions(-)
---
base-commit: b145877c22b391a4872c875145a8f86f6ffebaba
change-id: 20240319-u-boot-of-upstream-46454fded5ea
Best regards,

Hi,

On 28/03/2024 07:58, Viacheslav wrote:

Hi, Neil!
With this patchset I got wrong fdt link in env with double prefix:
fdtfile=amlogic/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb
but if i remove "amlogic" prefix in config it does not build
--- a/configs/jethub_j80_defconfig
+++ b/configs/jethub_j80_defconfig
-CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s905w-jethome-jethub-j80"
+CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s905w-jethome-jethub-j80"
Error:
make[2]: *** No rule to make target 'dts/upstream/src/arm64/meson-gxl-s905w-jethome-jethub-j80.dtb', needed by 'dtbs'.? Stop.
make[1]: *** [dts/Makefile:54: arch-dtbs] Error 2
make: *** [Makefile:1166: dts/dt.dtb] Error 2

You're right, I forgot to remove the fdtfile prefix, can you retry with:

=====><===========================================
diff --git a/include/configs/meson64.h b/include/configs/meson64.h
index efab9a624d..65fa5f3d6d 100644
--- a/include/configs/meson64.h
+++ b/include/configs/meson64.h
@@ -120,6 +120,12 @@

#include <config_distro_bootcmd.h>

+#ifdef CONFIG_OF_UPSTREAM
+#define FDTFILE_NAME CONFIG_DEFAULT_DEVICE_TREE ".dtb"
+#else
+#define FDTFILE_NAME "amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
+#endif
+
#ifndef CFG_EXTRA_ENV_SETTINGS
#define CFG_EXTRA_ENV_SETTINGS \
"stdin=" STDIN_CFG "\0" \
@@ -133,7 +139,7 @@
"pxefile_addr_r=" PXEFILE_ADDR_R "\0" \
"fdtoverlay_addr_r=" FDTOVERLAY_ADDR_R "\0" \
"ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \
- "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \
+ "fdtfile=" FDTFILE_NAME "\0" \
"dfu_alt_info=fitimage ram " KERNEL_ADDR_R " 0x4000000 \0" \
BOOTENV
#endif
=====><===========================================

Thanks,
Neil

22/03/2024 12.03, Neil Armstrong:

Hi Viacheslav,

On 19/03/2024 15:42, Neil Armstrong wrote:

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the
DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/
including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory and
drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files
kept in arch/arm/dts directory for these boards.

Keep A1 DTs locally since the architecture is still young.

CI built & tested at:


Signed-off-by: Neil Armstrong <neil.armstrong@...>
---
Neil Armstrong (4):
?????? dts: meson: Switch GXL, GXM & AXG to using upstream DT
?????? dts: meson: Drop redundant GXL, GXM & AXG devicetree files

Could you run a test run on your boards so make sure is still boots fine ?

Thanks,
Neil

?????? dts: meson-g12a: Switch to using upstream DT
?????? dts: meson: Drop redundant G12A, G12B & SM1 devicetree files

? arch/arm/dts/Makefile????????????????????????????? |?? 36 +-
? arch/arm/dts/meson-axg-jethome-jethub-j100.dts???? |? 361 ---
? arch/arm/dts/meson-axg-s400.dts??????????????????? |? 602 -----
? arch/arm/dts/meson-axg.dtsi??????????????????????? | 1957 ---------------
? arch/arm/dts/meson-g12-common.dtsi???????????????? | 2493 --------------------
? arch/arm/dts/meson-g12.dtsi??????????????????????? |? 385 ---
? arch/arm/dts/meson-g12a-radxa-zero.dts???????????? |? 405 ----
? arch/arm/dts/meson-g12a-sei510.dts???????????????? |? 566 -----
? arch/arm/dts/meson-g12a-u200.dts?????????????????? |? 308 ---
? arch/arm/dts/meson-g12a.dtsi?????????????????????? |? 140 --
? arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts???? |?? 33 -
? arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts????? |?? 41 -
? arch/arm/dts/meson-g12b-a311d.dtsi???????????????? |? 149 --
? arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts???? |? 165 --
? arch/arm/dts/meson-g12b-bananapi-cm4.dtsi????????? |? 388 ---
? arch/arm/dts/meson-g12b-bananapi.dtsi????????????? |? 521 ----
? arch/arm/dts/meson-g12b-gsking-x.dts?????????????? |? 133 --
? arch/arm/dts/meson-g12b-gtking-pro.dts???????????? |? 142 --
? arch/arm/dts/meson-g12b-gtking.dts???????????????? |? 163 --
? arch/arm/dts/meson-g12b-khadas-vim3.dtsi?????????? |? 107 -
? arch/arm/dts/meson-g12b-odroid-go-ultra.dts??????? |? 722 ------
? arch/arm/dts/meson-g12b-odroid-n2-plus.dts???????? |?? 31 -
? arch/arm/dts/meson-g12b-odroid-n2.dts????????????? |?? 15 -
? arch/arm/dts/meson-g12b-odroid-n2.dtsi???????????? |? 303 ---
? arch/arm/dts/meson-g12b-odroid-n2l.dts???????????? |? 125 -
? arch/arm/dts/meson-g12b-odroid.dtsi??????????????? |? 445 ----
? arch/arm/dts/meson-g12b-radxa-zero2.dts??????????? |? 489 ----
? arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts???? |?? 14 -
? arch/arm/dts/meson-g12b-s922x.dtsi???????????????? |? 139 --
? arch/arm/dts/meson-g12b-w400.dtsi????????????????? |? 425 ----
? arch/arm/dts/meson-g12b.dtsi?????????????????????? |? 146 --
? arch/arm/dts/meson-gx-libretech-pc.dtsi??????????? |? 447 ----
? arch/arm/dts/meson-gx-mali450.dtsi???????????????? |?? 61 -
? arch/arm/dts/meson-gx-p23x-q20x.dtsi?????????????? |? 324 ---
? arch/arm/dts/meson-gx.dtsi???????????????????????? |? 675 ------
? arch/arm/dts/meson-gxl-mali.dtsi?????????????????? |?? 17 -
? arch/arm/dts/meson-gxl-s805x-libretech-ac.dts????? |? 319 ---
? arch/arm/dts/meson-gxl-s805x.dtsi????????????????? |?? 23 -
? arch/arm/dts/meson-gxl-s905d-libretech-pc.dts????? |?? 16 -
? arch/arm/dts/meson-gxl-s905d.dtsi????????????????? |?? 12 -
? .../arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts |? 247 --
? arch/arm/dts/meson-gxl-s905x-khadas-vim.dts??????? |? 237 --
? arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts?? |? 313 ---
? arch/arm/dts/meson-gxl-s905x-libretech-cc.dts????? |? 356 ---
? arch/arm/dts/meson-gxl-s905x-p212.dts????????????? |? 134 --
? arch/arm/dts/meson-gxl-s905x-p212.dtsi???????????? |? 213 --
? arch/arm/dts/meson-gxl-s905x.dtsi????????????????? |?? 18 -
? arch/arm/dts/meson-gxl.dtsi??????????????????????? |? 940 --------
? arch/arm/dts/meson-gxm-gt1-ultimate.dts??????????? |?? 91 -
? arch/arm/dts/meson-gxm-khadas-vim2.dts???????????? |? 424 ----
? arch/arm/dts/meson-gxm-s912-libretech-pc.dts?????? |?? 62 -
? arch/arm/dts/meson-gxm-wetek-core2.dts???????????? |?? 85 -
? arch/arm/dts/meson-gxm.dtsi??????????????????????? |? 216 --
? arch/arm/dts/meson-khadas-vim3.dtsi??????????????? |? 534 -----
? arch/arm/dts/meson-sm1-bananapi-m2-pro.dts???????? |?? 97 -
? arch/arm/dts/meson-sm1-bananapi-m5.dts???????????? |? 221 --
? arch/arm/dts/meson-sm1-bananapi.dtsi?????????????? |? 435 ----
? arch/arm/dts/meson-sm1-khadas-vim3l.dts??????????? |? 113 -
? arch/arm/dts/meson-sm1-odroid-c4.dts?????????????? |?? 48 -
? arch/arm/dts/meson-sm1-odroid-hc4.dts????????????? |? 140 --
? arch/arm/dts/meson-sm1-odroid.dtsi???????????????? |? 449 ----
? arch/arm/dts/meson-sm1-sei610.dts????????????????? |? 616 -----
? arch/arm/dts/meson-sm1.dtsi??????????????????????? |? 550 -----
? arch/arm/mach-meson/Kconfig??????????????????????? |??? 4 +
? configs/bananapi-cm4-cm4io_defconfig?????????????? |??? 2 +-
? configs/bananapi-m2-pro_defconfig????????????????? |??? 2 +-
? configs/bananapi-m2s_defconfig???????????????????? |??? 2 +-
? configs/bananapi-m5_defconfig????????????????????? |??? 2 +-
? configs/beelink-gsking-x_defconfig???????????????? |??? 2 +-
? configs/beelink-gt1-ultimate_defconfig???????????? |??? 2 +-
? configs/beelink-gtking_defconfig?????????????????? |??? 2 +-
? configs/beelink-gtkingpro_defconfig??????????????? |??? 2 +-
? configs/jethub_j100_defconfig????????????????????? |??? 2 +-
? configs/jethub_j80_defconfig?????????????????????? |??? 2 +-
? configs/khadas-vim2_defconfig????????????????????? |??? 2 +-
? configs/khadas-vim3_android_ab_defconfig?????????? |??? 2 +-
? configs/khadas-vim3_android_defconfig????????????? |??? 2 +-
? configs/khadas-vim3_defconfig????????????????????? |??? 2 +-
? configs/khadas-vim3l_android_ab_defconfig????????? |??? 2 +-
? configs/khadas-vim3l_android_defconfig???????????? |??? 2 +-
? configs/khadas-vim3l_defconfig???????????????????? |??? 2 +-
? configs/khadas-vim_defconfig?????????????????????? |??? 2 +-
? configs/libretech-ac_defconfig???????????????????? |??? 2 +-
? configs/libretech-cc_defconfig???????????????????? |??? 2 +-
? configs/libretech-cc_v2_defconfig????????????????? |??? 2 +-
? configs/libretech-s905d-pc_defconfig?????????????? |??? 2 +-
? configs/libretech-s912-pc_defconfig??????????????? |??? 2 +-
? configs/odroid-c4_defconfig??????????????????????? |??? 2 +-
? configs/odroid-go-ultra_defconfig????????????????? |??? 2 +-
? configs/odroid-hc4_defconfig?????????????????????? |??? 2 +-
? configs/odroid-n2_defconfig??????????????????????? |??? 2 +-
? configs/odroid-n2l_defconfig?????????????????????? |??? 2 +-
? configs/p212_defconfig???????????????????????????? |??? 2 +-
? configs/radxa-zero2_defconfig????????????????????? |??? 2 +-
? configs/radxa-zero_defconfig?????????????????????? |??? 2 +-
? configs/s400_defconfig???????????????????????????? |??? 2 +-
? configs/sei510_defconfig?????????????????????????? |??? 2 +-
? configs/sei610_defconfig?????????????????????????? |??? 2 +-
? configs/u200_defconfig???????????????????????????? |??? 2 +-
? configs/wetek-core2_defconfig????????????????????? |??? 2 +-
? include/dt-bindings/gpio/meson-axg-gpio.h????????? |? 116 -
? include/dt-bindings/gpio/meson-g12a-gpio.h???????? |? 114 -
? include/dt-bindings/gpio/meson-gxbb-gpio.h???????? |? 148 --
? include/dt-bindings/gpio/meson-gxl-gpio.h????????? |? 125 -
? include/dt-bindings/power/meson-axg-power.h??????? |?? 14 -
? include/dt-bindings/power/meson-g12a-power.h?????? |?? 13 -
? include/dt-bindings/power/meson-gxbb-power.h?????? |?? 13 -
? include/dt-bindings/power/meson-sm1-power.h??????? |?? 18 -
? .../reset/amlogic,meson-axg-audio-arb.h??????????? |?? 19 -
? .../dt-bindings/reset/amlogic,meson-axg-reset.h??? |? 123 -
? .../reset/amlogic,meson-g12a-audio-reset.h???????? |?? 53 -
? .../dt-bindings/reset/amlogic,meson-g12a-reset.h?? |? 137 --
? .../dt-bindings/reset/amlogic,meson-gxbb-reset.h?? |? 161 --
? include/dt-bindings/sound/meson-aiu.h????????????? |?? 18 -
? include/dt-bindings/sound/meson-g12a-toacodec.h??? |?? 10 -
? include/dt-bindings/sound/meson-g12a-tohdmitx.h??? |?? 13 -
? 116 files changed, 42 insertions(+), 21511 deletions(-)
---
base-commit: b145877c22b391a4872c875145a8f86f6ffebaba
change-id: 20240319-u-boot-of-upstream-46454fded5ea

Best regards,

--
Best regards,
Viacheslav

Hi, Neil!

With this patchset I got wrong fdt link in env with double prefix:

fdtfile=amlogic/amlogic/meson-gxl-s905w-jethome-jethub-j80.dtb


but if i remove "amlogic" prefix in config it does not build

--- a/configs/jethub_j80_defconfig
+++ b/configs/jethub_j80_defconfig
-CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s905w-jethome-jethub-j80"
+CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s905w-jethome-jethub-j80"


Error:

make[2]: *** No rule to make target 'dts/upstream/src/arm64/meson-gxl-s905w-jethome-jethub-j80.dtb', needed by 'dtbs'. Stop.
make[1]: *** [dts/Makefile:54: arch-dtbs] Error 2
make: *** [Makefile:1166: dts/dt.dtb] Error 2



22/03/2024 12.03, Neil Armstrong:

Hi Viacheslav,
On 19/03/2024 15:42, Neil Armstrong wrote:

Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the
DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/
including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory and
drop redundant files from arch/arm/dts directory. Only *-u-boot.dtsi files
kept in arch/arm/dts directory for these boards.

Keep A1 DTs locally since the architecture is still young.

CI built & tested at:


Signed-off-by: Neil Armstrong <neil.armstrong@...>
---
Neil Armstrong (4):
?????? dts: meson: Switch GXL, GXM & AXG to using upstream DT
?????? dts: meson: Drop redundant GXL, GXM & AXG devicetree files

Could you run a test run on your boards so make sure is still boots fine ?
Thanks,
Neil

?????? dts: meson-g12a: Switch to using upstream DT
?????? dts: meson: Drop redundant G12A, G12B & SM1 devicetree files

? arch/arm/dts/Makefile????????????????????????????? |?? 36 +-
? arch/arm/dts/meson-axg-jethome-jethub-j100.dts???? |? 361 ---
? arch/arm/dts/meson-axg-s400.dts??????????????????? |? 602 -----
? arch/arm/dts/meson-axg.dtsi??????????????????????? | 1957 ---------------
? arch/arm/dts/meson-g12-common.dtsi???????????????? | 2493 --------------------
? arch/arm/dts/meson-g12.dtsi??????????????????????? |? 385 ---
? arch/arm/dts/meson-g12a-radxa-zero.dts???????????? |? 405 ----
? arch/arm/dts/meson-g12a-sei510.dts???????????????? |? 566 -----
? arch/arm/dts/meson-g12a-u200.dts?????????????????? |? 308 ---
? arch/arm/dts/meson-g12a.dtsi?????????????????????? |? 140 --
? arch/arm/dts/meson-g12b-a311d-bananapi-m2s.dts???? |?? 33 -
? arch/arm/dts/meson-g12b-a311d-khadas-vim3.dts????? |?? 41 -
? arch/arm/dts/meson-g12b-a311d.dtsi???????????????? |? 149 --
? arch/arm/dts/meson-g12b-bananapi-cm4-cm4io.dts???? |? 165 --
? arch/arm/dts/meson-g12b-bananapi-cm4.dtsi????????? |? 388 ---
? arch/arm/dts/meson-g12b-bananapi.dtsi????????????? |? 521 ----
? arch/arm/dts/meson-g12b-gsking-x.dts?????????????? |? 133 --
? arch/arm/dts/meson-g12b-gtking-pro.dts???????????? |? 142 --
? arch/arm/dts/meson-g12b-gtking.dts???????????????? |? 163 --
? arch/arm/dts/meson-g12b-khadas-vim3.dtsi?????????? |? 107 -
? arch/arm/dts/meson-g12b-odroid-go-ultra.dts??????? |? 722 ------
? arch/arm/dts/meson-g12b-odroid-n2-plus.dts???????? |?? 31 -
? arch/arm/dts/meson-g12b-odroid-n2.dts????????????? |?? 15 -
? arch/arm/dts/meson-g12b-odroid-n2.dtsi???????????? |? 303 ---
? arch/arm/dts/meson-g12b-odroid-n2l.dts???????????? |? 125 -
? arch/arm/dts/meson-g12b-odroid.dtsi??????????????? |? 445 ----
? arch/arm/dts/meson-g12b-radxa-zero2.dts??????????? |? 489 ----
? arch/arm/dts/meson-g12b-s922x-bananapi-m2s.dts???? |?? 14 -
? arch/arm/dts/meson-g12b-s922x.dtsi???????????????? |? 139 --
? arch/arm/dts/meson-g12b-w400.dtsi????????????????? |? 425 ----
? arch/arm/dts/meson-g12b.dtsi?????????????????????? |? 146 --
? arch/arm/dts/meson-gx-libretech-pc.dtsi??????????? |? 447 ----
? arch/arm/dts/meson-gx-mali450.dtsi???????????????? |?? 61 -
? arch/arm/dts/meson-gx-p23x-q20x.dtsi?????????????? |? 324 ---
? arch/arm/dts/meson-gx.dtsi???????????????????????? |? 675 ------
? arch/arm/dts/meson-gxl-mali.dtsi?????????????????? |?? 17 -
? arch/arm/dts/meson-gxl-s805x-libretech-ac.dts????? |? 319 ---
? arch/arm/dts/meson-gxl-s805x.dtsi????????????????? |?? 23 -
? arch/arm/dts/meson-gxl-s905d-libretech-pc.dts????? |?? 16 -
? arch/arm/dts/meson-gxl-s905d.dtsi????????????????? |?? 12 -
? .../arm/dts/meson-gxl-s905w-jethome-jethub-j80.dts |? 247 --
? arch/arm/dts/meson-gxl-s905x-khadas-vim.dts??????? |? 237 --
? arch/arm/dts/meson-gxl-s905x-libretech-cc-v2.dts?? |? 313 ---
? arch/arm/dts/meson-gxl-s905x-libretech-cc.dts????? |? 356 ---
? arch/arm/dts/meson-gxl-s905x-p212.dts????????????? |? 134 --
? arch/arm/dts/meson-gxl-s905x-p212.dtsi???????????? |? 213 --
? arch/arm/dts/meson-gxl-s905x.dtsi????????????????? |?? 18 -
? arch/arm/dts/meson-gxl.dtsi??????????????????????? |? 940 --------
? arch/arm/dts/meson-gxm-gt1-ultimate.dts??????????? |?? 91 -
? arch/arm/dts/meson-gxm-khadas-vim2.dts???????????? |? 424 ----
? arch/arm/dts/meson-gxm-s912-libretech-pc.dts?????? |?? 62 -
? arch/arm/dts/meson-gxm-wetek-core2.dts???????????? |?? 85 -
? arch/arm/dts/meson-gxm.dtsi??????????????????????? |? 216 --
? arch/arm/dts/meson-khadas-vim3.dtsi??????????????? |? 534 -----
? arch/arm/dts/meson-sm1-bananapi-m2-pro.dts???????? |?? 97 -
? arch/arm/dts/meson-sm1-bananapi-m5.dts???????????? |? 221 --
? arch/arm/dts/meson-sm1-bananapi.dtsi?????????????? |? 435 ----
? arch/arm/dts/meson-sm1-khadas-vim3l.dts??????????? |? 113 -
? arch/arm/dts/meson-sm1-odroid-c4.dts?????????????? |?? 48 -
? arch/arm/dts/meson-sm1-odroid-hc4.dts????????????? |? 140 --
? arch/arm/dts/meson-sm1-odroid.dtsi???????????????? |? 449 ----
? arch/arm/dts/meson-sm1-sei610.dts????????????????? |? 616 -----
? arch/arm/dts/meson-sm1.dtsi??????????????????????? |? 550 -----
? arch/arm/mach-meson/Kconfig??????????????????????? |??? 4 +
? configs/bananapi-cm4-cm4io_defconfig?????????????? |??? 2 +-
? configs/bananapi-m2-pro_defconfig????????????????? |??? 2 +-
? configs/bananapi-m2s_defconfig???????????????????? |??? 2 +-
? configs/bananapi-m5_defconfig????????????????????? |??? 2 +-
? configs/beelink-gsking-x_defconfig???????????????? |??? 2 +-
? configs/beelink-gt1-ultimate_defconfig???????????? |??? 2 +-
? configs/beelink-gtking_defconfig?????????????????? |??? 2 +-
? configs/beelink-gtkingpro_defconfig??????????????? |??? 2 +-
? configs/jethub_j100_defconfig????????????????????? |??? 2 +-
? configs/jethub_j80_defconfig?????????????????????? |??? 2 +-
? configs/khadas-vim2_defconfig????????????????????? |??? 2 +-
? configs/khadas-vim3_android_ab_defconfig?????????? |??? 2 +-
? configs/khadas-vim3_android_defconfig????????????? |??? 2 +-
? configs/khadas-vim3_defconfig????????????????????? |??? 2 +-
? configs/khadas-vim3l_android_ab_defconfig????????? |??? 2 +-
? configs/khadas-vim3l_android_defconfig???????????? |??? 2 +-
? configs/khadas-vim3l_defconfig???????????????????? |??? 2 +-
? configs/khadas-vim_defconfig?????????????????????? |??? 2 +-
? configs/libretech-ac_defconfig???????????????????? |??? 2 +-
? configs/libretech-cc_defconfig???????????????????? |??? 2 +-
? configs/libretech-cc_v2_defconfig????????????????? |??? 2 +-
? configs/libretech-s905d-pc_defconfig?????????????? |??? 2 +-
? configs/libretech-s912-pc_defconfig??????????????? |??? 2 +-
? configs/odroid-c4_defconfig??????????????????????? |??? 2 +-
? configs/odroid-go-ultra_defconfig????????????????? |??? 2 +-
? configs/odroid-hc4_defconfig?????????????????????? |??? 2 +-
? configs/odroid-n2_defconfig??????????????????????? |??? 2 +-
? configs/odroid-n2l_defconfig?????????????????????? |??? 2 +-
? configs/p212_defconfig???????????????????????????? |??? 2 +-
? configs/radxa-zero2_defconfig????????????????????? |??? 2 +-
? configs/radxa-zero_defconfig?????????????????????? |??? 2 +-
? configs/s400_defconfig???????????????????????????? |??? 2 +-
? configs/sei510_defconfig?????????????????????????? |??? 2 +-
? configs/sei610_defconfig?????????????????????????? |??? 2 +-
? configs/u200_defconfig???????????????????????????? |??? 2 +-
? configs/wetek-core2_defconfig????????????????????? |??? 2 +-
? include/dt-bindings/gpio/meson-axg-gpio.h????????? |? 116 -
? include/dt-bindings/gpio/meson-g12a-gpio.h???????? |? 114 -
? include/dt-bindings/gpio/meson-gxbb-gpio.h???????? |? 148 --
? include/dt-bindings/gpio/meson-gxl-gpio.h????????? |? 125 -
? include/dt-bindings/power/meson-axg-power.h??????? |?? 14 -
? include/dt-bindings/power/meson-g12a-power.h?????? |?? 13 -
? include/dt-bindings/power/meson-gxbb-power.h?????? |?? 13 -
? include/dt-bindings/power/meson-sm1-power.h??????? |?? 18 -
? .../reset/amlogic,meson-axg-audio-arb.h??????????? |?? 19 -
? .../dt-bindings/reset/amlogic,meson-axg-reset.h??? |? 123 -
? .../reset/amlogic,meson-g12a-audio-reset.h???????? |?? 53 -
? .../dt-bindings/reset/amlogic,meson-g12a-reset.h?? |? 137 --
? .../dt-bindings/reset/amlogic,meson-gxbb-reset.h?? |? 161 --
? include/dt-bindings/sound/meson-aiu.h????????????? |?? 18 -
? include/dt-bindings/sound/meson-g12a-toacodec.h??? |?? 10 -
? include/dt-bindings/sound/meson-g12a-tohdmitx.h??? |?? 13 -
? 116 files changed, 42 insertions(+), 21511 deletions(-)
---
base-commit: b145877c22b391a4872c875145a8f86f6ffebaba
change-id: 20240319-u-boot-of-upstream-46454fded5ea

Best regards,

--
Best regards,
Viacheslav

On 26/03/2024 09:19, Viacheslav Bocharov wrote:

Fix linter errors
Fixes: 2fc5e3c1668cffdb4b894986e98c1ee10f6e9955
Signed-off-by: Viacheslav Bocharov <adeep@...>
---
doc/board/amlogic/jethub-j100.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/board/amlogic/jethub-j100.rst b/doc/board/amlogic/jethub-j100.rst
index 80bed6e919e..cbf1ea76107 100644
--- a/doc/board/amlogic/jethub-j100.rst
+++ b/doc/board/amlogic/jethub-j100.rst
@@ -1,7 +1,7 @@
.. SPDX-License-Identifier: GPL-2.0+
U-Boot for JetHub J100/J110 (A113X)
-==============================
+===================================
JetHome Jethub D1/D1+ () is a home automation controller device
manufactured by JetHome with the following specifications:

Thanks, squashed!

Neil

Fix linter errors

Fixes: 2fc5e3c1668cffdb4b894986e98c1ee10f6e9955

Signed-off-by: Viacheslav Bocharov <adeep@...>
---
doc/board/amlogic/jethub-j100.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/board/amlogic/jethub-j100.rst b/doc/board/amlogic/jethub=
-j100.rst
index 80bed6e919e..cbf1ea76107 100644
--- a/doc/board/amlogic/jethub-j100.rst
+++ b/doc/board/amlogic/jethub-j100.rst
@@ -1,7 +1,7 @@
.. SPDX-License-Identifier: GPL-2.0+
=20
U-Boot for JetHub J100/J110 (A113X)
-=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D
+=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
=20
JetHome Jethub D1/D1+ () is a home automatio=
n controller device
manufactured by JetHome with the following specifications:
--=20
2.43.2

On Mon, Mar 25, 2024 at 10:45:43AM +0100, Neil Armstrong wrote:

Hi Tom,

Please pull this set of last minute fixes

Thanks,
Neil

The following changes since commit bd0aedde3ea3691616c17c720e2d25351308c0a1:

board: toradex: verdin-am62_r5: Increase SPL_STACK_R_MALLOC_SIMPLE_LEN (2024-03-22 11:10:51 -0400)

are available in the Git repository at:

tags/u-boot-amlogic-fixes-20240325

for you to fetch changes up to d54f87f09a36ac20154955297b7c999b368b0443:

board: amlogic: fix buffler overflow in seria, mac & usid read (2024-03-25 09:16:19 +0100)

Applied to u-boot/master, thanks!

--
Tom

Hi Tom,

Please pull this set of last minute fixes

Thanks,
Neil

The following changes since commit bd0aedde3ea3691616c17c720e2d25351308c0a1:

board: toradex: verdin-am62_r5: Increase SPL_STACK_R_MALLOC_SIMPLE_LEN (2024-03-22 11:10:51 -0400)

are available in the Git repository at:

tags/u-boot-amlogic-fixes-20240325

for you to fetch changes up to d54f87f09a36ac20154955297b7c999b368b0443:

board: amlogic: fix buffler overflow in seria, mac & usid read (2024-03-25 09:16:19 +0100)

----------------------------------------------------------------
- fix Ethernet and random MAC's on WeTek Hub/Play2
- fix buffer overflow in serial, mac & usid read

----------------------------------------------------------------
Christian Hewitt (2):
ARM: dts: fix Ethernet on WeTek Hub/Play2
board: amlogic: add meson_generate_serial_ethaddr fallback to p200

Neil Armstrong (1):
board: amlogic: fix buffler overflow in seria, mac & usid read

...b-wetek-u-boot.dtsi => meson-gxbb-wetek-hub-u-boot.dtsi} | 0
arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi | 13 +++++++++++++
board/amlogic/beelink-s922x/beelink-s922x.c | 3 ++-
board/amlogic/jethub-j100/jethub-j100.c | 3 ++-
board/amlogic/jethub-j80/jethub-j80.c | 9 ++++++---
board/amlogic/odroid-n2/odroid-n2.c | 3 ++-
board/amlogic/p200/p200.c | 8 ++++++--
board/amlogic/p201/p201.c | 6 ++++--
board/amlogic/p212/p212.c | 6 ++++--
board/amlogic/q200/q200.c | 6 ++++--
board/amlogic/vim3/vim3.c | 3 ++-
11 files changed, 45 insertions(+), 15 deletions(-)
rename arch/arm/dts/{meson-gxbb-wetek-u-boot.dtsi => meson-gxbb-wetek-hub-u-boot.dtsi} (100%)
create mode 100644 arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi

On 27/02/2024 07:54, Viacheslav Bocharov wrote:

Improove documentation, add new revision.
Signed-off-by: Viacheslav Bocharov <adeep@...>
---
doc/board/amlogic/jethub-j100.rst | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/doc/board/amlogic/jethub-j100.rst b/doc/board/amlogic/jethub-j100.rst
index 86acdafa06f..80bed6e919e 100644
--- a/doc/board/amlogic/jethub-j100.rst
+++ b/doc/board/amlogic/jethub-j100.rst
@@ -1,9 +1,9 @@
.. SPDX-License-Identifier: GPL-2.0+
-U-Boot for JetHub J100 (A113X)
+U-Boot for JetHub J100/J110 (A113X)
==============================

I have a CI failure:
/builds/u-boot/custodians/u-boot-amlogic/doc/board/amlogic/jethub-j100.rst:4:Title underline too short.
U-Boot for JetHub J100/J110 (A113X)

Could you check and send a follow-up patch I can squash on top?

Thanks,
Neil

Hi,

On Wed, 20 Mar 2024 09:46:11 +0100, Neil Armstrong wrote:

While meson_sm_read_efuse() doesn't overflow, the string is not
zero terminated and env_set*() will buffer overflow and add random
characters to environment.

Thanks, Applied to (u-boot-amlogic)

[1/1] board: amlogic: fix buffler overflow in seria, mac & usid read


--
Neil

Hi,

On Sun, 24 Mar 2024 15:19:03 +0000, Christian Hewitt wrote:

In submitting the original patches for WeTek Hub/Play2 I appear to have
squashed an experimental change to place the u-boot.dtsi file on the common
board dtsi, but this was incorrect and results in broken Ethernet. Patch 1
creates per-board u-boot.dtsi files to fix that. However, while the NIC is
now probed correctly the current p200.c board file doesn't find the MAC in
efuse and we get random MAC addresses. Patch 2 adds a fallback method for
generating a MAC from the CPU serial.

[...]

Thanks, Applied to (u-boot-amlogic)

[1/2] ARM: dts: fix Ethernet on WeTek Hub/Play2

[2/2] board: amlogic: add meson_generate_serial_ethaddr fallback to p200


--
Neil

Hi,

On Tue, 27 Feb 2024 09:54:03 +0300, Viacheslav Bocharov wrote:

Update JetHub D1/D1+ board support files.

Viacheslav Bocharov (3):
board: amlogic: jethubj100: fix common config header
board: amlogic: jethubj100: update MAINTAINERS
board: amlogic: jethubj100: update docs

[...]

Thanks, Applied to (u-boot-amlogic-next)

[1/3] board: amlogic: jethubj100: fix common config header

[2/3] board: amlogic: jethubj100: update MAINTAINERS

[3/3] board: amlogic: jethubj100: update docs


--
Neil

Add a fall-back method to generate ethaddr from CPU serial on p200 boards
if the MAC cannot be read from efuse. This prevents random MAC addresses
on the WeTek Hub/Play2 boards.

Signed-off-by: Christian Hewitt <christianshewitt@...>
---
board/amlogic/p200/p200.c | 2 ++
1 file changed, 2 insertions(+)

diff --git a/board/amlogic/p200/p200.c b/board/amlogic/p200/p200.c
index 7c432f9d281..3061f7a6b3c 100644
--- a/board/amlogic/p200/p200.c
+++ b/board/amlogic/p200/p200.c
@@ -30,6 +30,8 @@ int misc_init_r(void)
mac_addr, EFUSE_MAC_SIZE);
if (len == EFUSE_MAC_SIZE && is_valid_ethaddr(mac_addr))
eth_env_set_enetaddr("ethaddr", mac_addr);
+ else
+ meson_generate_serial_ethaddr();
}

if (!env_get("serial#")) {
--
2.34.1

Placing the snps,reset content needed for Ethernet to probe in a common
uboot.dtsi results in the content not being used and broken Ethernet. Fix
this by creating two board specific dtsi files with the right content.

Fixes: 67d5128df950 ("ARM: dts: add support for WeTek Hub and WeTek Play2")
Signed-off-by: Christian Hewitt <christianshewitt@...>
---
...u-boot.dtsi => meson-gxbb-wetek-hub-u-boot.dtsi} | 0
arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi | 13 +++++++++++++
2 files changed, 13 insertions(+)
rename arch/arm/dts/{meson-gxbb-wetek-u-boot.dtsi => meson-gxbb-wetek-hub-u-boot.dtsi} (100%)
create mode 100644 arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi

diff --git a/arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi b/arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi
similarity index 100%
rename from arch/arm/dts/meson-gxbb-wetek-u-boot.dtsi
rename to arch/arm/dts/meson-gxbb-wetek-hub-u-boot.dtsi
diff --git a/arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi
new file mode 100644
index 00000000000..3743053eb9c
--- /dev/null
+++ b/arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2019 BayLibre, SAS.
+ * Author: Neil Armstrong <narmstrong@...>
+ */
+
+#include "meson-gx-u-boot.dtsi"
+
+&ethmac {
+ snps,reset-gpio = <&gpio GPIOZ_14 0>;
+ snps,reset-delays-us = <0 10000 1000000>;
+ snps,reset-active-low;
+};
--
2.34.1

In submitting the original patches for WeTek Hub/Play2 I appear to have
squashed an experimental change to place the u-boot.dtsi file on the common
board dtsi, but this was incorrect and results in broken Ethernet. Patch 1
creates per-board u-boot.dtsi files to fix that. However, while the NIC is
now probed correctly the current p200.c board file doesn't find the MAC in
efuse and we get random MAC addresses. Patch 2 adds a fallback method for
generating a MAC from the CPU serial.

Changes from v1:
- Simplified p200.c changes
- Drop patch 3

Christian Hewitt (2):
ARM: dts: fix Ethernet on WeTek Hub/Play2
board: amlogic: add meson_generate_serial_ethaddr fallback to p200

...u-boot.dtsi => meson-gxbb-wetek-hub-u-boot.dtsi} | 0
arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi | 13 +++++++++++++
board/amlogic/p200/p200.c | 2 ++
3 files changed, 15 insertions(+)
rename arch/arm/dts/{meson-gxbb-wetek-u-boot.dtsi => meson-gxbb-wetek-hub-u-boot.dtsi} (100%)
create mode 100644 arch/arm/dts/meson-gxbb-wetek-play2-u-boot.dtsi

--
2.34.1

On 3/21/24 22:04, Caleb Connolly wrote:

This adjusts OF_UPSTREAM to behave more like the kernel by allowing for
all the devicetree files for a given vendor to be compiled. This is
useful for Qualcomm in particular as most boards are supported by a
single U-Boot build just provided with a different DT.
Signed-off-by: Caleb Connolly <caleb.connolly@...>
---
dts/Kconfig | 24 ++++++++++++++++++++++++
scripts/Makefile.dts | 13 +++++++++++++
2 files changed, 37 insertions(+)
diff --git a/dts/Kconfig b/dts/Kconfig
index b9b6367154ef..6883a000a052 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -100,8 +100,32 @@ config OF_UPSTREAM
However, newer boards whose devicetree source files haven't landed in
the dts/upstream subtree, they can override this option to have the
DT build from existing U-Boot tree location instead.
+config OF_UPSTREAM_BUILD_VENDOR
+ bool "Build all devicetree files for a particular vendor"
+ depends on OF_UPSTREAM
+ help
+ Enable building all devicetree files for a particular vendor. This
+ is useful for generic U-Boot configurations where many boards can
+ be supported with a single binary.
+
+ This is only available for platforms using upstream devicetree.
+
+config OF_UPSTREAM_VENDOR
+ string "Vendor to build all upstream devicetree files for"
+ depends on OF_UPSTREAM_BUILD_VENDOR
+ default "qcom" if ARCH_SNAPDRAGON
+ default "rockchip" if ARCH_ROCKCHIP
+ default "amlogic" if ARCH_MESON
+ default "allwinner" if ARCH_SUNXI
+ default "mediatek" if ARCH_MEDIATEK
+ default "marvell" if ARCH_MVEBU || ARCH_KIRKWOOD
+ default "xilinx" if ARCH_VERSAL || ARCH_ZYNQ

This is not enough it should be

ARCH_ZYNQ || ARCH_ZYNQMP || ARCH_VERSAL || ARCH_VERSAL_NET

Thanks,
Michal

On 3/21/24 22:03, Caleb Connolly wrote:

Drop in favour of dts/upstream
Signed-off-by: Caleb Connolly <caleb.connolly@...>
---
include/dt-bindings/clock/xlnx-versal-clk.h | 123 -----------------------
include/dt-bindings/clock/xlnx-zynqmp-clk.h | 126 ------------------------
include/dt-bindings/dma/xlnx-zynqmp-dpdma.h | 16 ---
include/dt-bindings/pinctrl/pinctrl-zynqmp.h | 19 ----
include/dt-bindings/power/xlnx-zynqmp-power.h | 50 ----------
include/dt-bindings/reset/xlnx-versal-resets.h | 105 --------------------
include/dt-bindings/reset/xlnx-zynqmp-resets.h | 130 -------------------------
7 files changed, 569 deletions(-)
diff --git a/include/dt-bindings/clock/xlnx-versal-clk.h b/include/dt-bindings/clock/xlnx-versal-clk.h
deleted file mode 100644
index 264d634d226e..000000000000
--- a/include/dt-bindings/clock/xlnx-versal-clk.h
+++ /dev/null
@@ -1,123 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (C) 2019 Xilinx Inc.
- *
- */
-
-#ifndef _DT_BINDINGS_CLK_VERSAL_H
-#define _DT_BINDINGS_CLK_VERSAL_H
-
-#define PMC_PLL 1
-#define APU_PLL 2
-#define RPU_PLL 3
-#define CPM_PLL 4
-#define NOC_PLL 5
-#define PLL_MAX 6
-#define PMC_PRESRC 7
-#define PMC_POSTCLK 8
-#define PMC_PLL_OUT 9
-#define PPLL 10
-#define NOC_PRESRC 11
-#define NOC_POSTCLK 12
-#define NOC_PLL_OUT 13
-#define NPLL 14
-#define APU_PRESRC 15
-#define APU_POSTCLK 16
-#define APU_PLL_OUT 17
-#define APLL 18
-#define RPU_PRESRC 19
-#define RPU_POSTCLK 20
-#define RPU_PLL_OUT 21
-#define RPLL 22
-#define CPM_PRESRC 23
-#define CPM_POSTCLK 24
-#define CPM_PLL_OUT 25
-#define CPLL 26
-#define PPLL_TO_XPD 27
-#define NPLL_TO_XPD 28
-#define APLL_TO_XPD 29
-#define RPLL_TO_XPD 30
-#define EFUSE_REF 31
-#define SYSMON_REF 32
-#define IRO_SUSPEND_REF 33
-#define USB_SUSPEND 34
-#define SWITCH_TIMEOUT 35
-#define RCLK_PMC 36
-#define RCLK_LPD 37
-#define WDT 38
-#define TTC0 39
-#define TTC1 40
-#define TTC2 41
-#define TTC3 42
-#define GEM_TSU 43
-#define GEM_TSU_LB 44
-#define MUXED_IRO_DIV2 45
-#define MUXED_IRO_DIV4 46
-#define PSM_REF 47
-#define GEM0_RX 48
-#define GEM0_TX 49
-#define GEM1_RX 50
-#define GEM1_TX 51
-#define CPM_CORE_REF 52
-#define CPM_LSBUS_REF 53
-#define CPM_DBG_REF 54
-#define CPM_AUX0_REF 55
-#define CPM_AUX1_REF 56
-#define QSPI_REF 57
-#define OSPI_REF 58
-#define SDIO0_REF 59
-#define SDIO1_REF 60
-#define PMC_LSBUS_REF 61
-#define I2C_REF 62
-#define TEST_PATTERN_REF 63
-#define DFT_OSC_REF 64
-#define PMC_PL0_REF 65
-#define PMC_PL1_REF 66
-#define PMC_PL2_REF 67
-#define PMC_PL3_REF 68
-#define CFU_REF 69
-#define SPARE_REF 70
-#define NPI_REF 71
-#define HSM0_REF 72
-#define HSM1_REF 73
-#define SD_DLL_REF 74
-#define FPD_TOP_SWITCH 75
-#define FPD_LSBUS 76
-#define ACPU 77
-#define DBG_TRACE 78
-#define DBG_FPD 79
-#define LPD_TOP_SWITCH 80
-#define ADMA 81
-#define LPD_LSBUS 82
-#define CPU_R5 83
-#define CPU_R5_CORE 84
-#define CPU_R5_OCM 85
-#define CPU_R5_OCM2 86
-#define IOU_SWITCH 87
-#define GEM0_REF 88
-#define GEM1_REF 89
-#define GEM_TSU_REF 90
-#define USB0_BUS_REF 91
-#define UART0_REF 92
-#define UART1_REF 93
-#define SPI0_REF 94
-#define SPI1_REF 95
-#define CAN0_REF 96
-#define CAN1_REF 97
-#define I2C0_REF 98
-#define I2C1_REF 99
-#define DBG_LPD 100
-#define TIMESTAMP_REF 101
-#define DBG_TSTMP 102
-#define CPM_TOPSW_REF 103
-#define USB3_DUAL_REF 104
-#define OUTCLK_MAX 105
-#define REF_CLK 106
-#define PL_ALT_REF_CLK 107
-#define MUXED_IRO 108
-#define PL_EXT 109
-#define PL_LB 110
-#define MIO_50_OR_51 111
-#define MIO_24_OR_25 112
-
-#endif
diff --git a/include/dt-bindings/clock/xlnx-zynqmp-clk.h b/include/dt-bindings/clock/xlnx-zynqmp-clk.h
deleted file mode 100644
index cdc4c0b9a374..000000000000
--- a/include/dt-bindings/clock/xlnx-zynqmp-clk.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Xilinx Zynq MPSoC Firmware layer
- *
- * Copyright (C) 2014-2018 Xilinx, Inc.
- *
- */
-
-#ifndef _DT_BINDINGS_CLK_ZYNQMP_H
-#define _DT_BINDINGS_CLK_ZYNQMP_H
-
-#define IOPLL 0
-#define RPLL 1
-#define APLL 2
-#define DPLL 3
-#define VPLL 4
-#define IOPLL_TO_FPD 5
-#define RPLL_TO_FPD 6
-#define APLL_TO_LPD 7
-#define DPLL_TO_LPD 8
-#define VPLL_TO_LPD 9
-#define ACPU 10
-#define ACPU_HALF 11
-#define DBF_FPD 12
-#define DBF_LPD 13
-#define DBG_TRACE 14
-#define DBG_TSTMP 15
-#define DP_VIDEO_REF 16
-#define DP_AUDIO_REF 17
-#define DP_STC_REF 18
-#define GDMA_REF 19
-#define DPDMA_REF 20
-#define DDR_REF 21
-#define SATA_REF 22
-#define PCIE_REF 23
-#define GPU_REF 24
-#define GPU_PP0_REF 25
-#define GPU_PP1_REF 26
-#define TOPSW_MAIN 27
-#define TOPSW_LSBUS 28
-#define GTGREF0_REF 29
-#define LPD_SWITCH 30
-#define LPD_LSBUS 31
-#define USB0_BUS_REF 32
-#define USB1_BUS_REF 33
-#define USB3_DUAL_REF 34
-#define USB0 35
-#define USB1 36
-#define CPU_R5 37
-#define CPU_R5_CORE 38
-#define CSU_SPB 39
-#define CSU_PLL 40
-#define PCAP 41
-#define IOU_SWITCH 42
-#define GEM_TSU_REF 43
-#define GEM_TSU 44
-#define GEM0_TX 45
-#define GEM1_TX 46
-#define GEM2_TX 47
-#define GEM3_TX 48
-#define GEM0_RX 49
-#define GEM1_RX 50
-#define GEM2_RX 51
-#define GEM3_RX 52
-#define QSPI_REF 53
-#define SDIO0_REF 54
-#define SDIO1_REF 55
-#define UART0_REF 56
-#define UART1_REF 57
-#define SPI0_REF 58
-#define SPI1_REF 59
-#define NAND_REF 60
-#define I2C0_REF 61
-#define I2C1_REF 62
-#define CAN0_REF 63
-#define CAN1_REF 64
-#define CAN0 65
-#define CAN1 66
-#define DLL_REF 67
-#define ADMA_REF 68
-#define TIMESTAMP_REF 69
-#define AMS_REF 70
-#define PL0_REF 71
-#define PL1_REF 72
-#define PL2_REF 73
-#define PL3_REF 74
-#define WDT 75
-#define IOPLL_INT 76
-#define IOPLL_PRE_SRC 77
-#define IOPLL_HALF 78
-#define IOPLL_INT_MUX 79
-#define IOPLL_POST_SRC 80
-#define RPLL_INT 81
-#define RPLL_PRE_SRC 82
-#define RPLL_HALF 83
-#define RPLL_INT_MUX 84
-#define RPLL_POST_SRC 85
-#define APLL_INT 86
-#define APLL_PRE_SRC 87
-#define APLL_HALF 88
-#define APLL_INT_MUX 89
-#define APLL_POST_SRC 90
-#define DPLL_INT 91
-#define DPLL_PRE_SRC 92
-#define DPLL_HALF 93
-#define DPLL_INT_MUX 94
-#define DPLL_POST_SRC 95
-#define VPLL_INT 96
-#define VPLL_PRE_SRC 97
-#define VPLL_HALF 98
-#define VPLL_INT_MUX 99
-#define VPLL_POST_SRC 100
-#define CAN0_MIO 101
-#define CAN1_MIO 102
-#define ACPU_FULL 103
-#define GEM0_REF 104
-#define GEM1_REF 105
-#define GEM2_REF 106
-#define GEM3_REF 107
-#define GEM0_REF_UNG 108
-#define GEM1_REF_UNG 109
-#define GEM2_REF_UNG 110
-#define GEM3_REF_UNG 111
-#define LPD_WDT 112
-
-#endif
diff --git a/include/dt-bindings/dma/xlnx-zynqmp-dpdma.h b/include/dt-bindings/dma/xlnx-zynqmp-dpdma.h
deleted file mode 100644
index 3719cda5679d..000000000000
--- a/include/dt-bindings/dma/xlnx-zynqmp-dpdma.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */
-/*
- * Copyright 2019 Laurent Pinchart <laurent.pinchart@...>
- */
-
-#ifndef __DT_BINDINGS_DMA_XLNX_ZYNQMP_DPDMA_H__
-#define __DT_BINDINGS_DMA_XLNX_ZYNQMP_DPDMA_H__
-
-#define ZYNQMP_DPDMA_VIDEO0 0
-#define ZYNQMP_DPDMA_VIDEO1 1
-#define ZYNQMP_DPDMA_VIDEO2 2
-#define ZYNQMP_DPDMA_GRAPHICS 3
-#define ZYNQMP_DPDMA_AUDIO0 4
-#define ZYNQMP_DPDMA_AUDIO1 5
-
-#endif /* __DT_BINDINGS_DMA_XLNX_ZYNQMP_DPDMA_H__ */
diff --git a/include/dt-bindings/pinctrl/pinctrl-zynqmp.h b/include/dt-bindings/pinctrl/pinctrl-zynqmp.h
deleted file mode 100644
index cdb215734bdf..000000000000
--- a/include/dt-bindings/pinctrl/pinctrl-zynqmp.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * MIO pin configuration defines for Xilinx ZynqMP
- *
- * Copyright (C) 2020 Xilinx, Inc.
- */
-
-#ifndef _DT_BINDINGS_PINCTRL_ZYNQMP_H
-#define _DT_BINDINGS_PINCTRL_ZYNQMP_H
-
-/* Bit value for different voltage levels */
-#define IO_STANDARD_LVCMOS33 0
-#define IO_STANDARD_LVCMOS18 1
-
-/* Bit values for Slew Rates */
-#define SLEW_RATE_FAST 0
-#define SLEW_RATE_SLOW 1
-
-#endif /* _DT_BINDINGS_PINCTRL_ZYNQMP_H */
diff --git a/include/dt-bindings/power/xlnx-zynqmp-power.h b/include/dt-bindings/power/xlnx-zynqmp-power.h
deleted file mode 100644
index e7eb0960480a..000000000000
--- a/include/dt-bindings/power/xlnx-zynqmp-power.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (C) 2018 Xilinx, Inc.
- */
-
-#ifndef _DT_BINDINGS_ZYNQMP_POWER_H
-#define _DT_BINDINGS_ZYNQMP_POWER_H
-
-#define PD_RPU_0 6
-#define PD_RPU_1 7
-#define PD_OCM_BANK_0 11
-#define PD_OCM_BANK_1 12
-#define PD_OCM_BANK_2 13
-#define PD_OCM_BANK_3 14
-#define PD_TCM_BANK_0 15
-#define PD_TCM_BANK_1 16
-#define PD_TCM_BANK_2 17
-#define PD_TCM_BANK_3 18
-#define PD_USB_0 22
-#define PD_USB_1 23
-#define PD_TTC_0 24
-#define PD_TTC_1 25
-#define PD_TTC_2 26
-#define PD_TTC_3 27
-#define PD_SATA 28
-#define PD_ETH_0 29
-#define PD_ETH_1 30
-#define PD_ETH_2 31
-#define PD_ETH_3 32
-#define PD_UART_0 33
-#define PD_UART_1 34
-#define PD_SPI_0 35
-#define PD_SPI_1 36
-#define PD_I2C_0 37
-#define PD_I2C_1 38
-#define PD_SD_0 39
-#define PD_SD_1 40
-#define PD_DP 41
-#define PD_GDMA 42
-#define PD_ADMA 43
-#define PD_NAND 44
-#define PD_QSPI 45
-#define PD_GPIO 46
-#define PD_CAN_0 47
-#define PD_CAN_1 48
-#define PD_GPU 58
-#define PD_PCIE 59
-#define PD_PL 69
-
-#endif
diff --git a/include/dt-bindings/reset/xlnx-versal-resets.h b/include/dt-bindings/reset/xlnx-versal-resets.h
deleted file mode 100644
index 895424e9b0e5..000000000000
--- a/include/dt-bindings/reset/xlnx-versal-resets.h
+++ /dev/null
@@ -1,105 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (C) 2020 Xilinx, Inc.
- */
-
-#ifndef _DT_BINDINGS_VERSAL_RESETS_H
-#define _DT_BINDINGS_VERSAL_RESETS_H
-
-#define VERSAL_RST_PMC_POR (0xc30c001U)
-#define VERSAL_RST_PMC (0xc410002U)
-#define VERSAL_RST_PS_POR (0xc30c003U)
-#define VERSAL_RST_PL_POR (0xc30c004U)
-#define VERSAL_RST_NOC_POR (0xc30c005U)
-#define VERSAL_RST_FPD_POR (0xc30c006U)
-#define VERSAL_RST_ACPU_0_POR (0xc30c007U)
-#define VERSAL_RST_ACPU_1_POR (0xc30c008U)
-#define VERSAL_RST_OCM2_POR (0xc30c009U)
-#define VERSAL_RST_PS_SRST (0xc41000aU)
-#define VERSAL_RST_PL_SRST (0xc41000bU)
-#define VERSAL_RST_NOC (0xc41000cU)
-#define VERSAL_RST_NPI (0xc41000dU)
-#define VERSAL_RST_SYS_RST_1 (0xc41000eU)
-#define VERSAL_RST_SYS_RST_2 (0xc41000fU)
-#define VERSAL_RST_SYS_RST_3 (0xc410010U)
-#define VERSAL_RST_FPD (0xc410011U)
-#define VERSAL_RST_PL0 (0xc410012U)
-#define VERSAL_RST_PL1 (0xc410013U)
-#define VERSAL_RST_PL2 (0xc410014U)
-#define VERSAL_RST_PL3 (0xc410015U)
-#define VERSAL_RST_APU (0xc410016U)
-#define VERSAL_RST_ACPU_0 (0xc410017U)
-#define VERSAL_RST_ACPU_1 (0xc410018U)
-#define VERSAL_RST_ACPU_L2 (0xc410019U)
-#define VERSAL_RST_ACPU_GIC (0xc41001aU)
-#define VERSAL_RST_RPU_ISLAND (0xc41001bU)
-#define VERSAL_RST_RPU_AMBA (0xc41001cU)
-#define VERSAL_RST_R5_0 (0xc41001dU)
-#define VERSAL_RST_R5_1 (0xc41001eU)
-#define VERSAL_RST_SYSMON_PMC_SEQ_RST (0xc41001fU)
-#define VERSAL_RST_SYSMON_PMC_CFG_RST (0xc410020U)
-#define VERSAL_RST_SYSMON_FPD_CFG_RST (0xc410021U)
-#define VERSAL_RST_SYSMON_FPD_SEQ_RST (0xc410022U)
-#define VERSAL_RST_SYSMON_LPD (0xc410023U)
-#define VERSAL_RST_PDMA_RST1 (0xc410024U)
-#define VERSAL_RST_PDMA_RST0 (0xc410025U)
-#define VERSAL_RST_ADMA (0xc410026U)
-#define VERSAL_RST_TIMESTAMP (0xc410027U)
-#define VERSAL_RST_OCM (0xc410028U)
-#define VERSAL_RST_OCM2_RST (0xc410029U)
-#define VERSAL_RST_IPI (0xc41002aU)
-#define VERSAL_RST_SBI (0xc41002bU)
-#define VERSAL_RST_LPD (0xc41002cU)
-#define VERSAL_RST_QSPI (0xc10402dU)
-#define VERSAL_RST_OSPI (0xc10402eU)
-#define VERSAL_RST_SDIO_0 (0xc10402fU)
-#define VERSAL_RST_SDIO_1 (0xc104030U)
-#define VERSAL_RST_I2C_PMC (0xc104031U)
-#define VERSAL_RST_GPIO_PMC (0xc104032U)
-#define VERSAL_RST_GEM_0 (0xc104033U)
-#define VERSAL_RST_GEM_1 (0xc104034U)
-#define VERSAL_RST_SPARE (0xc104035U)
-#define VERSAL_RST_USB_0 (0xc104036U)
-#define VERSAL_RST_UART_0 (0xc104037U)
-#define VERSAL_RST_UART_1 (0xc104038U)
-#define VERSAL_RST_SPI_0 (0xc104039U)
-#define VERSAL_RST_SPI_1 (0xc10403aU)
-#define VERSAL_RST_CAN_FD_0 (0xc10403bU)
-#define VERSAL_RST_CAN_FD_1 (0xc10403cU)
-#define VERSAL_RST_I2C_0 (0xc10403dU)
-#define VERSAL_RST_I2C_1 (0xc10403eU)
-#define VERSAL_RST_GPIO_LPD (0xc10403fU)
-#define VERSAL_RST_TTC_0 (0xc104040U)
-#define VERSAL_RST_TTC_1 (0xc104041U)
-#define VERSAL_RST_TTC_2 (0xc104042U)
-#define VERSAL_RST_TTC_3 (0xc104043U)
-#define VERSAL_RST_SWDT_FPD (0xc104044U)
-#define VERSAL_RST_SWDT_LPD (0xc104045U)
-#define VERSAL_RST_USB (0xc104046U)
-#define VERSAL_RST_DPC (0xc208047U)
-#define VERSAL_RST_PMCDBG (0xc208048U)
-#define VERSAL_RST_DBG_TRACE (0xc208049U)
-#define VERSAL_RST_DBG_FPD (0xc20804aU)
-#define VERSAL_RST_DBG_TSTMP (0xc20804bU)
-#define VERSAL_RST_RPU0_DBG (0xc20804cU)
-#define VERSAL_RST_RPU1_DBG (0xc20804dU)
-#define VERSAL_RST_HSDP (0xc20804eU)
-#define VERSAL_RST_DBG_LPD (0xc20804fU)
-#define VERSAL_RST_CPM_POR (0xc30c050U)
-#define VERSAL_RST_CPM (0xc410051U)
-#define VERSAL_RST_CPMDBG (0xc208052U)
-#define VERSAL_RST_PCIE_CFG (0xc410053U)
-#define VERSAL_RST_PCIE_CORE0 (0xc410054U)
-#define VERSAL_RST_PCIE_CORE1 (0xc410055U)
-#define VERSAL_RST_PCIE_DMA (0xc410056U)
-#define VERSAL_RST_CMN (0xc410057U)
-#define VERSAL_RST_L2_0 (0xc410058U)
-#define VERSAL_RST_L2_1 (0xc410059U)
-#define VERSAL_RST_ADDR_REMAP (0xc41005aU)
-#define VERSAL_RST_CPI0 (0xc41005bU)
-#define VERSAL_RST_CPI1 (0xc41005cU)
-#define VERSAL_RST_XRAM (0xc30c05dU)
-#define VERSAL_RST_AIE_ARRAY (0xc10405eU)
-#define VERSAL_RST_AIE_SHIM (0xc10405fU)
-
-#endif
diff --git a/include/dt-bindings/reset/xlnx-zynqmp-resets.h b/include/dt-bindings/reset/xlnx-zynqmp-resets.h
deleted file mode 100644
index d44525b9f8db..000000000000
--- a/include/dt-bindings/reset/xlnx-zynqmp-resets.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * Copyright (C) 2018 Xilinx, Inc.
- */
-
-#ifndef _DT_BINDINGS_ZYNQMP_RESETS_H
-#define _DT_BINDINGS_ZYNQMP_RESETS_H
-
-#define ZYNQMP_RESET_PCIE_CFG 0
-#define ZYNQMP_RESET_PCIE_BRIDGE 1
-#define ZYNQMP_RESET_PCIE_CTRL 2
-#define ZYNQMP_RESET_DP 3
-#define ZYNQMP_RESET_SWDT_CRF 4
-#define ZYNQMP_RESET_AFI_FM5 5
-#define ZYNQMP_RESET_AFI_FM4 6
-#define ZYNQMP_RESET_AFI_FM3 7
-#define ZYNQMP_RESET_AFI_FM2 8
-#define ZYNQMP_RESET_AFI_FM1 9
-#define ZYNQMP_RESET_AFI_FM0 10
-#define ZYNQMP_RESET_GDMA 11
-#define ZYNQMP_RESET_GPU_PP1 12
-#define ZYNQMP_RESET_GPU_PP0 13
-#define ZYNQMP_RESET_GPU 14
-#define ZYNQMP_RESET_GT 15
-#define ZYNQMP_RESET_SATA 16
-#define ZYNQMP_RESET_ACPU3_PWRON 17
-#define ZYNQMP_RESET_ACPU2_PWRON 18
-#define ZYNQMP_RESET_ACPU1_PWRON 19
-#define ZYNQMP_RESET_ACPU0_PWRON 20
-#define ZYNQMP_RESET_APU_L2 21
-#define ZYNQMP_RESET_ACPU3 22
-#define ZYNQMP_RESET_ACPU2 23
-#define ZYNQMP_RESET_ACPU1 24
-#define ZYNQMP_RESET_ACPU0 25
-#define ZYNQMP_RESET_DDR 26
-#define ZYNQMP_RESET_APM_FPD 27
-#define ZYNQMP_RESET_SOFT 28
-#define ZYNQMP_RESET_GEM0 29
-#define ZYNQMP_RESET_GEM1 30
-#define ZYNQMP_RESET_GEM2 31
-#define ZYNQMP_RESET_GEM3 32
-#define ZYNQMP_RESET_QSPI 33
-#define ZYNQMP_RESET_UART0 34
-#define ZYNQMP_RESET_UART1 35
-#define ZYNQMP_RESET_SPI0 36
-#define ZYNQMP_RESET_SPI1 37
-#define ZYNQMP_RESET_SDIO0 38
-#define ZYNQMP_RESET_SDIO1 39
-#define ZYNQMP_RESET_CAN0 40
-#define ZYNQMP_RESET_CAN1 41
-#define ZYNQMP_RESET_I2C0 42
-#define ZYNQMP_RESET_I2C1 43
-#define ZYNQMP_RESET_TTC0 44
-#define ZYNQMP_RESET_TTC1 45
-#define ZYNQMP_RESET_TTC2 46
-#define ZYNQMP_RESET_TTC3 47
-#define ZYNQMP_RESET_SWDT_CRL 48
-#define ZYNQMP_RESET_NAND 49
-#define ZYNQMP_RESET_ADMA 50
-#define ZYNQMP_RESET_GPIO 51
-#define ZYNQMP_RESET_IOU_CC 52
-#define ZYNQMP_RESET_TIMESTAMP 53
-#define ZYNQMP_RESET_RPU_R50 54
-#define ZYNQMP_RESET_RPU_R51 55
-#define ZYNQMP_RESET_RPU_AMBA 56
-#define ZYNQMP_RESET_OCM 57
-#define ZYNQMP_RESET_RPU_PGE 58
-#define ZYNQMP_RESET_USB0_CORERESET 59
-#define ZYNQMP_RESET_USB1_CORERESET 60
-#define ZYNQMP_RESET_USB0_HIBERRESET 61
-#define ZYNQMP_RESET_USB1_HIBERRESET 62
-#define ZYNQMP_RESET_USB0_APB 63
-#define ZYNQMP_RESET_USB1_APB 64
-#define ZYNQMP_RESET_IPI 65
-#define ZYNQMP_RESET_APM_LPD 66
-#define ZYNQMP_RESET_RTC 67
-#define ZYNQMP_RESET_SYSMON 68
-#define ZYNQMP_RESET_AFI_FM6 69
-#define ZYNQMP_RESET_LPD_SWDT 70
-#define ZYNQMP_RESET_FPD 71
-#define ZYNQMP_RESET_RPU_DBG1 72
-#define ZYNQMP_RESET_RPU_DBG0 73
-#define ZYNQMP_RESET_DBG_LPD 74
-#define ZYNQMP_RESET_DBG_FPD 75
-#define ZYNQMP_RESET_APLL 76
-#define ZYNQMP_RESET_DPLL 77
-#define ZYNQMP_RESET_VPLL 78
-#define ZYNQMP_RESET_IOPLL 79
-#define ZYNQMP_RESET_RPLL 80
-#define ZYNQMP_RESET_GPO3_PL_0 81
-#define ZYNQMP_RESET_GPO3_PL_1 82
-#define ZYNQMP_RESET_GPO3_PL_2 83
-#define ZYNQMP_RESET_GPO3_PL_3 84
-#define ZYNQMP_RESET_GPO3_PL_4 85
-#define ZYNQMP_RESET_GPO3_PL_5 86
-#define ZYNQMP_RESET_GPO3_PL_6 87
-#define ZYNQMP_RESET_GPO3_PL_7 88
-#define ZYNQMP_RESET_GPO3_PL_8 89
-#define ZYNQMP_RESET_GPO3_PL_9 90
-#define ZYNQMP_RESET_GPO3_PL_10 91
-#define ZYNQMP_RESET_GPO3_PL_11 92
-#define ZYNQMP_RESET_GPO3_PL_12 93
-#define ZYNQMP_RESET_GPO3_PL_13 94
-#define ZYNQMP_RESET_GPO3_PL_14 95
-#define ZYNQMP_RESET_GPO3_PL_15 96
-#define ZYNQMP_RESET_GPO3_PL_16 97
-#define ZYNQMP_RESET_GPO3_PL_17 98
-#define ZYNQMP_RESET_GPO3_PL_18 99
-#define ZYNQMP_RESET_GPO3_PL_19 100
-#define ZYNQMP_RESET_GPO3_PL_20 101
-#define ZYNQMP_RESET_GPO3_PL_21 102
-#define ZYNQMP_RESET_GPO3_PL_22 103
-#define ZYNQMP_RESET_GPO3_PL_23 104
-#define ZYNQMP_RESET_GPO3_PL_24 105
-#define ZYNQMP_RESET_GPO3_PL_25 106
-#define ZYNQMP_RESET_GPO3_PL_26 107
-#define ZYNQMP_RESET_GPO3_PL_27 108
-#define ZYNQMP_RESET_GPO3_PL_28 109
-#define ZYNQMP_RESET_GPO3_PL_29 110
-#define ZYNQMP_RESET_GPO3_PL_30 111
-#define ZYNQMP_RESET_GPO3_PL_31 112
-#define ZYNQMP_RESET_RPU_LS 113
-#define ZYNQMP_RESET_PS_ONLY 114
-#define ZYNQMP_RESET_PL 115
-#define ZYNQMP_RESET_PS_PL0 116
-#define ZYNQMP_RESET_PS_PL1 117
-#define ZYNQMP_RESET_PS_PL2 118
-#define ZYNQMP_RESET_PS_PL3 119
-
-#endif

Acked-by: Michal Simek <michal.simek@...>

Thanks,
Michal

This adjusts OF_UPSTREAM to behave more like the kernel by allowing for
all the devicetree files for a given vendor to be compiled. This is
useful for Qualcomm in particular as most boards are supported by a
single U-Boot build just provided with a different DT.

Signed-off-by: Caleb Connolly <caleb.connolly@...>
---
dts/Kconfig | 24 ++++++++++++++++++++++++
scripts/Makefile.dts | 13 +++++++++++++
2 files changed, 37 insertions(+)

diff --git a/dts/Kconfig b/dts/Kconfig
index b9b6367154ef..6883a000a052 100644
--- a/dts/Kconfig
+++ b/dts/Kconfig
@@ -100,8 +100,32 @@ config OF_UPSTREAM
However, newer boards whose devicetree source files haven't landed in
the dts/upstream subtree, they can override this option to have the
DT build from existing U-Boot tree location instead.

+config OF_UPSTREAM_BUILD_VENDOR
+ bool "Build all devicetree files for a particular vendor"
+ depends on OF_UPSTREAM
+ help
+ Enable building all devicetree files for a particular vendor. This
+ is useful for generic U-Boot configurations where many boards can
+ be supported with a single binary.
+
+ This is only available for platforms using upstream devicetree.
+
+config OF_UPSTREAM_VENDOR
+ string "Vendor to build all upstream devicetree files for"
+ depends on OF_UPSTREAM_BUILD_VENDOR
+ default "qcom" if ARCH_SNAPDRAGON
+ default "rockchip" if ARCH_ROCKCHIP
+ default "amlogic" if ARCH_MESON
+ default "allwinner" if ARCH_SUNXI
+ default "mediatek" if ARCH_MEDIATEK
+ default "marvell" if ARCH_MVEBU || ARCH_KIRKWOOD
+ default "xilinx" if ARCH_VERSAL || ARCH_ZYNQ
+ default "nvidia" if ARCH_TEGRA
+ help
+ Select the vendor to build all devicetree files for.
+
choice
prompt "Provider of DTB for DT control"
depends on OF_CONTROL

diff --git a/scripts/Makefile.dts b/scripts/Makefile.dts
index 5e2429c6170c..790f3c508f19 100644
--- a/scripts/Makefile.dts
+++ b/scripts/Makefile.dts
@@ -1,3 +1,16 @@
# SPDX-License-Identifier: GPL-2.0+

dtb-y += $(patsubst %,%.dtb,$(subst ",,$(CONFIG_DEFAULT_DEVICE_TREE) $(CONFIG_OF_LIST) $(CONFIG_SPL_OF_LIST)))
+
+ifeq ($(CONFIG_OF_UPSTREAM_BUILD_VENDOR),y)
+ifeq ($(CONFIG_ARM64),y)
+dt_dir := $(srctree)/dts/upstream/src/arm64
+else
+dt_dir := $(srctree)/dts/upstream/src/$(ARCH)
+endif
+
+dtb-vendor_dts := $(patsubst %.dts,%.dtb,$(wildcard $(dt_dir)/$(subst ",,$(CONFIG_OF_UPSTREAM_VENDOR))/*.dts))
+
+dtb-y += $(subst $(dt_dir)/,,$(dtb-vendor_dts))
+
+endif

--
2.44.0