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

board: hoperun: Switch to use complete DTS files from upstream DTS

Browse source 
For upstream Linux kernel we use below DTBs for HiHope boards:
- r8a774a1-hihope-rzg2m-ex.dtb
- r8a774e1-hihope-rzg2h-ex.dtb
- r8a774b1-hihope-rzg2n-ex.dtb

Update the CONFIG_OF_LIST to match the above. Now that we have switched
upstream DTS, drop deleting the nodes and also rename the
r8a774*-u-boot.dtsi files to r8a774*-ex-u-boot.dtsi to match the OF_LIST
files so that the `bootph-all` property gets applied to required nodes
in upstream DTS.

Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Signed-off-by: Chris Paterson <chris.paterson2@renesas.com>
This commit is contained in:
Lad Prabhakar 2024-11-04 13:50:12 +00:00 • committed by Marek Vasut
parent 34547a44da
commit 5fb5ed2f78
11 changed files with 31 additions and 213 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/arm/dts/r8a774a1-hihope-rzg2m-ex-u-boot.dtsi Normal file
View file

@ -0,0 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source extras for U-Boot for the Hihope RZ/G2M board
*
* Copyright (C) 2021-2024 Renesas Electronics Corporation
*/
#include "r8a774a1-u-boot.dtsi"

26
arch/arm/dts/r8a774a1-hihope-rzg2m-u-boot.dtsi
View file

@ -1,26 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source extras for U-Boot for the Hihope RZ/G2M board
*
* Copyright (C) 2021 Renesas Electronics Corporation
*/
#include "r8a774a1-u-boot.dtsi"
&gpio3 {
bt_reg_on{
gpio-hog;
gpios = <13 GPIO_ACTIVE_HIGH>;
output-low;
line-name = "bt-reg-on";
};
};
&gpio4 {
wlan_reg_on{
gpio-hog;
gpios = <6 GPIO_ACTIVE_HIGH>;
output-low;
line-name = "wlan-reg-on";
};
};

42
arch/arm/dts/r8a774a1-u-boot.dtsi
View file

@ -10,45 +10,3 @@
&extalr_clk { &extalr_clk {
bootph-all; bootph-all;
}; };
/delete-node/ &audma0;
/delete-node/ &audma1;
/delete-node/ &can0;
/delete-node/ &can1;
/delete-node/ &canfd;
/delete-node/ &csi20;
/delete-node/ &csi40;
/delete-node/ &du;
/delete-node/ &fcpf0;
/delete-node/ &fcpvb0;
/delete-node/ &fcpvd0;
/delete-node/ &fcpvd1;
/delete-node/ &fcpvd2;
/delete-node/ &fcpvi0;
/delete-node/ &hdmi0;
/delete-node/ &lvds0;
/delete-node/ &rcar_sound;
/delete-node/ &sound_card;
/delete-node/ &vin0;
/delete-node/ &vin1;
/delete-node/ &vin2;
/delete-node/ &vin3;
/delete-node/ &vin4;
/delete-node/ &vin5;
/delete-node/ &vin6;
/delete-node/ &vin7;
/delete-node/ &vspb;
/delete-node/ &vspd0;
/delete-node/ &vspd1;
/delete-node/ &vspd2;
/delete-node/ &vspi0;
/ {
/delete-node/ hdmi0-out;
};
/ {
soc {
/delete-node/ fdp1@fe940000;
};
};

8
arch/arm/dts/r8a774b1-hihope-rzg2n-ex-u-boot.dtsi Normal file
View file

@ -0,0 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source extras for U-Boot for the Hihope RZ/G2N board
*
* Copyright (C) 2021-2024 Renesas Electronics Corp.
*/
#include "r8a774b1-u-boot.dtsi"

26
arch/arm/dts/r8a774b1-hihope-rzg2n-u-boot.dtsi
View file

