Fix quoting problem (preboot setting) in many board config files.
[platform/kernel/u-boot.git] / include / configs / P3G4.h
index 7712384..74ef470 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/processor.h>
-
 #ifndef __ASSEMBLY__
 #include <galileo/core.h>
 #endif
@@ -51,7 +49,7 @@
 
 /* which initialization functions to call for this board */
 #define CONFIG_MISC_INIT_R     1
-#define CONFIG_BOARD_PRE_INIT  1
+#define CONFIG_BOARD_EARLY_INIT_F 1
 
 #define CFG_BOARD_NAME         "P3G4"
 
@@ -66,7 +64,7 @@
  * mpsc channel, change CONFIG_MPSC_PORT to the desired value.
  */
 #define        CONFIG_MPSC
-#define CONFIG_MPSC_PORT       1
+#define CONFIG_MPSC_PORT       0
 
 #define CONFIG_NET_MULTI        /* attempt all available adapters */
 
 
 #undef CONFIG_ETHER_PORT_MII   /* use RMII */
 
-#if 1
+#if 0
 #define CONFIG_BOOTDELAY       -1      /* autoboot disabled            */
 #else
 #define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 #endif
 #define CONFIG_ZERO_BOOTDELAY_CHECK
 
+#define CONFIG_PREBOOT "echo;" \
+       "echo Type \\\"run flash_nfs\\\" to mount root filesystem over NFS;" \
+       "echo"
+
 #undef CONFIG_BOOTARGS
-#define CONFIG_BOOTCOMMAND                                                  \
-       "bootp;"                                                     \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$serverip:$rootpath " \
-       "ip=$ipaddr:$serverip:$gatewayip:" \
-       "$netmask:$hostname:eth0:none;" \
-       "bootm"
+
+#define        CONFIG_EXTRA_ENV_SETTINGS                                       \
+       "netdev=eth0\0"                                                 \
+       "hostname=p3g4\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"                  \
+       "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
+       "flash_nfs=run nfsargs addip addtty;"                           \
+               "bootm ${kernel_addr}\0"                                \
+       "flash_self=run ramargs addip addtty;"                          \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;"     \
+               "bootm\0"                                               \
+       "rootpath=/opt/eldk/ppc_74xx\0"                                 \
+       "bootfile=/tftpboot/p3g4/uImage\0"                              \
+       "kernel_addr=ff000000\0"                                        \
+       "ramdisk_addr=ff010000\0"                                       \
+       "load=tftp 100000 /tftpboot/p3g4/u-boot.bin\0"                  \
+       "update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;"   \
+               "cp.b 100000 fff00000 ${filesize};"                     \
+               "setenv filesize;saveenv\0"                             \
+       "upd=run load;run update\0"                                     \
+       ""
+#define CONFIG_BOOTCOMMAND     "run flash_self"
 
 #define CONFIG_LOADS_ECHO      0       /* echo off for serial download */
 #define        CFG_LOADS_BAUD_CHANGE           /* allow baudrate changes       */
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 #undef CONFIG_ALTIVEC                  /* undef to disable             */
 
-#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_TIMESTAMP                /* Print image info with timestamp */
 
-#define CONFIG_COMMANDS        (CONFIG_CMD_DFL | CFG_CMD_ASKENV)
 
-/* 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_ASKENV
+#define CONFIG_CMD_DHCP
+#define CONFIG_CMD_PCI
+#define CONFIG_CMD_ELF
+#define CONFIG_CMD_MII
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_UNIVERSE
+#define CONFIG_CMD_BSP
+
 
 /*
  * Miscellaneous configurable options
  */
 #define        CFG_LONGHELP                    /* undef to save memory         */
 #define        CFG_PROMPT      "=> "           /* Monitor Command Prompt       */
-#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      */
  * Please note that CFG_SDRAM_BASE _must_ start at 0
  */
 #define        CFG_SDRAM_BASE          0x00000000
-#define CFG_FLASH_BASE         0xff800000
+#define CFG_FLASH_BASE         0xff000000
 #define CFG_RESET_ADDRESS      0xfff00100
 #define        CFG_MONITOR_LEN         (256 << 10)     /* Reserve 256 kB for Monitor */
 #define CFG_MONITOR_BASE       TEXT_BASE
 /* PCI MEMORY MAP section */
 #define CFG_PCI0_MEM_BASE      0x80000000
 #define CFG_PCI0_MEM_SIZE      _128M
+#define CFG_PCI0_0_MEM_SPACE   (CFG_PCI0_MEM_BASE)
+
 #define CFG_PCI1_MEM_BASE      0x88000000
 #define CFG_PCI1_MEM_SIZE      _128M
-
-#define CFG_PCI0_0_MEM_SPACE   (CFG_PCI0_MEM_BASE)
 #define CFG_PCI1_0_MEM_SPACE   (CFG_PCI1_MEM_BASE)
 
-
 /* PCI I/O MAP section */
 #define CFG_PCI0_IO_BASE       0xfa000000
 #define CFG_PCI0_IO_SIZE       _16M
-#define CFG_PCI1_IO_BASE       0xfb000000
-#define CFG_PCI1_IO_SIZE       _16M
-
 #define CFG_PCI0_IO_SPACE      (CFG_PCI0_IO_BASE)
 #define CFG_PCI0_IO_SPACE_PCI  0x00000000
+
+#define CFG_PCI1_IO_BASE       0xfb000000
+#define CFG_PCI1_IO_SIZE       _16M
 #define CFG_PCI1_IO_SPACE      (CFG_PCI1_IO_BASE)
 #define CFG_PCI1_IO_SPACE_PCI  0x00000000
 
 #define CFG_MAX_FLASH_BANKS    2       /* max number of memory banks   */
 #define CFG_MAX_FLASH_SECT     67      /* max number of sectors on one chip */
 
-#define CFG_EXTRA_FLASH_DEVICE DEVICE0 /* extra flash at device 0 */
+#define CFG_EXTRA_FLASH_DEVICE BOOT_DEVICE
 #define CFG_EXTRA_FLASH_WIDTH  2       /* 16 bit */
 #define CFG_BOOT_FLASH_WIDTH   2       /* 16 bit */
 
  * Cache Configuration
  */
 #define CFG_CACHELINE_SIZE     32      /* For all MPC74xx CPUs          */
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CACHELINE_SHIFT    5       /* log base 2 of the above value */
 #endif