rename CFG_ENV macros to CONFIG_ENV

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

diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h
index dac1eb7..bfb32fb 100644 (file)
--- a/include/configs/tb0229.h
+++ b/include/configs/tb0229.h
@@ -43,10 +43,10 @@
 #define CONFIG_TIMESTAMP               /* Print image info with timestamp */
 
 #define CONFIG_PREBOOT "echo;" \
-       "echo Type \"boot\" for the network boot using DHCP, TFTP and NFS;" \
-       "echo Type \"run netboot_initrd\" for the network boot with initrd;" \
-       "echo Type \"run flash_nfs\" to mount root filesystem over NFS;" \
-       "echo Type \"run flash_local\" to mount local root filesystem;" \
+       "echo Type \\\"boot\\\" for the network boot using DHCP, TFTP and NFS;" \
+       "echo Type \\\"run netboot_initrd\\\" for the network boot with initrd;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
+       "echo Type \\\"run flash_local\\\" to mount local root filesystem;" \
        "echo"
 
 #undef CONFIG_BOOTARGS
@@ -87,13 +87,27 @@
 /*#define CONFIG_BOOTCOMMAND   "run flash_local" */
 #define CONFIG_BOOTCOMMAND     "run netboot"
 
-#define CONFIG_COMMANDS                (CONFIG_CMD_DFL | \
-                                CFG_CMD_ASKENV | \
-                                CFG_CMD_DHCP   | \
-                                CFG_CMD_PING   | \
-                                CFG_CMD_PCI    | \
-                                CFG_CMD_ELF    )
-#include <cmd_confdefs.h>
+
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_BOOTFILESIZE
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+
+
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_ELF
+
 
 /*
  * Miscellaneous configurable options
@@ -108,7 +122,9 @@
 
 #define CFG_BOOTPARAMS_LEN     128*1024
 
-#define CFG_HZ                 (CPU_TCLOCK_RATE/4)
+#define CFG_MIPS_TIMER_FREQ    (CPU_TCLOCK_RATE/4)
+
+#define CFG_HZ                 1000
 
 #define CFG_SDRAM_BASE         0x80000000
 
@@ -137,11 +153,11 @@
 #define CFG_FLASH_ERASE_TOUT   (20 * 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           0xBFC40000
-#define CFG_ENV_SIZE           0x20000
+#define CONFIG_ENV_ADDR                0xBFC40000
+#define CONFIG_ENV_SIZE                0x20000
 
 #define CFG_DIRECT_FLASH_TFTP