mpc85xx: Add gdsys ControlCenter Digital board

[oweals/u-boot.git] / include / configs / linkstation.h

diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h
index 3958d09eb9324d597cffe40f99d6b92a3413b9d8..20f0a18f86fe0fde7cd7454b9cea072fd7671622 100644 (file)
--- a/include/configs/linkstation.h
+++ b/include/configs/linkstation.h
@@ -20,6 +20,22 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
+/*
+ * Valid values for CONFIG_SYS_TEXT_BASE are:
+ *
+ * Standard configuration - all models
+ * 0xFFF00000  boot from flash
+ *
+ * Test configuration (boot from RAM using uloader.o)
+ * LinkStation HD-HLAN and KuroBox Standard
+ * 0x03F00000  boot from RAM
+ * LinkStation HD-HGLAN and KuroBox HG
+ * 0x07F00000  boot from RAM
+ */
+#ifndef CONFIG_SYS_TEXT_BASE
+#define CONFIG_SYS_TEXT_BASE   0xFFF00000
+#endif
+
 #if 0
 #define DEBUG
 #endif
@@ -119,9 +135,6 @@
 
 #define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
-#define XMK_STR(x)             #x
-#define MK_STR(x)              XMK_STR(x)
-
 #if defined(CONFIG_HLAN) || defined(CONFIG_LAN)
 #define UBFILE                 "share/u-boot/u-boot-hd.flash.bin"
 #elif defined(CONFIG_HGLAN)
@@ -137,10 +150,10 @@
        "stdin=nc\0"                                                            \
        "stdout=nc\0"                                                           \
        "stderr=nc\0"                                                           \
-       "ipaddr="MK_STR(CONFIG_IPADDR_LS)"\0"                                   \
+       "ipaddr="__stringify(CONFIG_IPADDR_LS)"\0"                      \
        "netmask=255.255.255.0\0"                                               \
-       "serverip="MK_STR(CONFIG_SERVERIP_LS)"\0"                               \
-       "ncip="MK_STR(CONFIG_NCIP_LS)"\0"                                       \
+       "serverip="__stringify(CONFIG_SERVERIP_LS)"\0"                  \
+       "ncip="__stringify(CONFIG_NCIP_LS)"\0"                          \
        "netretry=no\0"                                                         \
        "nc=setenv stdin nc;setenv stdout nc;setenv stderr nc\0"                \
        "ser=setenv stdin serial;setenv stdout serial;setenv stderr serial\0"   \
@@ -172,6 +185,7 @@
  * PCI stuff
  */
 #define CONFIG_PCI
+#define CONFIG_PCI_INDIRECT_BRIDGE
 /* Verified: CONFIG_PCI_PNP doesn't work */
 #undef CONFIG_PCI_PNP
 #define CONFIG_PCI_SCAN_SHOW
@@ -195,7 +209,6 @@
 /*-----------------------------------------------------------------------
  * Ethernet stuff
  */
-#define CONFIG_NET_MULTI
 
 #if defined(CONFIG_LAN) || defined(CONFIG_HLAN)
 #define CONFIG_TULIP
@@ -217,7 +230,7 @@
 
 #define CONFIG_SYS_FLASH_BASE          0xFFC00000
 #define CONFIG_SYS_FLASH_SIZE          0x00400000
-#define CONFIG_SYS_MONITOR_BASE        TEXT_BASE
+#define CONFIG_SYS_MONITOR_BASE        CONFIG_SYS_TEXT_BASE
 
 #define CONFIG_SYS_RESET_ADDRESS       0xFFF00100
 #define CONFIG_SYS_EUMB_ADDR           0x80000000
@@ -240,7 +253,7 @@
 #endif
 
 /*-----------------------------------------------------------------------
- * Change TEXT_BASE in bord/linkstation/config.mk to get a RAM build
+ * Change CONFIG_SYS_TEXT_BASE in bord/linkstation/config.mk to get a RAM build
  *
  * RAM based builds are for testing purposes. A Linux module, uloader.o,
  * exists to load U-Boot and pass control to it
@@ -259,16 +272,14 @@
 #else
 #define CONFIG_SYS_INIT_RAM_ADDR       0x40000000
 #endif
-#define CONFIG_SYS_INIT_RAM_END        0x1000
-#define CONFIG_SYS_GBL_DATA_SIZE       128
-#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_END - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_INIT_RAM_SIZE       0x1000
+#define CONFIG_SYS_GBL_DATA_OFFSET     (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE)
 
 /*----------------------------------------------------------------------
  * Serial configuration
  */
 #define CONFIG_CONS_INDEX      1
 #define CONFIG_BAUDRATE                57600
-#define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 
 #define CONFIG_SYS_NS16550
 #define CONFIG_SYS_NS16550_SERIAL
@@ -290,7 +301,7 @@
  * taken from the orignal Linkstation boot code
  *
  * Most of the low level configuration setttings are normally used
- * in arch/ppc/cpu/mpc824x/cpu_init.c which is NOT used by this implementation.
+ * in arch/powerpc/cpu/mpc824x/cpu_init.c which is NOT used by this implementation.
  * Low level initialisation is done in board/linkstation/early_init.S
  * The values below are included for reference purpose only
  */
@@ -495,12 +506,4 @@
  */
 #define CONFIG_DOS_PARTITION
 
-/*-----------------------------------------------------------------------
- * Internal Definitions
- *
- * Boot Flags
- */
-#define BOOTFLAG_COLD          0x01    /* Normal Power-On: Boot from FLASH     */
-#define BOOTFLAG_WARM          0x02    /* Software reboot                      */
-
 #endif /* __CONFIG_H */