global: Migrate CONFIG_MXC_USB_FLAGS et al to CFG

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

diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h
index 39b879b..39f6ff8 100644 (file)
--- a/include/configs/at91sam9261ek.h
+++ b/include/configs/at91sam9261ek.h
@@ -11,116 +11,30 @@
 #define __CONFIG_H
 
 /* ARM asynchronous clock */
-#define CONFIG_SYS_AT91_SLOW_CLOCK     32768           /* slow clock xtal */
-#define CONFIG_SYS_AT91_MAIN_CLOCK     18432000        /* 18.432 MHz crystal */
-
-#ifdef CONFIG_AT91SAM9G10
-#define CONFIG_AT91SAM9G10EK           /* It's an Atmel AT91SAM9G10 EK*/
-#else
-#define CONFIG_AT91SAM9261EK           /* It's an Atmel AT91SAM9261 EK*/
-#endif
+#define CFG_SYS_AT91_SLOW_CLOCK        32768           /* slow clock xtal */
+#define CFG_SYS_AT91_MAIN_CLOCK        18432000        /* 18.432 MHz crystal */
 
 #include <asm/hardware.h>
 
-#define CONFIG_CMDLINE_TAG             /* enable passing of ATAGs */
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_INITRD_TAG
-
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-#define CONFIG_ATMEL_LEGACY
-
-/*
- * Hardware drivers
- */
-
-/* LCD */
-#define LCD_BPP                                LCD_COLOR8
-#define CONFIG_LCD_LOGO
-#undef LCD_TEST_PATTERN
-#define CONFIG_LCD_INFO
-#define CONFIG_LCD_INFO_BELOW_LOGO
-#define CONFIG_ATMEL_LCD
-#ifdef CONFIG_AT91SAM9261EK
-#define CONFIG_ATMEL_LCD_BGR555
-#endif
-
-/*
- * BOOTP options
- */
-#define CONFIG_BOOTP_BOOTFILESIZE
-
 /* SDRAM */
-#define CONFIG_SYS_SDRAM_BASE          0x20000000
-#define CONFIG_SYS_SDRAM_SIZE          0x04000000
-#define CONFIG_SYS_INIT_SP_ADDR \
-       (ATMEL_BASE_SRAM + 16 * 1024 - GENERATED_GBL_DATA_SIZE)
+#define CFG_SYS_SDRAM_BASE             0x20000000
+#define CFG_SYS_SDRAM_SIZE             0x04000000
+#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                   0x40000000
-#define CONFIG_SYS_NAND_DBW_8
+#define CFG_SYS_NAND_BASE                      0x40000000
 /* our ALE is AD22 */
-#define CONFIG_SYS_NAND_MASK_ALE               (1 << 22)
+#define CFG_SYS_NAND_MASK_ALE          (1 << 22)
 /* our CLE is AD21 */
-#define CONFIG_SYS_NAND_MASK_CLE               (1 << 21)
-#define CONFIG_SYS_NAND_ENABLE_PIN             AT91_PIN_PC14
-#define CONFIG_SYS_NAND_READY_PIN              AT91_PIN_PC15
+#define CFG_SYS_NAND_MASK_CLE          (1 << 21)
+#define CFG_SYS_NAND_ENABLE_PIN                AT91_PIN_PC14
+#define CFG_SYS_NAND_READY_PIN         AT91_PIN_PC15
 
 #endif
 
-/* Ethernet */
-#define CONFIG_DRIVER_DM9000
-#define CONFIG_DM9000_BASE             0x30000000
-#define DM9000_IO                      CONFIG_DM9000_BASE
-#define DM9000_DATA                    (CONFIG_DM9000_BASE + 4)
-#define CONFIG_DM9000_USE_16BIT
-#define CONFIG_DM9000_NO_SROM
-#define CONFIG_NET_RETRY_COUNT         20
-#define CONFIG_RESET_PHY_R
-
 /* USB */
-#define CONFIG_USB_ATMEL
-#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
-#define CONFIG_USB_OHCI_NEW
-#define CONFIG_SYS_USB_OHCI_CPU_INIT
-#define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00500000      /* AT91SAM9261_UHP_BASE */
-#ifdef CONFIG_AT91SAM9G10EK
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9g10"
-#else
-#define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9261"
-#endif
-#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-
-#define CONFIG_SYS_LOAD_ADDR                   0x22000000      /* load address */
-
-#define CONFIG_SYS_MEMTEST_START               CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END                 0x23e00000
-
-#ifdef CONFIG_SYS_USE_DATAFLASH_CS0
-
-/* bootstrap + u-boot + env + linux in dataflash on CS0 */
-#define CONFIG_BOOTCOMMAND     "sf probe 0; " \
-                               "sf read 0x22000000 0x84000 0x294000; " \
-                               "bootm 0x22000000"
-
-#elif CONFIG_SYS_USE_DATAFLASH_CS3
-
-/* bootstrap + u-boot + env + linux in dataflash on CS3 */
-#define CONFIG_BOOTCOMMAND     "sf probe 0:3; " \
-                               "sf read 0x22000000 0x84000 0x294000; " \
-                               "bootm 0x22000000"
-
-#else /* CONFIG_SYS_USE_NANDFLASH */
-
-/* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0x200000 0x300000; bootm"
-#endif
-
-/*
- * Size of malloc() pool
- */
-#define CONFIG_SYS_MALLOC_LEN          ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
+#define CFG_SYS_USB_OHCI_REGS_BASE             0x00500000      /* AT91SAM9261_UHP_BASE */
 
 #endif