diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2007-05-04 11:29:40 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2007-05-04 11:29:40 +0000 |
| commit | e22255fcebddb6cba283d7f71e85fbcf789d1a6a (patch) | |
| tree | 56ef54944ea0772855c31c389c8d2087d1c4d04e /target/linux/at91-2.6/image/u-boot | |
| parent | afcfa1a55c683c160efa6e54b159b7c6a1d1fc62 (diff) | |
| download | upstream-e22255fcebddb6cba283d7f71e85fbcf789d1a6a.tar.gz upstream-e22255fcebddb6cba283d7f71e85fbcf789d1a6a.tar.bz2 upstream-e22255fcebddb6cba283d7f71e85fbcf789d1a6a.zip | |
Changed partitioning not to use at91part.c as opposed to using command-line partitioning.
SVN-Revision: 7089
Diffstat (limited to 'target/linux/at91-2.6/image/u-boot')
| -rw-r--r-- | target/linux/at91-2.6/image/u-boot/patches/011-ubparams_update.patch | 19 | ||||
| -rw-r--r-- | target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c | 7 |
2 files changed, 22 insertions, 4 deletions
diff --git a/target/linux/at91-2.6/image/u-boot/patches/011-ubparams_update.patch b/target/linux/at91-2.6/image/u-boot/patches/011-ubparams_update.patch new file mode 100644 index 0000000000..267903efe4 --- /dev/null +++ b/target/linux/at91-2.6/image/u-boot/patches/011-ubparams_update.patch @@ -0,0 +1,19 @@ +diff -urN u-boot-1.1.4.old/tools/ubparams.c u-boot-1.1.4/tools/ubparams.c +--- u-boot-1.1.4.old/tools/ubparams.c 2007-05-01 13:20:17.000000000 +0200 ++++ u-boot-1.1.4/tools/ubparams.c 2007-05-04 10:13:34.000000000 +0200 +@@ -37,12 +37,11 @@ + "stdin=serial\0" + "stdout=serial\0" + "stderr=serial\0" +- "partitions=mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data)\0" +- "fbargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" +- "rdba=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" ++ "fbargs=setenv bootargs root=/dev/mtdblock3 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" ++ "rdba=setenv bootargs root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" + "rdram=run rdba; tftp 21000000 vImage; tftp 21200000 root.squashfs; bootm 21000000\0" + "flash=run fbargs; bootm 0xc0042000\0" +- "bootargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" ++ "bootargs=setenv bootargs root=/dev/mtdblock3 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" + "bootcmd=bootm 0xc0042000\0" + "ethaddr=00:30:49:00:00:01\0" + "ipaddr=10.0.1.73\0" diff --git a/target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c b/target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c index 99d7570623..103d4fd217 100644 --- a/target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c +++ b/target/linux/at91-2.6/image/u-boot/ubclient/ubpar.c @@ -35,12 +35,11 @@ static char *environment[] = { "stdin=serial\0" "stdout=serial\0" "stderr=serial\0" - "partitions=mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data)\0" - "fbargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" - "rdba=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" + "fbargs=setenv bootargs root=/dev/mtdblock3 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" + "rdba=setenv bootargs root=/dev/ram rw initrd=0x21200000,6000000 ramdisk_size=20000 init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" "rdram=run rdba; tftp 21000000 vImage; tftp 21200000 root.squashfs; bootm 21000000\0" "flash=run fbargs; bootm 0xc0042000\0" - "bootargs=setenv bootargs mtdparts=AT45DB642.spi0:132k(bootloader),33k(ubparams),99k(spare),1056k(linux),2112k(rootfs),33k(nvram),-(rootfs_data) root=/dev/mtdblock4 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" + "bootargs=setenv bootargs root=/dev/mtdblock3 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" "bootcmd=bootm 0xc0042000\0" "ipaddr=10.0.1.73\0" "serverip=10.0.1.210\0" |