From 0d115694abf394ed04960b2767d3fa804ede8a83 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Mon, 20 Sep 2021 11:14:28 -0500 Subject: ARM: rmobile: beacon: Support RZ/G2 [M/N/H] on TARGET_BEACON_RZG2M The three different boards share the same board file and only differ in terms of which SoC is being used. By enabling FIT on TARGET_BEACON_RZG2M, it can support all three boards and elimate duplicate code. Signed-off-by: Adam Ford --- arch/arm/mach-rmobile/Kconfig.64 | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'arch') diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64 index 98549742e76..6a6dafc1a6d 100644 --- a/arch/arm/mach-rmobile/Kconfig.64 +++ b/arch/arm/mach-rmobile/Kconfig.64 @@ -92,8 +92,14 @@ config TARGET_BEACON_RZG2H config TARGET_BEACON_RZG2M bool "Beacon EmbeddedWorks RZ/G2M Dev Kit" select R8A774A1 + select R8A774B1 + select R8A774E1 select RZ_G2 select PINCTRL_PFC_R8A774A1 + select PINCTRL_PFC_R8A774B1 + select PINCTRL_PFC_R8A774E1 + imply MULTI_DTB_FIT + imply MULTI_DTB_FIT_USER_DEFINED_AREA config TARGET_BEACON_RZG2N bool "Beacon EmbeddedWorks RZ/G2N Dev Kit" @@ -189,11 +195,13 @@ source "board/hoperun/hihope-rzg2/Kconfig" source "board/silinux/ek874/Kconfig" config MULTI_DTB_FIT_UNCOMPRESS_SZ + default 0x80000 if TARGET_BEACON_RZG2M default 0x80000 if TARGET_HIHOPE_RZG2 default 0x80000 if TARGET_SALVATOR_X default 0x80000 if TARGET_ULCB config MULTI_DTB_FIT_USER_DEF_ADDR + default 0x49000000 if TARGET_BEACON_RZG2M default 0x49000000 if TARGET_HIHOPE_RZG2 default 0x49000000 if TARGET_SALVATOR_X default 0x49000000 if TARGET_ULCB -- cgit v1.2.3 From cde373f04f116b931b87bc17cf5d101c181e77cc Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Mon, 20 Sep 2021 11:14:29 -0500 Subject: ARM: rmobile: beacon: Remove duplicated for RZ/G2 M/N/H Now that TARGET_BEACON_RZG2M can handle all the work that was done with TARGET_BEACON_RZG2N and TARGET_BEACON_RZG2H, remove them since they just create more duplicate code. Signed-off-by: Adam Ford --- arch/arm/mach-rmobile/Kconfig.64 | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'arch') diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64 index 6a6dafc1a6d..d76c3a76d80 100644 --- a/arch/arm/mach-rmobile/Kconfig.64 +++ b/arch/arm/mach-rmobile/Kconfig.64 @@ -83,14 +83,8 @@ choice prompt "Renesas ARM64 SoCs board select" optional -config TARGET_BEACON_RZG2H - bool "Beacon EmbeddedWorks RZ/G2H Dev Kit" - select R8A774E1 - select RZ_G2 - select PINCTRL_PFC_R8A774E1 - config TARGET_BEACON_RZG2M - bool "Beacon EmbeddedWorks RZ/G2M Dev Kit" + bool "Beacon EmbeddedWorks RZ/G2 Dev Kit" select R8A774A1 select R8A774B1 select R8A774E1 @@ -101,12 +95,6 @@ config TARGET_BEACON_RZG2M imply MULTI_DTB_FIT imply MULTI_DTB_FIT_USER_DEFINED_AREA -config TARGET_BEACON_RZG2N - bool "Beacon EmbeddedWorks RZ/G2N Dev Kit" - select R8A774B1 - select RZ_G2 - select PINCTRL_PFC_R8A774B1 - config TARGET_CONDOR bool "Condor board" imply R8A77980 -- cgit v1.2.3 From 5c5437b81e5ba4f39a2e937d5fcbb07468007403 Mon Sep 17 00:00:00 2001 From: Adam Ford Date: Mon, 20 Sep 2021 11:14:31 -0500 Subject: ARM: rmobile: beacon: Enable reference clocks for USB and AVB Both Ethernet and USB drivers get their reference clocks from the versaclock. Enable that driver and the common clock driver by default. Signed-off-by: Adam Ford --- arch/arm/mach-rmobile/Kconfig.64 | 2 ++ 1 file changed, 2 insertions(+) (limited to 'arch') diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64 index d76c3a76d80..007eaad251d 100644 --- a/arch/arm/mach-rmobile/Kconfig.64 +++ b/arch/arm/mach-rmobile/Kconfig.64 @@ -94,6 +94,8 @@ config TARGET_BEACON_RZG2M select PINCTRL_PFC_R8A774E1 imply MULTI_DTB_FIT imply MULTI_DTB_FIT_USER_DEFINED_AREA + imply CLK_VERSACLOCK + imply CLK_CCF config TARGET_CONDOR bool "Condor board" -- cgit v1.2.3