rename CFG_ENV macros to CONFIG_ENV

[karo-tx-uboot.git] / include / configs / sbc405.h

diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h
index 725b4937b3243931b5e2edebbbdde4da63a67a1d..759e4e2acae5b558a1ea59480298e03729c5831c 100644 (file)
--- a/include/configs/sbc405.h
+++ b/include/configs/sbc405.h
@@ -46,16 +46,16 @@
 #define CONFIG_PREBOOT "echo;echo Welcome to U-Boot for the sbc405;echo;echo Type \"? or help\" to get on-line help;echo"
 
 #define CONFIG_RAMBOOT                                                         \
-       "setenv bootargs root=/dev/ram rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/ram rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm ffc00000 ffca0000"
 #define CONFIG_NFSBOOT                                                         \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off;"    \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off;"    \
        "bootm ffc00000"
 
 #undef CONFIG_BOOTARGS
-#define CONFIG_BOOTCOMMAND      "version;echo;tftpboot $(loadaddr) $(loadfile);bootvx"      /* autoboot command     */
+#define CONFIG_BOOTCOMMAND      "version;echo;tftpboot ${loadaddr} ${loadfile};bootvx"      /* autoboot command     */
 
 
 #define CONFIG_MII             1       /* MII PHY management           */
@@ -70,37 +70,47 @@
        "env_endaddr=FF03FFFF\0" \
        "loadfile=vxWorks.st\0" \
        "loadaddr=0x01000000\0" \
-       "net_load=tftpboot $(loadaddr) $(loadfile)\0" \
+       "net_load=tftpboot ${loadaddr} ${loadfile}\0" \
        "uboot_startaddr=FFFC0000\0" \
        "uboot_endaddr=FFFFFFFF\0" \
-       "update=tftp $(loadaddr) u-boot.bin;" \
-               "protect off $(uboot_startaddr) $(uboot_endaddr);" \
-               "era $(uboot_startaddr) $(uboot_endaddr);" \
-               "cp.b $(loadaddr) $(uboot_startaddr) $(filesize);" \
-               "protect on $(uboot_startaddr) $(uboot_endaddr)\0" \
-       "zapenv=protect off $(env_startaddr) $(env_endaddr);" \
-               "era $(env_startaddr) $(env_endaddr);" \
-               "protect on $(env_startaddr) $(env_endaddr)\0"
+       "update=tftp ${loadaddr} u-boot.bin;" \
+               "protect off ${uboot_startaddr} ${uboot_endaddr};" \
+               "era ${uboot_startaddr} ${uboot_endaddr};" \
+               "cp.b ${loadaddr} ${uboot_startaddr} ${filesize};" \
+               "protect on ${uboot_startaddr} ${uboot_endaddr}\0" \
+       "zapenv=protect off ${env_startaddr} ${env_endaddr};" \
+               "era ${env_startaddr} ${env_endaddr};" \
+               "protect on ${env_startaddr} ${env_endaddr}\0"
 
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
-#define CONFIG_BOOTP_MASK      (CONFIG_BOOTP_DEFAULT | CONFIG_BOOTP_BOOTFILESIZE)
+/*
+ * BOOTP options
+ */
+#define CONFIG_BOOTP_SUBNETMASK
+#define CONFIG_BOOTP_GATEWAY
+#define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_BOOTPATH
+#define CONFIG_BOOTP_BOOTFILESIZE
+
 
 #define CONFIG_ENV_OVERWRITE
 
-#define CONFIG_COMMANDS        ( CONFIG_CMD_DFL        | \
-                               CFG_CMD_BSP     | \
-                               CFG_CMD_ELF     | \
-                               CFG_CMD_I2C     | \
-                               CFG_CMD_IRQ     | \
-                               CFG_CMD_MII     | \
-                               CFG_CMD_PCI     | \
-                               CFG_CMD_PING    | \
-                               CFG_CMD_SDRAM   | \
-                               0 )
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_BSP
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_I2C
+#define CONFIG_CMD_IRQ
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_SDRAM
+
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
@@ -123,7 +133,7 @@
 #define CFG_PROMPT_HUSH_PS2    "> "
 #endif
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CBSIZE     1024            /* Console I/O Buffer Size      */
 #else
 #define CFG_CBSIZE     256             /* Console I/O Buffer Size      */
@@ -217,21 +227,11 @@
 /*-----------------------------------------------------------------------
  * Environment Variable setup
  */
-#define CFG_ENV_ADDR   CFG_FLASH_BASE  /* starting right at the beginning      */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_OFFSET         0       /* starting right at the beginning      */
-#define CFG_ENV_SECT_SIZE      0x40000 /* see README - env sector total size   */
-#define CFG_ENV_SIZE           0x40000 /* Total Size of Environment Sector     */
-
-/*-----------------------------------------------------------------------
- * Cache Configuration
- */
-#define CFG_DCACHE_SIZE                16384   /* For AMCC 405 CPUs, older 405 ppc's   */
-                                       /* have only 8kB, 16kB is save here     */
-#define CFG_CACHELINE_SIZE     32      /* ...                                  */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
-#define CFG_CACHELINE_SHIFT    5       /* log base 2 of the above value        */
-#endif
+#define CONFIG_ENV_ADDR        CFG_FLASH_BASE  /* starting right at the beginning      */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning      */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* see README - env sector total size   */
+#define CONFIG_ENV_SIZE                0x40000 /* Total Size of Environment Sector     */
 
 /*-----------------------------------------------------------------------
  * External Bus Controller (EBC) Setup