From aad511a488c40393728156333d983c31001aac32 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Mon, 25 Mar 2024 09:17:54 +0100 Subject: [PATCH] ARM: dts: renesas: Switch to using upstream DT Enable OF_UPSTREAM to use upstream DT and add renesas/ prefix to the DEFAULT_DEVICE_TREE and OF_LIST. And thereby directly build DTB from dts/upstream/src/ including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory. The configuration update has been done using the following script: ``` sed -i '/^CONFIG_DEFAULT_DEVICE_TREE/ s@="@&renesas/@' `git grep -li renesas configs` sed -i '/^CONFIG_OF_LIST/ s@r8a@renesas/&@g' `git grep -li renesas configs` ``` The RZN1 Snarc board does not seem to have a matching Linux kernel DT counterpart, this is currently not switched to OF upstream. Signed-off-by: Marek Vasut Reviewed-by: Sumit Garg --- arch/arm/Kconfig | 1 + configs/alt_defconfig | 2 +- configs/blanche_defconfig | 2 +- configs/gose_defconfig | 2 +- configs/grpeach_defconfig | 2 +- configs/koelsch_defconfig | 2 +- configs/lager_defconfig | 2 +- configs/porter_defconfig | 2 +- configs/rzn1_snarc_defconfig | 1 + configs/silk_defconfig | 2 +- configs/stout_defconfig | 2 +- 11 files changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 23ee25269a..be8ab0f559 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1068,6 +1068,7 @@ config ARCH_RENESAS imply BOARD_EARLY_INIT_F imply CMD_DM imply FAT_WRITE + imply OF_UPSTREAM imply SYS_THUMB_BUILD imply ARCH_MISC_INIT if DISPLAY_CPUINFO diff --git a/configs/alt_defconfig b/configs/alt_defconfig index 06e9e11f29..c9ca22cbe8 100644 --- a/configs/alt_defconfig +++ b/configs/alt_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7794-alt" +CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a7794-alt" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Alt" CONFIG_R8A7794=y diff --git a/configs/blanche_defconfig b/configs/blanche_defconfig index c392055e5a..a2823a614a 100644 --- a/configs/blanche_defconfig +++ b/configs/blanche_defconfig @@ -12,7 +12,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0x40000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7792-blanche" +CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a7792-blanche" CONFIG_ARCH_RENESAS_BOARD_STRING="Blanche" CONFIG_R8A7792=y CONFIG_TARGET_BLANCHE=y diff --git a/configs/gose_defconfig b/configs/gose_defconfig index 35edc677c4..0f76ae147e 100644 --- a/configs/gose_defconfig +++ b/configs/gose_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7793-gose" +CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a7793-gose" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Gose" CONFIG_R8A7793=y diff --git a/configs/grpeach_defconfig b/configs/grpeach_defconfig index 0c581b634a..70a80088bf 100644 --- a/configs/grpeach_defconfig +++ b/configs/grpeach_defconfig @@ -11,7 +11,7 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0x80000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r7s72100-gr-peach" +CONFIG_DEFAULT_DEVICE_TREE="renesas/r7s72100-gr-peach" CONFIG_RZA1=y CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SYS_MONITOR_LEN=524288 diff --git a/configs/koelsch_defconfig b/configs/koelsch_defconfig index ad411b4514..a912e58cf4 100644 --- a/configs/koelsch_defconfig +++ b/configs/koelsch_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7791-koelsch" +CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a7791-koelsch" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Koelsch" CONFIG_R8A7791=y diff --git a/configs/lager_defconfig b/configs/lager_defconfig index f60d4db5ec..03f29b8849 100644 --- a/configs/lager_defconfig +++ b/configs/lager_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7790-lager" +CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a7790-lager" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Lager" CONFIG_R8A7790=y diff --git a/configs/porter_defconfig b/configs/porter_defconfig index f05a0baf21..170ca3a5f4 100644 --- a/configs/porter_defconfig +++ b/configs/porter_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7791-porter" +CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a7791-porter" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Porter" CONFIG_R8A7791=y diff --git a/configs/rzn1_snarc_defconfig b/configs/rzn1_snarc_defconfig index 29a96d1aef..1c313d2d4d 100644 --- a/configs/rzn1_snarc_defconfig +++ b/configs/rzn1_snarc_defconfig @@ -21,3 +21,4 @@ CONFIG_CADENCE_DDR_CTRL=y CONFIG_SYS_NS16550=y CONFIG_SYS_NS16550_MEM32=y # CONFIG_EFI_LOADER is not set +# CONFIG_OF_UPSTREAM is not set diff --git a/configs/silk_defconfig b/configs/silk_defconfig index 40ac8759d0..2e4fab8ac5 100644 --- a/configs/silk_defconfig +++ b/configs/silk_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk" +CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a7794-silk" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Silk" CONFIG_R8A7794=y diff --git a/configs/stout_defconfig b/configs/stout_defconfig index 428a024198..ee87ea53d6 100644 --- a/configs/stout_defconfig +++ b/configs/stout_defconfig @@ -16,7 +16,7 @@ CONFIG_ENV_SIZE=0x40000 CONFIG_ENV_OFFSET=0xC0000 CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="r8a7790-stout" +CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a7790-stout" CONFIG_SPL_TEXT_BASE=0xe6300000 CONFIG_ARCH_RENESAS_BOARD_STRING="Stout" CONFIG_R8A7790=y -- 2.39.5