om-gta02.conf: bring over this conf from om.dev

The modification is made in a merge so cherry-picking is not possible.

diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 9876ebe..f3e746b 100644 (file)
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -5,8 +5,7 @@
 #-----------------------------------------------------------------------------
 
 TARGET_ARCH = "arm"
-MACHINE_CLASS = "neo1973"
-PACKAGE_EXTRA_ARCHS = "fic-gta02 ${MACHINE_CLASS}"
+PACKAGE_EXTRA_ARCHS = "armv4t"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
@@ -21,12 +20,7 @@ XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
-  kernel-module-gta01-pm-bt  \
-  kernel-module-gta01-pm-gps \
-  kernel-module-gta01-pm-gsm \
-  kernel-module-gta01kbd \
-  kernel-module-s3cmci \
-  kernel-module-snd-soc-neo1973-gta02-wm8753 \
+  kernel-modules \
 "
 
 # no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
@@ -41,7 +35,11 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
   --littleendian --pad \
   -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
+  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary ; \
+  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.nosummary ; \
+  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary \
+  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"
 
 # build / upload tools
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native"