Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-24 14:25:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: dts: renesas: Switch to using upstream DT on 64bit Renesas SoCs

Browse source 
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`
```

There are SoCs which are not included in this patch. The 32bit SoCs
require further infrastructure work. R8A779H0 is coming during the
next upstream DT synchronization cycle as it is not included in
current upstream DTs yet.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by:  Adam Ford <aford173@gmail.com> # Beacon boards
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
This commit is contained in:
Marek Vasut 2024-03-18 15:59:38 +01:00
parent 9e2262e628
commit 18fb23b131
17 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/arm/mach-renesas/Kconfig
View file

@ -14,6 +14,7 @@ config RCAR_64
imply CMD_GPT imply CMD_GPT
imply CMD_MMC_SWRITE if MMC imply CMD_MMC_SWRITE if MMC
imply CMD_UUID imply CMD_UUID
imply OF_UPSTREAM
imply SUPPORT_EMMC_RPMB if MMC imply SUPPORT_EMMC_RPMB if MMC
choice choice

4
configs/hihope_rzg2_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_LEN=0x4000000
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a774a1-hihope-rzg2m" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a774a1-hihope-rzg2m"
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_TARGET_HIHOPE_RZG2=y CONFIG_TARGET_HIHOPE_RZG2=y
CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_MONITOR_LEN=1048576
@ -40,7 +40,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="r8a774a1-hihope-rzg2m r8a774b1-hihope-rzg2n r8a774e1-hihope-rzg2h" CONFIG_OF_LIST="renesas/r8a774a1-hihope-rzg2m renesas/r8a774b1-hihope-rzg2n renesas/r8a774e1-hihope-rzg2h"
CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_LZO=y
CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
CONFIG_ENV_OVERWRITE=y CONFIG_ENV_OVERWRITE=y

2
configs/r8a77970_eagle_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_OFFSET=0x700000
CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77970-eagle" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a77970-eagle"
CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_SPL_TEXT_BASE=0xe6318000
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_TARGET_EAGLE=y CONFIG_TARGET_EAGLE=y

2
configs/r8a77970_v3msk_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_OFFSET=0x700000
CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77970-v3msk" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a77970-v3msk"
CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_SPL_TEXT_BASE=0xe6318000
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_R8A77970=y CONFIG_R8A77970=y

2
configs/r8a77980_condor_defconfig
View file

@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_OFFSET=0x700000
CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77980-condor" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a77980-condor"
CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_SPL_TEXT_BASE=0xe6318000
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_TARGET_CONDOR=y CONFIG_TARGET_CONDOR=y

2
configs/r8a77980_v3hsk_defconfig
View file

@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_OFFSET=0x700000
CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77980-v3hsk" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a77980-v3hsk"
CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_SPL_TEXT_BASE=0xe6318000
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_R8A77980=y CONFIG_R8A77980=y

2
configs/r8a77990_ebisu_defconfig
View file

@ -8,7 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77990-ebisu" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a77990-ebisu"
CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_SPL_TEXT_BASE=0xe6318000
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_TARGET_EBISU=y CONFIG_TARGET_EBISU=y

2
configs/r8a77995_draak_defconfig
View file

@ -8,7 +8,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77995-draak" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a77995-draak"
CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_SPL_TEXT_BASE=0xe6318000
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_TARGET_DRAAK=y CONFIG_TARGET_DRAAK=y

2
configs/r8a779a0_falcon_defconfig
View file

@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0xC00000 CONFIG_ENV_OFFSET=0xC00000
CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a779a0-falcon" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a779a0-falcon"
CONFIG_RCAR_GEN4=y CONFIG_RCAR_GEN4=y
CONFIG_TARGET_FALCON=y CONFIG_TARGET_FALCON=y
CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_MONITOR_LEN=1048576

2
configs/r8a779f0_spider_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_ENV_SIZE=0x40000
CONFIG_ENV_OFFSET=0xD00000 CONFIG_ENV_OFFSET=0xD00000
CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_SECT_SIZE=0x40000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a779f0-spider" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a779f0-spider"
CONFIG_RCAR_GEN4=y CONFIG_RCAR_GEN4=y
CONFIG_TARGET_SPIDER=y CONFIG_TARGET_SPIDER=y
CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_MONITOR_LEN=1048576

