summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/collie.conf2
-rw-r--r--conf/machine/omap3evm.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 34731c387f..0dd8df1fae 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -10,7 +10,7 @@ require conf/machine/include/tune-strongarm.inc
PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
-EXTRA_IMAGECMD_jffs2 ?= "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
IMAGE_LINGUAS ?= ""
IMAGE_FSTYPES ?= "jffs2 tar.gz"
diff --git a/conf/machine/omap3evm.conf b/conf/machine/omap3evm.conf
index 416db2c937..bf358e9e11 100644
--- a/conf/machine/omap3evm.conf
+++ b/conf/machine/omap3evm.conf
@@ -20,7 +20,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp "
SERIAL_CONSOLE = "115200 ttyS0"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-omap2"
KERNEL_IMAGETYPE = "uImage"