hopefully the last fix for the aruba image stuff

[openwrt.git] / target / linux / Makefile

diff --git a/target/linux/Makefile b/target/linux/Makefile
index e1ffc79..af3e3bd 100644 (file)
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -1,43 +1,41 @@
 include $(TOPDIR)/rules.mk
 
-define kernel_template
-
-$(1)/$(2)-clean:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" clean
-
-$(1)/$(2)-prepare:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" prepare
-
-$(1)/$(2)-compile:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" compile
+PKG_OS:=$(shell uname -s)
+PKG_CPU:=$(shell uname -m)
 
-$(1)/$(2)-rebuild:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" rebuild
-
-$(1)/$(2)-install:
-       $(MAKE) -C linux-$(1) BOARD="$(2)" install
-
-$(1)/$(2)-image: $(1)/$(2)-install
-       $(MAKE) -C image KERNEL="$(1)" BOARD="$(2)" install
-
-ifeq ($(BR2_LINUX_$(3)),y)
-clean: $(1)/$(2)-clean
-prepare: $(1)/$(2)-prepare
-compile: $(1)/$(2)-compile
-rebuild: $(1)/$(2)-rebuild
-install: $(1)/$(2)-image
+define kernel_template
+ifeq ($(CONFIG_LINUX_$(3)),y)
+KERNEL:=$(1)
+BOARD:=$(2)
 endif
-
-.PHONY: $(1)/$(2)-clean $(1)/$(2)-prepare $(1)/$(2)-compile $(1)/$(2)-rebuild $(1)/$(2)-install
 endef
 
+$(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
+$(eval $(call kernel_template,2.4,ar7,2_4_AR7))
+$(eval $(call kernel_template,2.4,x86,2_4_X86))
+$(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_AU1000))
+$(eval $(call kernel_template,2.6,xscale,2_6_XSCALE))
+$(eval $(call kernel_template,2.6,sibyte,2_6_SIBYTE))
+
+export BOARD
+export KERNEL
+
 prepare:
-       $(MAKE) -C image prepare
+       $(MAKE) -C $(BOARD)-$(KERNEL) prepare
+
 compile:
-       $(MAKE) -C image compile
+       $(MAKE) -C $(BOARD)-$(KERNEL) compile
+
 install:
-rebuild:
+       $(MAKE) -C $(BOARD)-$(KERNEL) install
+       $(MAKE) -C image/$(BOARD) install
+       
 clean:
+       $(MAKE) -C $(BOARD)-$(KERNEL) clean
 
-$(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
-$(eval $(call kernel_template,2.4,ar7,2_4_AR7))
+image/%:
+       $(MAKE) -C image $(patsubst image/%,%,$@)