Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-22 12:54:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "ARM: da850-evm: Enable SPI Flash and NAND Flash when booting NOR"

Browse source 
Sorry for the noise, but there appears to be a regression with older
hardware.  Since it broke the direct_nor boot option, it should be
reverted until a better solution is available.

This reverts commit 51cd1e2373.
This commit is contained in:
Adam Ford 2019-08-13 14:04:02 -05:00 • committed by Tom Rini
parent 8f6babf82c
commit a24b051a14
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
board/davinci/da8xxevm/da850evm.c
View file

@ -234,8 +234,7 @@ const struct pinmux_resource pinmuxes[] = {
PINMUX_ITEM(emifa_pins_cs3), PINMUX_ITEM(emifa_pins_cs3),
PINMUX_ITEM(emifa_pins_cs4), PINMUX_ITEM(emifa_pins_cs4),
PINMUX_ITEM(emifa_pins_nand), PINMUX_ITEM(emifa_pins_nand),
#endif #elif defined(CONFIG_USE_NOR)
#ifdef CONFIG_USE_NOR
PINMUX_ITEM(emifa_pins_cs2), PINMUX_ITEM(emifa_pins_cs2),
PINMUX_ITEM(emifa_pins_nor), PINMUX_ITEM(emifa_pins_nor),
#endif #endif

8
configs/da850evm_direct_nor_defconfig
View file

@ -24,15 +24,14 @@ CONFIG_CMD_DM=y
# CONFIG_CMD_GPT is not set # CONFIG_CMD_GPT is not set
# CONFIG_CMD_MMC is not set # CONFIG_CMD_MMC is not set
CONFIG_CMD_MTD=y CONFIG_CMD_MTD=y
CONFIG_CMD_NAND=y
# CONFIG_CMD_PART is not set # CONFIG_CMD_PART is not set
# CONFIG_CMD_SF is not set # CONFIG_CMD_SF is not set
# CONFIG_CMD_SPI is not set # CONFIG_CMD_SPI is not set
# CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_SETEXPR is not set
# CONFIG_CMD_TIME is not set # CONFIG_CMD_TIME is not set
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.2,nor1=spi1.0,nand0=nand512" CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.2"
CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.2:1m(u-boot),128k(u-boot-env),-(spare);spi1.0:32k(SPL),480k(u-boot),64k(u-boot-env),7552k(kernel-spare),64k(MAC-Address);nand512:128k(u-boot env),512k(u-boot),128k(spl-os),8m(kernel),-(rootfs)" CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.2:1m(u-boot),128k(u-boot-env),-(spare)"
CONFIG_CMD_DIAG=y CONFIG_CMD_DIAG=y
CONFIG_OF_CONTROL=y CONFIG_OF_CONTROL=y
CONFIG_DEFAULT_DEVICE_TREE="da850-evm" CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
@ -50,13 +49,10 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y
CONFIG_FLASH_CFI_MTD=y CONFIG_FLASH_CFI_MTD=y
CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_PROTECTION=y
CONFIG_SYS_FLASH_CFI=y CONFIG_SYS_FLASH_CFI=y
CONFIG_NAND=y
CONFIG_NAND_DAVINCI=y
CONFIG_DM_SPI_FLASH=y CONFIG_DM_SPI_FLASH=y
CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_STMICRO=y
CONFIG_SPI_FLASH_WINBOND=y CONFIG_SPI_FLASH_WINBOND=y
CONFIG_SPI_FLASH_MTD=y
CONFIG_DM_ETH=y CONFIG_DM_ETH=y
CONFIG_MII=y CONFIG_MII=y
CONFIG_DRIVER_TI_EMAC=y CONFIG_DRIVER_TI_EMAC=y