summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2007-05-03 21:52:28 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2007-05-03 21:52:28 +0000
commitd371adc14d8dcdf7a19ec63b92bb6d2624348b6c (patch)
treea11ccbfdefd4933e33e3c56a071a111cc0aa681a /conf
parent5c59726be653249443ecfdb084bff22c948f2eec (diff)
parentfecb7beebd8a8e4b0b369f2b1f5449a89d2a85eb (diff)
merge of '63574aab45fa11754d7be72eaf51866ddc2f1fc4'
and 'e9f1e7c93893cfe82d2a2642ffa7844ff663e0f8'
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf6
-rw-r--r--conf/machine/magicbox.conf11
2 files changed, 9 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/machine/magicbox.conf b/conf/machine/magicbox.conf
index 4ed28337d6..22e30542f9 100644
--- a/conf/machine/magicbox.conf
+++ b/conf/machine/magicbox.conf
@@ -7,17 +7,18 @@ PACKAGE_EXTRA_ARCHS = "ppc405"
PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
-MACHINE_FEATURES = "kernel26 ext2"
+MACHINE_FEATURES = "kernel26"
+MACHINE_TASK_PROVIDER = "task-base"
TARGET_CPU = "405"
-OLDEST_KERNEL = "2.6.12"
+OLDEST_KERNEL = "2.6.18"
SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_VERSION_u-boot = "1.1.2"
-EXTRA_IMAGECMD = "--big-endian"
-ERASEBLOCK_SIZE = "0x10000"
-IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--big-endian"
+EXTRA_IMAGECMD_squashfs = " -be -all-root "
+EXTRA_IMAGECMD_squashfs-lzma = " -be -all-root "
#tune for the 405 cpu
require conf/machine/include/tune-ppc405.conf