diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-05-05 00:35:09 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-05-05 00:35:09 +0000 |
| commit | edb488ab04dd2d3fad6cd65ab682ad9c6741e9de (patch) | |
| tree | 855ee653989328a14b8169e9246121b1b6e050e2 /conf | |
| parent | e541e99e84defcec930be3621b112384fb9698d2 (diff) | |
| parent | 5b5b45a39e698b3c5e0f5647413a2cb051a991bc (diff) | |
merge of '1e54d761b418c28fcee92e7b7c45f55fe41676a3'
and 'f9d679b49c9ccfedc3565929011b677de9852036'
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 6 | ||||
| -rw-r--r-- | conf/distro/include/preferred-opie-versions-1.2.3-pre.inc | 2 | ||||
| -rw-r--r-- | conf/machine/ixp4xxbe.conf | 2 | ||||
| -rw-r--r-- | conf/machine/magicbox.conf | 9 |
4 files changed, 11 insertions, 8 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ae26d992f2..c754dab273 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -205,9 +205,9 @@ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE IMAGE_CMD_cpio = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)" IMAGE_CMD_cpio.gz = "cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc | gzip -c -9 >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio.gz)" EXTRA_IMAGECMD = "" -EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -EXTRA_IMAGECMD_squashfs = "-le -b 16384" -EXTRA_IMAGECMD_squashfs-lzma = "-le -b 16384" +EXTRA_IMAGECMD_jffs2 = "" +EXTRA_IMAGECMD_squashfs = "" +EXTRA_IMAGECMD_squashfs-lzma = "" IMAGE_DEPENDS = "" IMAGE_DEPENDS_jffs2 = "mtd-utils-native" diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc index ea5d6b1153..6990c98000 100644 --- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc +++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc @@ -3,7 +3,7 @@ QTE_VERSION ?= "2.3.10" PALMTOP_USE_MULTITHREADED_QT ?= "yes" -OPIE_SRCDATE ?= "20070328" +OPIE_SRCDATE ?= "20070428" OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}" OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}" diff --git a/conf/machine/ixp4xxbe.conf b/conf/machine/ixp4xxbe.conf index 9b3a4f693f..f208852d3a 100644 --- a/conf/machine/ixp4xxbe.conf +++ b/conf/machine/ixp4xxbe.conf @@ -8,6 +8,4 @@ PACKAGE_EXTRA_ARCHS = "armv4b armv4tb armv5eb armv5teb" require conf/machine/include/ixp4xx.conf -TARGET_CC_ARCH += " -D__ARMEB__ " - EXTRA_IMAGECMD_jffs2 += "--big-endian" diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf index 5231c68bb1..19dae402d9 100644 --- a/conf/machine/magicbox.conf +++ b/conf/machine/magicbox.conf @@ -2,6 +2,8 @@ #@Name: Magicbox router board #@DESCRIPTION: Machine configuration for Magicbox router board http://wwww.magicbox.pl +INHERIT += "magicbox-image" + TARGET_ARCH = "powerpc" PACKAGE_EXTRA_ARCHS = "ppc405" @@ -16,8 +18,11 @@ OLDEST_KERNEL = "2.6.18" SERIAL_CONSOLE = "115200 ttyS0" PREFERRED_VERSION_u-boot = "1.1.2" -EXTRA_IMAGECMD_jffs2 = "--big-endian" -EXTRA_IMAGECMD_squashfs = " -be -all-root " +EXTRA_IMAGECMD_jffs2 = "-pad --big-endian --squash -e 0x10000" +EXTRA_IMAGECMD_squashfs = " -be -all-root -nopad -noappend -root-owned" +EXTRA_IMAGECMD_squashfs-lzma = " -be -all-root -nopad -noappend -root-owned" + + #tune for the 405 cpu require conf/machine/include/tune-ppc405.conf |