summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-05-22 10:10:44 +0000
committerRichard Purdie <richard@openedhand.com>2008-05-22 10:10:44 +0000
commitd604b45027cb413b569fb1ff26d93299abdecb9d (patch)
treed3ba09351cfe35eab81d0e25022c83c5be41ab31
parent887c8775929b9208622d96f75b7531ac2ccb12f6 (diff)
downloadpoky-d604b45027cb413b569fb1ff26d93299abdecb9d.tar.gz
machine/om-gta*.conf: Sync with OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4541 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/machine/om-gta01.conf4
-rw-r--r--meta/conf/machine/om-gta02.conf8
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/machine/om-gta01.conf b/meta/conf/machine/om-gta01.conf
index 4211ff5e80..f40457e226 100644
--- a/meta/conf/machine/om-gta01.conf
+++ b/meta/conf/machine/om-gta01.conf
@@ -6,7 +6,7 @@
6 6
7TARGET_ARCH = "arm" 7TARGET_ARCH = "arm"
8MACHINE_CLASS = "neo1973" 8MACHINE_CLASS = "neo1973"
9PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" 9PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}"
10 10
11PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" 11PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
12UBOOT_ENTRYPOINT = "30008000" 12UBOOT_ENTRYPOINT = "30008000"
@@ -37,6 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\
37ROOT_FLASH_SIZE = "60" 37ROOT_FLASH_SIZE = "60"
38 38
39# extra jffs2 tweaks 39# extra jffs2 tweaks
40IMAGE_FSTYPES ?= "jffs2"
40EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" 41EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
41 42
42# build / upload tools 43# build / upload tools
@@ -44,3 +45,4 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
44 45
45# tune for S3C24x0 46# tune for S3C24x0
46include conf/machine/include/tune-arm920t.inc 47include conf/machine/include/tune-arm920t.inc
48
diff --git a/meta/conf/machine/om-gta02.conf b/meta/conf/machine/om-gta02.conf
index 0a6d579f3c..55f4bec21d 100644
--- a/meta/conf/machine/om-gta02.conf
+++ b/meta/conf/machine/om-gta02.conf
@@ -6,9 +6,10 @@
6 6
7TARGET_ARCH = "arm" 7TARGET_ARCH = "arm"
8MACHINE_CLASS = "neo1973" 8MACHINE_CLASS = "neo1973"
9PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" 9PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}"
10 10
11PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" 11PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko"
12PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
12UBOOT_ENTRYPOINT = "30008000" 13UBOOT_ENTRYPOINT = "30008000"
13 14
14MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" 15MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
@@ -26,7 +27,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\
26 kernel-module-gta01kbd \ 27 kernel-module-gta01kbd \
27 kernel-module-s3cmci \ 28 kernel-module-s3cmci \
28 kernel-module-snd-soc-neo1973-gta02-wm8753 \ 29 kernel-module-snd-soc-neo1973-gta02-wm8753 \
29 kernel-module-snd-soc-smdk2440 \
30" 30"
31 31
32SERIAL_CONSOLE = "115200 ttySAC2" 32SERIAL_CONSOLE = "115200 ttySAC2"
@@ -35,6 +35,7 @@ SERIAL_CONSOLE = "115200 ttySAC2"
35ROOT_FLASH_SIZE = "256" 35ROOT_FLASH_SIZE = "256"
36 36
37# extra jffs2 tweaks 37# extra jffs2 tweaks
38IMAGE_FSTYPES ?= "jffs2"
38EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ 39EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
39 --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ 40 --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
40 --littleendian --pad \ 41 --littleendian --pad \
@@ -46,6 +47,3 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
46 47
47# tune for S3C24x0 48# tune for S3C24x0
48include conf/machine/include/tune-arm920t.inc 49include conf/machine/include/tune-arm920t.inc
49
50# build YAFFS2
51IMAGE_FSTYPES ?= "jffs2 yaffs2"