diff options
| author | Adam Ford <aford173@gmail.com> | 2019-08-13 14:04:02 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-20 11:46:38 -0400 |
| commit | a24b051a14227c5e38b00cf07b076ec8f45b97e1 (patch) | |
| tree | b1e7884715ea3c1ad285ad6c46612123191d1176 | |
| parent | 8f6babf82c0b6ad9aa93de238df7c0bf978c4695 (diff) | |
| download | u-boot-a24b051a14227c5e38b00cf07b076ec8f45b97e1.zip u-boot-a24b051a14227c5e38b00cf07b076ec8f45b97e1.tar.gz u-boot-a24b051a14227c5e38b00cf07b076ec8f45b97e1.tar.bz2 | |
Revert "ARM: da850-evm: Enable SPI Flash and NAND Flash when booting NOR"
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 51cd1e2373274dc3167dabba628dcfc25828d36d.
| -rw-r--r-- | board/davinci/da8xxevm/da850evm.c | 3 | ||||
| -rw-r--r-- | configs/da850evm_direct_nor_defconfig | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index b2b2fa2..d9019de 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -234,8 +234,7 @@ const struct pinmux_resource pinmuxes[] = { PINMUX_ITEM(emifa_pins_cs3), PINMUX_ITEM(emifa_pins_cs4), PINMUX_ITEM(emifa_pins_nand), -#endif -#ifdef CONFIG_USE_NOR +#elif defined(CONFIG_USE_NOR) PINMUX_ITEM(emifa_pins_cs2), PINMUX_ITEM(emifa_pins_nor), #endif diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index e889751..407a30f 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -24,15 +24,14 @@ CONFIG_CMD_DM=y # CONFIG_CMD_GPT is not set # CONFIG_CMD_MMC is not set CONFIG_CMD_MTD=y -CONFIG_CMD_NAND=y # CONFIG_CMD_PART is not set # CONFIG_CMD_SF is not set # CONFIG_CMD_SPI is not set # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_TIME is not set CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nor0=physmap-flash.2,nor1=spi1.0,nand0=nand512" -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_MTDIDS_DEFAULT="nor0=physmap-flash.2" +CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.2:1m(u-boot),128k(u-boot-env),-(spare)" CONFIG_CMD_DIAG=y CONFIG_OF_CONTROL=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" @@ -50,13 +49,10 @@ CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y CONFIG_FLASH_CFI_MTD=y CONFIG_SYS_FLASH_PROTECTION=y CONFIG_SYS_FLASH_CFI=y -CONFIG_NAND=y -CONFIG_NAND_DAVINCI=y CONFIG_DM_SPI_FLASH=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y -CONFIG_SPI_FLASH_MTD=y CONFIG_DM_ETH=y CONFIG_MII=y CONFIG_DRIVER_TI_EMAC=y |