summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/machine/akita.conf2
-rw-r--r--meta/conf/machine/c7x0.conf2
-rw-r--r--meta/conf/machine/cmx270.conf2
-rw-r--r--meta/conf/machine/ipaq-pxa270.conf2
-rw-r--r--meta/conf/machine/nokia770.conf2
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/spitz.conf2
7 files changed, 12 insertions, 2 deletions
diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf
index 89c0d031ee..c191b9031d 100644
--- a/meta/conf/machine/akita.conf
+++ b/meta/conf/machine/akita.conf
@@ -5,4 +5,6 @@
5include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.conf
6include conf/machine/include/zaurus-clamshell-2.6.conf 6include conf/machine/include/zaurus-clamshell-2.6.conf
7 7
8IMAGE_FSTYPES ?= "jffs2"
9
8ROOT_FLASH_SIZE = "58" 10ROOT_FLASH_SIZE = "58"
diff --git a/meta/conf/machine/c7x0.conf b/meta/conf/machine/c7x0.conf
index 0bd9623526..4b1d8edb80 100644
--- a/meta/conf/machine/c7x0.conf
+++ b/meta/conf/machine/c7x0.conf
@@ -5,5 +5,7 @@
5include conf/machine/include/zaurus-clamshell.conf 5include conf/machine/include/zaurus-clamshell.conf
6include conf/machine/include/zaurus-clamshell-2.6.conf 6include conf/machine/include/zaurus-clamshell-2.6.conf
7 7
8IMAGE_FSTYPES ?= "jffs2"
9
8ROOT_FLASH_SIZE = "25" 10ROOT_FLASH_SIZE = "25"
9# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it. 11# yes, we are aware that the husky (c760,c860) has 54MB rootfs, but we don't make a special image for it.
diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
index fc281f3746..d35ca0430a 100644
--- a/meta/conf/machine/cmx270.conf
+++ b/meta/conf/machine/cmx270.conf
@@ -10,6 +10,8 @@ IMAGE_CMD_jffs2 = "mkdir -p ${DEPLOY_DIR_IMAGE}; \
10 mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ 10 mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
11 --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img ${EXTRA_IMAGECMD}; " 11 --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img ${EXTRA_IMAGECMD}; "
12 12
13IMAGE_FSTYPES ?= "jffs2 tar.bz2"
14
13PREFERRED_PROVIDER_virtual/bootloader = "" 15PREFERRED_PROVIDER_virtual/bootloader = ""
14 16
15# 800x480 is big enough for me 17# 800x480 is big enough for me
diff --git a/meta/conf/machine/ipaq-pxa270.conf b/meta/conf/machine/ipaq-pxa270.conf
index f5cc893c9c..ffa8b2d9c5 100644
--- a/meta/conf/machine/ipaq-pxa270.conf
+++ b/meta/conf/machine/ipaq-pxa270.conf
@@ -18,6 +18,8 @@ EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jf
18 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \ 18 -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
19 -e 256KiB -p" 19 -e 256KiB -p"
20 20
21IMAGE_FSTYPES ?= "tar.bz2"
22
21MODUTILS = "26" 23MODUTILS = "26"
22PCMCIA_MANAGER = "pcmciautils" 24PCMCIA_MANAGER = "pcmciautils"
23BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params " 25BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
diff --git a/meta/conf/machine/nokia770.conf b/meta/conf/machine/nokia770.conf
index bf893660d4..9bde19dcf6 100644
--- a/meta/conf/machine/nokia770.conf
+++ b/meta/conf/machine/nokia770.conf
@@ -22,6 +22,8 @@ include conf/machine/include/tune-arm926ejs.conf
22ROOT_FLASH_SIZE = "123" 22ROOT_FLASH_SIZE = "123"
23EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000" 23EXTRA_IMAGECMD_jffs2_nokia770 = "--pad --little-endian --eraseblock=0x20000"
24 24
25IMAGE_FSTYPES ?= "jffs2"
26
25# serial console port on devboard rev. B3 27# serial console port on devboard rev. B3
26SERIAL_CONSOLE = "115200 ttyS0" 28SERIAL_CONSOLE = "115200 ttyS0"
27 29
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 3341efd1a7..40de141fd5 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -39,7 +39,7 @@ ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsam
39#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm \ 39#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm \
40# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" 40# kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb"
41 41
42IMAGE_FSTYPES = "tar.bz2" 42IMAGE_FSTYPES ?= "tar.bz2"
43 43
44ROOT_FLASH_SIZE = "100" 44ROOT_FLASH_SIZE = "100"
45# actually that should really read ROOTFS_SIZE = "100", because with modern kernels, 45# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index f78dd7a3b9..f8b0572b42 100644
--- a/meta/conf/machine/spitz.conf
+++ b/meta/conf/machine/spitz.conf
@@ -11,7 +11,7 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += ""
11# Useful things for the built-in Harddisk 11# Useful things for the built-in Harddisk
12BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs" 12BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
13 13
14IMAGE_FSTYPES = "jffs2 tar.gz" 14IMAGE_FSTYPES ?= "tar.gz"
15 15
16ROOT_FLASH_SIZE = "100" 16ROOT_FLASH_SIZE = "100"
17# actually that should really read ROOTFS_SIZE = "100", because with modern kernels, 17# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,