ARM: rmobile: Turn R-Car V3U into R-Car Gen4

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-chips-socs/r-car-v3u-best-class-r-car-v3u-asil-d-system-chip-automated-driving

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]
This commit is contained in:
Hai Pham 2023-02-28 22:34:41 +01:00 committed by Marek Vasut
parent 1b1834c037
commit 32e6893caf
5 changed files with 25 additions and 27 deletions

View file

@ -1044,10 +1044,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

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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 */