a09fea1d28
- In ARMv8 NXP Layerscape platforms we also need to make use of CONFIG_SYS_RELOC_GD_ENV_ADDR now, do so. - On ENV_IS_IN_REMOTE, CONFIG_ENV_OFFSET is never used, drop the define to 0. - Add Kconfig entry for ENV_ADDR. - Make ENV_ADDR / ENV_OFFSET depend on the env locations that use it. - Add ENV_xxx_REDUND options that depend on their primary option and SYS_REDUNDAND_ENVIRONMENT - On a number of PowerPC platforms, use SPL_ENV_ADDR not CONFIG_ENV_ADDR for the pre-main-U-Boot environment location. - On ENV_IS_IN_SPI_FLASH, check not for CONFIG_ENV_ADDR being set but rather it being non-zero, as it will now be zero by default. - Rework the env_offset absolute in env/embedded.o to not use CONFIG_ENV_OFFSET as it was the only use of ENV_OFFSET within ENV_IS_IN_FLASH. - Migrate all platforms. Cc: Wolfgang Denk <wd@denx.de> Cc: Joe Hershberger <joe.hershberger@ni.com> Cc: Patrick Delaunay <patrick.delaunay@st.com> Cc: uboot-stm32@st-md-mailman.stormreply.com Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com> Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
77 lines
1.9 KiB
Plaintext
77 lines
1.9 KiB
Plaintext
CONFIG_ARM=y
|
|
CONFIG_ARCH_MX6=y
|
|
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_ENV_SIZE=0x20000
|
|
CONFIG_ENV_OFFSET=0x100000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_SPL=y
|
|
CONFIG_SYS_BOOTCOUNT_SINGLEWORD=y
|
|
CONFIG_SYS_BOOTCOUNT_ADDR=0x020D8024
|
|
CONFIG_DEBUG_UART_BASE=0x021f0000
|
|
CONFIG_DEBUG_UART_CLOCK=24000000
|
|
CONFIG_SPL_LIBDISK_SUPPORT=y
|
|
# CONFIG_CMD_BMODE is not set
|
|
CONFIG_DEBUG_UART=y
|
|
CONFIG_SPL_TEXT_BASE=0x00908000
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_SIGNATURE=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_SPL_LOAD_FIT=y
|
|
CONFIG_LEGACY_IMAGE_FORMAT=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
|
|
CONFIG_BOOTDELAY=3
|
|
CONFIG_SUPPORT_RAW_INITRD=y
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_SPL_OS_BOOT=y
|
|
CONFIG_SPL_WATCHDOG_SUPPORT=y
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_SYS_PROMPT="icorem6qdl> "
|
|
CONFIG_CRC32_VERIFY=y
|
|
CONFIG_CMD_MEMTEST=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_BMP=y
|
|
CONFIG_CMD_BOOTCOUNT=y
|
|
CONFIG_CMD_CACHE=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_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_OF_LIST="imx6q-icore imx6dl-icore"
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_BOOTCOUNT_LIMIT=y
|
|
CONFIG_BOOTCOUNT_BOOTLIMIT=3
|
|
CONFIG_SYS_BOOTCOUNT_MAGIC=0x0B01C041
|
|
CONFIG_SYS_I2C_MXC=y
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_NAND=y
|
|
CONFIG_NAND_MXS=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_SMSC=y
|
|
CONFIG_FEC_MXC=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX6=y
|
|
CONFIG_DEBUG_UART_MXC=y
|
|
CONFIG_MXC_UART=y
|
|
CONFIG_IMX_THERMAL=y
|
|
CONFIG_DM_VIDEO=y
|
|
CONFIG_SYS_WHITE_ON_BLACK=y
|
|
CONFIG_VIDEO_IPUV3=y
|
|
CONFIG_IMX_WATCHDOG=y
|