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

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

diff --git a/include/configs/h2200.h b/include/configs/h2200.h
index 3e419c644590f71127f7024c52b593facc1f50ed..530a88e9e1a7ecb4312a7200e5fd0ae9e78160e6 100644 (file)
--- a/include/configs/h2200.h
+++ b/include/configs/h2200.h
@@ -9,14 +9,11 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#define MACH_TYPE_H2200                        341
 #define CONFIG_MACH_TYPE               MACH_TYPE_H2200
 
 #define CONFIG_CPU_PXA25X              1
 #define CONFIG_BOARD_H2200
 
-#define CONFIG_SYS_NO_FLASH
-
 #define CONFIG_NR_DRAM_BANKS           1
 #define PHYS_SDRAM_1                   0xa0000000 /* SDRAM Bank #1 */
 #define PHYS_SDRAM_1_SIZE              0x04000000 /* 64 MB */
@@ -107,15 +104,11 @@
 /*
  * Serial port
  */
-
-#define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART
 #define CONFIG_CONS_INDEX              3
 
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 38400, 115200 }
 
-#define CONFIG_FIT_DISABLE_SHA256
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
@@ -131,7 +124,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 */