move target/image/platform to target/linux/platform/image

platform directories are now self contained


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5669 3c298f89-4303-0410-b956-a3cf2f4a3e73

55 files changed, 18 insertions, 13 deletions

diff --git a/Config.in b/Config.in
index 78df56383..acb27b47e 100644
--- a/Config.in
+++ b/Config.in
@@ -93,7 +93,7 @@ menu "Target Images"
 
 comment "Image Options"
 
-source "target/image/*/Config.in"
+source "target/linux/*/image/Config.in"
 
 	config TARGET_ROOTFS_FSPART
 		int "Filesystem part size (in MB)"
diff --git a/target/Makefile b/target/Makefile
index c00eea0d6..d5e6bea01 100644
--- a/target/Makefile
+++ b/target/Makefile
@@ -19,6 +19,9 @@ linux-compile: utils-install
 linux-install: $(BIN_DIR)
 image_install: linux-install
 
+IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
+
+
 download: $(patsubst %,%-download,$(TARGETS-y))
 prepare: linux-prepare
 compile: linux-compile image_compile
@@ -27,17 +30,17 @@ clean: $(patsubst %,%-clean,$(TARGETS-y)) image_clean
 
 prereq: FORCE
 	$(MAKE) -C linux/$(BOARD)-$(KERNEL) prereq
-	$(MAKE) -C image/$(BOARD) prereq
+	$(MAKE) -C $(IMAGE_DIR) prereq
 
 image_clean: FORCE
-	$(MAKE) -C image/$(BOARD) clean
+	$(MAKE) -C $(IMAGE_DIR) clean
 	rm -f $(BIN_DIR)/openwrt-*
 	
 image_compile: FORCE
-	$(MAKE) -C image/$(BOARD) compile
+	$(MAKE) -C $(IMAGE_DIR) compile
 
 image_install: image_compile
-	$(MAKE) -C image/$(BOARD) install
+	$(MAKE) -C $(IMAGE_DIR) install
 
 %-clean: FORCE
 	$(MAKE) -C $(patsubst %-clean,%,$@) clean
diff --git a/target/image/ar7/Makefile b/target/linux/ar7-2.4/image/Makefile
index bcdef970c..bcdef970c 100644
--- a/target/image/ar7/Makefile
+++ b/target/linux/ar7-2.4/image/Makefile
diff --git a/target/image/ar7/sercomm/adam2.bin b/target/linux/ar7-2.4/image/sercomm/adam2.bin
index d4aa0cd2d..d4aa0cd2d 100644
--- a/target/image/ar7/sercomm/adam2.bin
+++ b/target/linux/ar7-2.4/image/sercomm/adam2.bin
diff --git a/target/image/ar7/sercomm/dg834 b/target/linux/ar7-2.4/image/sercomm/dg834
index 61fe336e8..61fe336e8 100644
--- a/target/image/ar7/sercomm/dg834
+++ b/target/linux/ar7-2.4/image/sercomm/dg834
diff --git a/target/image/ar7/sercomm/jdr454wb b/target/linux/ar7-2.4/image/sercomm/jdr454wb
index 821ff1c1a..821ff1c1a 100644
--- a/target/image/ar7/sercomm/jdr454wb
+++ b/target/linux/ar7-2.4/image/sercomm/jdr454wb
diff --git a/target/image/ar7/src/LzmaDecode.c b/target/linux/ar7-2.4/image/src/LzmaDecode.c
index 951700bdd..951700bdd 100644
--- a/target/image/ar7/src/LzmaDecode.c
+++ b/target/linux/ar7-2.4/image/src/LzmaDecode.c
diff --git a/target/image/ar7/src/LzmaDecode.h b/target/linux/ar7-2.4/image/src/LzmaDecode.h
index f58944e3c..f58944e3c 100644
--- a/target/image/ar7/src/LzmaDecode.h
+++ b/target/linux/ar7-2.4/image/src/LzmaDecode.h
diff --git a/target/image/ar7/src/gzip.h b/target/linux/ar7-2.4/image/src/gzip.h
index 917e66655..917e66655 100644
--- a/target/image/ar7/src/gzip.h
+++ b/target/linux/ar7-2.4/image/src/gzip.h
diff --git a/target/image/ar7/src/ld.script.in b/target/linux/ar7-2.4/image/src/ld.script.in
index 40389e644..40389e644 100644
--- a/target/image/ar7/src/ld.script.in
+++ b/target/linux/ar7-2.4/image/src/ld.script.in
diff --git a/target/image/ar7/src/loader.c b/target/linux/ar7-2.4/image/src/loader.c
index 22b909d7e..22b909d7e 100644
--- a/target/image/ar7/src/loader.c
+++ b/target/linux/ar7-2.4/image/src/loader.c
diff --git a/target/image/ar7/src/srec2bin.c b/target/linux/ar7-2.4/image/src/srec2bin.c
index 0eb8b2023..0eb8b2023 100644
--- a/target/image/ar7/src/srec2bin.c
+++ b/target/linux/ar7-2.4/image/src/srec2bin.c
diff --git a/target/image/ar7/src/zimage.script.in b/target/linux/ar7-2.4/image/src/zimage.script.in
index 1a0865b08..1a0865b08 100644
--- a/target/image/ar7/src/zimage.script.in
+++ b/target/linux/ar7-2.4/image/src/zimage.script.in
diff --git a/target/image/aruba/Makefile b/target/linux/aruba-2.6/image/Makefile
index 09aa8eabd..37dd6fccb 100644
--- a/target/image/aruba/Makefile
+++ b/target/linux/aruba-2.6/image/Makefile
@@ -18,12 +18,12 @@ LOADER_MAKEOPTS= \
 		RAMSIZE=$(RAMSIZE)
 
 define Build/Clean
