Convert CONFIG_ENV_IS_IN_FLASH to Kconfig

[people/ms/u-boot.git] / include / configs / pm9261.h

diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 10415d31a5e7191eb2f0ea46d2426b27e7bc5c6b..bae5736801c1091e03fc39042f3b2b73a2c77bb2 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -20,10 +20,6 @@
 #include <asm/hardware.h>
 /* ARM asynchronous clock */
 
-#define CONFIG_SYS_GENERIC_BOARD
-
-#define CONFIG_DISPLAY_BOARDINFO
-
 #define MASTER_PLL_DIV         15
 #define MASTER_PLL_MUL         162
 #define MAIN_PLL_DIV           2
@@ -35,7 +31,6 @@
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SYS_TEXT_BASE   0
 
-#define MACH_TYPE_PM9261       1187
 #define CONFIG_MACH_TYPE       MACH_TYPE_PM9261
 
 /* clocks */
@@ -142,7 +137,6 @@
 #define CONFIG_INITRD_TAG      1
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers
@@ -153,16 +147,13 @@
 #define        CONFIG_USART_ID                 ATMEL_ID_SYS
 
 /* LCD */
-#define CONFIG_LCD                     1
 #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_SYS_WHITE_ON_BLACK      1
 #define CONFIG_ATMEL_LCD               1
 #define CONFIG_ATMEL_LCD_BGR555                1
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV   1
 
 /* LED */
 #define CONFIG_AT91_LED
@@ -170,7 +161,6 @@
 #define CONFIG_GREEN_LED       GPIO_PIN_PC(13)
 #define CONFIG_YELLOW_LED      GPIO_PIN_PC(15)
 
-#define CONFIG_BOOTDELAY       3
 
 /*
  * BOOTP options
@@ -183,18 +173,7 @@
 /*
  * Command line configuration.
  */
-#include <config_cmd_default.h>
-#undef CONFIG_CMD_BDI
-#undef CONFIG_CMD_IMI
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_LOADS
-#undef CONFIG_CMD_IMLS
-
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_PING                1
-#define CONFIG_CMD_DHCP                1
 #define CONFIG_CMD_NAND                1
-#define CONFIG_CMD_USB         1
 
 /* SDRAM */
 #define CONFIG_NR_DRAM_BANKS                   1
@@ -244,12 +223,10 @@
 #define CONFIG_USB_ATMEL
 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
 #define CONFIG_USB_OHCI_NEW                    1
-#define CONFIG_DOS_PARTITION                   1
 #define CONFIG_SYS_USB_OHCI_CPU_INIT           1
 #define CONFIG_SYS_USB_OHCI_REGS_BASE          0x00500000
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9261"
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     2
-#define CONFIG_USB_STORAGE                     1
 
 #define CONFIG_SYS_LOAD_ADDR                   0x22000000
 
@@ -279,7 +256,6 @@
 #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CONFIG_SYS_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND          1
 #define CONFIG_ENV_OFFSET              0x60000
 #define CONFIG_ENV_OFFSET_REDUND       0x80000
 #define CONFIG_ENV_SIZE                        0x20000         /* 1 sector = 128 kB */
@@ -293,7 +269,6 @@
 
 #elif defined (CONFIG_SYS_USE_FLASH)
 
-#define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OFFSET      0x40000
 #define CONFIG_ENV_SECT_SIZE   0x10000
 #define        CONFIG_ENV_SIZE         0x10000
@@ -341,9 +316,6 @@
 #error "Undefined memory device"
 #endif
 
-#define CONFIG_BAUDRATE                        115200
-
-#define CONFIG_SYS_PROMPT              "pm9261> "
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE              \