diff options
| author | Tom Rini <trini@ti.com> | 2013-11-25 10:42:13 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-25 10:42:13 -0500 |
| commit | faca8ff55f4a2cf45fb906cc37f44601149fc00e (patch) | |
| tree | 181e94fa3326f2ec97f0287f3bbbe54ccd3b13d1 /board | |
| parent | 5a4fe1aaf1210b02bb98e347993ffbcffeb4ffaa (diff) | |
| parent | 2c17e6d1d996a1b8b9325de15f253a13d5877dee (diff) | |
| download | u-boot-imx-faca8ff55f4a2cf45fb906cc37f44601149fc00e.zip u-boot-imx-faca8ff55f4a2cf45fb906cc37f44601149fc00e.tar.gz u-boot-imx-faca8ff55f4a2cf45fb906cc37f44601149fc00e.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-nand-flash
Diffstat (limited to 'board')
| -rw-r--r-- | board/atmel/sama5d3xek/sama5d3xek.c | 5 | ||||
| -rw-r--r-- | board/ti/am335x/board.c | 14 |
2 files changed, 4 insertions, 15 deletions
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c index b0965ef..83fd63f 100644 --- a/board/atmel/sama5d3xek/sama5d3xek.c +++ b/board/atmel/sama5d3xek/sama5d3xek.c @@ -131,7 +131,8 @@ static void sama5d3xek_lcd_hw_init(void) void lcd_show_board_info(void) { - ulong dram_size, nand_size; + ulong dram_size; + uint64_t nand_size; int i; char temp[32]; @@ -150,7 +151,7 @@ void lcd_show_board_info(void) for (i = 0; i < CONFIG_SYS_MAX_NAND_DEVICE; i++) nand_size += nand_info[i].size; #endif - lcd_printf("%ld MB SDRAM, %ld MB NAND\n", + lcd_printf("%ld MB SDRAM, %lld MB NAND\n", dram_size >> 20, nand_size >> 20); } #endif /* CONFIG_LCD_INFO */ diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 8edd21b..db225ce 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -481,26 +481,14 @@ void sdram_init(void) */ int board_init(void) { -#ifdef CONFIG_NOR - const u32 gpmc_nor[GPMC_MAX_REG] = { STNOR_GPMC_CONFIG1, - STNOR_GPMC_CONFIG2, STNOR_GPMC_CONFIG3, STNOR_GPMC_CONFIG4, - STNOR_GPMC_CONFIG5, STNOR_GPMC_CONFIG6, STNOR_GPMC_CONFIG7 }; -#endif - #if defined(CONFIG_HW_WATCHDOG) hw_watchdog_init(); #endif gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; - +#if defined(CONFIG_NOR) || defined(CONFIG_NAND) gpmc_init(); - -#ifdef CONFIG_NOR - /* Reconfigure CS0 for NOR instead of NAND. */ - enable_gpmc_cs_config(gpmc_nor, &gpmc_cfg->cs[0], - CONFIG_SYS_FLASH_BASE, GPMC_SIZE_16M); #endif - return 0; } |