summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorFlorian Boor <florian.boor@kernelconcepts.de>2008-03-10 13:50:26 +0000
committerFlorian Boor <florian.boor@kernelconcepts.de>2008-03-10 13:50:26 +0000
commita49dbef3f2322955d6d4ad59021facb240867713 (patch)
tree64101f38f9bcc620b6d4e4e95064fa76dfa496c8 /conf
parent75026ab34ab6dd2d15bb02e8c8321f49a9c67d2d (diff)
parenteb28e77b2310ed170d8173371f80c09a50c741b0 (diff)
merge of '7a689ee422b77b79d4b13b0d7a7c7060c257c930'
and '8fbb3c656df4e525b0de65e241599ee4cf1b2658'
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/mainstone.conf3
1 files changed, 1 insertions, 2 deletions
diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index 3bed8c010d..68dcfb069a 100644
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -14,8 +14,7 @@ require conf/machine/include/tune-xscale.inc
# used by sysvinit_2
SERIAL_CONSOLE = "115200 ttyS0"
-# used by opie-collections.inc
ROOT_FLASH_SIZE = "16"
MACHINE_FEATURES = "kernel26 pcmcia usbhost usbgadget pcmcia touchscreen keyboard alsa irda"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e 0x40000 --pad=0x01000000"
+EXTRA_IMAGECMD_jffs2 = "--little-endian -e 0x40000 --pad=0x02000000"