Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/07/20 16:33:51+02:00 uni-frankfurt.de!mickey
clean up the handhelds kernel situation a bit
honor that orinoco and hostap are built out of tree
copy init and modules.conf things from pxa ipaq to sa ipaq
please add the missing files (ipaq-hal.init)

BKrev: 40fd2d585p6h7KbJ9jp0mRKi0MdMgg

10 files changed, 30 insertions, 66 deletions

diff --git a/conf/ipaq-common.conf b/conf/ipaq-common.conf
index 6aadf2f755..516f94ba62 100644
--- a/conf/ipaq-common.conf
+++ b/conf/ipaq-common.conf
@@ -1,4 +1,4 @@
-IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd hostap-modules orinoco-modules airo-cs pcmf502rd pcmf502re sa1100-rtc ipaq-hal" 
+IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal" 
 
-BOOTSTRAP_EXTRA_DEPENDS += "freeswan mipv6"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "freeswan mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
+BOOTSTRAP_EXTRA_DEPENDS += "hostap-modules orinoco-modules freeswan mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "hostap-modules orinoco-modules freeswan mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.11.oe b/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.12/defconfig-ipaqpxa
index e69de29bb2..e69de29bb2 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.11.oe
+++ b/linux/handhelds-pxa-2.4.19-rmk6-pxa1-hh36.12/defconfig-ipaqpxa
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
index 8e860133e3..b0d6b21a2c 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.12.oe
@@ -44,7 +44,7 @@ INITSCRIPT_NAME = "ipaq-hal"
 INITSCRIPT_PARAMS = "start 21 S ."
 
 do_configure_prepend() {
-	oe_runmake ipaqpxa_config
+	 install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
 }
 
 do_install_append() {
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.9.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.9.oe
deleted file mode 100644
index 4566c12497..0000000000
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.9.oe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION = "handhelds.org Linux kernel for PXA25x based devices."
-MAINTAINER = "Phil Blundell <pb@handhelds.org>"
-LICENSE = "GPL"
-
-PACKAGE_ARCH = "ipaqpxa"
-KERNEL_CCSUFFIX = "-3.3.3"
-COMPATIBLE_HOST = "arm.*-linux"
-
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
-	   file://linux-2.4-no-short-loads.patch;patch=1 \
-	   file://linux-2.4-cpufreq.patch;patch=1"
-
-S = "${WORKDIR}/kernel"
-
-inherit kernel
-
-K_MAJOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
-K_MINOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
-K_MICRO = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
-RMKV    = "${@oe.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
-PXAV    = "${@oe.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
-HHV     = "${@oe.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
-
-KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + int(oe.data.getVar('RMKV',d,1)) * 1000 + int(oe.data.getVar('PXAV',d,1)) * 100 + float(oe.data.getVar('HHV',d,1)))}"
-
-do_configure_prepend() {
-	oe_runmake ipaqpxa_config
-}
diff --git a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36/defconfig-h3600 b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/defconfig-ipaqsa
index e69de29bb2..e69de29bb2 100644
--- a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36/defconfig-h3600
+++ b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/defconfig-ipaqsa
diff --git a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36/disable-pcmcia-probe.patch b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/disable-pcmcia-probe.patch
index e69de29bb2..e69de29bb2 100644
--- a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36/disable-pcmcia-probe.patch
+++ b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/disable-pcmcia-probe.patch
diff --git a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36/mkdep.patch b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/ipaqsa
index e69de29bb2..e69de29bb2 100644
--- a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36/mkdep.patch
+++ b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/ipaqsa
diff --git a/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/mkdep.patch b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/mkdep.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/linux/handhelds-sa-2.4.19-rmk6-pxa1-hh36.12/mkdep.patch
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
index 01874e1530..9563a48281 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.12.oe
@@ -6,8 +6,9 @@ PACKAGE_ARCH = "ipaqsa"
 KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}.${HHSUBV}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')}"
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig-ipaqsa"
 
 S = "${WORKDIR}/kernel"
 
@@ -22,7 +23,29 @@ HHV     = "${@oe.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
 
 KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + int(oe.data.getVar('RMKV',d,1)) * 1000 + int(oe.data.getVar('PXAV',d,1)) * 100 + float(oe.data.getVar('HHV',d,1)))}"
 
+module_conf_h3600_asic = "alias ipaq_hal_3600 h3600_asic"
+module_conf_pxa_ir = "alias irda0 sa_ir"
+module_conf_i2c_algo_pxa = "options i2c-algo-sa sa_scan=0"
+module_conf_pcmcia_core = "options pcmcia_core ignore_cis_vcc=1"
+module_conf_ppp_async = "alias ppp0 ppp_async"
+module_conf_orinoco_cs = "options orinoco_cs ignore_cis_vcc=1"
+module_conf_hostap_cs = "options hostap_cs ignore_cis_vcc=1"
+module_conf_spectrum_cs = "options spectrum_cs ignore_cis_vcc=1"
+
+autoload_h3600_generic_sleeve = "h3600_generic_sleeve"
+autoload_ds = "ds"
+autoload_sa_cs = "sa_cs"
+
+FILES_kernel += "/etc/init.d/ipaq-hal"
+INITSCRIPT_NAME = "ipaq-hal"
+INITSCRIPT_PARAMS = "start 21 S ."
+
 do_configure_prepend() {
-	oe_runmake ipaqsa_config
+	install -m 0644 ${WORKDIR}/defconfig-${PACKAGE_ARCH} ${S}/.config
+}
+
+do_install_append() {
+        install -d ${D}/etc/init.d
+        install ${WORKDIR}/ipaq-hal.init ${D}/etc/init.d/ipaq-hal
 }
 
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.oe
deleted file mode 100644
index 4d59399203..0000000000
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.oe
+++ /dev/null
@@ -1,31 +0,0 @@
-DESCRIPTION = "handhelds.org Linux kernel for StrongArm processor based devices."
-MAINTAINER = "Rene Wagner <reenoo@gmx.de>"
-LICENSE = "GPL"
-
-PACKAGE_ARCH = "ipaqsa"
-KERNEL_CCSUFFIX = "-3.3.3"
-COMPATIBLE_HOST = "arm.*-linux"
-
-HHSUBV  = "11"
-FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}.${HHSUBV}"
-SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')}-${HHSUBV} \
-	   file://disable-pcmcia-probe.patch;patch=1 \
-	   file://defconfig-h3600"
-
-S = "${WORKDIR}/kernel"
-
-inherit kernel
-
-K_MAJOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[0]}"
-K_MINOR = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[1]}"
-K_MICRO = "${@oe.data.getVar('PV',d,1).split('-')[0].split('.')[2]}"
-RMKV    = "${@oe.data.getVar('PV',d,1).split('-')[1].split('rmk')[-1]}"
-PXAV    = "${@oe.data.getVar('PV',d,1).split('-')[2].split('pxa')[-1]}"
-HHV     = "${@oe.data.getVar('PV',d,1).split('-')[3].split('hh')[-1]}"
-
-KERNEL_PRIORITY = "${@'%d' % (int(oe.data.getVar('K_MAJOR',d,1)) * 100000000 + int(oe.data.getVar('K_MINOR',d,1)) * 1000000 + int(oe.data.getVar('K_MICRO',d,1)) * 10000 + int(oe.data.getVar('RMKV',d,1)) * 1000 + int(oe.data.getVar('PXAV',d,1)) * 100 + float(oe.data.getVar('HHV',d,1)))}"
-
-do_configure_prepend() {
-        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
-}
-