diff options
| author | Sudhakar Rajashekhara <sudhakar.raj@ti.com> | 2010-01-20 13:58:48 +0530 |
|---|---|---|
| committer | Sudhakar Rajashekhara <sudhakar.raj@ti.com> | 2010-01-20 13:58:48 +0530 |
| commit | 652a0e7a3e86a6b525eb517d16009bf0ab73b0ed (patch) | |
| tree | 7babe063b6592454de614a2166c34aeb48c4d9f8 | |
| parent | 19f9aac5aead520631a8495885d5cb3f9af35b86 (diff) | |
da850: Add support for NOR boot mode
Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
| -rw-r--r-- | board/davinci/da8xxevm/da850evm.c | 51 | ||||
| -rw-r--r-- | include/configs/da850evm.h | 17 |
2 files changed, 60 insertions, 8 deletions
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index a3176741fa..fbe1e12def 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -111,6 +111,54 @@ const struct pinmux_config aemif_pins[] = { { pinmux[12], 1, 5 }, { pinmux[12], 1, 6 } }; +#elif defined(CONFIG_SYS_USE_NOR) +const struct pinmux_config nor_pins[] = { + { pinmux[5], 1, 6 }, + { pinmux[6], 1, 6 }, + { pinmux[7], 1, 0 }, + { pinmux[7], 1, 4 }, + { pinmux[7], 1, 5 }, + { pinmux[8], 1, 0 }, + { pinmux[8], 1, 1 }, + { pinmux[8], 1, 2 }, + { pinmux[8], 1, 3 }, + { pinmux[8], 1, 4 }, + { pinmux[8], 1, 5 }, + { pinmux[8], 1, 6 }, + { pinmux[8], 1, 7 }, + { pinmux[9], 1, 0 }, + { pinmux[9], 1, 1 }, + { pinmux[9], 1, 2 }, + { pinmux[9], 1, 3 }, + { pinmux[9], 1, 4 }, + { pinmux[9], 1, 5 }, + { pinmux[9], 1, 6 }, + { pinmux[9], 1, 7 }, + { pinmux[10], 1, 0 }, + { pinmux[10], 1, 1 }, + { pinmux[10], 1, 2 }, + { pinmux[10], 1, 3 }, + { pinmux[10], 1, 4 }, + { pinmux[10], 1, 5 }, + { pinmux[10], 1, 6 }, + { pinmux[10], 1, 7 }, + { pinmux[11], 1, 0 }, + { pinmux[11], 1, 1 }, + { pinmux[11], 1, 2 }, + { pinmux[11], 1, 3 }, + { pinmux[11], 1, 4 }, + { pinmux[11], 1, 5 }, + { pinmux[11], 1, 6 }, + { pinmux[11], 1, 7 }, + { pinmux[12], 1, 0 }, + { pinmux[12], 1, 1 }, + { pinmux[12], 1, 2 }, + { pinmux[12], 1, 3 }, + { pinmux[12], 1, 4 }, + { pinmux[12], 1, 5 }, + { pinmux[12], 1, 6 }, + { pinmux[12], 1, 7 } +}; #endif int board_init(void) @@ -179,6 +227,9 @@ int board_init(void) #ifdef CONFIG_USE_NAND if (davinci_configure_pin_mux(aemif_pins, ARRAY_SIZE(aemif_pins)) != 0) return 1; +#elif defined(CONFIG_SYS_USE_NOR) + if (davinci_configure_pin_mux(nor_pins, ARRAY_SIZE(nor_pins)) != 0) + return 1; #endif /* enable the console UART */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 067b783d89..dc4e7377cf 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -29,6 +29,7 @@ */ #define CONFIG_USE_SPIFLASH #undef CONFIG_USE_NAND +#undef CONFIG_SYS_USE_NOR /* * SoC Configuration @@ -131,19 +132,19 @@ #define DEF_BOOTM "" #endif -#ifdef CONFIG_USE_NOR +#ifdef CONFIG_SYS_USE_NOR #define CONFIG_ENV_IS_IN_FLASH #undef CONFIG_SYS_NO_FLASH -#define CONFIG_SYS_FLASH_CFI_DRIVER +#define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI +#define CONFIG_SYS_FLASH_PROTECTION #define CONFIG_SYS_MAX_FLASH_BANKS 1 /* max number of flash banks */ -#define CONFIG_SYS_FLASH_SECT_SZ (64 << 10) /* 64KB */ -#define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_SECT_SZ*3) +#define CONFIG_SYS_FLASH_SECT_SZ (128 << 10) /* 128KB */ +#define CONFIG_ENV_OFFSET (CONFIG_SYS_FLASH_SECT_SZ * 3) #define CONFIG_SYS_FLASH_BASE DAVINCI_ASYNC_EMIF_DATA_CE2_BASE -#define PHYS_FLASH_SIZE (32 << 20) /* Flash size 32MB */ -#define CONFIG_SYS_MAX_FLASH_SECT (PHYS_FLASH_SIZE/CONFIG_SYS_FLASH_SECT_SZ) +#define PHYS_FLASH_SIZE (8 << 20) /* Flash size 8MB */ +#define CONFIG_SYS_MAX_FLASH_SECT (PHYS_FLASH_SIZE/CONFIG_SYS_FLASH_SECT_SZ) + 3 #define CONFIG_ENV_SECT_SIZE CONFIG_SYS_FLASH_SECT_SZ -#define CONFIG_SYS_FLASH_SPL_ACCESS #endif #ifdef CONFIG_USE_SPIFLASH @@ -227,7 +228,7 @@ #endif #if !defined(CONFIG_USE_NAND) && \ - !defined(CONFIG_USE_NOR) && \ + !defined(CONFIG_SYS_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_IS_NOWHERE #define CONFIG_SYS_NO_FLASH |