-	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean
+	$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean
 endef
 
 define Image/Prepare
 	cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
-	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean compile
+	$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean compile
 endef
 
 define Image/BuildKernel
diff --git a/target/image/aruba/addVersion b/target/linux/aruba-2.6/image/addVersion
index 796f73ad1..796f73ad1 100755
--- a/target/image/aruba/addVersion
+++ b/target/linux/aruba-2.6/image/addVersion
diff --git a/target/image/aruba/version b/target/linux/aruba-2.6/image/version
index fff5589e1..fff5589e1 100644
--- a/target/image/aruba/version
+++ b/target/linux/aruba-2.6/image/version
diff --git a/target/image/au1000/Makefile b/target/linux/au1000-2.6/image/Makefile
index fa3f06e31..9c7bb06d3 100644
--- a/target/image/au1000/Makefile
+++ b/target/linux/au1000-2.6/image/Makefile
@@ -21,7 +21,7 @@ LOADER_MAKEOPTS= \
 		RAMSIZE=$(RAMSIZE)
 
 define Build/Clean
-	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean
+	$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean
 endef
 
 DROP_SECTIONS := .reginfo .mdebug .comment .note .pdr .options .MIPS.options
@@ -31,13 +31,13 @@ define Image/Prepare
 	cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
 	
 	# Build RAM image
-	$(MAKE) -C ../generic/lzma-loader \
+	$(MAKE) -C ../../generic-2.6/image/lzma-loader \
 		$(LOADER_MAKEOPTS) \
 		clean compile
 	$(OBJCOPY_KERNEL) $(KDIR)/loader.elf $(KDIR)/kernel.ram.srec
 	
 	# Build Flash image
-	$(MAKE) -C ../generic/lzma-loader \
+	$(MAKE) -C ../../generic-2.6/image/lzma-loader \
 		$(LOADER_MAKEOPTS) \
 		IMAGE_COPY=1 \
 		LOADER_ENTRY=$(FLASH_KERNEL) \
