mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
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>
95 lines
2.3 KiB
Plaintext
95 lines
2.3 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_DDRCAL=y
|
|
CONFIG_TARGET_DHCOMIMX6=y
|
|
CONFIG_SPL_MMC_SUPPORT=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_ENV_SIZE=0x4000
|
|
CONFIG_ENV_OFFSET=0x100000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_SPL=y
|
|
CONFIG_SYS_BOOTCOUNT_ADDR=0x00900000
|
|
CONFIG_ENV_SECT_SIZE=0x10000
|
|
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
|
CONFIG_SPL_SPI_SUPPORT=y
|
|
CONFIG_AHCI=y
|
|
CONFIG_SPL_TEXT_BASE=0x00908000
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
# CONFIG_SYS_MALLOC_F is not set
|
|
CONFIG_FIT=y
|
|
CONFIG_SPL_FIT=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_OVERWRITE_ROUTINE=y
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_SPL_SPI_LOAD=y
|
|
CONFIG_SYS_SPI_U_BOOT_OFFS=0x11400
|
|
CONFIG_SPL_WATCHDOG_SUPPORT=y
|
|
CONFIG_CMD_MEMTEST=y
|
|
CONFIG_CMD_UNZIP=y
|
|
CONFIG_CMD_DFU=y
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_SATA=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_USB_MASS_STORAGE=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx6q-dhcom-pdk2"
|
|
CONFIG_OF_LIST="imx6q-dhcom-pdk2 imx6dl-dhcom-pdk2"
|
|
CONFIG_MULTI_DTB_FIT=y
|
|
CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
|
CONFIG_ENV_OFFSET_REDUND=0x110000
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_DWC_AHSATA=y
|
|
CONFIG_BOOTCOUNT_LIMIT=y
|
|
CONFIG_DM_GPIO=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SYS_I2C_MXC=y
|
|
CONFIG_MISC=y
|
|
CONFIG_I2C_EEPROM=y
|
|
CONFIG_DM_MMC=y
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_DM_SPI_FLASH=y
|
|
CONFIG_SF_DEFAULT_MODE=0
|
|
CONFIG_SF_DEFAULT_SPEED=25000000
|
|
CONFIG_SPI_FLASH_SFDP_SUPPORT=y
|
|
CONFIG_SPI_FLASH_GIGADEVICE=y
|
|
CONFIG_SPI_FLASH_MACRONIX=y
|
|
CONFIG_SPI_FLASH_SPANSION=y
|
|
CONFIG_SPI_FLASH_WINBOND=y
|
|
CONFIG_SPI_FLASH_MTD=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_MICREL=y
|
|
CONFIG_PHY_MICREL_KSZ90X1=y
|
|
CONFIG_FEC_MXC=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX6=y
|
|
CONFIG_DM_REGULATOR=y
|
|
CONFIG_DM_REGULATOR_FIXED=y
|
|
CONFIG_DM_SCSI=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_MXC_SPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
CONFIG_USB_GADGET=y
|
|
CONFIG_USB_GADGET_MANUFACTURER="dh"
|
|
CONFIG_USB_GADGET_VENDOR_NUM=0x0525
|
|
CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
|
|
CONFIG_CI_UDC=y
|
|
CONFIG_USB_GADGET_DOWNLOAD=y
|
|
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
|
|
CONFIG_IMX_WATCHDOG=y
|