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.

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index f593194..05acebf 100644 (file)
--- 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/h5xxx.conf b/conf/machine/h5000.conf
similarity index 88%
rename from conf/machine/h5xxx.conf
rename to conf/machine/h5000.conf
index 5aac579..ffc1328 100644 (file)
--- a/conf/machine/h5xxx.conf
+++ b/conf/machine/h5000.conf
@@ -6,7 +6,7 @@
 # Hardware-based properties
 #
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te ipaqpxa h5xxx"
 
 require conf/machine/include/tune-xscale.conf
 
@@ -20,7 +20,7 @@ MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usb
 #
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-EXTRA_IMAGECMD_h5xxx_jffs2 = "-e 0x40000 -p"
+EXTRA_IMAGECMD_h5000_jffs2 = "-e 0x40000 -p"
 
 MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400_lcd \

diff --git a/packages/base-files/base-files/h5xxx/.mtn2git_empty b/packages/base-files/base-files/h5000/.mtn2git_empty
similarity index 100%
rename from packages/base-files/base-files/h5xxx/.mtn2git_empty
rename to packages/base-files/base-files/h5000/.mtn2git_empty

diff --git a/packages/base-files/base-files/h5xxx/fstab b/packages/base-files/base-files/h5000/fstab
similarity index 100%
rename from packages/base-files/base-files/h5xxx/fstab
rename to packages/base-files/base-files/h5000/fstab

diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
index 12b4e3d..bc739d3 100644 (file)
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
@@ -5,7 +5,7 @@ PR = "r0"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx)'
+COMPATIBLE_MACHINE = '(h3900|h5000)'
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
           file://defconfig-${PACKAGE_ARCH} \

diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
index 649704b..b936a4a 100644 (file)
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
@@ -6,7 +6,7 @@ PR = "r2"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx)'
+COMPATIBLE_MACHINE = '(h3900|h5000)'
 
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \

diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
index cf508cb..3b1c1a0 100644 (file)
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
@@ -6,7 +6,7 @@ PR = "r1"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx)'
+COMPATIBLE_MACHINE = '(h3900|h5000)'
 
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \

diff --git a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
index 6c80c44..21e3c18 100644 (file)
--- a/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
+++ b/packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
@@ -6,7 +6,7 @@ LICENSE = "GPL"
 
 KERNEL_CCSUFFIX = "-3.3.4"
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(h3900|h5xxx)'
+COMPATIBLE_MACHINE = '(h3900|h5000)'
 
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \

diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/.mtn2git_empty b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/.mtn2git_empty
similarity index 100%
rename from packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/.mtn2git_empty
rename to packages/linux/linux-handhelds-2.6-2.6.16/h5000/.mtn2git_empty

diff --git a/packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/defconfig b/packages/linux/linux-handhelds-2.6-2.6.16/h5000/defconfig
similarity index 100%
rename from packages/linux/linux-handhelds-2.6-2.6.16/h5xxx/defconfig
rename to packages/linux/linux-handhelds-2.6-2.6.16/h5000/defconfig

diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index ca2f248..0dfdd4c 100644 (file)
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -3,7 +3,7 @@ DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer h
 LICENSE = "GPL"
 
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5xxx|htcuniversal|hx4700|jornada56x|simpad)'
+COMPATIBLE_MACHINE ?= '(h1910|h2200|h3600|h3900|h4000|h5000|htcuniversal|hx4700|jornada56x|simpad)'
 
 # SRC_URI *must* be overriden in includer, but this is a good reference
 SRC_URI ?= "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \

diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 6cb2355..27a1a45 100644 (file)
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -74,7 +74,7 @@ SRC_URI_append_mnci         = "file://devfs.patch;patch=1 \
 #SRC_URI_append_h3600        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 #SRC_URI_append_h3900        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 #SRC_URI_append_h4000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
-#SRC_URI_append_h5xxx        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
+#SRC_URI_append_h5000        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 #SRC_URI_append_h6300        = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 #SRC_URI_append_hx2000       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
 #SRC_URI_append_hx4700       = "file://ipaq-keyboard.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 "
@@ -112,7 +112,7 @@ EXTRA_DEFINES_h3600         = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_h3900            = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_h3900            = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_h4000            = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_h5xxx            = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
+EXTRA_DEFINES_h5000            = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_h6300            = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_hx2000           = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
 EXTRA_DEFINES_hx4700           = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"

diff --git a/packages/tslib/tslib/h5xxx/.mtn2git_empty b/packages/tslib/tslib/h5000/.mtn2git_empty
similarity index 100%
rename from packages/tslib/tslib/h5xxx/.mtn2git_empty
rename to packages/tslib/tslib/h5000/.mtn2git_empty

diff --git a/packages/tslib/tslib/h5xxx/tslib.sh b/packages/tslib/tslib/h5000/tslib.sh
similarity index 100%
rename from packages/tslib/tslib/h5xxx/tslib.sh
rename to packages/tslib/tslib/h5000/tslib.sh

diff --git a/packages/tslib/tslib_1.0.bb b/packages/tslib/tslib_1.0.bb
index 3d2e3cd..d7ff81d 100644 (file)
--- a/packages/tslib/tslib_1.0.bb
+++ b/packages/tslib/tslib_1.0.bb
@@ -33,7 +33,7 @@ do_install_append() {
        install -d ${D}${sysconfdir}/profile.d/
        install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
        case ${MACHINE} in
-       a780 | e680 | h3600 | h3900 | h5xxx | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 |blueangel | h4000)
+       a780 | e680 | h3600 | h3900 | h5000 | h1940 | h6300 | h2200 | ipaq-pxa270 | hx4700 | hx2000 | blueangel | h4000)
                install -d ${D}${datadir}/tslib
                install -m 0644 ${WORKDIR}/ts.conf-h3600-2.4 ${D}${datadir}/tslib/
                ;;