diff --git a/target/linux/brcm-2.4/image b/target/linux/brcm-2.4/image
new file mode 120000
index 000000000..9813e361e
--- /dev/null
+++ b/target/linux/brcm-2.4/image
@@ -0,0 +1 @@
+../brcm-2.6/image/
\ No newline at end of file
diff --git a/target/image/brcm/Makefile b/target/linux/brcm-2.6/image/Makefile
index 6aad5581e..6aad5581e 100644
--- a/target/image/brcm/Makefile
+++ b/target/linux/brcm-2.6/image/Makefile
diff --git a/target/image/brcm/lzma-loader/Makefile b/target/linux/brcm-2.6/image/lzma-loader/Makefile
index b56cbaab0..b56cbaab0 100644
--- a/target/image/brcm/lzma-loader/Makefile
+++ b/target/linux/brcm-2.6/image/lzma-loader/Makefile
diff --git a/target/image/brcm/lzma-loader/src/LzmaDecode.c b/target/linux/brcm-2.6/image/lzma-loader/src/LzmaDecode.c
index 951700bdd..951700bdd 100644
--- a/target/image/brcm/lzma-loader/src/LzmaDecode.c
+++ b/target/linux/brcm-2.6/image/lzma-loader/src/LzmaDecode.c
diff --git a/target/image/brcm/lzma-loader/src/LzmaDecode.h b/target/linux/brcm-2.6/image/lzma-loader/src/LzmaDecode.h
index f58944e3c..f58944e3c 100644
--- a/target/image/brcm/lzma-loader/src/LzmaDecode.h
+++ b/target/linux/brcm-2.6/image/lzma-loader/src/LzmaDecode.h
diff --git a/target/image/brcm/lzma-loader/src/Makefile b/target/linux/brcm-2.6/image/lzma-loader/src/Makefile
index 85a864674..85a864674 100644
--- a/target/image/brcm/lzma-loader/src/Makefile
+++ b/target/linux/brcm-2.6/image/lzma-loader/src/Makefile
diff --git a/target/image/brcm/lzma-loader/src/README b/target/linux/brcm-2.6/image/lzma-loader/src/README
index 16649e950..16649e950 100644
--- a/target/image/brcm/lzma-loader/src/README
+++ b/target/linux/brcm-2.6/image/lzma-loader/src/README
diff --git a/target/image/brcm/lzma-loader/src/decompress.c b/target/linux/brcm-2.6/image/lzma-loader/src/decompress.c
index ec510e21e..ec510e21e 100644
--- a/target/image/brcm/lzma-loader/src/decompress.c
+++ b/target/linux/brcm-2.6/image/lzma-loader/src/decompress.c
diff --git a/target/image/brcm/lzma-loader/src/decompress.lds.in b/target/linux/brcm-2.6/image/lzma-loader/src/decompress.lds.in
index 33f56f8a0..33f56f8a0 100644
--- a/target/image/brcm/lzma-loader/src/decompress.lds.in
+++ b/target/linux/brcm-2.6/image/lzma-loader/src/decompress.lds.in
diff --git a/target/image/brcm/lzma-loader/src/head.S b/target/linux/brcm-2.6/image/lzma-loader/src/head.S
index 9bfbd53d5..9bfbd53d5 100644
--- a/target/image/brcm/lzma-loader/src/head.S
+++ b/target/linux/brcm-2.6/image/lzma-loader/src/head.S
diff --git a/target/image/brcm/lzma-loader/src/loader.lds.in b/target/linux/brcm-2.6/image/lzma-loader/src/loader.lds.in
index 20f2ea98e..20f2ea98e 100644
--- a/target/image/brcm/lzma-loader/src/loader.lds.in
+++ b/target/linux/brcm-2.6/image/lzma-loader/src/loader.lds.in
diff --git a/target/image/brcm63xx/Makefile b/target/linux/brcm63xx-2.6/image/Makefile
index 6aa72c292..27c7b49c3 100644
--- a/target/image/brcm63xx/Makefile
+++ b/target/linux/brcm63xx-2.6/image/Makefile
@@ -18,12 +18,12 @@ LOADER_MAKEOPTS= \
 		RAMSIZE=$(RAMSIZE)
 
 define Build/Clean
-	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean
+	$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean
 endef
 
 define Image/Prepare
 	cat $(KDIR)/vmlinux | $(STAGING_DIR)/bin/lzma e -si -so -eos -lc1 -lp2 -pb2 > $(KDIR)/vmlinux.lzma
