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

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

diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 3e419c6..e22cf09 100644 (file)
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -9,7 +9,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define MACH_TYPE_H2200                        341
 #define CONFIG_MACH_TYPE               MACH_TYPE_H2200
 
 #define CONFIG_CPU_PXA25X              1
@@ -107,8 +106,6 @@
 /*
  * Serial port
  */
-
-#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART
 #define CONFIG_CONS_INDEX              3
 
@@ -131,7 +128,6 @@
 
 #define CONFIG_BOOTARGS "root=/dev/ram0 ro console=ttyS0,115200n8"
 
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 #define CONFIG_USB_DEV_PULLUP_GPIO     33
 /* USB VBUS GPIO 3 */