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>
102 lines
2.6 KiB
Plaintext
102 lines
2.6 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_MX6_OCRAM_256KB=y
|
|
CONFIG_TARGET_MX6LOGICPD=y
|
|
CONFIG_SPL_MMC_SUPPORT=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_ENV_SIZE=0x100000
|
|
CONFIG_ENV_OFFSET=0x400000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_SPL=y
|
|
CONFIG_SPL_FS_FAT=y
|
|
CONFIG_SPL_TEXT_BASE=0x00908000
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
|
|
CONFIG_BOOTDELAY=3
|
|
# CONFIG_USE_BOOTCOMMAND is not set
|
|
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
|
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_SPL_RAW_IMAGE_SUPPORT=y
|
|
CONFIG_SPL_SEPARATE_BSS=y
|
|
# CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
|
|
CONFIG_SPL_DMA_SUPPORT=y
|
|
CONFIG_SPL_I2C_SUPPORT=y
|
|
CONFIG_SPL_NAND_SUPPORT=y
|
|
CONFIG_SPL_OS_BOOT=y
|
|
CONFIG_SPL_PAYLOAD="u-boot.img"
|
|
CONFIG_SPL_USB_HOST_SUPPORT=y
|
|
CONFIG_SPL_USB_GADGET=y
|
|
CONFIG_SPL_USB_SDP_SUPPORT=y
|
|
CONFIG_SPL_WATCHDOG_SUPPORT=y
|
|
CONFIG_SYS_PROMPT="i.MX6 Logic # "
|
|
CONFIG_CMD_SPL=y
|
|
CONFIG_CMD_SPL_NAND_OFS=0x1500000
|
|
CONFIG_CMD_SPL_WRITE_SIZE=0x00100000
|
|
CONFIG_CMD_MEMTEST=y
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_MTD=y
|
|
CONFIG_CMD_NAND_TRIMFFS=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_SDP=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
CONFIG_CMD_CACHE=y
|
|
# CONFIG_CMD_LED is not set
|
|
CONFIG_CMD_UUID=y
|
|
CONFIG_CMD_PMIC=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),16m(kernel),1m(dtb),-(fs)"
|
|
CONFIG_CMD_UBI=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx6q-logicpd"
|
|
CONFIG_ENV_IS_IN_FAT=y
|
|
CONFIG_ENV_IS_IN_NAND=y
|
|
CONFIG_ENV_FAT_INTERFACE="mmc"
|
|
CONFIG_ENV_FAT_DEVICE_AND_PART="0:1"
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
|
CONFIG_SPL_DM=y
|
|
CONFIG_SPL_DM_SEQ_ALIAS=y
|
|
CONFIG_SPL_OF_TRANSLATE=y
|
|
CONFIG_PCF8575_GPIO=y
|
|
CONFIG_LED=y
|
|
CONFIG_LED_GPIO=y
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_MTD=y
|
|
CONFIG_NAND=y
|
|
CONFIG_SYS_NAND_USE_FLASH_BBT=y
|
|
CONFIG_NAND_MXS=y
|
|
CONFIG_NAND_MXS_DT=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_ATHEROS=y
|
|
CONFIG_FEC_MXC=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_SPL_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX6=y
|
|
CONFIG_DM_PMIC_PFUZE100=y
|
|
CONFIG_DM_REGULATOR=y
|
|
CONFIG_DM_REGULATOR_PFUZE100=y
|
|
CONFIG_DM_REGULATOR_FIXED=y
|
|
CONFIG_DM_REGULATOR_GPIO=y
|
|
CONFIG_DM_SERIAL=y
|
|
CONFIG_MXC_UART=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
# CONFIG_SPL_DM_USB is not set
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_MANUFACTURER="FSL"
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
|
CONFIG_CI_UDC=y
|
|
CONFIG_USB_GADGET_DOWNLOAD=y
|