From 0799244e4c0c5b384613176b06e9b42587f592d1 Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Mon, 27 Jun 2005 16:30:36 +0000 Subject: pass extra argument to linux_module_packages() BKrev: 42c029acOh-cgAhVJ9Dt-apK2YnnbQ --- conf/machine/beagle.conf | 2 +- conf/machine/h1940.conf | 2 +- conf/machine/h3600.conf | 2 +- conf/machine/h3900.conf | 2 +- conf/machine/handheld-common.conf | 2 +- conf/machine/ipaq-common.conf | 2 +- conf/machine/ipaq-pxa270.conf | 38 ++++++++++++++++++++++++++++++++++++++ 7 files changed, 44 insertions(+), 6 deletions(-) (limited to 'conf') diff --git a/conf/machine/beagle.conf b/conf/machine/beagle.conf index d4051d091c..ecc99ff5a7 100644 --- a/conf/machine/beagle.conf +++ b/conf/machine/beagle.conf @@ -57,6 +57,6 @@ input uinput \ BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils" BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm irda-utils" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools ${@linux_module_packages('${HANDHELD_MODULES_COPY}')}" +BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools ${@linux_module_packages('${HANDHELD_MODULES_COPY}', d)}" INHERIT += "linux_modules" diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf index 122be30ae0..5e84076b01 100644 --- a/conf/machine/h1940.conf +++ b/conf/machine/h1940.conf @@ -17,7 +17,7 @@ irda irlan irtty ircomm ircomm-tty \ BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts" BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}')}" +BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" INHERIT += "linux_modules" diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf index 9ba744bed6..0c25562644 100644 --- a/conf/machine/h3600.conf +++ b/conf/machine/h3600.conf @@ -8,7 +8,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa" EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p" BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa ipaq-boot-params" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}')}" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}" H3600_MODULES = "\ h3600-asic \ diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf index 9360d6bbb9..c860ea414d 100644 --- a/conf/machine/h3900.conf +++ b/conf/machine/h3900.conf @@ -17,7 +17,7 @@ BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules" BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}')}" +BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf index a872062ce9..2445ee17a6 100644 --- a/conf/machine/handheld-common.conf +++ b/conf/machine/handheld-common.conf @@ -19,6 +19,6 @@ input uinput \ # Configuration bits for "generic handheld" BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap network-suspend-scripts" BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm apmd network-suspend-scripts" -BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}')}" +BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}" INHERIT += "linux_modules" diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf index 8349dd73b7..24a1e202f1 100644 --- a/conf/machine/ipaq-common.conf +++ b/conf/machine/ipaq-common.conf @@ -1,7 +1,7 @@ IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules mipv6 atmelwlandriver" -BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}')}" +BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs mipv6 atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf index e69de29bb2..c860ea414d 100644 --- a/conf/machine/ipaq-pxa270.conf +++ b/conf/machine/ipaq-pxa270.conf @@ -0,0 +1,38 @@ +#@TYPE: Machine +#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx +#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices + +KERNEL ?= "kernel24" +#KERNEL ?= "kernel26" + +OVERRIDES_prepend = "${KERNEL}:" + +TARGET_ARCH = "arm" +IPKG_ARCHS = "all arm ipaqpxa h3900" +PREFERRED_PROVIDER_xserver = "xserver-kdrive" +PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa" +EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p" + +BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params" +BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules" +BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools" + +BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}" +BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules" +BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools" + +H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380" +H3900_MODULES_kernel26 = " h3900_lcd asic2_ts g_ether pxa2xx_udc" + + +SERIAL_CONSOLE = "115200 tts/0 vt100" +USE_DEVFS_kernel24 = "1" +USE_VT = "0" + +include conf/machine/ipaq-common.conf +include conf/machine/handheld-common.conf + +GUI_MACHINE_CLASS = "smallscreen" + +# not using tune-xscale so as to retain backwards compatibility +include conf/machine/tune-strongarm.conf -- cgit v1.2.3