mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 06:00:43 +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>
67 lines
1.5 KiB
Text
67 lines
1.5 KiB
Text
CONFIG_PPC=y
|
|
CONFIG_SYS_TEXT_BASE=0xfff80000
|
|
CONFIG_ENV_SIZE=0x4000
|
|
CONFIG_ENV_SECT_SIZE=0x20000
|
|
CONFIG_MPC85xx=y
|
|
# CONFIG_CMD_ERRATA is not set
|
|
CONFIG_TARGET_SOCRATES=y
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
CONFIG_BOOTDELAY=1
|
|
CONFIG_USE_PREBOOT=y
|
|
CONFIG_PREBOOT="echo;echo Welcome on the ABB Socrates Board;echo"
|
|
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
|
CONFIG_BOARD_EARLY_INIT_R=y
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_CMD_REGINFO=y
|
|
# CONFIG_BOOTM_NETBSD is not set
|
|
# CONFIG_BOOTM_PLAN9 is not set
|
|
# CONFIG_BOOTM_RTEMS is not set
|
|
# CONFIG_BOOTM_VXWORKS is not set
|
|
CONFIG_CMD_IMLS=y
|
|
CONFIG_CMD_DM=y
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_NAND=y
|
|
CONFIG_CMD_PCI=y
|
|
CONFIG_CMD_SDRAM=y
|
|
CONFIG_CMD_USB=y
|
|
# CONFIG_CMD_SETEXPR is not set
|
|
CONFIG_CMD_DHCP=y
|
|
# CONFIG_CMD_NFS is not set
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_SNTP=y
|
|
# CONFIG_CMD_HASH is not set
|
|
CONFIG_CMD_EXT2=y
|
|
# CONFIG_CMD_IRQ is not set
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_DEFAULT_DEVICE_TREE="socrates"
|
|
CONFIG_ENV_IS_IN_FLASH=y
|
|
CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
|
CONFIG_ENV_ADDR=0xFFF40000
|
|
CONFIG_ENV_ADDR_REDUND=0xFFF20000
|
|
CONFIG_DM=y
|
|
CONFIG_BLK=y
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SYS_I2C_FSL=y
|
|
# CONFIG_MMC is not set
|
|
CONFIG_MTD_NOR_FLASH=y
|
|
CONFIG_FLASH_CFI_DRIVER=y
|
|
CONFIG_SYS_FLASH_CFI=y
|
|
CONFIG_PHY_MARVELL=y
|
|
CONFIG_MII=y
|
|
CONFIG_TSEC_ENET=y
|
|
CONFIG_DM_PCI=y
|
|
CONFIG_PCI_MPC85XX=y
|
|
CONFIG_DM_RTC=y
|
|
CONFIG_RTC_RX8025=y
|
|
CONFIG_SPECIFY_CONSOLE_INDEX=y
|
|
CONFIG_DM_SERIAL=y
|
|
CONFIG_SERIAL_SEARCH_ALL=y
|
|
CONFIG_SYS_NS16550=y
|
|
CONFIG_USB=y
|
|
CONFIG_DM_USB=y
|
|
# CONFIG_USB_EHCI_HCD is not set
|
|
CONFIG_USB_OHCI_PCI=y
|
|
CONFIG_USB_STORAGE=y
|