Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / at91sam9rlek.h

diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h
index 5bc47d6..cad00f6 100644 (file)
--- a/include/configs/at91sam9rlek.h
+++ b/include/configs/at91sam9rlek.h
@@ -13,59 +13,26 @@
 #include <asm/hardware.h>
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     12000000        /* main clock xtal */
-
-#define CONFIG_ATMEL_LEGACY
-
-/*
- * Hardware drivers
- */
-
-/* LCD */
-#define LCD_BPP                                LCD_COLOR8
-#define CONFIG_LCD_LOGO                        1
-#undef LCD_TEST_PATTERN
-#define CONFIG_LCD_INFO                        1
-#define CONFIG_LCD_INFO_BELOW_LOGO     1
-#define CONFIG_ATMEL_LCD               1
-#define CONFIG_ATMEL_LCD_RGB565                1
-/* Let board_init_f handle the framebuffer allocation */
-#undef CONFIG_FB_ADDR
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        12000000        /* main clock xtal */
 
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          ATMEL_BASE_CS1
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
+#define CFG_SYS_SDRAM_BASE             ATMEL_BASE_CS1
+#define CFG_SYS_SDRAM_SIZE             0x04000000
 
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (ATMEL_BASE_SRAM + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_INIT_RAM_SIZE  (16 * 1024)
+#define CFG_SYS_INIT_RAM_ADDR  ATMEL_BASE_SRAM
 
 /* NAND flash */
 #ifdef CONFIG_CMD_NAND
-#define CONFIG_SYS_MAX_NAND_DEVICE             1
-#define CONFIG_SYS_NAND_BASE                   ATMEL_BASE_CS3
-#define CONFIG_SYS_NAND_DBW_8                  1
+#define CFG_SYS_NAND_BASE                      ATMEL_BASE_CS3
 /* our ALE is AD21 */
-#define CONFIG_SYS_NAND_MASK_ALE               (1 << 21)
+#define CFG_SYS_NAND_MASK_ALE          (1 << 21)
 /* our CLE is AD22 */
-#define CONFIG_SYS_NAND_MASK_CLE               (1 << 22)
-#define CONFIG_SYS_NAND_ENABLE_PIN             AT91_PIN_PB6
-#define CONFIG_SYS_NAND_READY_PIN              AT91_PIN_PD17
+#define CFG_SYS_NAND_MASK_CLE          (1 << 22)
+#define CFG_SYS_NAND_ENABLE_PIN                AT91_PIN_PB6
+#define CFG_SYS_NAND_READY_PIN         AT91_PIN_PD17
 
 #endif
 
-/* Ethernet - not present */
-
-#ifdef CONFIG_SYS_USE_DATAFLASH
-
-/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-
-#elif CONFIG_SYS_USE_NANDFLASH
-
-/* bootstrap + u-boot + env + linux in nandflash */
-
-#else /* CONFIG_SYS_USE_MMC */
-
-/* bootstrap + u-boot + env + linux in mmc */
-#endif
 #endif