mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-01 08:59:33 +00: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>
72 lines
2 KiB
Text
72 lines
2 KiB
Text
CONFIG_PPC=y
|
|
CONFIG_SYS_IMMR=0xE0000000
|
|
CONFIG_SYS_TEXT_BASE=0xFFF80000
|
|
CONFIG_SYS_MALLOC_LEN=0x100000
|
|
CONFIG_ENV_SIZE=0x2000
|
|
CONFIG_ENV_SECT_SIZE=0x20000
|
|
CONFIG_DEFAULT_DEVICE_TREE="mpc8548cds"
|
|
CONFIG_MPC85xx=y
|
|
# CONFIG_CMD_ERRATA is not set
|
|
CONFIG_TARGET_MPC8548CDS=y
|
|
CONFIG_MPC85XX_HAVE_RESET_VECTOR=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
|
CONFIG_DYNAMIC_SYS_CLK_FREQ=y
|
|
CONFIG_BOOTDELAY=10
|
|
CONFIG_USE_BOOTCOMMAND=y
|
|
CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/nfs rw nfsroot=$serverip:$rootpath ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off console=$consoledev,$baudrate $othbootargs;tftp $loadaddr $bootfile;tftp $fdtaddr $fdtfile;bootm $loadaddr - $fdtaddr"
|
|
# CONFIG_MISC_INIT_R is not set
|
|
CONFIG_ID_EEPROM=y
|
|
CONFIG_HUSH_PARSER=y
|
|
CONFIG_CMD_IMLS=y
|
|
CONFIG_SYS_I2C_EEPROM_ADDR_LEN=2
|
|
CONFIG_CMD_I2C=y
|
|
CONFIG_CMD_PCI=y
|
|
CONFIG_CMD_DHCP=y
|
|
CONFIG_CMD_MII=y
|
|
CONFIG_CMD_PING=y
|
|
# CONFIG_CMD_HASH is not set
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_ADDR=0xFFF60000
|
|
CONFIG_DM=y
|
|
CONFIG_DDR_ECC=y
|
|
CONFIG_ECC_INIT_VIA_DDRCONTROLLER=y
|
|
CONFIG_SYS_BR0_PRELIM_BOOL=y
|
|
CONFIG_SYS_BR0_PRELIM=0xFF801001
|
|
CONFIG_SYS_OR0_PRELIM=0xFF806E65
|
|
CONFIG_SYS_BR1_PRELIM_BOOL=y
|
|
CONFIG_SYS_BR1_PRELIM=0xFF001001
|
|
CONFIG_SYS_OR1_PRELIM=0xFF806E65
|
|
CONFIG_SYS_BR2_PRELIM_BOOL=y
|
|
CONFIG_SYS_BR2_PRELIM=0xF0001861
|
|
CONFIG_SYS_OR2_PRELIM=0xFC006901
|
|
CONFIG_SYS_BR3_PRELIM_BOOL=y
|
|
CONFIG_SYS_BR3_PRELIM=0xF8000801
|
|
CONFIG_SYS_OR3_PRELIM=0xFFF00FF7
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_I2C_SET_DEFAULT_BUS_NUM=y
|
|
CONFIG_SYS_I2C_FSL=y
|
|
CONFIG_SYS_I2C_EEPROM_ADDR=0x57
|
|
# CONFIG_MMC is not set
|
|
CONFIG_MTD_NOR_FLASH=y
|
|
CONFIG_FLASH_CFI_DRIVER=y
|
|
CONFIG_SYS_FLASH_CFI=y
|
|
CONFIG_SYS_MAX_FLASH_BANKS=2
|
|
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_PHY_GIGE=y
|
|
CONFIG_E1000=y
|
|
CONFIG_MII=y
|
|
CONFIG_TSEC_ENET=y
|
|
CONFIG_DM_PCI_COMPAT=y
|
|
CONFIG_PCIE_FSL=y
|
|
CONFIG_CONS_INDEX=2
|
|
CONFIG_SYS_NS16550=y
|