PCMCIA_MANAGER: Correctly handle this for various machines in a consistent way and set a default in bitbake.conf for backwards compatibility in such a way it can be overridden in a variety of ways.

7 files changed, 22 insertions, 7 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index cd435a9cad..3b642e58f7 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -395,3 +395,9 @@ include conf/machine/${MACHINE}.conf
 include conf/distro/${DISTRO}.conf
 include conf/documentation.conf
 require conf/sanity.conf
+
+##################################################################
+# Weak variables (usually to retain backwards compatibility)
+##################################################################
+
+PCMCIA_MANAGER ?= "pcmcia-cs"
\ No newline at end of file
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index b0147aad55..ce11ddf08c 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -66,6 +66,15 @@ PREFERRED_VERSION_dbus = "0.61"
 
 #Down here we put stuff we want to install into machines without polluting conf/machine/ with distro stuff
 
+#### Bootstrap options ####
+
+PCMCIA_MANAGER_c7x0 = "pcmciautils"
+PCMCIA_MANAGER_akita = "pcmciautils"
+PCMCIA_MANAGER_spitz = "pcmciautils"
+PCMCIA_MANAGER_borzoi = "pcmciautils"
+PCMCIA_MANAGER_nokia770 = "pcmciautils"
+PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
+
 #### GPE section ###
 
 #Install libgtkinput in devices without a keyboard
diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf
index 185c9f02cb..10ffb80c32 100644
--- a/conf/machine/borzoi.conf
+++ b/conf/machine/borzoi.conf
@@ -7,7 +7,7 @@ KERNEL_VERSION ?= "2.6"
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
 # Useful things for the built-in Harddisk
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
index fbecc6e25c..f8767d2ddf 100644
--- a/conf/machine/include/handheld-common.conf
+++ b/conf/machine/include/handheld-common.conf
@@ -16,8 +16,6 @@ irda irlan irnet irport irtty ircomm-tty \
 input uinput \
 "
 
-PCMCIA_MANAGER ?= "pcmcia-cs"
-
 # Configuration bits for "generic handheld"
 BOOTSTRAP_EXTRA_RDEPENDS +=  "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
 BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index f5d7602699..e73028d7ee 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -4,8 +4,10 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
 PREFERRED_VERSION_wpa_supplicant = "0.4.7"
 
+PCMCIA_MANAGER ?= "pcmciautils"
+
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
-pcmcia-cs apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
+${PCMCIA_MANAGER} apm  wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
 ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
 
 # Ethernet modules
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index d022d8703a..44cb860fc9 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -2,7 +2,7 @@
 #@NAME: Nokia 770 internet tablet
 #@DESCRIPTION: Machine configuration for the Nokia 770, an omap 1710 based tablet
 TARGET_ARCH = "arm"
-IPKG_ARCHS = "all arm armv4 armv5te"
+IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-omap"
 PREFERRED_PROVIDER_virtual/bootloader = ""
@@ -30,7 +30,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "sysfsutils  nokia770-init \
-pcmcia-cs apm  ppp wireless-tools console-tools"
+${PCMCIA_MANAGER} apm  ppp wireless-tools console-tools"
 
 # NFS Modules
 #BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc"
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index e1cb468d8f..212da52587 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -7,7 +7,7 @@ KERNEL_VERSION ?= "2.6"
 include conf/machine/include/zaurus-clamshell.conf
 include conf/machine/include/zaurus-clamshell-${KERNEL_VERSION}.conf
 
-PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
 PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 
 # Useful things for the built-in Harddisk