-	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) compile
+	$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) compile
 endef
 
 define Image/Build
diff --git a/target/linux/generic-2.4/image b/target/linux/generic-2.4/image
new file mode 120000
index 000000000..a96fdd0ab
--- /dev/null
+++ b/target/linux/generic-2.4/image
@@ -0,0 +1 @@
+../generic-2.6/image/
\ No newline at end of file
diff --git a/target/image/generic/Makefile b/target/linux/generic-2.6/image/Makefile
index 64b294d76..64b294d76 100644
--- a/target/image/generic/Makefile
+++ b/target/linux/generic-2.6/image/Makefile
diff --git a/target/image/generic/lzma-loader/Makefile b/target/linux/generic-2.6/image/lzma-loader/Makefile
index e3a98afbc..e3a98afbc 100644
--- a/target/image/generic/lzma-loader/Makefile
+++ b/target/linux/generic-2.6/image/lzma-loader/Makefile
diff --git a/target/image/generic/lzma-loader/src/LzmaDecode.c b/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.c
index c90a0d3ef..c90a0d3ef 100644
--- a/target/image/generic/lzma-loader/src/LzmaDecode.c
+++ b/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.c
diff --git a/target/image/generic/lzma-loader/src/LzmaDecode.h b/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.h
index 213062af1..213062af1 100644
--- a/target/image/generic/lzma-loader/src/LzmaDecode.h
+++ b/target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.h
diff --git a/target/image/generic/lzma-loader/src/Makefile b/target/linux/generic-2.6/image/lzma-loader/src/Makefile
index dbe9019f2..dbe9019f2 100644
--- a/target/image/generic/lzma-loader/src/Makefile
+++ b/target/linux/generic-2.6/image/lzma-loader/src/Makefile
diff --git a/target/image/generic/lzma-loader/src/decompress.c b/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
index 4ed432d1a..4ed432d1a 100644
--- a/target/image/generic/lzma-loader/src/decompress.c
+++ b/target/linux/generic-2.6/image/lzma-loader/src/decompress.c
diff --git a/target/image/generic/lzma-loader/src/lzma-copy.lds.in b/target/linux/generic-2.6/image/lzma-loader/src/lzma-copy.lds.in
index fbc87ab8e..fbc87ab8e 100644
--- a/target/image/generic/lzma-loader/src/lzma-copy.lds.in
+++ b/target/linux/generic-2.6/image/lzma-loader/src/lzma-copy.lds.in
diff --git a/target/image/generic/lzma-loader/src/lzma.lds.in b/target/linux/generic-2.6/image/lzma-loader/src/lzma.lds.in
index 6021cec01..6021cec01 100644
--- a/target/image/generic/lzma-loader/src/lzma.lds.in
+++ b/target/linux/generic-2.6/image/lzma-loader/src/lzma.lds.in
diff --git a/target/image/generic/lzma-loader/src/print.c b/target/linux/generic-2.6/image/lzma-loader/src/print.c
index 950687bef..950687bef 100644
--- a/target/image/generic/lzma-loader/src/print.c
+++ b/target/linux/generic-2.6/image/lzma-loader/src/print.c
diff --git a/target/image/generic/lzma-loader/src/print.h b/target/linux/generic-2.6/image/lzma-loader/src/print.h
index b05146390..b05146390 100644
--- a/target/image/generic/lzma-loader/src/print.h
+++ b/target/linux/generic-2.6/image/lzma-loader/src/print.h
diff --git a/target/image/generic/lzma-loader/src/printf.c b/target/linux/generic-2.6/image/lzma-loader/src/printf.c
index 49bd50d7c..49bd50d7c 100644
--- a/target/image/generic/lzma-loader/src/printf.c
+++ b/target/linux/generic-2.6/image/lzma-loader/src/printf.c
diff --git a/target/image/generic/lzma-loader/src/printf.h b/target/linux/generic-2.6/image/lzma-loader/src/printf.h
index 9b1c1df23..9b1c1df23 100644
--- a/target/image/generic/lzma-loader/src/printf.h
+++ b/target/linux/generic-2.6/image/lzma-loader/src/printf.h
diff --git a/target/image/generic/lzma-loader/src/start.S b/target/linux/generic-2.6/image/lzma-loader/src/start.S
index 9a85c4c35..9a85c4c35 100644
--- a/target/image/generic/lzma-loader/src/start.S
+++ b/target/linux/generic-2.6/image/lzma-loader/src/start.S
diff --git a/target/image/generic/lzma-loader/src/uart16550.c b/target/linux/generic-2.6/image/lzma-loader/src/uart16550.c
index 7df572760..7df572760 100644
--- a/target/image/generic/lzma-loader/src/uart16550.c
+++ b/target/linux/generic-2.6/image/lzma-loader/src/uart16550.c
diff --git a/target/image/generic/lzma-loader/src/uart16550.h b/target/linux/generic-2.6/image/lzma-loader/src/uart16550.h
index b3fd6fdd7..b3fd6fdd7 100644
--- a/target/image/generic/lzma-loader/src/uart16550.h
+++ b/target/linux/generic-2.6/image/lzma-loader/src/uart16550.h
diff --git a/target/image/ixp4xx/Makefile b/target/linux/ixp4xx-2.6/image/Makefile
index 23a064433..23a064433 100644
--- a/target/image/ixp4xx/Makefile
+++ b/target/linux/ixp4xx-2.6/image/Makefile
diff --git a/target/image/magicbox/Makefile b/target/linux/magicbox-2.6/image/Makefile
index 10f71df2a..10f71df2a 100644
--- a/target/image/magicbox/Makefile
+++ b/target/linux/magicbox-2.6/image/Makefile
diff --git a/target/image/rb532/Makefile b/target/linux/rb532-2.6/image/Makefile
index 7213cf8b8..6bf3f9d05 100644
--- a/target/image/rb532/Makefile
+++ b/target/linux/rb532-2.6/image/Makefile
@@ -21,7 +21,7 @@ LOADER_MAKEOPTS= \
 		IMAGE_COPY=$(IMAGE_COPY)
 
 define Build/Clean
