Merge git://git.denx.de/u-boot-mmc

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

diff --git a/include/configs/ls2080a_emu.h b/include/configs/ls2080a_emu.h
index 4a7ba2477bcfb736e0556006d666f94e86b6664d..6b34edfbf115d3bf4286c46f15625b0752491c99 100644 (file)
--- a/include/configs/ls2080a_emu.h
+++ b/include/configs/ls2080a_emu.h
@@ -9,16 +9,6 @@
 
 #include "ls2080a_common.h"
 
-#ifdef CONFIG_LS2080A
-#define CONFIG_IDENT_STRING            " LS2080A-EMU"
-#define CONFIG_BOOTP_VCI_STRING                "U-boot.LS2080A-EMU"
-#endif
-
-#ifdef CONFIG_LS2085A
-#define CONFIG_IDENT_STRING            " LS2085A-EMU"
-#define CONFIG_BOOTP_VCI_STRING                "U-boot.LS2085A-EMU"
-#endif
-
 #define CONFIG_SYS_CLK_FREQ    100000000
 #define CONFIG_DDR_CLK_FREQ    133333333
 
@@ -92,7 +82,6 @@
 #define CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS 200000
 
 /* Store environment at top of flash */
-#define CONFIG_ENV_IS_NOWHERE          1
 #define CONFIG_ENV_SIZE                        0x1000
 
 #endif /* __LS2_EMU_H */