diff options
author | Robert Schuster <thebohemian@gmx.net> | 2008-03-04 16:46:11 +0000 |
---|---|---|
committer | Robert Schuster <thebohemian@gmx.net> | 2008-03-04 16:46:11 +0000 |
commit | ba69123b245d6244b756a07f7118bfb11acb47f0 (patch) | |
tree | 6c0f87cbb91fb142e9b748fdc2628e8390f5edd0 /conf/machine | |
parent | 25fe9599d951a3de39a2e8983810f2c6a40d74b0 (diff) | |
parent | b1fbc8c1b11f8c30bf327b4605defac0a3d47457 (diff) |
merge of '1d06736abd89e6b42d2eaf5918fcd17ad518fcb3'
and '3601bc2cdb1e980ccaf4f1de781d948df8d45545'
Diffstat (limited to 'conf/machine')
-rw-r--r-- | conf/machine/cm-x270.conf | 2 | ||||
-rw-r--r-- | conf/machine/simpad.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/cm-x270.conf b/conf/machine/cm-x270.conf index 1b6188753e..0c9578e407 100644 --- a/conf/machine/cm-x270.conf +++ b/conf/machine/cm-x270.conf @@ -6,7 +6,7 @@ TARGET_ARCH = "arm" GUI_MACHINE_CLASS ?= "bigscreen" PREFERRED_PROVIDER_virtual/kernel = "linux" -PREFERRED_VERSION_linux ?= "2.6.23" +PREFERRED_VERSION_linux ?= "2.6.24" PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt" diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf index 6334d34171..b98981c106 100644 --- a/conf/machine/simpad.conf +++ b/conf/machine/simpad.conf @@ -13,7 +13,7 @@ require conf/machine/include/tune-strongarm.inc ROOT_FLASH_SIZE = "16" -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000" GUI_MACHINE_CLASS = "bigscreen" SERIAL_CONSOLE = "ttySA0 115200 vt100" |