[PATCH 0/4] arm: meson: Switch to using upstream DT for GXL, GXM, AXG, G12A, G12B & SM1 SoCs
neil.armstrong at linaro.org
neil.armstrong at linaro.org
Thu Mar 28 08:50:10 CET 2024
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:
>>> https://gitlab.com/amlogic-foss/amlogic-u-boot-autotest/-/pipelines/1219273552
>>>
>>> Signed-off-by: Neil Armstrong <neil.armstrong at linaro.org>
>>> ---
>>> 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
More information about the U-Boot
mailing list