summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bitbake.conf5
-rw-r--r--meta/conf/distro/poky.conf2
-rw-r--r--meta/conf/machine/cmx270.conf2
3 files changed, 6 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 49c4544f78..08ce44d8e3 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -199,8 +199,6 @@ IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE
199EXTRA_IMAGECMD = "" 199EXTRA_IMAGECMD = ""
200EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" 200EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
201EXTRA_IMAGECMD_squashfs = "-le -b 16384" 201EXTRA_IMAGECMD_squashfs = "-le -b 16384"
202IMAGE_ROOTFS_SIZE_ext2 = "65536"
203IMAGE_ROOTFS_SIZE_ext2.gz = "65536"
204 202
205IMAGE_DEPENDS = "" 203IMAGE_DEPENDS = ""
206IMAGE_DEPENDS_jffs2 = "mtd-utils-native" 204IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
@@ -423,6 +421,9 @@ require conf/sanity.conf
423IMAGE_FSTYPES ?= "jffs2" 421IMAGE_FSTYPES ?= "jffs2"
424PCMCIA_MANAGER ?= "pcmcia-cs" 422PCMCIA_MANAGER ?= "pcmcia-cs"
425MACHINE_TASK_PROVIDER ?= "task-bootstrap" 423MACHINE_TASK_PROVIDER ?= "task-bootstrap"
424IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
425IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
426
426 427
427 428
428################################################################## 429##################################################################
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 03c53004e4..bbf8d940ad 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -16,7 +16,7 @@ INHERIT += " ${PACKAGE_CLASSES} debian multimachine poky devshell "
16TARGET_OS = "linux" 16TARGET_OS = "linux"
17TARGET_FPU_arm ?= "soft" 17TARGET_FPU_arm ?= "soft"
18TARGET_FPU_armeb ?= "soft" 18TARGET_FPU_armeb ?= "soft"
19IMAGE_ROOTFS_SIZE_ext2 = 131072 19IMAGE_ROOTFS_SIZE_ext2 ?= 131072
20 20
21PARALLEL_INSTALL_MODULES = "1" 21PARALLEL_INSTALL_MODULES = "1"
22 22
diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf
index 509da675ab..37ea0f707f 100644
--- a/meta/conf/machine/cmx270.conf
+++ b/meta/conf/machine/cmx270.conf
@@ -12,6 +12,8 @@ IMAGE_CMD_jffs2 = "mkdir -p ${DEPLOY_DIR_IMAGE}; \
12 12
13IMAGE_FSTYPES ?= "jffs2 tar.bz2 ext2" 13IMAGE_FSTYPES ?= "jffs2 tar.bz2 ext2"
14 14
15IMAGE_ROOTFS_SIZE_ext2 = 120000
16
15PREFERRED_PROVIDER_virtual/bootloader = "" 17PREFERRED_PROVIDER_virtual/bootloader = ""
16 18
17# 800x480 is big enough for me 19# 800x480 is big enough for me