Skip to contentSkip to conversation

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

PATCH New Adam Ford 2 participants 2 messages Aug 3, 2019 – Aug 13, 2019

lore
Share & tools
lore

Adam Ford

author
#0 lore raw

PATCH 1/1 ARM: da850-evm: Enable SPI Flash and NAND Flash when booting NOR

Historically there have been various boot options, SPI flash, NAND or NOR. The NOR flash is mutually exclusive with MMC, but it isn't mutually exclusive with NAND or SPI Flash, so this patch enables both NAND flash and SPI Flash when booting from NOR.

board/davinci/da8xxevm/da850evm.c +2 -1
index 2d5710076d..c9c34a0c29 100644
@@ -234,7 +234,8 @@ const struct pinmux_resource pinmuxes[] = {
 	PINMUX_ITEM(emifa_pins_cs3),
 	PINMUX_ITEM(emifa_pins_cs4),
 	PINMUX_ITEM(emifa_pins_nand),
-#elif defined(CONFIG_USE_NOR)
+#endif
+#ifdef CONFIG_USE_NOR
 	PINMUX_ITEM(emifa_pins_cs2),
 	PINMUX_ITEM(emifa_pins_nor),
 #endif
configs/da850evm_direct_nor_defconfig +6 -2
index b4e0d08d7f..e92650178c 100644
@@ -24,14 +24,15 @@ 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"
-CONFIG_MTDPARTS_DEFAULT="mtdparts=physmap-flash.2:1m(u-boot),128k(u-boot-env),-(spare)"
+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_CMD_DIAG=y
 CONFIG_OF_CONTROL=y
 CONFIG_DEFAULT_DEVICE_TREE="da850-evm"
@@ -49,10 +50,13 @@ 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
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/1 ARM: da850-evm: Enable SPI Flash and NAND Flash when booting NOR

board/davinci/da8xxevm/da850evm.c

Quoted 9 lines · Adam Ford

Historically there have been various boot options, SPI flash, NAND or NOR. The NOR flash is mutually exclusive with MMC, but it isn't mutually exclusive with NAND or SPI Flash, so this patch enables both NAND flash and SPI Flash when booting from NOR.

board/davinci/da8xxevm/da850evm.c +0 -0
index 2d5710076d..c9c34a0c29 100644

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190813/8d80e895/attachment.sig>