mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-28 23:51:33 +00: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>
81 lines
2.1 KiB
Text
81 lines
2.1 KiB
Text
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_SYS_MALLOC_F_LEN=0x2200
|
|
CONFIG_MX6_DDRCAL=y
|
|
CONFIG_TARGET_KP_IMX6Q_TPC=y
|
|
CONFIG_SPL_MMC_SUPPORT=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_ENV_SIZE=0x2000
|
|
CONFIG_ENV_OFFSET=0x100000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_SPL=y
|
|
CONFIG_SPL_TEXT_BASE=0x00908000
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
|
|
CONFIG_SD_BOOT=y
|
|
CONFIG_BOOTDELAY=3
|
|
# CONFIG_USE_BOOTCOMMAND is not set
|
|
CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_SPL_RAW_IMAGE_SUPPORT=y
|
|
CONFIG_SPL_PAYLOAD="u-boot.img"
|
|
CONFIG_SPL_POWER_SUPPORT=y
|
|
CONFIG_SPL_WATCHDOG_SUPPORT=y
|
|
CONFIG_AUTOBOOT_KEYED=y
|
|
CONFIG_AUTOBOOT_STOP_STR="."
|
|
# CONFIG_CMD_ELF is not set
|
|
# CONFIG_CMD_FLASH is not set
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_TIME=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
# CONFIG_ISO_PARTITION is not set
|
|
# CONFIG_EFI_PARTITION is not set
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_SPL_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx6q-kp"
|
|
CONFIG_OF_SPL_REMOVE_PROPS="interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents interrupts dmas dma-names"
|
|
CONFIG_ENV_IS_IN_MMC=y
|
|
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
|
CONFIG_ENV_OFFSET_REDUND=0x102000
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
# CONFIG_BLOCK_CACHE is not set
|
|
CONFIG_SPL_CLK_IMX6Q=y
|
|
CONFIG_CLK_IMX6Q=y
|
|
CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
|
|
CONFIG_SYS_I2C_MXC=y
|
|
CONFIG_SYS_I2C_MXC_I2C1=y
|
|
CONFIG_SYS_I2C_MXC_I2C2=y
|
|
CONFIG_LED=y
|
|
CONFIG_LED_GPIO=y
|
|
CONFIG_SUPPORT_EMMC_BOOT=y
|
|
CONFIG_FSL_USDHC=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_REGULATOR_FIXED=y
|
|
CONFIG_SPL_DM_REGULATOR_FIXED=y
|
|
CONFIG_DM_RTC=y
|
|
CONFIG_RTC_DS1307=y
|
|
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
CONFIG_MXC_UART=y
|
|
CONFIG_SYSRESET=y
|
|
CONFIG_SPL_SYSRESET=y
|
|
CONFIG_SYSRESET_WATCHDOG=y
|
|
CONFIG_IMX_THERMAL=y
|
|
CONFIG_USB=y
|
|
# CONFIG_SPL_DM_USB is not set
|
|
CONFIG_WATCHDOG_TIMEOUT_MSECS=60000
|
|
CONFIG_IMX_WATCHDOG=y
|