mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-30 00:21:06 +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>
121 lines
3.2 KiB
Text
121 lines
3.2 KiB
Text
CONFIG_PPC=y
|
|
CONFIG_SYS_IMMR=0xFFE00000
|
|
CONFIG_SYS_TEXT_BASE=0x11001000
|
|
CONFIG_SYS_MALLOC_LEN=0x100000
|
|
CONFIG_ENV_SIZE=0x20000
|
|
CONFIG_ENV_OFFSET=0x100000
|
|
CONFIG_DEFAULT_DEVICE_TREE="p1020rdb-pd"
|
|
CONFIG_SPL_TEXT_BASE=0xFF800000
|
|
CONFIG_SPL_SERIAL=y
|
|
CONFIG_TPL_TEXT_BASE=0xF8F81000
|
|
CONFIG_TPL_LIBCOMMON_SUPPORT=y
|
|
CONFIG_TPL_LIBGENERIC_SUPPORT=y
|
|
CONFIG_SPL=y
|
|
CONFIG_MPC85xx=y
|
|
# CONFIG_CMD_ERRATA is not set
|
|
CONFIG_TARGET_P1020RDB_PD=y
|
|
CONFIG_SYS_CUSTOM_LDSCRIPT=y
|
|
CONFIG_SYS_LDSCRIPT="arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
|
|
CONFIG_MP=y
|
|
CONFIG_FIT=y
|
|
CONFIG_FIT_VERBOSE=y
|
|
CONFIG_OF_BOARD_SETUP=y
|
|
CONFIG_OF_STDOUT_VIA_ALIAS=y
|
|
CONFIG_BOOTDELAY=10
|
|
CONFIG_USE_BOOTCOMMAND=y
|
|
CONFIG_BOOTCOMMAND="setenv bootargs root=/dev/$bdev rw rootdelay=30 console=$consoledev,$baudrate $othbootargs;usb start;ext2load usb 0:1 $loadaddr /boot/$bootfile;ext2load usb 0:1 $fdtaddr /boot/$fdtfile;bootm $loadaddr - $fdtaddr"
|
|
CONFIG_BOARD_EARLY_INIT_F=y
|
|
CONFIG_BOARD_EARLY_INIT_R=y
|
|
# CONFIG_MISC_INIT_R is not set
|
|
# CONFIG_SPL_FRAMEWORK is not set
|
|
CONFIG_SPL_NAND_BOOT=y
|
|
CONFIG_SPL_NAND_SUPPORT=y
|
|
CONFIG_TPL=y
|
|
CONFIG_TPL_ENV_SUPPORT=y
|
|
CONFIG_TPL_I2C=y
|
|
CONFIG_TPL_MPC8XXX_INIT_DDR=y
|
|
CONFIG_TPL_NAND_SUPPORT=y
|
|
CONFIG_TPL_SERIAL=y
|
|
CONFIG_HUSH_PARSER=y
|
|
# CONFIG_AUTO_COMPLETE is not set
|
|
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_HASH is not set
|
|
CONFIG_CMD_EXT2=y
|
|
CONFIG_CMD_FAT=y
|
|
CONFIG_CMD_MTDPARTS=y
|
|
CONFIG_MTDIDS_DEFAULT="nor0=ec000000.nor"
|
|
CONFIG_MTDPARTS_DEFAULT="mtdparts=ec000000.nor:128k(dtb),6016k(kernel),57088k(fs),1m(vsc7385-firmware),1280k(u-boot)"
|
|
CONFIG_OF_CONTROL=y
|
|
CONFIG_ENV_OVERWRITE=y
|
|
CONFIG_ENV_IS_IN_NAND=y
|
|
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
|
CONFIG_DM=y
|
|
CONFIG_DDR_CLK_FREQ=66666666
|
|
CONFIG_SYS_BR0_PRELIM_BOOL=y
|
|
CONFIG_SYS_BR0_PRELIM=0xFF800C21
|
|
CONFIG_SYS_OR0_PRELIM=0xFFFF8796
|
|
CONFIG_SYS_BR1_PRELIM_BOOL=y
|
|
CONFIG_SYS_BR1_PRELIM=0xEC001001
|
|
CONFIG_SYS_OR1_PRELIM=0xFC000FF7
|
|
CONFIG_SYS_BR2_PRELIM_BOOL=y
|
|
CONFIG_SYS_BR2_PRELIM=0xFFB00801
|
|
CONFIG_SYS_OR2_PRELIM=0xFFFE09FF
|
|
CONFIG_SYS_BR3_PRELIM_BOOL=y
|
|
CONFIG_SYS_BR3_PRELIM=0xFFA00801
|
|
CONFIG_SYS_OR3_PRELIM=0xFFF009F7
|
|
CONFIG_DM_I2C=y
|
|
CONFIG_SPL_SYS_I2C_LEGACY=y
|
|
CONFIG_TPL_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_SYS_I2C_EEPROM_ADDR=0x52
|
|
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_FLASH_CFI_MTD=y
|
|
CONFIG_SYS_FLASH_CFI=y
|
|
CONFIG_MTD_RAW_NAND=y
|
|
CONFIG_NAND_FSL_ELBC=y
|
|
CONFIG_SYS_NAND_BLOCK_SIZE=0x20000
|
|
CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y
|
|
CONFIG_SYS_NAND_U_BOOT_OFFS=0x20000
|
|
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_PHY_FIXED=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
|
|
CONFIG_USB_STORAGE=y
|