46 files changed, 35 insertions, 32 deletions
diff --git a/include/target.mk b/include/target.mk
new file mode 100644
index 0000000000..afdf5d8ae6
--- /dev/null
+++ b/include/target.mk
@@ -0,0 +1,23 @@
+define kernel_template
+ifeq ($(CONFIG_LINUX_$(3)),y)
+KERNEL:=$(1)
+BOARD:=$(2)
+endif
+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,rb532,2_6_RB532))
+$(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
+
+
diff --git a/target/Makefile b/target/Makefile
index 0a1434472a..836469d171 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -1,4 +1,5 @@
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/target.mk
 
 all: install
 
@@ -11,15 +12,23 @@ TARGETS-$(CONFIG_SDK) += sdk
 linux-compile: utils-install
 linux-install: $(BIN_DIR)
 sdk-compile: linux-install
+image_install: linux-install
 
 download: $(patsubst %,%-source,$(TARGETS-y))
 prepare: linux-prepare
-compile: linux-compile
-install: image_clean $(patsubst %,%-install,$(TARGETS-y))
+compile: linux-compile image_compile
+install: image_clean $(patsubst %,%-install,$(TARGETS-y)) image_install
 clean: $(patsubst %,%-clean,$(TARGETS-y)) image_clean
 
 image_clean: FORCE
+	$(MAKE) -C image/$(BOARD) clean
 	rm -f $(BIN_DIR)/openwrt-*
+	
+image_compile: FORCE
+	$(MAKE) -C image/$(BOARD) compile
+
+image_install: image_compile
+	$(MAKE) -C image/$(BOARD) install
 
 %-clean: FORCE
 	$(MAKE) -C $(patsubst %-clean,%,$@) clean
diff --git a/target/linux/image/ar7/Makefile b/target/image/ar7/Makefile
index 5ee6b0dc10..5ee6b0dc10 100644
--- a/target/linux/image/ar7/Makefile
+++ b/target/image/ar7/Makefile
diff --git a/target/linux/image/ar7/sercomm/adam2.bin b/target/image/ar7/sercomm/adam2.bin
index d4aa0cd2d3..d4aa0cd2d3 100644
--- a/target/linux/image/ar7/sercomm/adam2.bin
+++ b/target/image/ar7/sercomm/adam2.bin
diff --git a/target/linux/image/ar7/sercomm/dg834 b/target/image/ar7/sercomm/dg834
index 61fe336e85..61fe336e85 100644
--- a/target/linux/image/ar7/sercomm/dg834
+++ b/target/image/ar7/sercomm/dg834
diff --git a/target/linux/image/ar7/sercomm/jdr454wb b/target/image/ar7/sercomm/jdr454wb
index 821ff1c1af..821ff1c1af 100644
--- a/target/linux/image/ar7/sercomm/jdr454wb
+++ b/target/image/ar7/sercomm/jdr454wb
diff --git a/target/linux/image/ar7/src/LzmaDecode.c b/target/image/ar7/src/LzmaDecode.c
index 951700bddf..951700bddf 100644
--- a/target/linux/image/ar7/src/LzmaDecode.c
+++ b/target/image/ar7/src/LzmaDecode.c
diff --git a/target/linux/image/ar7/src/LzmaDecode.h b/target/image/ar7/src/LzmaDecode.h
index f58944e3c3..f58944e3c3 100644
--- a/target/linux/image/ar7/src/LzmaDecode.h
+++ b/target/image/ar7/src/LzmaDecode.h
diff --git a/target/linux/image/ar7/src/gzip.h b/target/image/ar7/src/gzip.h
index 917e66655c..917e66655c 100644
--- a/target/linux/image/ar7/src/gzip.h
+++ b/target/image/ar7/src/gzip.h
diff --git a/target/linux/image/ar7/src/ld.script.in b/target/image/ar7/src/ld.script.in
index 40389e644f..40389e644f 100644
--- a/target/linux/image/ar7/src/ld.script.in
+++ b/target/image/ar7/src/ld.script.in
diff --git a/target/linux/image/ar7/src/loader.c b/target/image/ar7/src/loader.c
index 22b909d7e9..22b909d7e9 100644
--- a/target/linux/image/ar7/src/loader.c
+++ b/target/image/ar7/src/loader.c
diff --git a/target/linux/image/ar7/src/srec2bin.c b/target/image/ar7/src/srec2bin.c
index 0eb8b2023a..0eb8b2023a 100644
--- a/target/linux/image/ar7/src/srec2bin.c
+++ b/target/image/ar7/src/srec2bin.c
diff --git a/target/linux/image/ar7/src/zimage.script.in b/target/image/ar7/src/zimage.script.in
index 1a0865b086..1a0865b086 100644
--- a/target/linux/image/ar7/src/zimage.script.in
+++ b/target/image/ar7/src/zimage.script.in
diff --git a/target/linux/image/aruba/Makefile b/target/image/aruba/Makefile
index ad13ffd541..ad13ffd541 100644
--- a/target/linux/image/aruba/Makefile
+++ b/target/image/aruba/Makefile
diff --git a/target/linux/image/aruba/addVersion b/target/image/aruba/addVersion
index 796f73ad1b..796f73ad1b 100755
--- a/target/linux/image/aruba/addVersion
+++ b/target/image/aruba/addVersion
diff --git a/target/linux/image/aruba/version b/target/image/aruba/version
index fff5589e14..fff5589e14 100644
--- a/target/linux/image/aruba/version
+++ b/target/image/aruba/version
diff --git a/target/linux/image/au1000/Makefile b/target/image/au1000/Makefile
index 3aaf665ca9..3aaf665ca9 100644
--- a/target/linux/image/au1000/Makefile
+++ b/target/image/au1000/Makefile
diff --git a/target/linux/image/brcm/Makefile b/target/image/brcm/Makefile
index 30bad50f20..30bad50f20 100644
--- a/target/linux/image/brcm/Makefile
+++ b/target/image/brcm/Makefile
diff --git a/target/linux/image/brcm/lzma-loader/Makefile b/target/image/brcm/lzma-loader/Makefile
index 3fa00fa4d9..3fa00fa4d9 100644
--- a/target/linux/image/brcm/lzma-loader/Makefile
+++ b/target/image/brcm/lzma-loader/Makefile
diff --git a/target/linux/image/brcm/lzma-loader/src/LzmaDecode.c b/target/image/brcm/lzma-loader/src/LzmaDecode.c
index 951700bddf..951700bddf 100644
--- a/target/linux/image/brcm/lzma-loader/src/LzmaDecode.c
+++ b/target/image/brcm/lzma-loader/src/LzmaDecode.c
diff --git a/target/linux/image/brcm/lzma-loader/src/LzmaDecode.h b/target/image/brcm/lzma-loader/src/LzmaDecode.h
index f58944e3c3..f58944e3c3 100644
--- a/target/linux/image/brcm/lzma-loader/src/LzmaDecode.h
+++ b/target/image/brcm/lzma-loader/src/LzmaDecode.h
diff --git a/target/linux/image/brcm/lzma-loader/src/Makefile b/target/image/brcm/lzma-loader/src/Makefile
index 85a864674b..85a864674b 100644
--- a/target/linux/image/brcm/lzma-loader/src/Makefile
+++ b/target/image/brcm/lzma-loader/src/Makefile
diff --git a/target/linux/image/brcm/lzma-loader/src/README b/target/image/brcm/lzma-loader/src/README
index 16649e9500..16649e9500 100644
--- a/target/linux/image/brcm/lzma-loader/src/README
+++ b/target/image/brcm/lzma-loader/src/README
diff --git a/target/linux/image/brcm/lzma-loader/src/decompress.c b/target/image/brcm/lzma-loader/src/decompress.c
index ec510e21e3..ec510e21e3 100644
--- a/target/linux/image/brcm/lzma-loader/src/decompress.c
+++ b/target/image/brcm/lzma-loader/src/decompress.c
diff --git a/target/linux/image/brcm/lzma-loader/src/decompress.lds.in b/target/image/brcm/lzma-loader/src/decompress.lds.in
index 33f56f8a09..33f56f8a09 100644
--- a/target/linux/image/brcm/lzma-loader/src/decompress.lds.in
+++ b/target/image/brcm/lzma-loader/src/decompress.lds.in
diff --git a/target/linux/image/brcm/lzma-loader/src/head.S b/target/image/brcm/lzma-loader/src/head.S
index 9bfbd53d51..9bfbd53d51 100644
--- a/target/linux/image/brcm/lzma-loader/src/head.S
+++ b/target/image/brcm/lzma-loader/src/head.S
diff --git a/target/linux/image/brcm/lzma-loader/src/loader.lds.in b/target/image/brcm/lzma-loader/src/loader.lds.in
index 20f2ea98ec..20f2ea98ec 100644
--- a/target/linux/image/brcm/lzma-loader/src/loader.lds.in
+++ b/target/image/brcm/lzma-loader/src/loader.lds.in
diff --git a/target/linux/image/generic/Makefile b/target/image/generic/Makefile
index 3cb3b2e0b6..3cb3b2e0b6 100644
--- a/target/linux/image/generic/Makefile
+++ b/target/image/generic/Makefile
diff --git a/target/linux/image/generic/lzma-loader/Makefile b/target/image/generic/lzma-loader/Makefile
index 3de04a81a8..3de04a81a8 100644
--- a/target/linux/image/generic/lzma-loader/Makefile
+++ b/target/image/generic/lzma-loader/Makefile
diff --git a/target/linux/image/generic/lzma-loader/src/LzmaDecode.c b/target/image/generic/lzma-loader/src/LzmaDecode.c
index c90a0d3ef4..c90a0d3ef4 100644
--- a/target/linux/image/generic/lzma-loader/src/LzmaDecode.c
+++ b/target/image/generic/lzma-loader/src/LzmaDecode.c
diff --git a/target/linux/image/generic/lzma-loader/src/LzmaDecode.h b/target/image/generic/lzma-loader/src/LzmaDecode.h
index 213062af12..213062af12 100644
--- a/target/linux/image/generic/lzma-loader/src/LzmaDecode.h
+++ b/target/image/generic/lzma-loader/src/LzmaDecode.h
diff --git a/target/linux/image/generic/lzma-loader/src/Makefile b/target/image/generic/lzma-loader/src/Makefile
index 54356889f5..54356889f5 100644
--- a/target/linux/image/generic/lzma-loader/src/Makefile
+++ b/target/image/generic/lzma-loader/src/Makefile
diff --git a/target/linux/image/generic/lzma-loader/src/decompress.c b/target/image/generic/lzma-loader/src/decompress.c
index 4ed432d1a5..4ed432d1a5 100644
--- a/target/linux/image/generic/lzma-loader/src/decompress.c
+++ b/target/image/generic/lzma-loader/src/decompress.c
diff --git a/target/linux/image/generic/lzma-loader/src/lzma-copy.lds.in b/target/image/generic/lzma-loader/src/lzma-copy.lds.in
index fbc87ab8e2..fbc87ab8e2 100644
--- a/target/linux/image/generic/lzma-loader/src/lzma-copy.lds.in
+++ b/target/image/generic/lzma-loader/src/lzma-copy.lds.in
diff --git a/target/linux/image/generic/lzma-loader/src/lzma.lds.in b/target/image/generic/lzma-loader/src/lzma.lds.in
index 6021cec014..6021cec014 100644
--- a/target/linux/image/generic/lzma-loader/src/lzma.lds.in
+++ b/target/image/generic/lzma-loader/src/lzma.lds.in
diff --git a/target/linux/image/generic/lzma-loader/src/print.c b/target/image/generic/lzma-loader/src/print.c
index 950687beff..950687beff 100644
--- a/target/linux/image/generic/lzma-loader/src/print.c
+++ b/target/image/generic/lzma-loader/src/print.c
diff --git a/target/linux/image/generic/lzma-loader/src/print.h b/target/image/generic/lzma-loader/src/print.h
index b051463909..b051463909 100644
--- a/target/linux/image/generic/lzma-loader/src/print.h
+++ b/target/image/generic/lzma-loader/src/print.h
diff --git a/target/linux/image/generic/lzma-loader/src/printf.c b/target/image/generic/lzma-loader/src/printf.c
index 49bd50d7c7..49bd50d7c7 100644
--- a/target/linux/image/generic/lzma-loader/src/printf.c
+++ b/target/image/generic/lzma-loader/src/printf.c
diff --git a/target/linux/image/generic/lzma-loader/src/printf.h b/target/image/generic/lzma-loader/src/printf.h
index 9b1c1df232..9b1c1df232 100644
--- a/target/linux/image/generic/lzma-loader/src/printf.h
+++ b/target/image/generic/lzma-loader/src/printf.h
diff --git a/target/linux/image/generic/lzma-loader/src/start.S b/target/image/generic/lzma-loader/src/start.S
index 9a85c4c357..9a85c4c357 100644
--- a/target/linux/image/generic/lzma-loader/src/start.S
+++ b/target/image/generic/lzma-loader/src/start.S
diff --git a/target/linux/image/generic/lzma-loader/src/uart16550.c b/target/image/generic/lzma-loader/src/uart16550.c
index 7df5727600..7df5727600 100644
--- a/target/linux/image/generic/lzma-loader/src/uart16550.c
+++ b/target/image/generic/lzma-loader/src/uart16550.c
diff --git a/target/linux/image/generic/lzma-loader/src/uart16550.h b/target/image/generic/lzma-loader/src/uart16550.h
index b3fd6fdd75..b3fd6fdd75 100644
--- a/target/linux/image/generic/lzma-loader/src/uart16550.h
+++ b/target/image/generic/lzma-loader/src/uart16550.h
diff --git a/target/linux/image/rb532/Makefile b/target/image/rb532/Makefile
index bba89522ac..bba89522ac 100644
--- a/target/linux/image/rb532/Makefile
+++ b/target/image/rb532/Makefile
diff --git a/target/linux/image/x86/Makefile b/target/image/x86/Makefile
index e4b3a9e446..e4b3a9e446 100644
--- a/target/linux/image/x86/Makefile
+++ b/target/image/x86/Makefile
diff --git a/target/linux/image/xscale/Makefile b/target/image/xscale/Makefile
index 683c6028f6..683c6028f6 100644
--- a/target/linux/image/xscale/Makefile
+++ b/target/image/xscale/Makefile
diff --git a/target/linux/Makefile b/target/linux/Makefile
index e1a314d1d8..bab26845a1 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -1,33 +1,8 @@
 include $(TOPDIR)/rules.mk
-
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
-
-define kernel_template
-ifeq ($(CONFIG_LINUX_$(3)),y)
-KERNEL:=$(1)
-BOARD:=$(2)
-endif
-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,rb532,2_6_RB532))
-$(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
+include $(INCLUDE_DIR)/target.mk
 
 source:
 	$(MAKE) -C $(BOARD)-$(KERNEL) source
-	$(MAKE) -C image/$(BOARD) source
 
 prepare:
 	rm -f $(TOPDIR)/.kernel.mk
@@ -38,10 +13,6 @@ compile:
 
 install:
 	$(MAKE) -C $(BOARD)-$(KERNEL) install
-	$(MAKE) -C image/$(BOARD) install
 	
 clean:
 	$(MAKE) -C $(BOARD)-$(KERNEL) clean
-
-image/%:
-	$(MAKE) -C image $(patsubst image/%,%,$@)