diff options
5 files changed, 50 insertions, 5 deletions
diff --git a/recipes/angstrom/angstrom-uboot-scripts.bb b/recipes/angstrom/angstrom-uboot-scripts.bb index a478cb2333..020a7afd8d 100644 --- a/recipes/angstrom/angstrom-uboot-scripts.bb +++ b/recipes/angstrom/angstrom-uboot-scripts.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Various uboot scripts" -PR = "r9" +PR = "r10" DEPENDS = "u-boot-mkimage-native" diff --git a/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-user.cmd b/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-user.cmd index 7dbf69b548..971b96ede0 100644 --- a/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-user.cmd +++ b/recipes/angstrom/angstrom-uboot-scripts/beagleboard-validation-user.cmd @@ -1,11 +1,14 @@ mmc init -setenv rdaddr 0x81000000 -setenv ramroot /dev/ram0 if test "${beaglerev}" = "AxBx"; then +setenv rdaddr 0x81000000 setenv optargs mem=80M@0x80000000 musb_hdrc.fifomode=5 elif test "${beaglerev}" = "Cx"; then +setenv rdaddr 0x88000000 +setenv ramroot /dev/ram0 rw ramdisk_size=131072 initrd=${rdaddr},128M setenv optargs mem=80M@0x80000000 mem=128M@0x88000000 musb_hdrc.fifomode=5 else +setenv rdaddr 0x88000000 +setenv ramroot /dev/ram0 rw ramdisk_size=131072 initrd=${rdaddr},128M setenv optargs mem=80M@0x80000000 mem=384M@0x88000000 fi run loadramdisk diff --git a/recipes/images/beagleboard-test-image.bb b/recipes/images/beagleboard-test-image.bb index cbbd3c2513..7361017e32 100644 --- a/recipes/images/beagleboard-test-image.bb +++ b/recipes/images/beagleboard-test-image.bb @@ -28,4 +28,7 @@ IMAGE_INSTALL += " \ export IMAGE_BASENAME = "beagleboard-test-image" EXTRA_IMAGEDEPENDS += "x-load u-boot virtual/kernel" -IMAGE_FSTYPES += "ext2.gz" +IMAGE_FSTYPES += "ext2.gz cpio.gz.u-boot" +IMAGE_ROOTFS_SIZE_ext2 = "131072" +EXTRA_IMAGECMD_ext2.gz += "-i 8192" + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0001-BeagleBoard-move-ramdisk-parameters.patch b/recipes/u-boot/u-boot-git/beagleboard/0001-BeagleBoard-move-ramdisk-parameters.patch new file mode 100644 index 0000000000..5d6e69d24b --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0001-BeagleBoard-move-ramdisk-parameters.patch @@ -0,0 +1,38 @@ +From c8d02f2a8500f06de39681aed60ea5c9894f8087 Mon Sep 17 00:00:00 2001 +From: Jason Kridner <jkridner@beagleboard.org> +Date: Wed, 11 Aug 2010 14:50:38 -0500 +Subject: [PATCH] BeagleBoard: move ramdisk parameters + +This will make it easier to reprogram the ramdisk size. + +Signed-off-by: Jason Kridner <jkridner@beagleboard.org> +--- + include/configs/omap3_beagle.h | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 48ad805..4f5c1d4 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -217,7 +217,7 @@ + "mmcrootfstype=ext3 rootwait\0" \ + "nandroot=/dev/mtdblock4 rw\0" \ + "nandrootfstype=jffs2\0" \ +- "ramroot=/dev/ram0 rw\0" \ ++ "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=${rdaddr},64M\0" \ + "ramrootfstype=ext2\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "${optargs} " \ +@@ -248,8 +248,7 @@ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapdss.def_disp=${defaultdisplay} " \ +- "root=${ramroot} rw ramdisk_size=65536 " \ +- "initrd=${rdaddr},64M " \ ++ "root=${ramroot} " \ + "rootfstype=${ramrootfstype}\0" \ + "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ +-- +1.5.6.4 + diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 7f26a87114..19386fce95 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r63" +PR ="r64" FILESPATHPKG =. "u-boot-git:" @@ -71,6 +71,7 @@ SRC_URI_beagleboard = "git://www.denx.de/git/u-boot.git;protocol=git \ file://0044-Beagleboard-Adjust-boot.patch \ file://0045-BeagleBoard-Enable-pullups-on-i2c2.patch \ file://0046-BeagleBoard-Add-camera-to-default-bootargs.patch \ + file://0001-BeagleBoard-move-ramdisk-parameters.patch \ file://fw_env.config \ " SRCREV_beagleboard = "ca6e1c136ddb720c3bb2cc043b99f7f06bc46c55" |