mirror of
https://github.com/u-boot/u-boot.git
synced 2024-12-14 07:13:28 +08:00
dd2986ac11
When migrating SYS_IMMR, I didn't allow for boards to provide
non-default values here. This lead to an incorrect migration on the
platforms where CONFIG_SYS_IMMR is set to CONFIG_SYS_CCSRBAR and
CONFIG_SYS_CSSRBAR is NOT the same as CONFIG_SYS_CCSRBAR_DEFAULT. Add
text to the prompt so that non-default values can be used and re-migrate
the platforms that have CONFIG_SYS_IMMR=CONFIG_SYS_CSSRBAR where
CONFIG_SYS_CSSRBAR != CONFIG_SYS_CCSRBAR_DEFAULT.
Fixes: be7dbb60c5 ("Convert CONFIG_SYS_IMMR to Kconfig")
Reported-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Tom Rini <trini@konsulko.com>
Tested-by: Pali Rohár <pali@kernel.org>
95 lines
2.4 KiB
Plaintext
95 lines
2.4 KiB
Plaintext
CONFIG_PPC=y
|
|
CONFIG_SYS_IMMR=0xFFE00000
|
|
CONFIG_SYS_TEXT_BASE=0x11001000
|
|
CONFIG_SYS_MALLOC_LEN=0x100000
|
|
CONFIG_SPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_SPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_ENV_SIZE=0x2000
|
|
CONFIG_ENV_OFFSET=0x100000
|
|
CONFIG_ENV_SECT_SIZE=0x10000
|
|
CONFIG_DEFAULT_DEVICE_TREE="p1010rdb-pa"
|
|
CONFIG_SPL_TEXT_BASE=0xD0001000
|
|
CONFIG_SPL_SERIAL=y
|
|
CONFIG_SPL_DRIVERS_MISC=y
|
|
CONFIG_SPL=y
|
|
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
|
CONFIG_SPL_SPI=y
|
|
CONFIG_MPC85xx=y
|
|
CONFIG_TARGET_P1010RDB_PA=y
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
|
CONFIG_SYS_EXTRA_OPTIONS="SPIFLASH"
|
|
CONFIG_BOOTDELAY=10
|
|
CONFIG_USE_BOOTCOMMAND=y
|
|
CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/ram rw console=$consoledev,$baudrate $othbootargs ramdisk_size=$ramdisk_size;tftp $ramdiskaddr $ramdiskfile;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr $ramdiskaddr $fdtaddr"
|
|
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
CONFIG_BOARD_EARLY_INIT_R=y
|
|
# CONFIG_SPL_FRAMEWORK is not set
|
|
CONFIG_SPL_SPI_BOOT=y
|
|
CONFIG_SPL_ENV_SUPPORT=y
|
|
CONFIG_SPL_I2C=y
|
|
CONFIG_SPL_MPC8XXX_INIT_DDR=y
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_CMD_IMLS=y
|
|
CONFIG_SYS_EEPROM_PAGE_WRITE_BITS=3
|
|
CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS=5
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_MMC=y
|
|
CONFIG_CMD_USB=y
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
CONFIG_CMD_EXT2=y
|
|
CONFIG_CMD_FAT=y
|
|
CONFIG_MTDIDS_DEFAULT="nand0=ff800000.flash"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=ff800000.flash:2m(uboot-env),1m(dtb),5m(kernel),56m(fs),-(usr)"
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_IS_IN_SPI_FLASH=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_DM=y
|
|
CONFIG_SYS_SATA_MAX_DEVICE=2
|
|
CONFIG_FSL_CAAM=y
|
|
CONFIG_DDR_CLK_FREQ=66666666
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SPL_SYS_I2C_LEGACY=y
|
|
CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
|
|
CONFIG_SYS_I2C_FSL=y
|
|
CONFIG_SYS_FSL_I2C_OFFSET=0x3000
|
|
CONFIG_SYS_FSL_HAS_I2C2_OFFSET=y
|
|
CONFIG_SYS_FSL_I2C2_OFFSET=0x3100
|
|
CONFIG_FSL_ESDHC=y
|
|
CONFIG_MTD=y
|
|
CONFIG_MTD_NOR_FLASH=y
|
|
CONFIG_FLASH_CFI_DRIVER=y
|
|
CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
|
|
CONFIG_SYS_FLASH_CFI=y
|
|
CONFIG_DM_SPI_FLASH=y
|
|
CONFIG_SF_DEFAULT_SPEED=10000000
|
|
CONFIG_SPI_FLASH_SPANSION=y
|
|
CONFIG_PHY_ATHEROS=y
|
|
CONFIG_PHY_BROADCOM=y
|
|
CONFIG_PHY_DAVICOM=y
|
|
CONFIG_PHY_LXT=y
|
|
CONFIG_PHY_MARVELL=y
|
|
CONFIG_PHY_NATSEMI=y
|
|
CONFIG_PHY_REALTEK=y
|
|
CONFIG_PHY_SMSC=y
|
|
CONFIG_PHY_VITESSE=y
|
|
CONFIG_DM_ETH=y
|
|
CONFIG_DM_MDIO=y
|
|
CONFIG_PHY_GIGE=y
|
|
CONFIG_E1000=y
|
|
CONFIG_MII=y
|
|
CONFIG_TSEC_ENET=y
|
|
CONFIG_PCIE_FSL=y
|
|
CONFIG_DM_RTC=y
|
|
CONFIG_SYS_NS16550=y
|
|
CONFIG_SPI=y
|
|
CONFIG_DM_SPI=y
|
|
CONFIG_FSL_ESPI=y
|
|
CONFIG_USB=y
|
|
CONFIG_USB_EHCI_FSL=y
|