From c41fbdc08a45fb5dc18458f9e5806a179cdfe367 Mon Sep 17 00:00:00 2001 From: Hamish Guthrie Date: Tue, 19 Jun 2007 13:04:42 +0000 Subject: [PATCH] Changed bootloader and partition parameters to ease virgin unit programming without SD-Flash card. SVN-Revision: 7672 --- .../u-boot/patches/014-ubparam-kernel.patch | 11 +++++++++++ .../at91-2.6/image/u-boot/ubclient/ubpar.c | 2 +- .../at91-2.6/patches/014-initpartition.patch | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 target/linux/at91-2.6/image/u-boot/patches/014-ubparam-kernel.patch create mode 100644 target/linux/at91-2.6/patches/014-initpartition.patch diff --git a/target/linux/at91-2.6/image/u-boot/patches/014-ubparam-kernel.patch b/target/linux/at91-2.6/image/u-boot/patches/014-ubparam-kernel.patch new file mode 100644 index 0000000000..f6d0a1b191 --- /dev/null +++ b/target/linux/at91-2.6/image/u-boot/patches/014-ubparam-kernel.patch @@ -0,0 +1,11 @@ +--- u-boot-1.1.4.old/tools/ubparams.c 2007-06-19 14:24:39.000000000 +0200 ++++ u-boot-1.1.4/tools/ubparams.c 2007-06-19 14:25:05.000000000 +0200 +@@ -39,7 +39,7 @@ + "stderr=serial\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" ++ "rdram=run rdba; tftp 21000000 uImage; tftp 21200000 root.squashfs; bootm 21000000\0" + "flash=run fbargs; bootm 0xc0042000\0" + "bootargs=setenv bootargs root=/dev/mtdblock3 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" + "bootcmd=bootm 0xc0042000\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 3f6c070017..7e8ea0eb2d 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 @@ -48,7 +48,7 @@ static char *environment[] = { "stderr=serial\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" + "rdram=run rdba; tftp 21000000 uImage; tftp 21200000 root.squashfs; bootm 21000000\0" "flash=run fbargs; bootm 0xc0042000\0" "bootargs=setenv bootargs root=/dev/mtdblock3 ro init=/etc/preinit console=/dev/ttyS0,115200,mem=32M\0" "bootcmd=bootm 0xc0042000\0" diff --git a/target/linux/at91-2.6/patches/014-initpartition.patch b/target/linux/at91-2.6/patches/014-initpartition.patch new file mode 100644 index 0000000000..7e78e6487a --- /dev/null +++ b/target/linux/at91-2.6/patches/014-initpartition.patch @@ -0,0 +1,18 @@ +--- linux-2.6.21.5.old/drivers/mtd/devices/at91_dataflash.c 2007-06-13 13:31:24.000000000 +0200 ++++ linux-2.6.21.5/drivers/mtd/devices/at91_dataflash.c 2007-06-19 12:49:48.000000000 +0200 +@@ -161,12 +161,12 @@ + .mask_flags = MTD_WRITEABLE, /* read-only */ + }, + { +- .name = "kernel", ++ .name = "knlroot", + .offset = MTDPART_OFS_NXTBLK, +- .size = 5 * 32 * 8 * 1056, /* 5 sectors */ ++ .size = 0x320400, /* 5 sectors */ + }, + { +- .name = "filesystem", ++ .name = "jffs2", + .offset = MTDPART_OFS_NXTBLK, + .size = MTDPART_SIZ_FULL, /* rest = 26 sectors */ + }