Deduplicate defconfigs for all Renesas R-Car 64bit systems by factoring out the common parts into generic renesas_rcar64.config and including those using the #include <configs/...> preprocessor macro in the current set of board specific defconfigs. The preprocessor macro is applicable to defconfigs as well.
This introduces no functional change, the resulting .config is identical for all Renesas R-Car 64bit systems.
Signed-off-by: Marek Vasut marek.vasut+renesas@mailbox.org --- Cc: "Cogent Embedded, Inc." source@cogentembedded.com Cc: Adam Ford aford173@gmail.com Cc: Biju Das biju.das.jz@bp.renesas.com Cc: Hai Pham hai.pham.ud@renesas.com Cc: Heinrich Schuchardt xypron.glpk@gmx.de Cc: Lad Prabhakar prabhakar.mahadev-lad.rj@bp.renesas.com Cc: Masakazu Mochizuki masakazu.mochizuki.wd@hitachi.com Cc: Nobuhiro Iwamatsu iwamatsu@nigauri.org Cc: Paul Barker paul.barker.ct@bp.renesas.com Cc: Sumit Garg sumit.garg@linaro.org Cc: Tom Rini trini@konsulko.com Cc: u-boot@lists.denx.de --- V2: Rename common _defconfig to .config --- configs/renesas_rcar3.config | 43 ++--------------------------------- configs/renesas_rcar4.config | 43 ++--------------------------------- configs/renesas_rcar64.config | 41 +++++++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 82 deletions(-) create mode 100644 configs/renesas_rcar64.config
diff --git a/configs/renesas_rcar3.config b/configs/renesas_rcar3.config index 9183abf8f8c..228e1b4c679 100644 --- a/configs/renesas_rcar3.config +++ b/configs/renesas_rcar3.config @@ -1,45 +1,6 @@ -CONFIG_ARCH_RENESAS=y -CONFIG_ARM=y +#include <configs/renesas_rcar64.config> + CONFIG_BITBANGMII=y CONFIG_BITBANGMII_MULTI=y -CONFIG_CLK=y -CONFIG_CLK_RENESAS=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_SPI=y -CONFIG_DM_GPIO=y -CONFIG_DM_I2C=y -CONFIG_DM_REGULATOR=y -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_REGULATOR_GPIO=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y CONFIG_ENV_OVERWRITE=y -CONFIG_FIT=y -CONFIG_HUSH_PARSER=y -CONFIG_MTD=y -CONFIG_OF_CONTROL=y -CONFIG_PHY_ANEG_TIMEOUT=20000 -CONFIG_RCAR_GPIO=y -CONFIG_REGMAP=y -CONFIG_REMAKE_ELF=y -CONFIG_RENESAS_RPC_SPI=y -CONFIG_SCIF_CONSOLE=y -CONFIG_SPI=y -CONFIG_SUPPORT_RAW_INITRD=y -CONFIG_SYSCON=y -CONFIG_SYS_LOAD_ADDR=0x58000000 -CONFIG_SYS_MALLOC_BOOTPARAMS=y -CONFIG_SYS_MALLOC_LEN=0x4000000 -CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_PBSIZE=2068 -CONFIG_VERSION_VARIABLE=y diff --git a/configs/renesas_rcar4.config b/configs/renesas_rcar4.config index ebca0591838..87d6a60e56e 100644 --- a/configs/renesas_rcar4.config +++ b/configs/renesas_rcar4.config @@ -1,56 +1,17 @@ +#include <configs/renesas_rcar64.config> + # CONFIG_PSCI_RESET is not set # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set CONFIG_ARCH_CPU_INIT=y -CONFIG_ARCH_RENESAS=y -CONFIG_ARM=y CONFIG_BOOTARGS="root=/dev/nfs rw nfsroot=192.168.0.1:/export/rfs ip=192.168.0.20" -CONFIG_CLK=y -CONFIG_CLK_RENESAS=y -CONFIG_CMD_BOOTZ=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MII=y CONFIG_CMD_MMC=y -CONFIG_CMD_PING=y -CONFIG_CMD_SPI=y CONFIG_DM_ETH_PHY=y -CONFIG_DM_GPIO=y -CONFIG_DM_I2C=y -CONFIG_DM_REGULATOR=y -CONFIG_DM_REGULATOR_FIXED=y -CONFIG_DM_REGULATOR_GPIO=y -CONFIG_DM_SPI=y -CONFIG_DM_SPI_FLASH=y -CONFIG_FIT=y -CONFIG_HUSH_PARSER=y CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y -CONFIG_MTD=y -CONFIG_OF_CONTROL=y -CONFIG_PHY_ANEG_TIMEOUT=20000 -CONFIG_RCAR_GPIO=y -CONFIG_REGMAP=y -CONFIG_REMAKE_ELF=y -CONFIG_RENESAS_RPC_SPI=y CONFIG_RENESAS_SDHI=y -CONFIG_SCIF_CONSOLE=y -CONFIG_SPI=y CONFIG_SPI_FLASH_SPANSION=y -CONFIG_SUPPORT_RAW_INITRD=y -CONFIG_SYSCON=y CONFIG_SYS_I2C_RCAR_I2C=y -CONFIG_SYS_LOAD_ADDR=0x58000000 -CONFIG_SYS_MALLOC_BOOTPARAMS=y -CONFIG_SYS_MALLOC_LEN=0x4000000 -CONFIG_SYS_MONITOR_LEN=1048576 CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_VERSION_VARIABLE=y diff --git a/configs/renesas_rcar64.config b/configs/renesas_rcar64.config new file mode 100644 index 00000000000..3e2cc50b02c --- /dev/null +++ b/configs/renesas_rcar64.config @@ -0,0 +1,41 @@ +CONFIG_ARCH_RENESAS=y +CONFIG_ARM=y +CONFIG_CLK=y +CONFIG_CLK_RENESAS=y +CONFIG_CMD_BOOTZ=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_SPI=y +CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_SPI=y +CONFIG_DM_SPI_FLASH=y +CONFIG_FIT=y +CONFIG_HUSH_PARSER=y +CONFIG_MTD=y +CONFIG_OF_CONTROL=y +CONFIG_PHY_ANEG_TIMEOUT=20000 +CONFIG_RCAR_GPIO=y +CONFIG_REGMAP=y +CONFIG_REMAKE_ELF=y +CONFIG_RENESAS_RPC_SPI=y +CONFIG_SCIF_CONSOLE=y +CONFIG_SPI=y +CONFIG_SUPPORT_RAW_INITRD=y +CONFIG_SYSCON=y +CONFIG_SYS_LOAD_ADDR=0x58000000 +CONFIG_SYS_MALLOC_BOOTPARAMS=y +CONFIG_SYS_MALLOC_LEN=0x4000000 +CONFIG_SYS_MONITOR_LEN=1048576 +CONFIG_VERSION_VARIABLE=y