diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-12-19 09:20:25 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-12-19 09:20:25 +0100 |
| commit | 89becd13888f321e4f7e1d88165db41f86caaaf8 (patch) | |
| tree | 47c3b02c7f8de78003f446c9a5bc5b73d3f4a40c /conf/machine | |
| parent | 26102276cb26e256186d841390988460c52bde8a (diff) | |
| parent | ef5ad935d6efd350b24e141e34bf26744ca31409 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/machine')
| -rw-r--r-- | conf/machine/om-gta01.conf | 8 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf | 17 |
2 files changed, 10 insertions, 15 deletions
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf index a45380f606..d503532bf0 100644 --- a/conf/machine/om-gta01.conf +++ b/conf/machine/om-gta01.conf @@ -1,12 +1,10 @@ #----------------------------------------------------------------------------- #@TYPE: Machine -#@NAME: FIC GTA01 (Neo 1973) -#@DESCRIPTION: Machine configuration for the FIC Neo 1973 GSM phone +#@NAME: OM GTA01 (Neo1973) +#@DESCRIPTION: Machine configuration for the OM Neo1973 GSM phone #----------------------------------------------------------------------------- TARGET_ARCH = "arm" -MACHINE_CLASS = "neo1973" -PACKAGE_EXTRA_ARCHS = "fic-gta01 ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" @@ -26,7 +24,7 @@ MACHINE_EXTRA_RRECOMMENDS = "\ kernel-module-gta01kbd \ kernel-module-s3cmci \ kernel-module-snd-soc-neo1973-wm8753 \ - kernel-module-snd-soc-smdk2440 \ + kernel-module-g-ether \ " # do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf index 9876ebecbd..b3fe6b8dc8 100644 --- a/conf/machine/om-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -5,8 +5,6 @@ #----------------------------------------------------------------------------- TARGET_ARCH = "arm" -MACHINE_CLASS = "neo1973" -PACKAGE_EXTRA_ARCHS = "fic-gta02 ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo" @@ -21,12 +19,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 @@ -36,12 +29,16 @@ SERIAL_CONSOLE = "115200 ttySAC2" ROOT_FLASH_SIZE = "256" # extra jffs2 tweaks -IMAGE_FSTYPES ?= "jffs2" +IMAGE_FSTYPES += "jffs2" 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" |