Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/incaip.h b/include/configs/incaip.h
index 4caf54e..5368ac8 100644 (file)
--- a/include/configs/incaip.h
+++ b/include/configs/incaip.h
@@ -48,7 +48,7 @@
 #define        CONFIG_TIMESTAMP                /* Print image info with timestamp */
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -118,7 +118,9 @@
 
 #define CFG_BOOTPARAMS_LEN     128*1024
 
-#define CFG_HZ                 (incaip_get_cpuclk() / 2)
+#define CFG_MIPS_TIMER_FREQ    (incaip_get_cpuclk() / 2)
+
+#define CFG_HZ                 1000
 
 #define CFG_SDRAM_BASE         0x80000000
 
@@ -148,11 +150,11 @@
 #define CFG_FLASH_ERASE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Erase */
 #define CFG_FLASH_WRITE_TOUT   (2 * CFG_HZ) /* Timeout for Flash Write */
 
-#define        CFG_ENV_IS_IN_FLASH     1
+#define        CONFIG_ENV_IS_IN_FLASH  1
 
 /* Address and size of Primary Environment Sector      */
-#define CFG_ENV_ADDR           0xB0030000
-#define CFG_ENV_SIZE           0x10000
+#define CONFIG_ENV_ADDR                0xB0030000
+#define CONFIG_ENV_SIZE                0x10000
 
 #define CONFIG_FLASH_16BIT