summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLad, Prabhakar <prabhakar.lad@ti.com>2012-06-26 16:49:18 +0530
committerManjunathappa, Prakash <prakash.pm@ti.com>2012-06-27 12:39:16 +0530
commit9cd42875e7d154dfc5b186d55c21f329bb8ebd50 (patch)
tree5f6fc97cfb76543dcec6fc04b338dfdd3ac541f8
parenta2992f50a4a711c919d17b22f32183111e4c7570 (diff)
da850: add a entry in boards.cfg for NAND
add a entry for NAND configuration in boards.cfg. This config can directly be used to build for NAND boot mode. Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
-rw-r--r--boards.cfg1
-rw-r--r--include/configs/da850evm.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/boards.cfg b/boards.cfg
index 345474d924..37ba4f8a18 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -122,6 +122,7 @@ cam_enc_4xx arm arm926ejs cam_enc_4xx ait
da830evm arm arm926ejs da8xxevm davinci davinci
da850_am18xxevm arm arm926ejs da8xxevm davinci davinci da850evm:DA850_AM18X_EVM,MAC_ADDR_IN_EEPROM,SYS_I2C_EEPROM_ADDR_LEN=2,SYS_I2C_EEPROM_ADDR=0x50
da850evm arm arm926ejs da8xxevm davinci davinci da850evm:MAC_ADDR_IN_SPIFLASH
+da850evm_nand arm arm926ejs da8xxevm davinci davinci da850evm:MAC_ADDR_IN_SPIFLASH,USE_NAND
da850evm_direct_nor arm arm926ejs da8xxevm davinci davinci da850evm:MAC_ADDR_IN_SPIFLASH,USE_NOR,DIRECT_NOR_BOOT
davinci_dm355evm arm arm926ejs dm355evm davinci davinci
davinci_dm355leopard arm arm926ejs dm355leopard davinci davinci
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index ea022efa21..947a9509e7 100644
--- a/include/configs/da850evm.h
+++ b/include/configs/da850evm.h
@@ -28,7 +28,7 @@
*/
#define CONFIG_DRIVER_TI_EMAC
/* check if direct NOR boot config is used */
-#ifndef CONFIG_DIRECT_NOR_BOOT
+#if !defined(CONFIG_DIRECT_NOR_BOOT) && !defined(CONFIG_USE_NAND)
#define CONFIG_USE_SPIFLASH
#endif