Merge git://git.denx.de/u-boot-net

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

diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h
index 6ac42b8629ef73adabafb6a1d73085f87d919dd1..b22a3b6a2bfe0270f8a5ac7a63f5e34eadb926a2 100644 (file)
--- a/include/configs/pm9261.h
+++ b/include/configs/pm9261.h
@@ -31,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 */
@@ -138,7 +137,6 @@
 #define CONFIG_INITRD_TAG      1
 
 #undef CONFIG_SKIP_LOWLEVEL_INIT
-#define CONFIG_BOARD_EARLY_INIT_F
 
 /*
  * Hardware drivers
@@ -149,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
@@ -228,7 +223,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          0x00500000
 #define CONFIG_SYS_USB_OHCI_SLOT_NAME          "at91sam9261"
@@ -324,8 +318,6 @@
 #error "Undefined memory device"
 #endif
 
-#define CONFIG_BAUDRATE                        115200
-
 #define CONFIG_SYS_CBSIZE              256
 #define CONFIG_SYS_MAXARGS             16
 #define CONFIG_SYS_PBSIZE              \