diff options
| author |   Koen Kooi <koen@openembedded.org> | 2009-10-20 20:15:40 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-10-21 15:27:27 +0200 |
| commit | d57e14b9e27ed8360d49446361c5f7607ea34d88 (patch) | |
| tree | 5537320fb1b8a6022ae998a458c051c5bd7721a8 /recipes/u-boot/files | |
| parent | 9566f5fa6724f0beae77c206c9c391b177060fb8 (diff) | |
| download | openembedded-d57e14b9e27ed8360d49446361c5f7607ea34d88.tar.gz | |
u-boot: fix fw_env logic, update beagle and touchbook
Diffstat (limited to 'recipes/u-boot/files')
| -rw-r--r-- | recipes/u-boot/files/beagleboard/fw_env.config | 8 | ||||
| -rw-r--r-- | recipes/u-boot/files/fw_env.config | 7 | ||||
| -rw-r--r-- | recipes/u-boot/files/omap3-touchbook/fw_env.config | 6 | ||||
| -rw-r--r-- | recipes/u-boot/files/rootfs.patch | 62 |
4 files changed, 83 insertions, 0 deletions
diff --git a/recipes/u-boot/files/beagleboard/fw_env.config b/recipes/u-boot/files/beagleboard/fw_env.config new file mode 100644 index 0000000000..8fc96f7572 --- /dev/null +++ b/recipes/u-boot/files/beagleboard/fw_env.config @@ -0,0 +1,8 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundant +# environment sector is assumed present. +# Notice, that the "Number of sectors" is ignored on NOR. + +# MTD device name Device offset Env. size Flash sector size Number of sectors +/dev/mtd2 0x0000 0x20000 0x40000 + diff --git a/recipes/u-boot/files/fw_env.config b/recipes/u-boot/files/fw_env.config new file mode 100644 index 0000000000..940308f28b --- /dev/null +++ b/recipes/u-boot/files/fw_env.config @@ -0,0 +1,7 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundand +# environment sector is assumed present. + +# MTD device name Device offset Env. size Flash sector size +#/dev/mtd1 0x0000 0x4000 0x4000 +#/dev/mtd2 0x0000 0x4000 0x4000 diff --git a/recipes/u-boot/files/omap3-touchbook/fw_env.config b/recipes/u-boot/files/omap3-touchbook/fw_env.config new file mode 100644 index 0000000000..a7bfec1ebb --- /dev/null +++ b/recipes/u-boot/files/omap3-touchbook/fw_env.config @@ -0,0 +1,6 @@ +# Configuration file for fw_(printenv/saveenv) utility. +# Up to two entries are valid, in this case the redundand +# environment sector is assumed present. + +# MTD device name Device offset Env. size Flash sector size +/dev/mtd2 0x0000 0x20000 0x20000 diff --git a/recipes/u-boot/files/rootfs.patch b/recipes/u-boot/files/rootfs.patch new file mode 100644 index 0000000000..655c040500 --- /dev/null +++ b/recipes/u-boot/files/rootfs.patch @@ -0,0 +1,62 @@ +--- git/include/configs/omap3_overo.h-orig 2009-09-17 13:06:08.000000000 -0700 ++++ git/include/configs/omap3_overo.h 2009-09-17 13:06:49.000000000 -0700 +@@ -158,20 +158,24 @@ + "vram=12M\0" \ + "dvimode=1024x768MR-16@60\0" \ + "defaultdisplay=dvi\0" \ ++ "mmcroot=/dev/mmcblk0p2 rw\0" \ ++ "mmcrootfstype=ext3 rootwait\0" \ ++ "nandroot=/dev/mtdblock4 rw\0" \ ++ "nandrootfstype=jffs2\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapfb.debug=y " \ + "omapdss.def_disp=${defaultdisplay} " \ +- "root=/dev/mmcblk0p2 rw " \ +- "rootfstype=ext3 rootwait\0" \ ++ "root=${mmcroot} " \ ++ "rootfstype=${mmcrootfstype}\0" \ + "nandargs=setenv bootargs console=${console} " \ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapfb.debug=y " \ + "omapdss.def_disp=${defaultdisplay} " \ +- "root=/dev/mtdblock4 rw " \ +- "rootfstype=jffs2\0" \ ++ "root=${nandroot} " \ ++ "rootfstype=${nandrootfstype}\0" \ + "loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source ${loadaddr}\0" \ +--- git/include/configs/omap3_beagle.h-orig 2009-09-17 14:48:55.000000000 -0700 ++++ git/include/configs/omap3_beagle.h 2009-09-19 22:15:01.000000000 -0700 +@@ -167,20 +167,24 @@ + "vram=12M\0" \ + "dvimode=1024x768MR-16@60\0" \ + "defaultdisplay=dvi\0" \ ++ "mmcroot=/dev/mmcblk0p2 rw\0" \ ++ "mmcrootfstype=ext3 rootwait\0" \ ++ "nandroot=/dev/mtdblock4 rw\0" \ ++ "nandrootfstype=jffs2\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapfb.debug=y " \ + "omapdss.def_disp=${defaultdisplay} " \ +- "root=/dev/mmcblk0p2 rw " \ +- "rootfstype=ext3 rootwait\0" \ ++ "root=${mmcroot} " \ ++ "rootfstype=${mmcrootfstype}\0" \ + "nandargs=setenv bootargs console=${console} " \ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ + "omapfb.debug=y " \ + "omapdss.def_disp=${defaultdisplay} " \ +- "root=/dev/mtdblock4 rw " \ +- "rootfstype=jffs2\0" \ ++ "root=${nandroot} " \ ++ "rootfstype=${nandrootfstype}\0" \ + "loadbootscript=fatload mmc 0 ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source ${loadaddr}\0" \ |