Convert CONFIG_DM9000_BYTE_SWAPPED et al to Kconfig

[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 9ad4f59..caaa9ed 100644 (file)
--- a/include/configs/nokia_rx51.h
+++ b/include/configs/nokia_rx51.h
@@ -47,16 +47,7 @@
  */
 #define CFG_SYS_NS16550_COM3           OMAP34XX_UART3
 
-#define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
-
-/* USB device configuration */
-#define CONFIG_USB_DEVICE
-#define CONFIG_USB_TTY
-#define CONFIG_USBD_VENDORID           0x0421
-#define CONFIG_USBD_PRODUCTID_CDCACM   0x01c8
-#define CONFIG_USBD_PRODUCTID_GSERIAL  0x01c8
-#define CONFIG_USBD_MANUFACTURER       "Nokia"
-#define CONFIG_USBD_PRODUCT_NAME       "N900 (U-Boot)"
+#define CFG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 }
 
 #define GPIO_SLIDE                     71
 
@@ -64,7 +55,7 @@
  * Board ONENAND Info.
  */
 
-#define CONFIG_SYS_ONENAND_BASE                ONENAND_MAP
+#define CFG_SYS_ONENAND_BASE           ONENAND_MAP
 
 /* Environment information */
 #define CONFIG_EXTRA_ENV_SETTINGS \
@@ -150,7 +141,7 @@
  * (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
  * This rate is divided by a local divisor.
  */
-#define CONFIG_SYS_TIMERBASE           (OMAP34XX_GPT2)
+#define CFG_SYS_TIMERBASE              (OMAP34XX_GPT2)
 
 /*
  * Physical Memory Map
@@ -162,8 +153,8 @@
  */
 
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM_1
-#define CONFIG_SYS_INIT_RAM_ADDR       0x4020f800
-#define CONFIG_SYS_INIT_RAM_SIZE       0x800
+#define CFG_SYS_INIT_RAM_ADDR  0x4020f800
+#define CFG_SYS_INIT_RAM_SIZE  0x800
 
 /*
  * Attached kernel image