From 9cb14015c6fb87732da5bb5f35b45fb1a0774a3f Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 26 Mar 2008 13:59:50 +0000 Subject: fic-gta0? : renamed fic-gta0? to om-gta0? to reflect true name of device --- conf/distro/include/angstrom.inc | 4 ++-- conf/distro/openmoko.conf | 28 +++++++++++----------- conf/machine/fic-gta01.conf | 47 ------------------------------------ conf/machine/fic-gta02.conf | 51 ---------------------------------------- conf/machine/om-gta01.conf | 47 ++++++++++++++++++++++++++++++++++++ conf/machine/om-gta02.conf | 51 ++++++++++++++++++++++++++++++++++++++++ 6 files changed, 114 insertions(+), 114 deletions(-) delete mode 100644 conf/machine/fic-gta01.conf delete mode 100644 conf/machine/fic-gta02.conf create mode 100644 conf/machine/om-gta01.conf create mode 100644 conf/machine/om-gta02.conf (limited to 'conf') 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/openmoko.conf b/conf/distro/openmoko.conf index 2b7aea03b9..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" @@ -49,20 +49,20 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd" # Same kernel runs on both these machines # Currently not used but left here in case someone wants to switch on # quickly -#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}" +#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" @@ -74,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/fic-gta01.conf deleted file mode 100644 index bfaf5ed793..0000000000 --- a/conf/machine/fic-gta01.conf +++ /dev/null @@ -1,47 +0,0 @@ -#----------------------------------------------------------------------------- -#@TYPE: Machine -#@NAME: FIC GTA01 (Neo1973) -#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone -#----------------------------------------------------------------------------- - -TARGET_ARCH = "arm" -MACHINE_CLASS = "neo1973" -PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" - -PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" -UBOOT_ENTRYPOINT = "30008000" - -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2" -MACHINE_DISPLAY_WIDTH_PIXELS = "480" -MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_DISPLAY_ORIENTATION = "0" -MACHINE_DISPLAY_PPI = "285" -XSERVER = "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-wm8753 \ - kernel-module-snd-soc-smdk2440 \ -" - -# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab -#SERIAL_CONSOLE = "115200 ttySAC0" - -# used by some images -ROOT_FLASH_SIZE = "60" - -# extra jffs2 tweaks -IMAGE_FSTYPES ?= "jffs2" -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" - -# build / upload tools -EXTRA_IMAGEDEPENDS += "dfu-util-native" - -# tune for S3C24x0 -include conf/machine/include/tune-arm920t.inc - diff --git a/conf/machine/fic-gta02.conf b/conf/machine/fic-gta02.conf deleted file mode 100644 index 2c2034b1b6..0000000000 --- a/conf/machine/fic-gta02.conf +++ /dev/null @@ -1,51 +0,0 @@ -#----------------------------------------------------------------------------- -#@TYPE: Machine -#@NAME: FIC GTA02 (Neo1973) -#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone -#----------------------------------------------------------------------------- - -TARGET_ARCH = "arm" -MACHINE_CLASS = "neo1973" -PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" - -PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" -UBOOT_ENTRYPOINT = "30008000" - -MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" -MACHINE_DISPLAY_WIDTH_PIXELS = "480" -MACHINE_DISPLAY_HEIGHT_PIXELS = "640" -MACHINE_DISPLAY_ORIENTATION = "0" -MACHINE_DISPLAY_PPI = "285" -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 \ -" - -SERIAL_CONSOLE = "115200 ttySAC2" - -# used by some images -ROOT_FLASH_SIZE = "256" - -# extra jffs2 tweaks -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" - -# build / upload tools -EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" - -# tune for S3C24x0 -include conf/machine/include/tune-arm920t.inc - -# build YAFFS2 -IMAGE_FSTYPES ?= "jffs2 yaffs2" - diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf new file mode 100644 index 0000000000..bfaf5ed793 --- /dev/null +++ b/conf/machine/om-gta01.conf @@ -0,0 +1,47 @@ +#----------------------------------------------------------------------------- +#@TYPE: Machine +#@NAME: FIC GTA01 (Neo1973) +#@DESCRIPTION: Machine configuration for the FIC Neo1973/1 GSM phone +#----------------------------------------------------------------------------- + +TARGET_ARCH = "arm" +MACHINE_CLASS = "neo1973" +PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" + +PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" +UBOOT_ENTRYPOINT = "30008000" + +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2" +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "285" +XSERVER = "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-wm8753 \ + kernel-module-snd-soc-smdk2440 \ +" + +# do not outcomment, we bypass the sysvinit.bb logic here -- see FIC GTA01 inittab +#SERIAL_CONSOLE = "115200 ttySAC0" + +# used by some images +ROOT_FLASH_SIZE = "60" + +# extra jffs2 tweaks +IMAGE_FSTYPES ?= "jffs2" +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n" + +# build / upload tools +EXTRA_IMAGEDEPENDS += "dfu-util-native" + +# tune for S3C24x0 +include conf/machine/include/tune-arm920t.inc + diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf new file mode 100644 index 0000000000..2c2034b1b6 --- /dev/null +++ b/conf/machine/om-gta02.conf @@ -0,0 +1,51 @@ +#----------------------------------------------------------------------------- +#@TYPE: Machine +#@NAME: FIC GTA02 (Neo1973) +#@DESCRIPTION: Machine configuration for the FIC Neo1973/2 GSM phone +#----------------------------------------------------------------------------- + +TARGET_ARCH = "arm" +MACHINE_CLASS = "neo1973" +PACKAGE_EXTRA_ARCHS = "armv4t ${MACHINE_CLASS}" + +PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko" +UBOOT_ENTRYPOINT = "30008000" + +MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2" +MACHINE_DISPLAY_WIDTH_PIXELS = "480" +MACHINE_DISPLAY_HEIGHT_PIXELS = "640" +MACHINE_DISPLAY_ORIENTATION = "0" +MACHINE_DISPLAY_PPI = "285" +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 \ +" + +SERIAL_CONSOLE = "115200 ttySAC2" + +# used by some images +ROOT_FLASH_SIZE = "256" + +# extra jffs2 tweaks +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" + +# build / upload tools +EXTRA_IMAGEDEPENDS += "sjf2410-linux-native dfu-util-native" + +# tune for S3C24x0 +include conf/machine/include/tune-arm920t.inc + +# build YAFFS2 +IMAGE_FSTYPES ?= "jffs2 yaffs2" + -- cgit v1.2.3