diff options
-rw-r--r-- | configs/Sinovoip_BPI_M3_defconfig | 2 | ||||
-rw-r--r-- | configs/evb-px5_defconfig | 3 | ||||
-rw-r--r-- | configs/imx6qdl_icore_mmc_defconfig | 2 | ||||
-rw-r--r-- | configs/lion-rk3368_defconfig | 3 | ||||
-rw-r--r-- | configs/omap3_evm_defconfig | 3 | ||||
-rw-r--r-- | configs/rpi_2_defconfig | 2 | ||||
-rw-r--r-- | configs/rpi_3_32b_defconfig | 2 | ||||
-rw-r--r-- | configs/rpi_3_defconfig | 2 | ||||
-rw-r--r-- | configs/rpi_defconfig | 2 | ||||
-rw-r--r-- | configs/sheep-rk3368_defconfig | 3 | ||||
-rw-r--r-- | scripts/config_whitelist.txt | 9 |
11 files changed, 10 insertions, 23 deletions
diff --git a/configs/Sinovoip_BPI_M3_defconfig b/configs/Sinovoip_BPI_M3_defconfig index e09527b6fb..04d81693eb 100644 --- a/configs/Sinovoip_BPI_M3_defconfig +++ b/configs/Sinovoip_BPI_M3_defconfig @@ -5,6 +5,7 @@ CONFIG_DRAM_TYPE=7 CONFIG_DRAM_CLK=480 CONFIG_DRAM_ZQ=15355 CONFIG_DRAM_ODT_EN=y +CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_INITIAL_USB_SCAN_DELAY=500 CONFIG_USB0_VBUS_PIN="AXP0-VBUS-ENABLE" CONFIG_USB0_VBUS_DET="AXP0-VBUS-DETECT" @@ -12,7 +13,6 @@ CONFIG_USB0_ID_DET="PH11" CONFIG_USB1_VBUS_PIN="PD24" CONFIG_AXP_GPIO=y CONFIG_SATAPWR="PD25" -CONFIG_MMC_SUNXI_SLOT_EXTRA=2 CONFIG_DEFAULT_DEVICE_TREE="sun8i-a83t-sinovoip-bpi-m3" # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set CONFIG_CONSOLE_MUX=y diff --git a/configs/evb-px5_defconfig b/configs/evb-px5_defconfig index ba87fb25c2..4323b77768 100644 --- a/configs/evb-px5_defconfig +++ b/configs/evb-px5_defconfig @@ -5,10 +5,9 @@ CONFIG_ROCKCHIP_RK3368=y CONFIG_TARGET_EVB_PX5=y CONFIG_DEFAULT_DEVICE_TREE="rk3368-px5-evb" CONFIG_DEBUG_UART=y +CONFIG_ANDROID_BOOT_IMAGE=y # CONFIG_DISPLAY_CPUINFO is not set CONFIG_ARCH_EARLY_INIT_R=y -CONFIG_FASTBOOT=y -CONFIG_ANDROID_BOOT_IMAGE=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y CONFIG_CMD_CACHE=y diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 5a84c6366e..1bc9a06fc1 100644 --- a/configs/imx6qdl_icore_mmc_defconfig +++ b/configs/imx6qdl_icore_mmc_defconfig @@ -18,6 +18,7 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" CONFIG_BOOTDELAY=3 CONFIG_SPL=y CONFIG_SPL_EXT_SUPPORT=y +CONFIG_SPL_OS_BOOT=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="icorem6qdl> " # CONFIG_CMD_IMLS is not set @@ -49,4 +50,3 @@ CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_MXC_UART=y CONFIG_IMX_THERMAL=y CONFIG_VIDEO_IPUV3=y -CONFIG_SPL_OS_BOOT=y diff --git a/configs/lion-rk3368_defconfig b/configs/lion-rk3368_defconfig index 5d5e145f2a..45a12a8b27 100644 --- a/configs/lion-rk3368_defconfig +++ b/configs/lion-rk3368_defconfig @@ -14,6 +14,7 @@ CONFIG_SPL_STACK_R_ADDR=0x600000 CONFIG_DEFAULT_DEVICE_TREE="rk3368-lion" CONFIG_SMBIOS_PRODUCT_NAME="sheep_rk3368" CONFIG_DEBUG_UART=y +CONFIG_ANDROID_BOOT_IMAGE=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_SPL_LOAD_FIT=y @@ -32,8 +33,6 @@ CONFIG_SPL_ATF_TEXT_BASE=0x10000 CONFIG_TPL=y CONFIG_TPL_BOOTROM_SUPPORT=y CONFIG_TPL_DRIVERS_MISC_SUPPORT=y -CONFIG_FASTBOOT=y -CONFIG_ANDROID_BOOT_IMAGE=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 51fd210d41..962ffa0729 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -7,7 +7,6 @@ CONFIG_SYS_MPUCLK=720 CONFIG_TARGET_OMAP3_EVM=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_ENV_IS_IN_NAND=y CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" @@ -44,8 +43,8 @@ CONFIG_DM=y CONFIG_SPL_DM=y CONFIG_DM_GPIO=y CONFIG_MMC_OMAP_HS=y -CONFIG_NAND=y CONFIG_MTD=y +CONFIG_NAND=y CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index 848aeb73aa..9a03c845b0 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -13,10 +13,10 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_OF_EMBED=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DM_KEYBOARD=y -CONFIG_OF_EMBED=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index 196b619bb7..9d1b303be0 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -14,10 +14,10 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_OF_EMBED=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DM_KEYBOARD=y -CONFIG_OF_EMBED=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index f23c1e7b18..31c4130af4 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -14,10 +14,10 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_OF_EMBED=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DM_KEYBOARD=y -CONFIG_OF_EMBED=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index 939870637a..893baf9e6d 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -13,10 +13,10 @@ CONFIG_SYS_PROMPT="U-Boot> " CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_OF_EMBED=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_DM_KEYBOARD=y -CONFIG_OF_EMBED=y CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_BCM2835=y diff --git a/configs/sheep-rk3368_defconfig b/configs/sheep-rk3368_defconfig index e641888e16..b862a14751 100644 --- a/configs/sheep-rk3368_defconfig +++ b/configs/sheep-rk3368_defconfig @@ -4,9 +4,8 @@ CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_ROCKCHIP_RK3368=y CONFIG_DEFAULT_DEVICE_TREE="rk3368-sheep" CONFIG_DEBUG_UART=y -# CONFIG_DISPLAY_CPUINFO is not set -CONFIG_FASTBOOT=y CONFIG_ANDROID_BOOT_IMAGE=y +# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y CONFIG_REGMAP=y diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fb2224e38d..c4a19d5c1e 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1600,7 +1600,6 @@ CONFIG_NET_RETRY_COUNT CONFIG_NEVER_ASSERT_ODT_TO_CPU CONFIG_NFC_FREQ CONFIG_NFSBOOTCOMMAND -CONFIG_NFS_READ_SIZE CONFIG_NFS_TIMEOUT CONFIG_NOBQFMAN CONFIG_NON_SECURE @@ -2871,10 +2870,7 @@ CONFIG_SYS_EBI_CFGR_VAL CONFIG_SYS_EBI_CSA_VAL CONFIG_SYS_EEPROM_BASE CONFIG_SYS_EEPROM_BUS_NUM -CONFIG_SYS_EEPROM_PAGE_WRITE_BITS -CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS CONFIG_SYS_EEPROM_PAGE_WRITE_ENABLE -CONFIG_SYS_EEPROM_SIZE CONFIG_SYS_EEPROM_WREN CONFIG_SYS_EHCI_USB1_ADDR CONFIG_SYS_ELBC_BASE @@ -3401,7 +3397,6 @@ CONFIG_SYS_I2C_BASE3 CONFIG_SYS_I2C_BASE4 CONFIG_SYS_I2C_BASE5 CONFIG_SYS_I2C_BUSES -CONFIG_SYS_I2C_BUS_MAX CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS @@ -3409,10 +3404,6 @@ CONFIG_SYS_I2C_DVI_ADDR CONFIG_SYS_I2C_DVI_BUS_NUM CONFIG_SYS_I2C_EARLY_INIT CONFIG_SYS_I2C_EEPROM -CONFIG_SYS_I2C_EEPROM_ADDR -CONFIG_SYS_I2C_EEPROM_ADDR_LEN -CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW -CONFIG_SYS_I2C_EEPROM_BUS CONFIG_SYS_I2C_EEPROM_CCID CONFIG_SYS_I2C_EEPROM_NXID CONFIG_SYS_I2C_EEPROM_NXID_MAC |