Merge branch 'master' into next

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

diff --git a/include/configs/lpd7a404.h b/include/configs/lpd7a404.h
index 3e726a0..557f389 100644 (file)
--- a/include/configs/lpd7a404.h
+++ b/include/configs/lpd7a404.h
@@ -43,6 +43,7 @@
 /*
  * select serial console configuration
  */
+#define CONFIG_LH7A40X_SERIAL
 #define CONFIG_CONSOLE_UART2   /* UART2 LH7A40x for console */
 
 /* allow to overwrite serial and ethaddr */
@@ -71,7 +72,7 @@
 #include <config_cmd_default.h>
 
 #ifndef USE_920T_MMU
-    #define CONFIG_CMD_PING)
+    #define CONFIG_CMD_PING
     #undef CONFIG_CMD_CACHE
 #else
     #define CONFIG_CMD_DATE
@@ -99,8 +100,6 @@
 #define CONFIG_SYS_MEMTEST_START       0xc0300000      /* memtest works on     */
 #define CONFIG_SYS_MEMTEST_END         0xc0500000      /* 2 MB in DRAM */
 
-#undef  CONFIG_SYS_CLKS_IN_HZ          /* everything, incl board info, in Hz */
-
 #define        CONFIG_SYS_LOAD_ADDR            0xc0f00000      /* default load address */
 
 /* valid baudrates */