From fbc6b140a51f4faa9b995eb965b6e69ebb541f3f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 10 Jan 2006 19:43:00 +0000 Subject: large target/linux cleanup git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2877 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/package/diag/Config.in | 3 +-- target/linux/package/diag/Makefile | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'target/linux/package/diag') diff --git a/target/linux/package/diag/Config.in b/target/linux/package/diag/Config.in index 001da0a005..b34f773691 100644 --- a/target/linux/package/diag/Config.in +++ b/target/linux/package/diag/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_KMOD_DIAG prompt "kmod-diag......................... Driver for router LEDs and Buttons" tristate - default y if BR2_LINUX_2_4_BRCM + depends BR2_LINUX_2_4_BRCM default m if CONFIG_DEVEL - default n help Driver for router LEDs and Buttons diff --git a/target/linux/package/diag/Makefile b/target/linux/package/diag/Makefile index 47908f0866..26bdcc952f 100644 --- a/target/linux/package/diag/Makefile +++ b/target/linux/package/diag/Makefile @@ -10,16 +10,12 @@ PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) include $(TOPDIR)/package/rules.mk -$(eval $(call PKG_template,KMOD_DIAG,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(KERNEL_RELEASE)))) - -ifeq ($(KERNEL_DIR),) -KERNEL_DIR:=$(LINUX_DIR) -endif +$(eval $(call PKG_template,KMOD_DIAG,$(PKG_NAME),$(LINUX_VERSION)-$(BOARD)-$(PKG_RELEASE),$(ARCH),kernel ($(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)))) DIAG_FLAGS:=$(TARGET_CFLAGS) -D__KERNEL__ -fno-strict-aliasing -fno-common -fomit-frame-pointer -G 0 \ -mno-abicalls -fno-pic -finline-limit=100000 -mabi=32 -march=mips32 -Wa,-32 -Wa,-march=mips32 \ -Wa,-mips32 -Wa,--trap -Wstrict-prototypes -Wno-trigraphs -DMODULE -mlong-calls -fno-common -I. -I linux-2.4 -nostdinc \ - -iwithprefix include -I$(KERNEL_DIR)/include -I$(KERNEL_DIR)/include/asm/gcc -c -I$(KERNEL_DIR)/arch/mips/bcm947xx/include -DBCMDRIVER + -iwithprefix include -I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/asm/gcc -c -I$(LINUX_DIR)/arch/mips/bcm947xx/include -DBCMDRIVER $(PKG_BUILD_DIR)/.prepared: mkdir -p $(PKG_BUILD_DIR) -- cgit v1.2.3