[oe-commits] org.oe.dev h5xxx: Rename machine to h5000.
pfalcon commit
openembedded-commits at lists.openembedded.org
Mon Nov 20 22:26:18 UTC 2006
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.
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: a245c6986b9923650003dbb564c2fb2cdf73124a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a245c6986b9923650003dbb564c2fb2cdf73124a
Files:
1
conf/machine/h5xxx.conf
conf/machine/h5000.conf
packages/base-files/base-files/h5xxx
packages/base-files/base-files/h5000
packages/linux/linux-handhelds-2.6-2.6.16/h5xxx
packages/linux/linux-handhelds-2.6-2.6.16/h5000
packages/tslib/tslib/h5xxx
packages/tslib/tslib/h5000
conf/distro/angstrom-2007.1.conf
packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb
packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb
packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb
packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb
packages/linux/linux-handhelds-2.6.inc
packages/qte/qte-common_2.3.10.inc
packages/tslib/tslib_1.0.bb
Diffs:
#
# mt diff -r1a8b8b461f0411e51d72fb156790d6c3a42558e1 -ra245c6986b9923650003dbb564c2fb2cdf73124a
#
#
#
# rename "conf/machine/h5xxx.conf"
# to "conf/machine/h5000.conf"
#
# rename "packages/base-files/base-files/h5xxx"
# to "packages/base-files/base-files/h5000"
#
# rename "packages/linux/linux-handhelds-2.6-2.6.16/h5xxx"
# to "packages/linux/linux-handhelds-2.6-2.6.16/h5000"
#
# rename "packages/tslib/tslib/h5xxx"
# to "packages/tslib/tslib/h5000"
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [df6d0961c6ea53585e2eb6418e45bd0d4de64a75]
# to [ff52a507d1f8a12e920780647bf488fb3a0d8cd1]
#
# patch "conf/machine/h5000.conf"
# from [64d70e68e4e78fd2253b17781c7b667b8ddf9bcd]
# to [38448a49ef7330e15f6a607688b28bfa8e3bcbf2]
#
# patch "packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb"
# from [1620d787d856198014bbef4fa1aa3475924c6bcf]
# to [557f7fa8e8e1ae2a971c85ef1169d42bfc6c7364]
#
# patch "packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb"
# from [b4f374e5635c3f83a27f4a3440528706c0c8986e]
# to [724146c863c2837661f1e31fc002baf4e2900d12]
#
# patch "packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb"
# from [a483afad08b682779a48c3cb9c46a633b6649b25]
# to [276e9d6e74202b0679614869af910560c993e702]
#
# patch "packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb"
# from [4a71a658a7570174a220674877d4d05884555282]
# to [6c8e626f3fe90b8fc1e20de9f61732678b500cd0]
#
# patch "packages/linux/linux-handhelds-2.6.inc"
# from [187fefdad287d159e48ff78ed304dc47782aea57]
# to [07debbd9c732f5b283a28adc4da0744553c39790]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [2d85742e4c4dd8711995e7826d41637640369667]
# to [2dd6cb4351caea4a02307d6c773df448eef2394d]
#
# patch "packages/tslib/tslib_1.0.bb"
# from [f81c3bbebb0cfdc79df23b0dec7a501713132a19]
# to [bff648497834d91da4772f129a9cbd823822b0f0]
#
============================================================
--- conf/distro/angstrom-2007.1.conf df6d0961c6ea53585e2eb6418e45bd0d4de64a75
+++ conf/distro/angstrom-2007.1.conf ff52a507d1f8a12e920780647bf488fb3a0d8cd1
@@ -33,7 +33,7 @@ FEED_ARCH_h4000 = "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"
============================================================
--- conf/machine/h5xxx.conf 64d70e68e4e78fd2253b17781c7b667b8ddf9bcd
+++ conf/machine/h5000.conf 38448a49ef7330e15f6a607688b28bfa8e3bcbf2
@@ -6,7 +6,7 @@ TARGET_ARCH = "arm"
# 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 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
#
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 \
============================================================
--- packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb 1620d787d856198014bbef4fa1aa3475924c6bcf
+++ packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh40.bb 557f7fa8e8e1ae2a971c85ef1169d42bfc6c7364
@@ -5,7 +5,7 @@ COMPATIBLE_HOST = "arm.*-linux"
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} \
============================================================
--- packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb b4f374e5635c3f83a27f4a3440528706c0c8986e
+++ packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.1.bb 724146c863c2837661f1e31fc002baf4e2900d12
@@ -6,7 +6,7 @@ COMPATIBLE_HOST = "arm.*-linux"
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('.', '-')} \
============================================================
--- packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb a483afad08b682779a48c3cb9c46a633b6649b25
+++ packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh41.bb 276e9d6e74202b0679614869af910560c993e702
@@ -6,7 +6,7 @@ COMPATIBLE_HOST = "arm.*-linux"
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('.', '-')} \
============================================================
--- packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb 4a71a658a7570174a220674877d4d05884555282
+++ packages/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh42.bb 6c8e626f3fe90b8fc1e20de9f61732678b500cd0
@@ -6,7 +6,7 @@ COMPATIBLE_HOST = "arm.*-linux"
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('.', '-')} \
============================================================
--- packages/linux/linux-handhelds-2.6.inc 187fefdad287d159e48ff78ed304dc47782aea57
+++ packages/linux/linux-handhelds-2.6.inc 07debbd9c732f5b283a28adc4da0744553c39790
@@ -1,9 +1,9 @@ COMPATIBLE_HOST = "arm.*-linux"
SECTION = "kernel"
DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
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('.', '-')} \
============================================================
--- packages/qte/qte-common_2.3.10.inc 2d85742e4c4dd8711995e7826d41637640369667
+++ packages/qte/qte-common_2.3.10.inc 2dd6cb4351caea4a02307d6c773df448eef2394d
@@ -74,7 +74,7 @@ SRC_URI_append_mnci = "file://de
#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_h4000 = "-DQT_QWS_TSLIB
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"
============================================================
--- packages/tslib/tslib_1.0.bb f81c3bbebb0cfdc79df23b0dec7a501713132a19
+++ packages/tslib/tslib_1.0.bb bff648497834d91da4772f129a9cbd823822b0f0
@@ -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/
;;
More information about the Openembedded-commits
mailing list