diff options
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/include/angstrom.inc | 4 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 2 | ||||
| -rw-r--r-- | conf/distro/openmoko.conf | 31 | ||||
| -rw-r--r-- | conf/machine/om-gta01.conf (renamed from conf/machine/fic-gta01.conf) | 2 | ||||
| -rw-r--r-- | conf/machine/om-gta02.conf (renamed from conf/machine/fic-gta02.conf) | 2 |
5 files changed, 22 insertions, 19 deletions
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc index 8699dc183c..bb1d65dec3 100644 --- a/conf/distro/include/angstrom.inc +++ b/conf/distro/include/angstrom.inc @@ -92,8 +92,8 @@ FEED_ARCH_acern30 = "armv4t" FEED_ARCH_amsdelta = "armv4t" FEED_ARCH_ep93xx = "armv4t" FEED_ARCH_eteng500 = "armv4t" -FEED_ARCH_fic-gta01 = "armv4t" -FEED_ARCH_fic-gta02 = "armv4t" +FEED_ARCH_om-gta01 = "armv4t" +FEED_ARCH_om-gta02 = "armv4t" FEED_ARCH_h1940 = "armv4t" FEED_ARCH_h6300 = "armv4t" FEED_ARCH_kb9202 = "armv4t" diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 9c14f9a018..13ea6a4811 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323" # Enlightenment Foundation Libraries # Caution: This is not alphabetically, but (roughly) dependency-sorted. # Please leave it like that. -EFL_SRCDATE = "20080129" +EFL_SRCDATE = "20080310" SRCDATE_edb-native ?= "${EFL_SRCDATE}" SRCDATE_edb ?= "${EFL_SRCDATE}" SRCDATE_eet-native ?= "${EFL_SRCDATE}" diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf index 62d2189c8a..434469dc74 100644 --- a/conf/distro/openmoko.conf +++ b/conf/distro/openmoko.conf @@ -27,12 +27,12 @@ FEED_URIS = "\ snapshot-all##http://buildhost.openmoko.org/snapshots/2007.08/ipk/all \ snapshot-armv4t##http://buildhost.openmoko.org/snapshots/2007.08/ipk/armv4t \ snapshot-neo1973##http://buildhost.openmoko.org/snapshots/2007.08/ipk/neo1973 \ - snapshot-fic-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/fic-gta01 \ + snapshot-om-gta01##http://buildhost.openmoko.org/snapshots/2007.08/ipk/om-gta01 \ \ updates-all##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/all \ updates-armv4t##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/armv4t \ updates-neo1973##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/neo1973 \ - updates-fic-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/fic-gta01 " + updates-om-gta01##http://buildhost.openmoko.org/OM2007.2/tmp/deploy/glibc/ipk/om-gta01 " # 2.18 seems to break badly on 64-bit systems PREFERRED_VERSION_binutils ?= "2.17.50.0.12" @@ -47,19 +47,22 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd" # 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}" -PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-linux-openmoko-devel_fic-gta02 = "${MACHINE_CLASS}" +# Currently not used but left here in case someone wants to switch on +# quickly +#PACKAGE_ARCH_pn-linux-openmoko_om-gta01 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko_om-gta02 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta01 = "${MACHINE_CLASS}" +#PACKAGE_ARCH_pn-linux-openmoko-devel_om-gta02 = "${MACHINE_CLASS}" + # 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}" +PACKAGE_ARCH_pn-usb-gadget-mode_om-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-usb-gadget-mode_om-gta02 = "${MACHINE_CLASS}" # same kernel so same keymaps -PACKAGE_ARCH_pn-keymaps_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-keymaps_fic-gta02 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-keymaps_om-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-keymaps_om-gta02 = "${MACHINE_CLASS}" # neod knows about both machines -PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}" -PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-neod_om-gta01 = "${MACHINE_CLASS}" +PACKAGE_ARCH_pn-neod_om-gta02 = "${MACHINE_CLASS}" # Select package versions we want to use. PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling" @@ -71,5 +74,5 @@ PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial" PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk" # 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}" +DEPLOY_DIR_IMAGE_om-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" +DEPLOY_DIR_IMAGE_om-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}" diff --git a/conf/machine/fic-gta01.conf b/conf/machine/om-gta01.conf index bfaf5ed793..09c382f376 100644 --- a/conf/machine/fic-gta01.conf +++ b/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" diff --git a/conf/machine/fic-gta02.conf b/conf/machine/om-gta02.conf index 2c2034b1b6..18678cc336 100644 --- a/conf/machine/fic-gta02.conf +++ b/conf/machine/om-gta02.conf @@ -6,7 +6,7 @@ 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" UBOOT_ENTRYPOINT = "30008000" |