Merge tag 'xilinx-for-v2017.07' of git://www.denx.de/git/u-boot-microblaze

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

diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h
index 5b0cb2ef50d0a93750d2c65c32d9c782aa84f589..5e2d5991e76d9601ddd9f1fb7086a3c0e0b938ef 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
@@ -48,7 +44,6 @@
 #define V_OSCK                 26000000        /* Clock output from T2 */
 #define V_SCLK                 (V_OSCK >> 1)
 
-#undef CONFIG_USE_IRQ                          /* no support for IRQs */
 #define CONFIG_MISC_INIT_R
 #define CONFIG_SKIP_LOWLEVEL_INIT              /* X-Loader set everything up */
 
@@ -87,7 +82,6 @@
 
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
 
 /* USB */
@@ -108,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 */
@@ -130,11 +122,9 @@
 /*
  * TWL4030
  */
-#define CONFIG_TWL4030_POWER
 #define CONFIG_TWL4030_LED
 #define CONFIG_TWL4030_KEYPAD
 
-#define CONFIG_OMAP_GPIO
 #define GPIO_SLIDE                     71
 
 /*
@@ -381,13 +371,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
 #define CONFIG_SYS_TIMERBASE           (OMAP34XX_GPT2)
 #define CONFIG_SYS_PTV                 2       /* Divisor: 2^(PTV+1) => 8 */
 
-/*
- * Stack sizes
- *
- * The stack sizes are set up in start.S using the settings below
- */
-#define CONFIG_STACKSIZE               (128 << 10) /* regular stack 128 KiB */
-
 /*
  * Physical Memory Map
  */