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 79b35d708e1832725619a2af7700e24022dd0ef1..bae5736801c1091e03fc39042f3b2b73a2c77bb2 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -152,7 +152,6 @@
 #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
 
@@ -257,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 */
@@ -271,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
@@ -319,8 +316,6 @@
 #error "Undefined memory device"
 #endif
 
-#define CONFIG_BAUDRATE                        115200
-
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE              \