diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-05-22 10:10:44 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-05-22 10:10:44 +0000 |
| commit | d604b45027cb413b569fb1ff26d93299abdecb9d (patch) | |
| tree | d3ba09351cfe35eab81d0e25022c83c5be41ab31 /meta/conf/machine | |
| parent | 887c8775929b9208622d96f75b7531ac2ccb12f6 (diff) | |
| download | openembedded-core-d604b45027cb413b569fb1ff26d93299abdecb9d.tar.gz openembedded-core-d604b45027cb413b569fb1ff26d93299abdecb9d.tar.bz2 openembedded-core-d604b45027cb413b569fb1ff26d93299abdecb9d.zip | |
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
Diffstat (limited to 'meta/conf/machine')
| -rw-r--r-- | meta/conf/machine/om-gta01.conf | 4 | ||||
| -rw-r--r-- | meta/conf/machine/om-gta02.conf | 8 |
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 @@ TARGET_ARCH = "arm" MACHINE_CLASS = "neo1973" -PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" +PACKAGE_EXTRA_ARCHS = "armv4t fic-gta01 ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" @@ -37,6 +37,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ ROOT_FLASH_SIZE = "60" # extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # build / upload tools @@ -44,3 +45,4 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc + 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 @@ TARGET_ARCH = "arm" MACHINE_CLASS = "neo1973" -PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" +PACKAGE_EXTRA_ARCHS = "armv4t fic-gta02 ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" +PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo" UBOOT_ENTRYPOINT = "30008000" MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" @@ -26,7 +27,6 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01kbd \ kernel-module-s3cmci \ kernel-module-snd-soc-neo1973-gta02-wm8753 \ - kernel-module-snd-soc-smdk2440 \ " SERIAL_CONSOLE = "115200 ttySAC2" @@ -35,6 +35,7 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \ --littleendian --pad \ @@ -46,6 +47,3 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \ # tune for S3C24x0 include conf/machine/include/tune-arm920t.inc - -# build YAFFS2 -IMAGE_FSTYPES ?= "jffs2 yaffs2" |