@ -1,26 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source extras for U-Boot for the Hihope RZ/G2N board
*
* Copyright (C) 2021 Renesas Electronics Corp.
*/
#include "r8a774b1-u-boot.dtsi"
&gpio3 {
bt_reg_on{
gpio-hog;
gpios = <13 GPIO_ACTIVE_HIGH>;
output-low;
line-name = "bt-reg-on";
};
};
&gpio4 {
wlan_reg_on{
gpio-hog;
gpios = <6 GPIO_ACTIVE_HIGH>;
output-low;
line-name = "wlan-reg-on";
};
};

40
arch/arm/dts/r8a774b1-u-boot.dtsi
View file

@ -10,43 +10,3 @@
&extalr_clk { &extalr_clk {
bootph-all; bootph-all;
}; };
/delete-node/ &audma0;
/delete-node/ &audma1;
/delete-node/ &can0;
/delete-node/ &can1;
/delete-node/ &canfd;
/delete-node/ &csi20;
/delete-node/ &csi40;
/delete-node/ &du;
/delete-node/ &fcpf0;
/delete-node/ &fcpvb0;
/delete-node/ &fcpvd0;
/delete-node/ &fcpvd1;
/delete-node/ &fcpvi0;
/delete-node/ &hdmi0;
/delete-node/ &lvds0;
/delete-node/ &rcar_sound;
/delete-node/ &sound_card;
/delete-node/ &vin0;
/delete-node/ &vin1;
/delete-node/ &vin2;
/delete-node/ &vin3;
/delete-node/ &vin4;
/delete-node/ &vin5;
/delete-node/ &vin6;
/delete-node/ &vin7;
/delete-node/ &vspb;
/delete-node/ &vspd0;
/delete-node/ &vspd1;
/delete-node/ &vspi0;
/ {
/delete-node/ hdmi0-out;
};
/ {
soc {
/delete-node/ fdp1@fe940000;
};
};

8
arch/arm/dts/r8a774e1-hihope-rzg2h-ex-u-boot.dtsi Normal file
View file

@ -0,0 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source extras for U-Boot for the Hihope RZ/G2H board
*
* Copyright (C) 2020-2024 Renesas Electronics Corp.
*/
#include "r8a774e1-u-boot.dtsi"

26
arch/arm/dts/r8a774e1-hihope-rzg2h-u-boot.dtsi
View file

@ -1,26 +0,0 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source extras for U-Boot for the Hihope RZ/G2H board
*
* Copyright (C) 2020 Renesas Electronics Corp.
*/
#include "r8a774e1-u-boot.dtsi"
&gpio3 {
bt_reg_on{
gpio-hog;
gpios = <13 GPIO_ACTIVE_HIGH>;
output-low;
line-name = "bt-reg-on";
};
};
&gpio4 {
wlan_reg_on{
gpio-hog;
gpios = <6 GPIO_ACTIVE_HIGH>;
output-low;
line-name = "wlan-reg-on";
};
};

46
arch/arm/dts/r8a774e1-u-boot.dtsi
View file

@ -10,49 +10,3 @@
&extalr_clk { &extalr_clk {
bootph-all; bootph-all;
}; };
/delete-node/ &audma0;
/delete-node/ &audma1;
/delete-node/ &can0;
/delete-node/ &can1;
/delete-node/ &canfd;
/delete-node/ &csi20;
/delete-node/ &csi40;
/delete-node/ &du;
/delete-node/ &fcpf0;
/delete-node/ &fcpf1;
/delete-node/ &fcpvb0;
/delete-node/ &fcpvb1;
/delete-node/ &fcpvd0;
/delete-node/ &fcpvd1;
/delete-node/ &fcpvi0;
/delete-node/ &fcpvi1;
/delete-node/ &hdmi0;
/delete-node/ &lvds0;
/delete-node/ &rcar_sound;
/delete-node/ &sound_card;
/delete-node/ &vin0;
/delete-node/ &vin1;
/delete-node/ &vin2;
/delete-node/ &vin3;
/delete-node/ &vin4;
/delete-node/ &vin5;
/delete-node/ &vin6;
/delete-node/ &vin7;
/delete-node/ &vspbc;
/delete-node/ &vspbd;
/delete-node/ &vspd0;
/delete-node/ &vspd1;
/delete-node/ &vspi0;
/delete-node/ &vspi1;
/ {
/delete-node/ hdmi0-out;
};
/ {
soc {
/delete-node/ fdp1@fe940000;
/delete-node/ fdp1@fe944000;
};
};

