mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-13 08:27:23 +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>
82 lines
2.2 KiB
Text
82 lines
2.2 KiB
Text
CONFIG_ARM=y
|
|
CONFIG_ARCH_MX6=y
|
|
CONFIG_SYS_TEXT_BASE=0x17800000
|
|
CONFIG_SPL_GPIO_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_TARGET_MCCMON6=y
|
|
CONFIG_SPL_MMC_SUPPORT=y
|
|
CONFIG_SPL_SERIAL_SUPPORT=y
|
|
CONFIG_ENV_SIZE=0x20000
|
|
CONFIG_NR_DRAM_BANKS=1
|
|
CONFIG_SPL=y
|
|
CONFIG_ENV_SECT_SIZE=0x20000
|
|
# CONFIG_CMD_BMODE is not set
|
|
CONFIG_SPL_TEXT_BASE=0x00908000
|
|
CONFIG_DISTRO_DEFAULTS=y
|
|
CONFIG_FIT=y
|
|
CONFIG_SPL_LOAD_FIT=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/liebherr/mccmon6/mon6_imximage_sd.cfg"
|
|
# CONFIG_USE_BOOTCOMMAND is not set
|
|
CONFIG_BOUNCE_BUFFER=y
|
|
CONFIG_SPL_BOARD_INIT=y
|
|
CONFIG_SPL_ENV_SUPPORT=y
|
|
CONFIG_SPL_NOR_SUPPORT=y
|
|
CONFIG_CMD_SPL=y
|
|
CONFIG_CMD_SPL_NOR_OFS=0x09600000
|
|
CONFIG_CMD_SPL_WRITE_SIZE=0x20000
|
|
CONFIG_CMD_CLK=y
|
|
CONFIG_CMD_GPIO=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
# CONFIG_CMD_PINMUX is not set
|
|
CONFIG_CMD_CACHE=y
|
|
CONFIG_CMD_PMIC=y
|
|
CONFIG_CMD_REGULATOR=y
|
|
CONFIG_CMD_EXT4_WRITE=y
|
|
CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_MTDIDS_DEFAULT="nor0=8000000.nor"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nor:32m@0x0(mccmon6-image.nor),256k@0x40000(u-boot-env.nor),1m@0x80000(u-boot.nor),8m@0x180000(kernel.nor),8m@0x980000(swupdate-kernel.nor),8m@0x1180000(swupdate-rootfs.nor)"
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="imx6q-mccmon6"
|
|
CONFIG_ENV_IS_IN_FLASH=y
|
|
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
|
CONFIG_ENV_ADDR=0x8040000
|
|
CONFIG_ENV_ADDR_REDUND=0x8060000
|
|
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=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_DM_MMC=y
|
|
CONFIG_FSL_USDHC=y
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_NOR_FLASH=y
|
|
CONFIG_MTD_DEVICE=y
|
|
CONFIG_FLASH_CFI_DRIVER=y
|
|
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
|
|
CONFIG_FLASH_CFI_MTD=y
|
|
CONFIG_SYS_FLASH_PROTECTION=y
|
|
CONFIG_SYS_FLASH_CFI=y
|
|
CONFIG_DM_SPI_FLASH=y
|
|
CONFIG_SF_DEFAULT_MODE=0
|
|
CONFIG_SF_DEFAULT_SPEED=25000000
|
|
CONFIG_SPI_FLASH_SPANSION=y
|
|
CONFIG_PHYLIB=y
|
|
CONFIG_PHY_MICREL=y
|
|
CONFIG_PHY_MICREL_KSZ90X1=y
|
|
CONFIG_FEC_MXC=y
|
|
CONFIG_RGMII=y
|
|
CONFIG_MII=y
|
|
CONFIG_PINCTRL=y
|
|
CONFIG_PINCTRL_IMX6=y
|
|
CONFIG_DM_PMIC=y
|
|
# CONFIG_SPL_PMIC_CHILDREN is not set
|
|
CONFIG_DM_PMIC_PFUZE100=y
|
|
CONFIG_DM_REGULATOR=y
|
|
CONFIG_DM_REGULATOR_PFUZE100=y
|
|
# CONFIG_REQUIRE_SERIAL_CONSOLE is not set
|
|
# CONFIG_SPL_SERIAL_PRESENT is not set
|
|
CONFIG_MXC_UART=y
|
|
CONFIG_SPI=y
|
|
CONFIG_MXC_SPI=y
|
|
CONFIG_DM_THERMAL=y
|