diff options
Diffstat (limited to 'board')
| -rw-r--r-- | board/ronetix/pm9261/Makefile | 2 | ||||
| -rw-r--r-- | board/ronetix/pm9261/pm9261.c | 19 |
2 files changed, 3 insertions, 18 deletions
diff --git a/board/ronetix/pm9261/Makefile b/board/ronetix/pm9261/Makefile index 3860283a3b..90835d372f 100644 --- a/board/ronetix/pm9261/Makefile +++ b/board/ronetix/pm9261/Makefile @@ -11,5 +11,5 @@ # obj-y += pm9261.o -obj-y += led.o +obj-$(CONFIG_RED_LED) += led.o obj-$(CONFIG_HAS_DATAFLASH) += partition.o diff --git a/board/ronetix/pm9261/pm9261.c b/board/ronetix/pm9261/pm9261.c index 160f8f86d1..f338ff8f47 100644 --- a/board/ronetix/pm9261/pm9261.c +++ b/board/ronetix/pm9261/pm9261.c @@ -21,7 +21,6 @@ #include <lcd.h> #include <atmel_lcdc.h> -#include <dataflash.h> #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_DRIVER_DM9000) #include <net.h> #endif @@ -178,7 +177,7 @@ extern flash_info_t flash_info[]; void lcd_show_board_info(void) { - ulong dram_size, nand_size, flash_size, dataflash_size; + ulong dram_size, nand_size, flash_size; int i; char temp[32]; @@ -201,17 +200,11 @@ void lcd_show_board_info(void) for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; i++) flash_size += flash_info[i].size; - dataflash_size = 0; - for (i = 0; i < CONFIG_SYS_MAX_DATAFLASH_BANKS; i++) - dataflash_size += (unsigned int) dataflash_info[i].Device.pages_number * - dataflash_info[i].Device.pages_size; - lcd_printf ("%ld MB SDRAM, %ld MB NAND\n%ld MB NOR Flash\n" "%ld MB DataFlash\n", dram_size >> 20, nand_size >> 20, - flash_size >> 20, - dataflash_size >> 20); + flash_size >> 20); } #endif /* CONFIG_LCD_INFO */ @@ -219,11 +212,6 @@ void lcd_show_board_info(void) int board_early_init_f(void) { - at91_periph_clk_enable(ATMEL_ID_PIOA); - at91_periph_clk_enable(ATMEL_ID_PIOC); - - at91_seriald_hw_init(); - return 0; } @@ -238,9 +226,6 @@ int board_init(void) #ifdef CONFIG_CMD_NAND pm9261_nand_hw_init(); #endif -#ifdef CONFIG_HAS_DATAFLASH - at91_spi0_hw_init(1 << 0); -#endif #ifdef CONFIG_DRIVER_DM9000 pm9261_dm9000_hw_init(); #endif |