Merge branch 'master' of git://git.denx.de/u-boot-mmc

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

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index e99968c..5e2d599 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -22,10 +22,6 @@
 /*
  * High Level Configuration Options
  */
-
-#define CONFIG_OMAP                    /* in a TI OMAP core */
-#define CONFIG_OMAP3430                        /* which is in a 3430 */
-#define CONFIG_OMAP3_RX51              /* working with RX51 */
 #define CONFIG_SYS_L2CACHE_OFF         /* pretend there is no L2 CACHE */
 
 #define CONFIG_MACH_TYPE               MACH_TYPE_NOKIA_RX51
@@ -106,8 +102,6 @@
 #define CONFIG_CMDLINE_EDITING         /* add command line history */
 #define CONFIG_AUTO_COMPLETE           /* add autocompletion support */
 
-#define CONFIG_CMD_CLEAR               /* ANSI terminal clear screen command */
-
 #ifdef ONENAND_SUPPORT
 
 #define CONFIG_CMD_ONENAND             /* ONENAND support */
@@ -128,11 +122,9 @@
 /*
  * TWL4030
  */
-#define CONFIG_TWL4030_POWER
 #define CONFIG_TWL4030_LED
 #define CONFIG_TWL4030_KEYPAD
 
-#define CONFIG_OMAP_GPIO
 #define GPIO_SLIDE                     71
 
 /*