Merge with /home/m8/git/u-boot

[oweals/u-boot.git] / include / configs / lpd7a400.h

diff --git a/include/configs/lpd7a400.h b/include/configs/lpd7a400.h
index 3e915364b4326e75af5f03e9eb7bdf0fd3fc26df..d7d0460ef663b0b8b70a1cb7e00b5ad69ecfb070 100644 (file)
--- a/include/configs/lpd7a400.h
+++ b/include/configs/lpd7a400.h
@@ -21,23 +21,15 @@
 #ifndef __LPD7A400_H_
 #define __LPD7A400_H_
 
-/*
- * If we are developing, we might want to start armboot from ram
- * so we MUST NOT initialize critical regs like mem-timing ...
- */
-#define CONFIG_INIT_CRITICAL   /* undef for developing */
+#define CONFIG_LPD7A400                /* Logic LH7A400 SDK */
 
 #undef CONFIG_USE_IRQ
 
-#define MACH_TYPE_LPD7A400     389
-
 /*
  * This board uses the logic LH7A400-10 card engine
  */
 #include <configs/lpd7a400-10.h>
 
-#define CONFIG_LPD7A400                /* Logic LH7A400 SDK */
-
 #define CONFIG_CMDLINE_TAG             1       /* enable passing of ATAGs      */
 #define CONFIG_SETUP_MEMORY_TAGS       1
 #define CONFIG_INITRD_TAG              1