2
configs/r8a779g0_whitehawk_defconfig
View file

@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x4000000
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a779g0-white-hawk" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a779g0-white-hawk"
CONFIG_RCAR_GEN4=y CONFIG_RCAR_GEN4=y
CONFIG_TARGET_WHITEHAWK=y CONFIG_TARGET_WHITEHAWK=y
CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_MONITOR_LEN=1048576

1
configs/r8a779h0_grayhawk_defconfig
View file

@ -72,3 +72,4 @@ CONFIG_SCIF_CONSOLE=y
CONFIG_SPI=y CONFIG_SPI=y
CONFIG_DM_SPI=y CONFIG_DM_SPI=y
CONFIG_RENESAS_RPC_SPI=y CONFIG_RENESAS_RPC_SPI=y
# CONFIG_OF_UPSTREAM is not set

4
configs/rcar3_salvator-x_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_SYS_MALLOC_LEN=0x4000000
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77951-salvator-x" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a77951-salvator-x"
CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_SPL_TEXT_BASE=0xe6338000
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_TARGET_SALVATOR_X=y CONFIG_TARGET_SALVATOR_X=y
@ -48,7 +48,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="r8a77951-salvator-x r8a77960-salvator-x r8a77965-salvator-x" CONFIG_OF_LIST="renesas/r8a77951-salvator-x renesas/r8a77960-salvator-x renesas/r8a77965-salvator-x"
CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_LZO=y
CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
CONFIG_OF_DTB_PROPS_REMOVE=y CONFIG_OF_DTB_PROPS_REMOVE=y

4
configs/rcar3_ulcb_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77951-ulcb" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a77951-ulcb"
CONFIG_SPL_TEXT_BASE=0xe6338000 CONFIG_SPL_TEXT_BASE=0xe6338000
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_TARGET_ULCB=y CONFIG_TARGET_ULCB=y
@ -46,7 +46,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="r8a77951-ulcb r8a77960-ulcb r8a77965-ulcb" CONFIG_OF_LIST="renesas/r8a77951-ulcb renesas/r8a77960-ulcb renesas/r8a77965-ulcb"
CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_LZO=y
CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
CONFIG_OF_DTB_PROPS_REMOVE=y CONFIG_OF_DTB_PROPS_REMOVE=y

2
configs/renesas_rzg2l_smarc_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x80000
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r9a07g044l2-smarc" CONFIG_DEFAULT_DEVICE_TREE="renesas/r9a07g044l2-smarc"
CONFIG_RZG2L=y CONFIG_RZG2L=y
CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_MONITOR_LEN=1048576
CONFIG_SYS_LOAD_ADDR=0x58000000 CONFIG_SYS_LOAD_ADDR=0x58000000

4
configs/rzg2_beacon_defconfig
View file

@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x4000000
CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_OFFSET=0x0 CONFIG_ENV_OFFSET=0x0
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a774a1-beacon-rzg2m-kit" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a774a1-beacon-rzg2m-kit"
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_TARGET_BEACON_RZG2M=y CONFIG_TARGET_BEACON_RZG2M=y
CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_MONITOR_LEN=1048576
@ -39,7 +39,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="r8a774a1-beacon-rzg2m-kit r8a774b1-beacon-rzg2n-kit r8a774e1-beacon-rzg2h-kit" CONFIG_OF_LIST="renesas/r8a774a1-beacon-rzg2m-kit renesas/r8a774b1-beacon-rzg2n-kit renesas/r8a774e1-beacon-rzg2h-kit"
CONFIG_MULTI_DTB_FIT_LZO=y CONFIG_MULTI_DTB_FIT_LZO=y
CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
CONFIG_ENV_OVERWRITE=y CONFIG_ENV_OVERWRITE=y

2
configs/silinux_ek874_defconfig
View file

@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x10000
CONFIG_ENV_OFFSET=0x3F0000 CONFIG_ENV_OFFSET=0x3F0000
CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_DM_GPIO=y CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a774c0-ek874" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a774c0-ek874"
CONFIG_SPL_TEXT_BASE=0xe6318000 CONFIG_SPL_TEXT_BASE=0xe6318000
CONFIG_RCAR_GEN3=y CONFIG_RCAR_GEN3=y
CONFIG_TARGET_SILINUX_EK874=y CONFIG_TARGET_SILINUX_EK874=y