From 2b8176358284d1044c558428e97d674794f93b62 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Mon, 20 Nov 2006 22:22:22 +0000 Subject: h5xxx: Rename machine to h5000. * Use naming scheme consistent with other iPaq devices, where "series" name is used. * h5000 is series consisting of h5100, h5400, and h5500 models, each having common architecture, but slightly different builtin peripherals. Each model may also have few marketing nicknames, differing in last digit (sometimes 2 last digits). * Closes #1586. * Approved by Koen Kooi. --- conf/distro/angstrom-2007.1.conf | 2 +- conf/machine/h5000.conf | 33 +++++++++++++++++++++++++++++++++ conf/machine/h5xxx.conf | 33 --------------------------------- 3 files changed, 34 insertions(+), 34 deletions(-) create mode 100644 conf/machine/h5000.conf delete mode 100644 conf/machine/h5xxx.conf (limited to 'conf') diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf index f593194ba6..05acebfa8f 100644 --- a/conf/distro/angstrom-2007.1.conf +++ b/conf/distro/angstrom-2007.1.conf @@ -33,7 +33,7 @@ FEED_ARCH_akita = "armv5te" FEED_ARCH_c7x0 = "armv5te" FEED_ARCH_h2200 = "armv5te" FEED_ARCH_h4000 = "armv5te" -FEED_ARCH_h5xxx = "armv5te" +FEED_ARCH_h5000 = "armv5te" FEED_ARCH_htcuniversal = "armv5te" FEED_ARCH_hx2000 = "armv5te" FEED_ARCH_hx4700 = "armv5te" diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf new file mode 100644 index 0000000000..ffc1328f50 --- /dev/null +++ b/conf/machine/h5000.conf @@ -0,0 +1,33 @@ +#@TYPE: Machine +#@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx +#@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices + +# +# Hardware-based properties +# +TARGET_ARCH = "arm" +PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx" + +require conf/machine/include/tune-xscale.conf + +ROOT_FLASH_SIZE = "32" +VOLATILE_STORAGE_SIZE = "64" +GUI_MACHINE_CLASS = "smallscreen" +MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" + +# +# Software/packages selection +# +PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p" + +MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" +MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ + kernel-module-h5400_battery" + +# +# Modules autoload and other boot properties +# +SERIAL_CONSOLE = "115200 ttyS0 vt100" +USE_VT = "0" diff --git a/conf/machine/h5xxx.conf b/conf/machine/h5xxx.conf deleted file mode 100644 index 5aac579e91..0000000000 --- a/conf/machine/h5xxx.conf +++ /dev/null @@ -1,33 +0,0 @@ -#@TYPE: Machine -#@NAME: Compaq iPAQ 51xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx -#@DESCRIPTION: Machine configuration for the Compaq iPAQ 51xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices - -# -# Hardware-based properties -# -TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa" - -require conf/machine/include/tune-xscale.conf - -ROOT_FLASH_SIZE = "32" -VOLATILE_STORAGE_SIZE = "64" -GUI_MACHINE_CLASS = "smallscreen" -MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget usbhost" - -# -# Software/packages selection -# -PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6" -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p" - -MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params" -MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \ - kernel-module-h5400_battery" - -# -# Modules autoload and other boot properties -# -SERIAL_CONSOLE = "115200 ttyS0 vt100" -USE_VT = "0" -- cgit v1.2.3 From 0e95464d777d95e88fdebf0b8a13e57589965c7b Mon Sep 17 00:00:00 2001 From: Kristoffer Ericson Date: Mon, 20 Nov 2006 23:36:19 +0000 Subject: conf/distro/jlime-donkey.conf: Minor changes to distro file * Updated glibc 2.4 -> 2.5 to make it more arm friendly --- conf/distro/jlime-donkey.conf | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'conf') diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf index 2390106023..1ae683b336 100644 --- a/conf/distro/jlime-donkey.conf +++ b/conf/distro/jlime-donkey.conf @@ -20,7 +20,7 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross" - +PREFERRED_PROVIDER_virtual/${ARCH}-linux-libc-for-gcc = "glibc" #<>-----------------------------------------------------------------> #<> We want this so we can crosscompile the kernel using gcc 3.4.3 @@ -50,18 +50,9 @@ PREFERRED_VERSION_gcc = "4.1.1" PREFERRED_VERSION_gcc-cross = "4.1.1" PREFERRED_VERSION_gcc-cross-initial = "4.1.1" PREFERRED_VERSION_linux-libc-headers = "2.6.15.99" -PREFERRED_VERSION_glibc = "2.4" -PREFERRED_VERSION_glibc-intermediate = "2.4" - -#<>-----------------------------------------------------------------> -#<>Patch for bitbake bug: -#<>Due to bitbake not grabbing glibc 2.4 properly -#<>we need to override it to be sure. Do it for both supported archs -#<>-----------------------------------------------------------------< - -#Add proper line to your local.conf (sh3 for 6xx, arm for 7xx) -#PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate" -#PREFERRED_PROVIDER_virtual/sh3-linux-libc-for-gcc = "glibc-intermediate" +PREFERRED_VERSION_glibc = "2.5" +PREFERRED_VERSION_glibc-initial = "2.3.2" +PREFERRED_VERSION_glibc-intermediate = "2.5" #<>------------------------------------------------------------------> #<> -- cgit v1.2.3