projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-amlogic-20190704' of https://gitlab.denx.de/u-boot/custodians/u...
[platform/kernel/u-boot.git]
/
configs
/
imx6qdl_icore_nand_defconfig
diff --git
a/configs/imx6qdl_icore_nand_defconfig
b/configs/imx6qdl_icore_nand_defconfig
index
b32eea9
..
1657298
100644
(file)
--- a/
configs/imx6qdl_icore_nand_defconfig
+++ b/
configs/imx6qdl_icore_nand_defconfig
@@
-1,41
+1,55
@@
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
CONFIG_ARM=y
CONFIG_ARCH_MX6=y
-CONFIG_TARGET_MX6Q_ICORE=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,ENV_IS_IN_NAND"
-CONFIG_DEFAULT_FDT_FILE="imx6dl-icore.dtb"
-CONFIG_DEFAULT_DEVICE_TREE="imx6dl-icore"
-CONFIG_SYS_PROMPT="icorem6qdl> "
+CONFIG_SYS_TEXT_BASE=0x17800000
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TARGET_MX6Q_ENGICAM=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_NR_DRAM_BANKS=1
CONFIG_SPL=y
CONFIG_SPL=y
+# CONFIG_CMD_BMODE is not set
+CONFIG_FIT=y
+CONFIG_FIT_SIGNATURE=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_IMAGE_FORMAT_LEGACY=y
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
CONFIG_BOOTDELAY=3
CONFIG_BOOTDELAY=3
-CONFIG_BOARD_EARLY_INIT_F=y
-CONFIG_DISPLAY_CPUINFO=y
+CONFIG_SUPPORT_RAW_INITRD=y
+CONFIG_BOUNCE_BUFFER=y
+CONFIG_SPL_TEXT_BASE=0x00908000
+CONFIG_SPL_DMA_SUPPORT=y
+CONFIG_SPL_WATCHDOG_SUPPORT=y
CONFIG_HUSH_PARSER=y
CONFIG_HUSH_PARSER=y
-CONFIG_AUTO_COMPLETE=y
-CONFIG_SYS_MAXARGS=32
-# CONFIG_CMD_IMLS is not set
-CONFIG_CMD_BOOTZ=y
+CONFIG_SYS_PROMPT="icorem6qdl> "
+CONFIG_CMD_MEMTEST=y
CONFIG_CMD_GPIO=y
CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
+CONFIG_CMD_MMC=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
CONFIG_CMD_MII=y
CONFIG_CMD_PING=y
-CONFIG_CMD_MEMTEST=y
-CONFIG_CMD_NAND=y
CONFIG_CMD_CACHE=y
CONFIG_CMD_CACHE=y
-CONFIG_OF_LIBFDT=y
-CONFIG_FEC_MXC=y
-CONFIG_MXC_UART=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_EXT4_WRITE=y
+CONFIG_CMD_FAT=y
+CONFIG_CMD_FS_GENERIC=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
+CONFIG_CMD_UBI=y
+CONFIG_DEFAULT_DEVICE_TREE="imx6q-icore"
+CONFIG_ENV_IS_IN_NAND=y
+CONFIG_SYS_I2C_MXC=y
+CONFIG_FSL_ESDHC_IMX=y
+CONFIG_NAND=y
CONFIG_NAND_MXS=y
CONFIG_NAND_MXS=y
-CONFIG_IMX_THERMAL=y
-# CONFIG_BLK is not set
-# CONFIG_DM_MMC_OPS is not set
+CONFIG_PHYLIB=y
+CONFIG_PHY_SMSC=y
+CONFIG_FEC_MXC=y
+CONFIG_MII=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
CONFIG_PINCTRL=y
CONFIG_PINCTRL_IMX6=y
-CONFIG_VIDEO=y
+CONFIG_MXC_UART=y
+CONFIG_IMX_THERMAL=y
+CONFIG_DM_VIDEO=y
CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO_IPUV3=y
-CONFIG_SYS_CONSOLE_IS_IN_ENV=y
-CONFIG_SPL_LIBCOMMON_SUPPORT=y
-CONFIG_SPL_LIBGENERIC_SUPPORT=y
-CONFIG_SPL_SERIAL_SUPPORT=y
-CONFIG_SPL_I2C_SUPPORT=y
-CONFIG_SPL_GPIO_SUPPORT=y
-CONFIG_SPL_WATCHDOG_SUPPORT=y
-CONFIG_SPL_DMA_SUPPORT=y