6
board/hoperun/hihope-rzg2/hihope-rzg2.c
View file

@ -96,15 +96,15 @@ static bool is_hoperun_hihope_rzg2_board(const char *board_name)
int board_fit_config_name_match(const char *name) int board_fit_config_name_match(const char *name)
{ {
if (is_hoperun_hihope_rzg2_board("hoperun,hihope-rzg2m") && if (is_hoperun_hihope_rzg2_board("hoperun,hihope-rzg2m") &&
!strcmp(name, "r8a774a1-hihope-rzg2m-u-boot")) !strcmp(name, "r8a774a1-hihope-rzg2m-ex"))
return 0; return 0;
if (is_hoperun_hihope_rzg2_board("hoperun,hihope-rzg2n") && if (is_hoperun_hihope_rzg2_board("hoperun,hihope-rzg2n") &&
!strcmp(name, "r8a774b1-hihope-rzg2n-u-boot")) !strcmp(name, "r8a774b1-hihope-rzg2n-ex"))
return 0; return 0;
if (is_hoperun_hihope_rzg2_board("hoperun,hihope-rzg2h") && if (is_hoperun_hihope_rzg2_board("hoperun,hihope-rzg2h") &&
!strcmp(name, "r8a774e1-hihope-rzg2h-u-boot")) !strcmp(name, "r8a774e1-hihope-rzg2h-ex"))
return 0; return 0;
return -1; return -1;

8
configs/hihope_rzg2_defconfig
View file

@ -8,18 +8,18 @@ CONFIG_ARCH_CPU_INIT=y
CONFIG_TEXT_BASE=0x50000000 CONFIG_TEXT_BASE=0x50000000
CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_SIZE=0x20000
CONFIG_ENV_OFFSET=0xFFFE0000 CONFIG_ENV_OFFSET=0xFFFE0000
CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a774a1-hihope-rzg2m" CONFIG_DEFAULT_DEVICE_TREE="renesas/r8a774a1-hihope-rzg2m-ex"
CONFIG_TARGET_HIHOPE_RZG2=y CONFIG_TARGET_HIHOPE_RZG2=y
# CONFIG_SPL is not set # CONFIG_SPL is not set
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_USE_BOOTCOMMAND=y CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a774a1-hihope-rzg2m.dtb; booti 0x48080000 - 0x48000000" CONFIG_BOOTCOMMAND="tftp 0x48080000 Image; tftp 0x48000000 Image-r8a774a1-hihope-rzg2m-ex.dtb; booti 0x48080000 - 0x48000000"
CONFIG_DEFAULT_FDT_FILE="r8a774a1-hihope-rzg2m.dtb" CONFIG_DEFAULT_FDT_FILE="r8a774a1-hihope-rzg2m-ex.dtb"
# CONFIG_BOARD_EARLY_INIT_F is not set # CONFIG_BOARD_EARLY_INIT_F is not set
CONFIG_CMD_MMC=y CONFIG_CMD_MMC=y
CONFIG_CMD_PART=y CONFIG_CMD_PART=y
CONFIG_CMD_USB=y CONFIG_CMD_USB=y
CONFIG_OF_LIST="renesas/r8a774a1-hihope-rzg2m renesas/r8a774b1-hihope-rzg2n renesas/r8a774e1-hihope-rzg2h" CONFIG_OF_LIST="renesas/r8a774a1-hihope-rzg2m-ex renesas/r8a774b1-hihope-rzg2n-ex renesas/r8a774e1-hihope-rzg2h-ex"
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_IS_IN_MMC=y CONFIG_ENV_IS_IN_MMC=y