Merge branch 'master' of /home/stefan/git/u-boot/u-boot

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

diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h
index 13e7a7c..9cbc9cc 100644 (file)
--- a/include/configs/mgsuvd.h
+++ b/include/configs/mgsuvd.h
@@ -36,6 +36,9 @@
 #define CONFIG_MPC866          1       /* This is a MPC866 CPU         */
 #define CONFIG_MGSUVD          1       /* ...on a mgsuvd board */
 
+/* Do boardspecific init */
+#define CONFIG_BOARD_EARLY_INIT_R       1
+
 #define CONFIG_8xx_GCLK_FREQ           66000000
 
 #define CFG_SMC_UCODE_PATCH    1       /* Relocate SMC1 */
@@ -51,37 +54,37 @@
 #define CONFIG_BOARD_TYPES     1       /* support board types          */
 
 #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
 
-#define CONFIG_EXTRA_ENV_SETTINGS                                      \
-       "netdev=eth0\0"                                                 \
-       "addcon=setenv bootargs ${bootargs} console=ttyCPM0,${baudrate}\0"      \
-       "nfsargs=setenv bootargs root=/dev/nfs rw "                     \
-               "nfsroot=${serverip}:${rootpath}\0"                     \
-       "ramargs=setenv bootargs root=/dev/ram rw\0"                    \
-       "addip=setenv bootargs ${bootargs} "                            \
-               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
-               ":${hostname}:${netdev}:off panic=1\0"                  \
-       "flash_nfs=run nfsargs addip;"                                  \
-               "bootm ${kernel_addr}\0"                                \
-       "flash_self=run ramargs addip;"                                 \
-               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
-       "net_nfs=tftp ${kernel_addr} ${bootfile}; "                     \
-               "tftp ${fdt_addr} ${fdt_file}; run nfsargs addip addcon;"\
-               "bootm ${kernel_addr} - ${fdt_addr}\0"                  \
-       "rootpath=/opt/eldk/ppc_8xx\0"                                  \
-       "bootfile=/tftpboot/mgsuvd/uImage\0"                            \
-       "fdt_addr=400000\0"                                             \
-       "kernel_addr=200000\0"                                          \
-       "fdt_file=/tftpboot/mgsuvd/mgsuvd.dtb\0"                        \
-       "load=tftp 200000 ${u-boot}\0"                                  \
-       "update=protect off f0000000 +${filesize};"                     \
-               "erase f0000000 +${filesize};"                          \
-               "cp.b 200000 f0000000 ${filesize};"                     \
-               "protect on f0000000 +${filesize}\0"                    \
+#define CONFIG_EXTRA_ENV_SETTINGS                                              \
+       "netdev=eth0\0"                                                         \
+       "addcons=setenv bootargs ${bootargs} console=ttyCPM0,${baudrate}\0"     \
+       "nfsargs=setenv bootargs root=/dev/nfs rw "                             \
+               "nfsroot=${serverip}:${rootpath}\0"                             \
+       "ramargs=setenv bootargs root=/dev/ram rw\0"                            \
+       "addip=setenv bootargs ${bootargs} "                                    \
+               "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"              \
+               ":${hostname}:${netdev}:off panic=1\0"                          \
+       "flash_nfs=run nfsargs addip;"                                          \
+               "bootm ${kernel_addr}\0"                                        \
+       "flash_self=run ramargs addip;"                                         \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                        \
+       "net_nfs=tftp ${kernel_addr} ${bootfile}; "                             \
+               "tftp ${fdt_addr} ${fdt_file}; run nfsargs addip addcons;"      \
+               "bootm ${kernel_addr} - ${fdt_addr}\0"                          \
+       "rootpath=/opt/eldk/ppc_8xx\0"                                          \
+       "bootfile=/tftpboot/mgsuvd/uImage\0"                                    \
+       "fdt_addr=400000\0"                                                     \
+       "kernel_addr=200000\0"                                                  \
+       "fdt_file=/tftpboot/mgsuvd/mgsuvd.dtb\0"                                \
+       "load=tftp 200000 ${u-boot}\0"                                          \
+       "update=protect off f0000000 +${filesize};"                             \
+               "erase f0000000 +${filesize};"                                  \
+               "cp.b 200000 f0000000 ${filesize};"                             \
+               "protect on f0000000 +${filesize}\0"                            \
        ""
 #define CONFIG_BOOTCOMMAND     "run flash_self"
 
@@ -299,7 +302,12 @@
  * 64  Refresh cycle in ms per number of rows
  */
 #define CFG_PTA_PER_CLK        ((4096 * 64 * 1000) / (4 * 64))
-/* HS HS noch zu setzen */
+
+/* GPIO/PIGGY on CS3 initialization values
+*/
+#define CFG_PIGGY_BASE (0x30000000)
+#define CFG_OR3_PRELIM (0xfe000d24)
+#define CFG_BR3_PRELIM (0x30000401)
 
 /*
  * Internal Definitions
@@ -318,7 +326,7 @@
 #define CONFIG_OF_BOARD_SETUP  1
 
 #define OF_CPU                 "PowerPC,866@0"
-#define OF_SOC                 "soc@f0000000"
+#define OF_SOC                 "soc@fff00000"
 #define OF_TBCLK               (bd->bi_busfreq / 4)
 #define OF_STDOUT_PATH         "/soc/cpm/serial@a80"