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

ARM: dts: renesas: Replace R8A77950 with R8A77951

Browse source 
R-Car R8A77950 H3 ES1.* was only available to an internal development
group and needed a lot of quirks and workarounds. Public users only
have R-Car R8A77950 H3 ES2 and newer. Switch existing systems to use
R8A77951 device trees.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
This commit is contained in:
Marek Vasut 2024-03-18 15:59:37 +01:00
parent 85f4b91141
commit 9e2262e628
8 changed files with 14 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/dts/Makefile
View file

@ -1073,8 +1073,8 @@ dtb-$(CONFIG_RCAR_GEN3) += \
r8a774b1-hihope-rzg2n.dtb \
r8a774c0-ek874.dtb \
r8a774e1-hihope-rzg2h.dtb \
r8a77950-ulcb.dtb \
r8a77950-salvator-x.dtb \
r8a77951-ulcb.dtb \
r8a77951-salvator-x.dtb \
r8a77960-ulcb.dtb \
r8a77960-salvator-x.dtb \
r8a77965-ulcb.dtb \

2
arch/arm/dts/r8a77950-salvator-x-u-boot.dtsi → arch/arm/dts/r8a77951-salvator-x-u-boot.dtsi
View file

@ -5,7 +5,7 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
#include "r8a77950-u-boot.dtsi"
#include "r8a77951-u-boot.dtsi"
/ {
sysinfo {

6
arch/arm/dts/r8a77950-u-boot.dtsi → arch/arm/dts/r8a77951-u-boot.dtsi
View file

@ -30,7 +30,6 @@
/delete-node/ &can1;
/delete-node/ &canfd;
/delete-node/ &csi20;
/delete-node/ &csi21;
/delete-node/ &csi40;
/delete-node/ &csi41;
/delete-node/ &drif00;
@ -44,16 +43,13 @@
/delete-node/ &du;
/delete-node/ &fcpf0;
/delete-node/ &fcpf1;
/delete-node/ &fcpf2;
/delete-node/ &fcpvb0;
/delete-node/ &fcpvb1;
/delete-node/ &fcpvd0;
/delete-node/ &fcpvd1;
/delete-node/ &fcpvd2;
/delete-node/ &fcpvd3;
/delete-node/ &fcpvi0;
/delete-node/ &fcpvi1;
/delete-node/ &fcpvi2;
/delete-node/ &hdmi0;
/delete-node/ &hdmi1;
/delete-node/ &lvds0;
@ -72,10 +68,8 @@
/delete-node/ &vspd0;
/delete-node/ &vspd1;
/delete-node/ &vspd2;
/delete-node/ &vspd3;
/delete-node/ &vspi0;
/delete-node/ &vspi1;
/delete-node/ &vspi2;
/ {
/delete-node/ cvbs-in;

2
arch/arm/dts/r8a77950-ulcb-u-boot.dtsi → arch/arm/dts/r8a77951-ulcb-u-boot.dtsi
View file

@ -5,7 +5,7 @@
* Copyright (C) 2018 Marek Vasut <marek.vasut@gmail.com>
*/
#include "r8a77950-u-boot.dtsi"
#include "r8a77951-u-boot.dtsi"
/ {
cpld {

2
board/renesas/salvator-x/salvator-x.c
View file

@ -79,7 +79,7 @@ int board_fit_config_name_match(const char *name)
u32 cpu_type = renesas_get_cpu_type();
if ((cpu_type == RENESAS_CPU_TYPE_R8A7795) &&
!strcmp(name, "r8a77950-salvator-x"))
!strcmp(name, "r8a77951-salvator-x"))
return 0;
if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) &&

2
board/renesas/ulcb/ulcb.c
View file

@ -70,7 +70,7 @@ int board_fit_config_name_match(const char *name)
u32 cpu_type = renesas_get_cpu_type();
if ((cpu_type == RENESAS_CPU_TYPE_R8A7795) &&
!strcmp(name, "r8a77950-ulcb"))
!strcmp(name, "r8a77951-ulcb"))
return 0;
if ((cpu_type == RENESAS_CPU_TYPE_R8A7796) &&

8
configs/rcar3_salvator-x_defconfig
View file

@ -6,7 +6,7 @@ CONFIG_SYS_MALLOC_LEN=0x4000000
CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77950-salvator-x"
CONFIG_DEFAULT_DEVICE_TREE="r8a77951-salvator-x"
CONFIG_SPL_TEXT_BASE=0xe6338000
CONFIG_RCAR_GEN3=y
CONFIG_TARGET_SALVATOR_X=y
@ -21,8 +21,8 @@ CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_USE_BOOTARGS=y
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77950-salvator-x.dtb; booti 0x48080000 - 0x48000000"
CONFIG_DEFAULT_FDT_FILE="r8a77950-salvator-x.dtb"
CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77951-salvator-x.dtb; booti 0x48080000 - 0x48000000"
CONFIG_DEFAULT_FDT_FILE="r8a77951-salvator-x.dtb"
CONFIG_SYS_PBSIZE=2068
CONFIG_SYS_MALLOC_BOOTPARAMS=y
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
@ -48,7 +48,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="r8a77950-salvator-x r8a77960-salvator-x r8a77965-salvator-x"
CONFIG_OF_LIST="r8a77951-salvator-x r8a77960-salvator-x r8a77965-salvator-x"
CONFIG_MULTI_DTB_FIT_LZO=y
CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
CONFIG_OF_DTB_PROPS_REMOVE=y

8
configs/rcar3_ulcb_defconfig
View file

@ -7,7 +7,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DM_GPIO=y
CONFIG_DEFAULT_DEVICE_TREE="r8a77950-ulcb"
CONFIG_DEFAULT_DEVICE_TREE="r8a77951-ulcb"
CONFIG_SPL_TEXT_BASE=0xe6338000
CONFIG_RCAR_GEN3=y
CONFIG_TARGET_ULCB=y
@ -20,8 +20,8 @@ CONFIG_FIT=y
CONFIG_SUPPORT_RAW_INITRD=y
CONFIG_USE_BOOTARGS=y
CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77950-ulcb.dtb; booti 0x48080000 - 0x48000000"
CONFIG_DEFAULT_FDT_FILE="r8a77950-ulcb.dtb"
CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a77951-ulcb.dtb; booti 0x48080000 - 0x48000000"
CONFIG_DEFAULT_FDT_FILE="r8a77951-ulcb.dtb"
CONFIG_SYS_PBSIZE=2068
CONFIG_SYS_MALLOC_BOOTPARAMS=y
CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
@ -46,7 +46,7 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y
CONFIG_OF_LIST="r8a77950-ulcb r8a77960-ulcb r8a77965-ulcb"
CONFIG_OF_LIST="r8a77951-ulcb r8a77960-ulcb r8a77965-ulcb"
CONFIG_MULTI_DTB_FIT_LZO=y
CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
CONFIG_OF_DTB_PROPS_REMOVE=y