diff options
4 files changed, 13 insertions, 10 deletions
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf index b693f1329a..2c652fa5e0 100644 --- a/conf/machine/collie.conf +++ b/conf/machine/collie.conf @@ -7,9 +7,10 @@ IPKG_ARCHS = "all arm ${MACHINE}" PREFERRED_PROVIDER_xserver = "xserver-kdrive" PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules sharp-sdmmc-support \ -kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor " +BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules \ +sharp-sdmmc-support kernel-module-devinfo kernel-module-gpio kernel-module-net-fd \ +kernel-module-registers kernel-module-sa1100-bi kernel-module-usbdcore \ +kernel-module-usbdmonitor kernel-module-collie-ssp kernel-module-collie-tc35143af" # This is needed for the ramdisk script to work BOOTSTRAP_EXTRA_DEPENDS += "e2fsprogs" diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie index e97d8955fd..cf7efbfc89 100644 --- a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie +++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/defconfig-collie @@ -916,10 +916,10 @@ CONFIG_FONT_4x6=y # CONFIG_SOUND=y # CONFIG_SOUND_BT878 is not set -CONFIG_SOUND_COLLIE_SSP=y +CONFIG_SOUND_COLLIE_SSP=m CONFIG_COLLIE_PCM1741=y # CONFIG_COLLIE_PCM1717 is not set -CONFIG_SOUND_COLLIE_TC35143=y +CONFIG_SOUND_COLLIE_TC35143=m # CONFIG_SOUND_CMPCI is not set # CONFIG_SOUND_EMU10K1 is not set # CONFIG_MIDI_EMU10K1 is not set diff --git a/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/sound-2.4.18r2.patch b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/sound-2.4.18r2.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/linux/openzaurus-sa-2.4.18-rmk7-pxa3-embedix20030509/sound-2.4.18r2.patch diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe index 8b89debecf..4393809832 100644 --- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe +++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe @@ -25,7 +25,8 @@ SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${ file://disable-pcmcia-probe.patch;patch=1 \ file://linux-2.4.18-list_move.patch;patch=1 \ file://defconfig-${MACHINE} \ - file://module_licence.patch;patch=1" + file://module_licence.patch;patch=1 \ + file://sound-2.4.18r2.patch;patch=1 " # apply this when we have a patch that allows building with gcc 3.x: # SRC_URI_append = file://gcc-3.3.patch;patch=1 @@ -49,7 +50,8 @@ EXTRA_OEMAKE = "" module_conf_usbdmonitor = "alias usbd0 usbdmonitor" module_conf_sa1100_bi = "below sa1100_bi net_fd usbdcore " module_autoload_sa1100_bi = "sa1100_bi" - +module_autoload_collie_ssp = "collie_ssp" +module_autoload_collie_tc35143af = "tc35143af" # # FIXME: Use configuration system # @@ -73,12 +75,12 @@ do_configure_prepend() { echo "CONFIG_MTDRAM_ERASE_SIZE=1" >> ${S}/.config echo "CONFIG_MTDRAM_ABS_POS=$addr" >> ${S}/.config fi - echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config + echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config } do_deploy() { - install -d ${DEPLOY_DIR}/images - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${DATETIME} + install -d ${DEPLOY_DIR}/images + install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${DATETIME} } do_deploy[dirs] = "${S}" |