]> git.sur5r.net Git - u-boot/commitdiff
ppc4xx: Update Makalu defconfig to use device-tree booting as default
authorStefan Roese <sr@denx.de>
Sat, 10 May 2008 08:30:36 +0000 (10:30 +0200)
committerStefan Roese <sr@denx.de>
Sat, 10 May 2008 08:30:36 +0000 (10:30 +0200)
This patch reworks the default environment on Makalu. Now "net_nfs" for
example uses the device-tree style booting formerly know as "net_nfs_fdt".
Also the addresses in RAM were changed because of the new image booting
support, which check for image overwriting. So the addresses needed to
get adjusted.

Signed-off-by: Stefan Roese <sr@denx.de>
include/configs/makalu.h

index 6556666d27b50c1c89d8c28b6a9baad8b488c0b4..67243d4e40c3dfab2c61b54911c7b5fcf6bf723a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * (C) Copyright 2007
+ * (C) Copyright 2007-2008
  * Stefan Roese, DENX Software Engineering, sr@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
                ":${hostname}:${netdev}:off panic=1\0"                  \
        "addtty=setenv bootargs ${bootargs} console=ttyS0,${baudrate}\0"\
        "addmisc=setenv bootargs ${bootargs} rtc-x1205.probe=0,0x6f\0"  \
-       "net_nfs=tftp 200000 ${bootfile};"                              \
+       "flash_self_old=run ramargs addip addtty addmisc;"              \
+               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+       "flash_self=run ramargs addip addtty addmisc;"                  \
+               "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0"    \
+       "flash_nfs_old=run nfsargs addip addtty addmisc;"               \
+               "bootm ${kernel_addr}\0"                                \
+       "flash_nfs=run nfsargs addip addtty addmisc;"                   \
+               "bootm ${kernel_addr} - ${fdt_addr}\0"                  \
+       "net_nfs_old=tftp ${kernel_addr_r} ${bootfile};"                \
                "run nfsargs addip addtty addmisc;"                     \
-               "bootm 200000\0"                                        \
-       "net_nfs_fdt=tftp 200000 ${bootfile};"                          \
-               "tftp ${fdt_addr} ${fdt_file};"                         \
+               "bootm ${kernel_addr_r}\0"                              \
+       "net_nfs=tftp ${kernel_addr_r} ${bootfile}; "                   \
+               "tftp ${fdt_addr_r} ${fdt_file}; "                      \
                "run nfsargs addip addtty addmisc;"                     \
-               "bootm 200000 - ${fdt_addr}\0"                          \
-       "flash_nfs=run nfsargs addip addtty addmisc;"                   \
-               "bootm ${kernel_addr}\0"                                \
-       "flash_self=run ramargs addip addtty addmisc;"                  \
-               "bootm ${kernel_addr} ${ramdisk_addr}\0"                \
+               "bootm ${kernel_addr_r} - ${fdt_addr_r}\0"              \
        "rootpath=/opt/eldk/ppc_4xx\0"                                  \
        "bootfile=makalu/uImage\0"                                      \
        "fdt_file=makalu/makalu.dtb\0"                                  \
-       "fdt_addr=400000\0"                                             \
+       "kernel_addr_r=400000\0"                                        \
+       "fdt_addr_r=800000\0"                                           \
        "kernel_addr=fc000000\0"                                        \
+       "fdt_addr=fc1e0000\0"                                           \
        "ramdisk_addr=fc200000\0"                                       \
        "initrd_high=30000000\0"                                        \
        "load=tftp 200000 makalu/u-boot.bin\0"                          \
 #define CONFIG_BOOTP_BOOTPATH
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
+#define CONFIG_BOOTP_SUBNETMASK
 
 /*
  * Command line configuration.