Convert CONFIG_SYS_CONSOLE_IS_IN_ENV and CONFIG_CONSOLE_MUX to Kconfig

[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 152a6e564b00f1ec74207ebb08e140399f8ab487..a8ccf3cd44e9584c91f070f7f7a13ab13f15f37e 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -28,7 +28,6 @@
 #define CONFIG_OMAP3_RX51              /* working with RX51 */
 #define CONFIG_SYS_L2CACHE_OFF         /* pretend there is no L2 CACHE */
 #define CONFIG_OMAP_COMMON
-#define CONFIG_SYS_GENERIC_BOARD
 /* Common ARM Erratas */
 #define CONFIG_ARM_ERRATA_454179
 #define CONFIG_ARM_ERRATA_430973
@@ -50,12 +49,6 @@
 #include <asm/arch/mem.h>
 #include <linux/stringify.h>
 
-/*
- * Display CPU and Board information
- */
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
 /* Clock Defines */
 #define V_OSCK                 26000000        /* Clock output from T2 */
 #define V_SCLK                 (V_OSCK >> 1)
@@ -86,7 +79,6 @@
  */
 #define V_NS16550_CLK          48000000                /* 48MHz (APLL96/2) */
 
-#define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #define CONFIG_SYS_NS16550_CLK         V_NS16550_CLK
@@ -108,8 +100,8 @@
 #define CONFIG_DOS_PARTITION
 
 /* USB */
-#define CONFIG_MUSB_UDC
-#define CONFIG_MUSB_HDC
+#define CONFIG_USB_MUSB_UDC
+#define CONFIG_USB_MUSB_HCD
 #define CONFIG_USB_OMAP3
 #define CONFIG_TWL4030_USB
 
@@ -120,19 +112,9 @@
 #define CONFIG_USBD_MANUFACTURER       "Nokia"
 #define CONFIG_USBD_PRODUCT_NAME       "N900"
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_SYS_NO_FLASH
 
 /* commands to include */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_EXT2                        /* EXT2 Support */
-#define CONFIG_CMD_EXT4                        /* EXT4 Support */
-#define CONFIG_CMD_FAT                 /* FAT support */
-
-#define CONFIG_CMD_I2C                 /* I2C serial bus support */
-#define CONFIG_CMD_MMC                 /* MMC support */
-#define CONFIG_CMD_GPIO                        /* Enable gpio command */
 
 #define CONFIG_CMDLINE_EDITING         /* add command line history */
 #define CONFIG_AUTO_COMPLETE           /* add autocompletion support */
@@ -146,20 +128,11 @@
 #define CONFIG_CMD_MTDPARTS            /* mtd parts support */
 
 #ifdef UBIFS_SUPPORT
-#define CONFIG_CMD_UBI                 /* UBI Support */
 #define CONFIG_CMD_UBIFS               /* UBIFS Support */
 #endif
 
 #endif
 
-/* commands not needed from config_cmd_default.h */
-#undef CONFIG_CMD_FPGA                 /* FPGA configuration Support */
-#undef CONFIG_CMD_IMI                  /* iminfo */
-#undef CONFIG_CMD_NET                  /* bootp, tftpboot, rarpboot */
-#undef CONFIG_CMD_NFS                  /* NFS support */
-#undef CONFIG_CMD_SAVEENV              /* saveenv */
-#undef CONFIG_CMD_SETGETDCR            /* DCR support on 4xx */
-
 #define CONFIG_OMAP3_SPI
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_OMAP24_I2C_SPEED    100000
@@ -251,7 +224,6 @@
  * Framebuffer
  */
 /* Video console */
-#define CONFIG_VIDEO
 #define CONFIG_CFB_CONSOLE
 #define CONFIG_CFB_CONSOLE_ANSI        /* Enable ANSI escape codes in framebuffer */
 #define CONFIG_VIDEO_LOGO
@@ -396,8 +368,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
        "run attachboot;" \
        "echo"
 
-#define CONFIG_BOOTDELAY 30
-#define CONFIG_AUTOBOOT_KEYED
 #define CONFIG_MENU
 #define CONFIG_MENU_SHOW
 
@@ -405,9 +375,6 @@ int rx51_kp_getc(struct stdio_dev *sdev);
  * Miscellaneous configurable options
  */
 #define CONFIG_SYS_LONGHELP                    /* undef to save memory */
-#define CONFIG_SYS_HUSH_PARSER                 /* use "hush" command parser */
-#define CONFIG_SYS_PROMPT_HUSH_PS2     "> "
-#define CONFIG_SYS_PROMPT              "Nokia RX-51 # "
 #define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size */
 /* Print Buffer Size */
 #define CONFIG_SYS_PBSIZE              (CONFIG_SYS_CBSIZE + \