On 4/9/19 9:02 PM, Simon Goldschmidt wrote: > This commit moves common config options used in all socfpga boards > to select/imply in Kconfig. This both cleans up the defconfig files > as well as makes future changes easier. > > Options implied/defaulted for all sub-arches: > - SPL, SPL_DM, USE_TINY_PRINTF, NR_DRAM_BANKS > > Options implied/defaulted for implied for A10 & gen5: > - FPGA_SOCFPGA, SYS_MALLOC_F_LEN, SYS_TEXT_BASE > > Options implied/defaulted for gen5: > - SPL_STACK_R, SPL_SYS_MALLOC_SIMPLE, SPL_STACK_R_ADDR > > Signed-off-by: Simon Goldschmidt <[email protected]> > --- > > Changes in v4: > - adapt to socfpga-next > > Changes in v3: > - adapt to socfpge-next: imply USE_TINY_PRINTF only for gen5 & a10, > not s10 > > Changes in v2: > - added patch to imply/default common config options > > arch/arm/Kconfig | 2 ++ > arch/arm/mach-socfpga/Kconfig | 20 ++++++++++++++++++++ > configs/socfpga_arria10_defconfig | 6 ------ > configs/socfpga_arria5_defconfig | 10 ---------- > configs/socfpga_cyclone5_defconfig | 10 ---------- > configs/socfpga_dbm_soc1_defconfig | 10 ---------- > configs/socfpga_de0_nano_soc_defconfig | 10 ---------- > configs/socfpga_de10_nano_defconfig | 10 ---------- > configs/socfpga_de1_soc_defconfig | 10 ---------- > configs/socfpga_is1_defconfig | 8 -------- > configs/socfpga_sockit_defconfig | 10 ---------- > configs/socfpga_socrates_defconfig | 10 ---------- > configs/socfpga_sr1500_defconfig | 10 ---------- > configs/socfpga_stratix10_defconfig | 2 -- > configs/socfpga_vining_fpga_defconfig | 10 ---------- > 15 files changed, 22 insertions(+), 116 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 77a534f81f..6554ad94f8 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -841,6 +841,8 @@ config ARCH_SOCFPGA > imply DM_SPI > imply DM_SPI_FLASH > imply FAT_WRITE > + imply SPL > + imply SPL_DM > imply SPL_LIBDISK_SUPPORT > imply SPL_MMC_SUPPORT > imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION > diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig > index 5e87371f8c..3c6c63067d 100644 > --- a/arch/arm/mach-socfpga/Kconfig > +++ b/arch/arm/mach-socfpga/Kconfig > @@ -1,8 +1,22 @@ > if ARCH_SOCFPGA > > +config NR_DRAM_BANKS > + default 1 > + > +config SPL_STACK_R_ADDR > + default 0x00800000 if TARGET_SOCFPGA_GEN5 > + > config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE > default 0xa2 > > +config SYS_MALLOC_F_LEN > + default 0x2000 if TARGET_SOCFPGA_ARRIA10 > + default 0x2000 if TARGET_SOCFPGA_GEN5 > + > +config SYS_TEXT_BASE > + default 0x01000040 if TARGET_SOCFPGA_ARRIA10 > + default 0x01000040 if TARGET_SOCFPGA_GEN5 > + > config TARGET_SOCFPGA_ARRIA5 > bool > select TARGET_SOCFPGA_GEN5 > @@ -21,6 +35,8 @@ config TARGET_SOCFPGA_ARRIA10 > select SYSCON > select SPL_SYSCON if SPL > select ETH_DESIGNWARE_SOCFPGA > + imply FPGA_SOCFPGA > + imply USE_TINY_PRINTF > > config TARGET_SOCFPGA_CYCLONE5 > bool > @@ -29,6 +45,10 @@ config TARGET_SOCFPGA_CYCLONE5 > config TARGET_SOCFPGA_GEN5 > bool > select ALTERA_SDRAM > + imply FPGA_SOCFPGA > + imply SPL_STACK_R > + imply SPL_SYS_MALLOC_SIMPLE > + imply USE_TINY_PRINTF > > config TARGET_SOCFPGA_STRATIX10 > bool > diff --git a/configs/socfpga_arria10_defconfig > b/configs/socfpga_arria10_defconfig > index f321a0ac3b..b3540cfe42 100644 > --- a/configs/socfpga_arria10_defconfig > +++ b/configs/socfpga_arria10_defconfig > @@ -1,12 +1,9 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_ARRIA10_SOCDK=y > -CONFIG_SPL=y > CONFIG_IDENT_STRING="socfpga_arria10" > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_USE_BOOTARGS=y > CONFIG_BOOTARGS="console=ttyS0,115200" > # CONFIG_USE_BOOTCOMMAND is not set > @@ -28,9 +25,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0" > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_MMC=y > @@ -42,4 +37,3 @@ CONFIG_SPI=y > CONFIG_TIMER=y > CONFIG_SPL_TIMER=y > CONFIG_DESIGNWARE_APB_TIMER=y > -CONFIG_USE_TINY_PRINTF=y > diff --git a/configs/socfpga_arria5_defconfig > b/configs/socfpga_arria5_defconfig > index 2f04092649..d514b14364 100644 > --- a/configs/socfpga_arria5_defconfig > +++ b/configs/socfpga_arria5_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > @@ -16,8 +11,6 @@ CONFIG_DEFAULT_FDT_FILE="socfpga_arria5_socdk.dtb" > CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -39,10 +32,8 @@ CONFIG_CMD_UBI=y > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_DFU_MMC=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > @@ -72,4 +63,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 > CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_USE_TINY_PRINTF=y > diff --git a/configs/socfpga_cyclone5_defconfig > b/configs/socfpga_cyclone5_defconfig > index 2625aadf40..2d1a20154a 100644 > --- a/configs/socfpga_cyclone5_defconfig > +++ b/configs/socfpga_cyclone5_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > @@ -16,8 +11,6 @@ CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_socdk.dtb" > CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -39,10 +32,8 @@ CONFIG_CMD_UBI=y > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_DFU_MMC=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > @@ -73,4 +64,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 > CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_USE_TINY_PRINTF=y > diff --git a/configs/socfpga_dbm_soc1_defconfig > b/configs/socfpga_dbm_soc1_defconfig > index b6f4f8a3dd..233d1334b3 100644 > --- a/configs/socfpga_dbm_soc1_defconfig > +++ b/configs/socfpga_dbm_soc1_defconfig > @@ -1,11 +1,6 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_DEVBOARDS_DBM_SOC1=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > CONFIG_USE_BOOTARGS=y > CONFIG_BOOTARGS="console=ttyS0,115200" > @@ -15,8 +10,6 @@ CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y > CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_HUSH_PARSER=y > CONFIG_CMD_BOOTZ=y > @@ -41,9 +34,7 @@ CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_dbm_soc1" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_SPL_DM=y > CONFIG_DFU_MMC=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > @@ -67,4 +58,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 > CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_USE_TINY_PRINTF=y > diff --git a/configs/socfpga_de0_nano_soc_defconfig > b/configs/socfpga_de0_nano_soc_defconfig > index 9a89bb5d68..dfd2d0f504 100644 > --- a/configs/socfpga_de0_nano_soc_defconfig > +++ b/configs/socfpga_de0_nano_soc_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > @@ -17,8 +12,6 @@ CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -40,9 +33,7 @@ CONFIG_CMD_UBI=y > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_SPL_DM=y > CONFIG_DFU_MMC=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > @@ -68,4 +59,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 > CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_USE_TINY_PRINTF=y > diff --git a/configs/socfpga_de10_nano_defconfig > b/configs/socfpga_de10_nano_defconfig > index db516891ba..d02a8d7d87 100644 > --- a/configs/socfpga_de10_nano_defconfig > +++ b/configs/socfpga_de10_nano_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_TERASIC_DE10_NANO=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > @@ -16,8 +11,6 @@ CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de10_nano.dtb" > CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -36,9 +29,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0" > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de10_nano" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_SPL_DM=y > CONFIG_DFU_MMC=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > @@ -64,4 +55,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 > CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_USE_TINY_PRINTF=y > diff --git a/configs/socfpga_de1_soc_defconfig > b/configs/socfpga_de1_soc_defconfig > index 5bed755723..c860bb45ad 100644 > --- a/configs/socfpga_de1_soc_defconfig > +++ b/configs/socfpga_de1_soc_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > @@ -17,8 +12,6 @@ CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_YMODEM_SUPPORT=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -36,8 +29,6 @@ CONFIG_MTDIDS_DEFAULT="nor0=ff705000.spi.0" > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_SPL_DM=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > @@ -55,5 +46,4 @@ CONFIG_SPI=y > CONFIG_USB=y > CONFIG_DM_USB=y > CONFIG_USB_DWC2=y > -CONFIG_USE_TINY_PRINTF=y > # CONFIG_EFI_LOADER is not set > diff --git a/configs/socfpga_is1_defconfig b/configs/socfpga_is1_defconfig > index cd7211d202..7c81a83fc6 100644 > --- a/configs/socfpga_is1_defconfig > +++ b/configs/socfpga_is1_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_IS1=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > CONFIG_USE_BOOTARGS=y > CONFIG_BOOTARGS="console=ttyS0,115200" > @@ -17,7 +12,6 @@ CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y > CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -36,11 +30,9 @@ CONFIG_CMD_UBI=y > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1" > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8 > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > diff --git a/configs/socfpga_sockit_defconfig > b/configs/socfpga_sockit_defconfig > index 4c17d1a9e4..805bbe1a1a 100644 > --- a/configs/socfpga_sockit_defconfig > +++ b/configs/socfpga_sockit_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > @@ -16,8 +11,6 @@ CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_sockit.dtb" > CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -39,10 +32,8 @@ CONFIG_CMD_UBI=y > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_DFU_MMC=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > @@ -73,4 +64,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 > CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_USE_TINY_PRINTF=y > diff --git a/configs/socfpga_socrates_defconfig > b/configs/socfpga_socrates_defconfig > index 45fd78a15c..0ded246e78 100644 > --- a/configs/socfpga_socrates_defconfig > +++ b/configs/socfpga_socrates_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_EBV_SOCRATES=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > @@ -16,8 +11,6 @@ CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_socrates.dtb" > CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -40,10 +33,8 @@ CONFIG_CMD_UBI=y > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates" > CONFIG_ENV_IS_IN_MMC=y > -CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_DFU_MMC=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > @@ -73,4 +64,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 > CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_USE_TINY_PRINTF=y > diff --git a/configs/socfpga_sr1500_defconfig > b/configs/socfpga_sr1500_defconfig > index b8de47a4b1..6542045ca2 100644 > --- a/configs/socfpga_sr1500_defconfig > +++ b/configs/socfpga_sr1500_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_SR1500=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_SYS_CONSOLE_IS_IN_ENV=y > @@ -18,8 +13,6 @@ CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > CONFIG_BOARD_EARLY_INIT_F=y > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -40,11 +33,9 @@ CONFIG_CMD_UBI=y > # CONFIG_EFI_PARTITION is not set > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500" > CONFIG_ENV_IS_IN_SPI_FLASH=y > -CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_BOOTCOUNT_LIMIT=y > CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8 > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_DM_I2C=y > @@ -64,4 +55,3 @@ CONFIG_MII=y > CONFIG_DM_RESET=y > CONFIG_SPI=y > CONFIG_CADENCE_QSPI=y > -CONFIG_USE_TINY_PRINTF=y > diff --git a/configs/socfpga_stratix10_defconfig > b/configs/socfpga_stratix10_defconfig > index 4848013b21..a6a28893ca 100644 > --- a/configs/socfpga_stratix10_defconfig > +++ b/configs/socfpga_stratix10_defconfig > @@ -3,7 +3,6 @@ CONFIG_ARCH_SOCFPGA=y > CONFIG_SYS_TEXT_BASE=0x1000 > CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y > -CONFIG_SPL=y > CONFIG_IDENT_STRING="socfpga_stratix10" > CONFIG_SPL_FS_FAT=y > CONFIG_NR_DRAM_BANKS=2 > @@ -30,7 +29,6 @@ CONFIG_OF_EMBED=y > CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" > CONFIG_ENV_IS_IN_MMC=y > CONFIG_NET_RANDOM_ETHADDR=y > -CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > diff --git a/configs/socfpga_vining_fpga_defconfig > b/configs/socfpga_vining_fpga_defconfig > index 3eba09dcb1..7b47b111b7 100644 > --- a/configs/socfpga_vining_fpga_defconfig > +++ b/configs/socfpga_vining_fpga_defconfig > @@ -1,12 +1,7 @@ > CONFIG_ARM=y > CONFIG_ARCH_SOCFPGA=y > -CONFIG_SYS_TEXT_BASE=0x01000040 > -CONFIG_SYS_MALLOC_F_LEN=0x2000 > CONFIG_TARGET_SOCFPGA_SAMTEC_VINING_FPGA=y > -CONFIG_SPL=y > -CONFIG_SPL_STACK_R_ADDR=0x00800000 > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_NR_DRAM_BANKS=1 > CONFIG_FIT=y > CONFIG_BOOTDELAY=5 > CONFIG_USE_BOOTARGS=y > @@ -19,8 +14,6 @@ CONFIG_MISC_INIT_R=y > CONFIG_VERSION_VARIABLE=y > # CONFIG_DISPLAY_BOARDINFO is not set > CONFIG_DISPLAY_BOARDINFO_LATE=y > -CONFIG_SPL_SYS_MALLOC_SIMPLE=y > -CONFIG_SPL_STACK_R=y > CONFIG_SPL_SPI_LOAD=y > CONFIG_CMD_ASKENV=y > CONFIG_CMD_GREPENV=y > @@ -45,12 +38,10 @@ CONFIG_CMD_UBI=y > CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga" > CONFIG_ENV_IS_IN_SPI_FLASH=y > CONFIG_NET_RANDOM_ETHADDR=y > -CONFIG_SPL_DM=y > CONFIG_SPL_DM_SEQ_ALIAS=y > CONFIG_DFU_MMC=y > CONFIG_DFU_RAM=y > CONFIG_DFU_SF=y > -CONFIG_FPGA_SOCFPGA=y > CONFIG_DM_GPIO=y > CONFIG_DWAPB_GPIO=y > CONFIG_LED_STATUS=y > @@ -90,4 +81,3 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 > CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 > CONFIG_USB_GADGET_DWC2_OTG=y > CONFIG_USB_GADGET_DOWNLOAD=y > -CONFIG_USE_TINY_PRINTF=y >
Acked-by: Marek Vasut <[email protected]> -- Best regards, Marek Vasut _______________________________________________ U-Boot mailing list [email protected] https://lists.denx.de/listinfo/u-boot
