diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2007-10-15 09:53:11 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2007-10-15 09:53:11 +0000 |
| commit | 00ff0f2d7d838fbb1a0922ab1835ea11f903a12a (patch) | |
| tree | 41b3e5ad9646678196a4914ddf87230df6e71414 /conf | |
| parent | 031679b20bbc9ac219206dbc74a458b4ee49229d (diff) | |
distro/openmoko.conf : make gta01/02 equivalent machines for packages
where the resulting packages are in fact identical.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/openmoko.conf | 28 | ||||
| -rw-r--r-- | conf/machine/fic-gta01.conf | 3 | ||||
| -rw-r--r-- | conf/machine/fic-gta02.conf | 5 |
3 files changed, 33 insertions, 3 deletions
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 8657b1140a..d8779a8da6 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -39,3 +39,31 @@ require conf/distro/include/preferred-openmoko-versions.inc # Bleeding-edge developers should add the following line to their local.conf: # require conf/distro/include/moko-autorev.inc +# override the PACKAGE_ARCH of certain packages for openmoko distro +# +# Same kernel runs on both these machines +PACKAGE_ARCH_pn-linux-openmoko_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-linux-openmoko_fic-gta02 = "${MACHINE_CLASS}" +# Same touchscreen on both these machines +PACKAGE_ARCH_pn-pointercal_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-pointercal_fic-gta02 = "${MACHINE_CLASS}" +SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta01 = "0" +SRC_URI_OVERRIDES_PACKAGE_ARCH_pn-pointercal_fic-gta02 = "0" +# Same kernel so same usb +PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-usb-gadget-mode_fic-gta02 = "${MACHINE_CLASS}" +# same kernel so same keymaps +PACKAGE_ARCH_pn-keymaps_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}" +# neod knows about both machines +PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" + +# Select packge versions we wash to use. +PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" +PREFERRED_VERSION_gtk+-fastscaling = "2.10.14" + +# deploy gta01 and gta02 in ${MACHINE_CLASS} directory +DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" +DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" + diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf index ffd3584da6..bd14df5814 100644 --- a/conf/machine/fic-gta01.conf +++ b/conf/machine/fic-gta01.conf @@ -5,7 +5,8 @@ #----------------------------------------------------------------------------- TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" +MACHINE_CLASS = "neo1973" +PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf index ac85afc48c..1760424fc8 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/fic-gta02.conf @@ -5,7 +5,8 @@ #----------------------------------------------------------------------------- TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4t" +MACHINE_CLASS = "neo1973" +PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" UBOOT_ENTRYPOINT = "30008000" @@ -46,4 +47,4 @@ EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" include conf/machine/include/tune-arm920t.inc # build YAFFS2 -IMAGE_FSTYPES =+ "yaffs2" +IMAGE_FSTYPES ?= "jffs2 yaffs2" |