powerpc: Cleanup BOOTFLAG_* references

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

diff --git a/include/configs/VoVPN-GW.h b/include/configs/VoVPN-GW.h
index 5f9a17f..6243afe 100644 (file)
--- a/include/configs/VoVPN-GW.h
+++ b/include/configs/VoVPN-GW.h
@@ -29,6 +29,8 @@
 /* define busmode: 8260 */
 #undef CONFIG_BUSMODE_60x
 
+#define        CONFIG_SYS_TEXT_BASE            0xfff00000
+
 /* system clock rate (CLKIN) - equal to the 60x and local bus speed */
 #ifdef CONFIG_CLKIN_66MHz
 #define        CONFIG_8260_CLKIN               66666666        /* in Hz */
@@ -124,6 +126,11 @@
 #define CONFIG_BITBANGMII
 
 #define MDIO_PORT                      1               /* Port B */
+
+#define MDIO_DECLARE           volatile ioport_t *iop = ioport_addr ( \
+                                       (immap_t *) CONFIG_SYS_IMMR, MDIO_PORT )
+#define MDC_DECLARE            MDIO_DECLARE
+
 #define CONFIG_SYS_MDIO_PIN                    0x00002000      /* PB18 */
 #define CONFIG_SYS_MDC_PIN                     0x00001000      /* PB19 */
 #define MDIO_ACTIVE                    (iop->pdir |=  CONFIG_SYS_MDIO_PIN)
@@ -150,11 +157,9 @@
  * Command line configuration.
  */
 
-#define CONFIG_CMD_AUTOSCRIPT
 #define CONFIG_CMD_BDI
 #define CONFIG_CMD_CONSOLE
 #define CONFIG_CMD_ECHO
-#define CONFIG_CMD_SAVEENV
 #define CONFIG_CMD_FLASH
 #define CONFIG_CMD_IMI
 #define CONFIG_CMD_IMLS
@@ -164,6 +169,8 @@
 #define CONFIG_CMD_NET
 #define CONFIG_CMD_PING
 #define CONFIG_CMD_RUN
+#define CONFIG_CMD_SAVEENV
+#define CONFIG_CMD_SOURCE
 
 
 /*
@@ -303,15 +310,11 @@
  */
 #define CONFIG_SYS_SDRAM_BASE                  0x00000000
 #define CONFIG_SYS_SDRAM_SIZE                  (32*1024*1024)
-#define CONFIG_SYS_MONITOR_BASE                TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE                CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_MONITOR_FLASH               (CONFIG_SYS_FLASH_BASE + CONFIG_SYS_MONITOR_OFFSET)
 #define CONFIG_SYS_MONITOR_LEN                 0x00020000
 #define CONFIG_SYS_MALLOC_LEN                  0x00020000
 
-/* boot flags */
-#define BOOTFLAG_COLD                  0x01    /* normal power-on */
-#define BOOTFLAG_WARM                  0x02    /* software reboot */
-
 /* cache configuration */
 #define CONFIG_SYS_CACHELINE_SIZE              32      /* for MPC8260 */
 #if defined(CONFIG_CMD_KGDB)