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 <aford173@gmail.com>

diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64
index 9854974..6a6dafc 100644 (file)
--- 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

diff --git a/configs/r8a774a1_beacon_defconfig b/configs/r8a774a1_beacon_defconfig
index 4e52dd0..2b1057f 100644 (file)
--- a/configs/r8a774a1_beacon_defconfig
+++ b/configs/r8a774a1_beacon_defconfig
@@ -33,6 +33,9 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_FAT=y
 CONFIG_CMD_FS_GENERIC=y
 CONFIG_OF_CONTROL=y
+CONFIG_OF_LIST="r8a774a1-beacon-rzg2m-kit r8a774b1-beacon-rzg2n-kit r8a774e1-beacon-rzg2h-kit"
+CONFIG_MULTI_DTB_FIT_LZO=y
+CONFIG_MULTI_DTB_FIT_USER_DEFINED_AREA=y
 CONFIG_ENV_OVERWRITE=y
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_MMC_ENV_DEV=1