Deduplicate common Renesas defconfig by factoring out the common parts into generic renesas_rcar_defconfig 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 are identical for all Renesas 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_rcar.config | 27 +++++++++++++++++++++++++++ configs/renesas_rcar2.config | 29 ++--------------------------- configs/renesas_rcar64.config | 31 ++----------------------------- 3 files changed, 31 insertions(+), 56 deletions(-) create mode 100644 configs/renesas_rcar.config
diff --git a/configs/renesas_rcar.config b/configs/renesas_rcar.config new file mode 100644 index 00000000000..351803b743a --- /dev/null +++ b/configs/renesas_rcar.config @@ -0,0 +1,27 @@ +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_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=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_RCAR_GPIO=y +CONFIG_SCIF_CONSOLE=y +CONFIG_SPI=y +CONFIG_VERSION_VARIABLE=y diff --git a/configs/renesas_rcar2.config b/configs/renesas_rcar2.config index 77606a47082..74dfd41f1a3 100644 --- a/configs/renesas_rcar2.config +++ b/configs/renesas_rcar2.config @@ -1,56 +1,32 @@ +#include <configs/renesas_rcar.config> + # CONFIG_CMD_IMI is not set # CONFIG_CMD_XIMG is not set # CONFIG_EFI_LOADER is not set CONFIG_ARCH_CPU_INIT=y CONFIG_BOOTDELAY=3 -CONFIG_CLK=y -CONFIG_CLK_RENESAS=y -CONFIG_CMD_BOOTZ=y CONFIG_CMD_CACHE=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_EXT2=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_GPIO=y -CONFIG_CMD_I2C=y -CONFIG_CMD_MII=y CONFIG_CMD_MMC=y CONFIG_CMD_PCI=y -CONFIG_CMD_PING=y CONFIG_CMD_SDRAM=y CONFIG_CMD_TIME=y CONFIG_CMD_USB=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x4f000000 -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_ENABLE_ARM_SOC_BOOT0_HOOK=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_ENV_OVERWRITE=y CONFIG_ENV_SECT_SIZE=0x40000 CONFIG_ENV_SIZE=0x40000 -CONFIG_FIT=y CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_HUSH_PARSER=y -CONFIG_MTD=y CONFIG_NR_DRAM_BANKS=1 -CONFIG_OF_CONTROL=y CONFIG_PARTITION_UUIDS=y CONFIG_PCI=y CONFIG_PCI_RCAR_GEN2=y CONFIG_PINCONF=y CONFIG_PINCTRL=y CONFIG_PINCTRL_PFC=y -CONFIG_RCAR_GPIO=y CONFIG_RENESAS_SDHI=y -CONFIG_SCIF_CONSOLE=y CONFIG_SH_QSPI=y -CONFIG_SPI=y CONFIG_SPI_FLASH_SPANSION=y CONFIG_SYS_CBSIZE=256 CONFIG_SYS_I2C_RCAR_IIC=y @@ -64,4 +40,3 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_PCI=y CONFIG_USB_STORAGE=y -CONFIG_VERSION_VARIABLE=y diff --git a/configs/renesas_rcar64.config b/configs/renesas_rcar64.config index 3e2cc50b02c..12211ae2810 100644 --- a/configs/renesas_rcar64.config +++ b/configs/renesas_rcar64.config @@ -1,41 +1,14 @@ -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 +#include <configs/renesas_rcar.config> + 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