From: Hai Pham hai.pham.ud@renesas.com
Despite the name, R-Car V3U is the first member of the R-Car Gen4 family [1]. Hence reflect this in related files, select appropriate configuration options and split DT build into its own GEN4 entry.
[1] https://www.renesas.com/us/en/products/automotive-products/automotive-system...
Reviewed-by: Marek Vasut marek.vasut+renesas@mailbox.org Signed-off-by: Hai Pham hai.pham.ud@renesas.com Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org [Marek: Deduplicate DTC_FLAGS addition using RCAR_64 symbol Update commit message] --- arch/arm/dts/Makefile | 6 ++++-- arch/arm/mach-rmobile/Kconfig.rcar3 | 13 ------------- arch/arm/mach-rmobile/Kconfig.rcar4 | 19 +++++++++++++++++++ configs/r8a779a0_falcon_defconfig | 2 +- include/configs/falcon.h | 12 +----------- 5 files changed, 25 insertions(+), 27 deletions(-)
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 7a577deb502..379deffa88e 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1035,10 +1035,12 @@ dtb-$(CONFIG_RCAR_GEN3) += \ r8a77970-eagle-u-boot.dtb \ r8a77980-condor-u-boot.dtb \ r8a77990-ebisu-u-boot.dtb \ - r8a77995-draak-u-boot.dtb \ + r8a77995-draak-u-boot.dtb + +dtb-$(CONFIG_RCAR_GEN4) += \ r8a779a0-falcon-u-boot.dtb
-ifdef CONFIG_RCAR_GEN3 +ifdef CONFIG_RCAR_64 DTC_FLAGS += -R 4 -p 0x1000 endif
diff --git a/arch/arm/mach-rmobile/Kconfig.rcar3 b/arch/arm/mach-rmobile/Kconfig.rcar3 index 680aa455160..5f338219b45 100644 --- a/arch/arm/mach-rmobile/Kconfig.rcar3 +++ b/arch/arm/mach-rmobile/Kconfig.rcar3 @@ -70,12 +70,6 @@ config R8A77995 imply CLK_R8A77995 imply PINCTRL_PFC_R8A77995
-config R8A779A0 - bool "Renesas SoC R8A779A0" - select GICV3 - imply CLK_R8A779A0 - imply PINCTRL_PFC_R8A779A0 - config RZ_G2 bool "Renesas ARM SoCs RZ/G2 (64bit)"
@@ -123,12 +117,6 @@ config TARGET_EBISU help Support for Renesas R-Car Gen3 Ebisu platform
-config TARGET_FALCON - bool "Falcon board" - imply R8A779A0 - help - Support for Renesas R-Car Gen3 Falcon platform - config TARGET_HIHOPE_RZG2 bool "HiHope RZ/G2 board" imply MULTI_DTB_FIT @@ -176,7 +164,6 @@ source "board/renesas/condor/Kconfig" source "board/renesas/draak/Kconfig" source "board/renesas/eagle/Kconfig" source "board/renesas/ebisu/Kconfig" -source "board/renesas/falcon/Kconfig" source "board/renesas/salvator-x/Kconfig" source "board/renesas/ulcb/Kconfig" source "board/beacon/beacon-rzg2m/Kconfig" diff --git a/arch/arm/mach-rmobile/Kconfig.rcar4 b/arch/arm/mach-rmobile/Kconfig.rcar4 index 6d9e16586d9..104672f938e 100644 --- a/arch/arm/mach-rmobile/Kconfig.rcar4 +++ b/arch/arm/mach-rmobile/Kconfig.rcar4 @@ -1,8 +1,27 @@ if RCAR_GEN4
+menu "Select Target SoC" + +config R8A779A0 + bool "Renesas SoC R8A779A0" + select GICV3 + imply CLK_R8A779A0 + imply PINCTRL_PFC_R8A779A0 + +endmenu + choice prompt "Renesas ARM64 SoCs board select" optional + +config TARGET_FALCON + bool "Falcon board" + imply R8A779A0 + help + Support for Renesas R-Car Gen3 Falcon platform + endchoice
+source "board/renesas/falcon/Kconfig" + endif diff --git a/configs/r8a779a0_falcon_defconfig b/configs/r8a779a0_falcon_defconfig index 083055a1dfa..14feaf13d6e 100644 --- a/configs/r8a779a0_falcon_defconfig +++ b/configs/r8a779a0_falcon_defconfig @@ -10,7 +10,7 @@ CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="r8a779a0-falcon-u-boot" CONFIG_SPL_TEXT_BASE=0xe6338000 -CONFIG_RCAR_GEN3=y +CONFIG_RCAR_GEN4=y CONFIG_TARGET_FALCON=y CONFIG_SPL_STACK=0xe6304000 CONFIG_SYS_CLK_FREQ=16666666 diff --git a/include/configs/falcon.h b/include/configs/falcon.h index 446261cedc7..0b62ff9fbe1 100644 --- a/include/configs/falcon.h +++ b/include/configs/falcon.h @@ -9,17 +9,7 @@ #ifndef __FALCON_H #define __FALCON_H
-#include "rcar-gen3-common.h" - -/* - * Generic Interrupt Controller Definitions. Undefine v2 locations and define - * v3 locations. - */ -#undef GICD_BASE -#undef GICC_BASE -#undef GICR_BASE -#define GICD_BASE 0xF1000000 -#define GICR_BASE 0xF1060000 +#include "rcar-gen4-common.h"
/* Board Clock */ /* XTAL_CLK : 16.66MHz */