summaryrefslogtreecommitdiff
path: root/conf/distro
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2006-08-27 17:37:21 +0000
committerRichard Purdie <rpurdie@rpsys.net>2006-08-27 17:37:21 +0000
commite75954d06cc21565451c14de8f3d3c31d7d0293a (patch)
treee7553f3445587659838abf1a7fa06473cc838d8c /conf/distro
parentea43a6c869027d4d3b45999fa4d95d2be78e00d6 (diff)
parent2101f6f377a76c373b5ef4ff2fb8484ab5d4d31f (diff)
merge of '90a1ac7c53dbaf35a4b93a66275d608d001eb092'
and 'ec80efa0b796cacd58e78cc5eeb3e250413712e8'
Diffstat (limited to 'conf/distro')
-rw-r--r--conf/distro/openmn.conf2
-rw-r--r--conf/distro/unslung.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/distro/openmn.conf b/conf/distro/openmn.conf
index 0e3d36ed2d..8118acb1da 100644
--- a/conf/distro/openmn.conf
+++ b/conf/distro/openmn.conf
@@ -16,6 +16,6 @@ IPKG_EXTRA_ARCHS = "armv5te openmn"
FEED_URIS = "mnci54##http://www.mn-solutions.de/feed/mnci54/base"
-IMAGE_FSTYPE = "jffs2"
+IMAGE_FSTYPES = "jffs2"
EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime --output=${DEPLOY_DIR_IMAGE}/rootfs.${MACHINE} ${EXTRA_IMAGECMD}"
diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf
index 0c757edc45..da1efa9cc4 100644
--- a/conf/distro/unslung.conf
+++ b/conf/distro/unslung.conf
@@ -34,7 +34,7 @@ FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-reg
INHERIT += " package_ipk nslu2-jffs2-image"
-IMAGE_FSTYPE = "jffs2"
+IMAGE_FSTYPES = "jffs2"
UNSLUNG_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-unslung.txt')}"
EXTRA_IMAGECMD_jffs2 = "--no-eraseblock-headers --pad --big-endian --eraseblock=0x20000 -D ${UNSLUNG_DEVICE_TABLE}"