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

[u-boot] / include / configs / fx12mm.h

diff --git a/include/configs/fx12mm.h b/include/configs/fx12mm.h
index d45e7a0efd66624947c64df37661be310fc92900..58445674c355b2cbb1cd162d6bf53298c903f8b3 100644 (file)
--- a/include/configs/fx12mm.h
+++ b/include/configs/fx12mm.h
@@ -25,11 +25,10 @@
  * MA 02111-1307 USA
  */
 
-
 /*
-   Configuration file for the Virtex4FX12 Minimodul by Avnet/Memec,
-   see http://www.em.avnet.com
-*/
+ * Configuration file for the Virtex4FX12 Minimodul by Avnet/Memec,
+ * see http://www.em.avnet.com
+ */
 
 #ifndef __CONFIG_FX12_H
 #define __CONFIG_FX12_H
@@ -54,19 +53,14 @@
 
 /*Misc*/
 #define CONFIG_SYS_PROMPT      "FX12MM:/# " /* Monitor Command Prompt */
-#define CONFIG_PREBOOT         "echo U-Boot is up and runnining;"
+#define CONFIG_PREBOOT         "echo U-Boot is up and running;"
 
 /*Flash*/
-#define CONFIG_SYS_FLASH_BASE          XPAR_FLASH_2MX16_MEM0_BASEADDR
 #define CONFIG_SYS_FLASH_SIZE          (4*1024*1024)
 #define CONFIG_SYS_MAX_FLASH_SECT      71
-#define CONFIG_SYS_FLASH_CFI           1
-#define CONFIG_FLASH_CFI_DRIVER                1
 #define MTDIDS_DEFAULT         "nor0=fx12mm-flash"
 #define MTDPARTS_DEFAULT       "mtdparts=fx12mm-flash:-(user)"
 
-
 #include "configs/xilinx-ppc405.h"
 
-#endif                          /* __CONFIG_H */
-
+#endif /* __CONFIG_H */