diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-10 19:43:00 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-10 19:43:00 +0000 |
| commit | 489f9455f265caba0edd3488fe9580e36418eb32 (patch) | |
| tree | 227994a76fef5a3c7c651667756984dc69bddb2d /openwrt/target/linux/package/alsa | |
| parent | 3224e1420fd9c58ce5bf3b67e871730be18f8fdd (diff) | |
large target/linux cleanup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2877 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'openwrt/target/linux/package/alsa')
| -rw-r--r-- | openwrt/target/linux/package/alsa/Config.in | 4 | ||||
| -rw-r--r-- | openwrt/target/linux/package/alsa/Makefile | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/openwrt/target/linux/package/alsa/Config.in b/openwrt/target/linux/package/alsa/Config.in index 29a4e89e1..df4da0b7d 100644 --- a/openwrt/target/linux/package/alsa/Config.in +++ b/openwrt/target/linux/package/alsa/Config.in @@ -1,9 +1,9 @@ config BR2_PACKAGE_KMOD_ALSA prompt "kmod-alsa......................... Alsa Sound Drivers" tristate - default m if CONFIG_DEVEL - depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM + depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_X86 || BR2_LINUX_2_6_BRCM depends BR2_PACKAGE_KMOD_USB_CONTROLLER select BR2_PACKAGE_KMOD_SOUNDCORE + default m if CONFIG_DEVEL help Alsa Drivers for USB Soundcards diff --git a/openwrt/target/linux/package/alsa/Makefile b/openwrt/target/linux/package/alsa/Makefile index 02baa44b3..711ee1fc4 100644 --- a/openwrt/target/linux/package/alsa/Makefile +++ b/openwrt/target/linux/package/alsa/Makefile @@ -14,29 +14,25 @@ PKG_CAT:=bzcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -ifeq ($(KERNEL_DIR),) -KERNEL_DIR:=$(LINUX_DIR) -endif - include $(TOPDIR)/package/rules.mk ifeq ($(LINUX_KARCH),i386) -KERNEL_C_INCS:= -I$(KERNEL_DIR)/include/asm-i386/mach-generic +KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-i386/mach-generic KERNEL_C_OPTS:= -Os -mpreferred-stack-boundary=2 -march=i486 -fno-unit-at-a-time endif ifeq ($(LINUX_KARCH),mips) -KERNEL_C_INCS:= -I$(KERNEL_DIR)/include/asm-mips/mach-generic +KERNEL_C_INCS:= -I$(LINUX_DIR)/include/asm-mips/mach-generic KERNEL_C_OPTS:= -Os -G 0 -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 -Wa,-mips32 -Wa,--trap endif -$(eval $(call PKG_template,KMOD_ALSA,kmod-alsa,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(KERNEL_RELEASE)))) +$(eval $(call PKG_template,KMOD_ALSA,kmod-alsa,$(LINUX_VERSION)+$(PKG_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel-$(LINUX_VERSION)-$(BOARD) ($(LINUX_RELEASE)))) $(PKG_BUILD_DIR)/.configured: (cd $(PKG_BUILD_DIR); \ CFLAGS="$(KERNEL_C_INCS)" \ ./configure \ - --with-build=$(KERNEL_DIR) \ - --with-kernel=$(KERNEL_DIR) \ + --with-build=$(LINUX_DIR) \ + --with-kernel=$(LINUX_DIR) \ --with-cross=$(KERNEL_CROSS) \ --with-redhat=no \ --with-suse=no \ |