]> git.karo-electronics.de Git - karo-tx-uboot.git/blobdiff - include/configs/P3G4.h
rename CFG_ENV macros to CONFIG_ENV
[karo-tx-uboot.git] / include / configs / P3G4.h
index c56ad11b9fe74780c8f7327a8391ee137912443a..815009182d50782ebc4ab72a0bb300e46779d222 100644 (file)
@@ -28,8 +28,6 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <asm/processor.h>
-
 #ifndef __ASSEMBLY__
 #include <galileo/core.h>
 #endif
@@ -44,7 +42,7 @@
 #define CONFIG_P3G4            1       /* this is a P3G4  board        */
 #define CFG_GT_6426x        GT_64260 /* with a 64260 system controller */
 
-#define CONFIG_BAUDRATE                115200  /* console baudrate = 115200    */
+#define CONFIG_BAUDRATE                115200  /* console baudrate = 115200    */
 
 #undef CONFIG_ECC                      /* enable ECC support */
 /* #define CONFIG_EVB64260_750CX  1 */      /* Support the EVB-64260-750CX Board */
@@ -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 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      */
 /* 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_FLASH_WRITE_TOUT   500     /* Timeout for Flash Write (in ms) */
 #define CFG_FLASH_CFI          1
 
-#define        CFG_ENV_IS_IN_FLASH     1
-#define        CFG_ENV_SIZE            0x1000  /* Total Size of Environment Sector */
-#define CFG_ENV_SECT_SIZE      0x20000
-#define CFG_ENV_ADDR           0xFFFE0000
+#define        CONFIG_ENV_IS_IN_FLASH  1
+#define        CONFIG_ENV_SIZE         0x1000  /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x20000
+#define CONFIG_ENV_ADDR                0xFFFE0000
 
 /*-----------------------------------------------------------------------
  * 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
 
 
 #define CFG_L2
 
-#define L2_INIT        (L2CR_L2SIZ_2M | L2CR_L2CLK_3 | L2CR_L2RAM_BURST | \
-                       L2CR_L2OH_5 | L2CR_L2CTL | L2CR_L2WT)
+#define L2_INIT                (L2CR_L2SIZ_2M | L2CR_L2CLK_3 | L2CR_L2RAM_BURST | \
+                        L2CR_L2OH_5 | L2CR_L2CTL | L2CR_L2WT)
 
 #define L2_ENABLE      (L2_INIT | L2CR_L2E)