summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2008-04-06 22:19:45 +0000
committerMichael Lauer <mickey@vanille-media.de>2008-04-06 22:19:45 +0000
commitfbca01e0fc7d470346573de02b3f0e7dbf8dd6a4 (patch)
treeef3946b7818975a48f41d8508c150ff354783e7a /conf
parent1d3489029167ab63158a96e8d76489668dbaa2d7 (diff)
parent5213e7b3522b716c284b14cdfb2f51cc5e57e7e3 (diff)
merge of '262ebdec7339ba774fffa1aa586eb226acd32493'
and '7ce1c09c2ab95fc13a699ae089ac05fba3e7024c'
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/at32stk1000.conf2
-rw-r--r--conf/machine/atngw100.conf1
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index 23c8942ab2..15e3c85ec5 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -17,7 +17,7 @@ MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget touchscreen screen"
SERIAL_CONSOLE = "115200 ttyS0"
# used by some images
-IMAGE_FSTYPES ?= "jffs2"
+IMAGE_FSTYPES ?= "tar.bz2 jffs2"
ROOT_FLASH_SIZE = "8"
EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 77f9fdf34e..0bf8988ac2 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -16,6 +16,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
SERIAL_CONSOLE = "115200 ttyS0"
# used by some images
+IMAGE_FSTYPES ?= "tar.bz2 jffs2"
ROOT_FLASH_SIZE = "8"
EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"