-	$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean
+	$(MAKE) -C ../../generic-2.6/image/lzma-loader $(LOADER_MAKEOPTS) clean
 endef
 
 CMDLINE_SIZE=512
diff --git a/target/image/rdc/Makefile b/target/linux/rdc-2.6/image/Makefile
index 06082404e..06082404e 100644
--- a/target/image/rdc/Makefile
+++ b/target/linux/rdc-2.6/image/Makefile
diff --git a/target/image/uml/Makefile b/target/linux/uml-2.6/image/Makefile
index 6af4b8b81..6af4b8b81 100755
--- a/target/image/uml/Makefile
+++ b/target/linux/uml-2.6/image/Makefile
diff --git a/target/image/x86/Config.in b/target/linux/x86-2.6/image/Config.in
index 511a8d9d0..511a8d9d0 100644
--- a/target/image/x86/Config.in
+++ b/target/linux/x86-2.6/image/Config.in
diff --git a/target/image/x86/Makefile b/target/linux/x86-2.6/image/Makefile
index 7aa03b2d2..7aa03b2d2 100644
--- a/target/image/x86/Makefile
+++ b/target/linux/x86-2.6/image/Makefile
diff --git a/target/image/x86/gen_image.sh b/target/linux/x86-2.6/image/gen_image.sh
index 21deeee6a..21deeee6a 100755
--- a/target/image/x86/gen_image.sh
+++ b/target/linux/x86-2.6/image/gen_image.sh
diff --git a/target/image/x86/grub/Makefile b/target/linux/x86-2.6/image/grub/Makefile
index e30443e18..e30443e18 100644
--- a/target/image/x86/grub/Makefile
+++ b/target/linux/x86-2.6/image/grub/Makefile
diff --git a/target/image/x86/grub/menu.lst b/target/linux/x86-2.6/image/grub/menu.lst
index 590a7d5e3..590a7d5e3 100644
--- a/target/image/x86/grub/menu.lst
+++ b/target/linux/x86-2.6/image/grub/menu.lst