X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2FMakefile;h=d7744f56e08d69012857af73e6445c4531ca982d;hb=11969830947ba88158f7dbba7f85b5c7f72883e3;hp=f40a99cf5368df3f69369cc0271432e578b4c3b8;hpb=1903fda53bfd3cfc89a2d1642909a59fb01346aa;p=openwrt-10.03%2F.git

diff --git a/target/linux/Makefile b/target/linux/Makefile
index f40a99cf5..d7744f56e 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -9,36 +9,29 @@ IB_DIR:=$(BUILD_DIR)/$(IB_NAME)
 define kernel_template
 
 $(1)/$(2)-clean:
-	@$(TRACE) target/linux/$(2)-$(1)-clean
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" clean
 
 $(1)/$(2)-prepare:
-	@$(TRACE) target/linux/$(2)-$(1)-prepare
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" prepare
 
 $(1)/$(2)-compile:
-	@$(TRACE) target/linux/$(2)-$(1)-compile
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" compile
 
 $(1)/$(2)-rebuild:
-	@$(TRACE) target/linux/$(2)-$(1)-rebuild
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" rebuild
 
 $(1)/$(2)-install:
-	@$(TRACE) target/linux/$(2)-$(1)-install
 	$(MAKE) -C $(2)-$(1) BOARD="$(2)" install
 
 $(1)/$(2)-image: $(1)/$(2)-install
-	@$(TRACE) target/linux/image-install
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
 
 $(1)/$(2)-install-ib:
-	@$(TRACE) target/linux/image-install-ib
 	$(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" IB_DIR="$(IB_DIR)" install-ib
 	echo '$$$$(eval $$$$(call image_template,$(2),$(1)))' >> $(IB_DIR)/kernel.mk
 
 
-ifeq ($(BR2_LINUX_$(3)),y)
+ifeq ($(CONFIG_LINUX_$(3)),y)
 clean: $(1)/$(2)-clean
 prepare: $(1)/$(2)-prepare
 compile: $(1)/$(2)-compile
@@ -71,15 +64,13 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2:
 	find $(IB_DIR) -name CVS | xargs rm -rf
 	(cd $(BUILD_DIR); tar c $(IB_NAME) | bzip2 -c > $(BIN_DIR)/$(IB_NAME).tar.bz2)
 
-ifeq ($(BR2_PACKAGE_IMAGEBUILDER),y)
+ifeq ($(CONFIG_PACKAGE_IMAGEBUILDER),y)
 install: $(BIN_DIR)/$(IB_NAME).tar.bz2
 endif
 
 prepare:
-	@$(TRACE) target/linux/image-prepare
 	$(MAKE) -C image prepare
 compile:
-	@$(TRACE) target/linux/image-compile
 	$(MAKE) -C image compile
 install:
 rebuild:
@@ -92,4 +83,4 @@ $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
 $(eval $(call kernel_template,2.6,x86,2_6_X86))
 $(eval $(call kernel_template,2.4,ar531x,2_4_AR531X))
 $(eval $(call kernel_template,2.6,aruba,2_6_ARUBA))
-$(eval $(call kernel_template,2.6,au1000,2_6_MTX-1))
+$(eval $(call kernel_template,2.6,au1000,2_6_AU1000))