Convert CONFIG_ENV_IS_IN_FLASH to Kconfig

[u-boot] / include / configs / pm9263.h

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index f112c36f366df705a70b72da5285991b857adc11..9ea444009a89289745d8f395c727b4bfcc93737a 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -31,7 +31,6 @@
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_SYS_TEXT_BASE   0
 
-#define MACH_TYPE_PM9263       1475
 #define CONFIG_MACH_TYPE       MACH_TYPE_PM9263
 
 /* clocks */
@@ -151,7 +150,6 @@
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
 #define CONFIG_USER_LOWLEVEL_INIT      1
-#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers
@@ -162,16 +160,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
 
 #define CONFIG_LCD_IN_PSRAM            1
 
@@ -231,7 +226,6 @@
 
 #endif
 
-#define CONFIG_CMD_JFFS2               1
 #define CONFIG_JFFS2_CMDLINE           1
 #define CONFIG_JFFS2_NAND              1
 #define CONFIG_JFFS2_DEV               "nand0" /* NAND device jffs2 lives on */
@@ -257,7 +251,6 @@
 #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          0x00a00000      /* AT91SAM9263_UHP_BASE */
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9263"
@@ -289,7 +282,6 @@
 #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CFG_USE_NANDFLASH */
 
 /* bootstrap + u-boot + env + linux in nandflash */
-#define CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              0x60000
 #define CONFIG_ENV_OFFSET_REDUND       0x80000
 #define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */
@@ -307,7 +299,6 @@
 
 #elif defined(CONFIG_SYS_USE_FLASH) /* CFG_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
@@ -358,8 +349,6 @@
 #error "Undefined memory device"
 #endif
 
-#define CONFIG_BAUDRATE                        115200
-
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE              \