Pārlūkot izejas kodu

move target/image/platform to target/linux/platform/image platform directories are now self contained

SVN-Revision: 5669
Mike Baker 19 gadi atpakaļ
vecāks
revīzija
c3c4dfb57b
55 mainītis faili ar 18 papildinājumiem un 13 dzēšanām
  1. 1 1
      Config.in
  2. 7 4
      target/Makefile
  3. 0 0
      target/linux/ar7-2.4/image/Makefile
  4. 0 0
      target/linux/ar7-2.4/image/sercomm/adam2.bin
  5. 0 0
      target/linux/ar7-2.4/image/sercomm/dg834
  6. 0 0
      target/linux/ar7-2.4/image/sercomm/jdr454wb
  7. 0 0
      target/linux/ar7-2.4/image/src/LzmaDecode.c
  8. 0 0
      target/linux/ar7-2.4/image/src/LzmaDecode.h
  9. 0 0
      target/linux/ar7-2.4/image/src/gzip.h
  10. 0 0
      target/linux/ar7-2.4/image/src/ld.script.in
  11. 0 0
      target/linux/ar7-2.4/image/src/loader.c
  12. 0 0
      target/linux/ar7-2.4/image/src/srec2bin.c
  13. 0 0
      target/linux/ar7-2.4/image/src/zimage.script.in
  14. 2 2
      target/linux/aruba-2.6/image/Makefile
  15. 0 0
      target/linux/aruba-2.6/image/addVersion
  16. 0 0
      target/linux/aruba-2.6/image/version
  17. 3 3
      target/linux/au1000-2.6/image/Makefile
  18. 1 0
      target/linux/brcm-2.4/image
  19. 0 0
      target/linux/brcm-2.6/image/Makefile
  20. 0 0
      target/linux/brcm-2.6/image/lzma-loader/Makefile
  21. 0 0
      target/linux/brcm-2.6/image/lzma-loader/src/LzmaDecode.c
  22. 0 0
      target/linux/brcm-2.6/image/lzma-loader/src/LzmaDecode.h
  23. 0 0
      target/linux/brcm-2.6/image/lzma-loader/src/Makefile
  24. 0 0
      target/linux/brcm-2.6/image/lzma-loader/src/README
  25. 0 0
      target/linux/brcm-2.6/image/lzma-loader/src/decompress.c
  26. 0 0
      target/linux/brcm-2.6/image/lzma-loader/src/decompress.lds.in
  27. 0 0
      target/linux/brcm-2.6/image/lzma-loader/src/head.S
  28. 0 0
      target/linux/brcm-2.6/image/lzma-loader/src/loader.lds.in
  29. 2 2
      target/linux/brcm63xx-2.6/image/Makefile
  30. 1 0
      target/linux/generic-2.4/image
  31. 0 0
      target/linux/generic-2.6/image/Makefile
  32. 0 0
      target/linux/generic-2.6/image/lzma-loader/Makefile
  33. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.c
  34. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.h
  35. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/Makefile
  36. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/decompress.c
  37. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/lzma-copy.lds.in
  38. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/lzma.lds.in
  39. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/print.c
  40. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/print.h
  41. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/printf.c
  42. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/printf.h
  43. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/start.S
  44. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/uart16550.c
  45. 0 0
      target/linux/generic-2.6/image/lzma-loader/src/uart16550.h
  46. 0 0
      target/linux/ixp4xx-2.6/image/Makefile
  47. 0 0
      target/linux/magicbox-2.6/image/Makefile
  48. 1 1
      target/linux/rb532-2.6/image/Makefile
  49. 0 0
      target/linux/rdc-2.6/image/Makefile
  50. 0 0
      target/linux/uml-2.6/image/Makefile
  51. 0 0
      target/linux/x86-2.6/image/Config.in
  52. 0 0
      target/linux/x86-2.6/image/Makefile
  53. 0 0
      target/linux/x86-2.6/image/gen_image.sh
  54. 0 0
      target/linux/x86-2.6/image/grub/Makefile
  55. 0 0
      target/linux/x86-2.6/image/grub/menu.lst

+ 1 - 1
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)"

+ 7 - 4
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

+ 0 - 0
target/image/ar7/Makefile → target/linux/ar7-2.4/image/Makefile


+ 0 - 0
target/image/ar7/sercomm/adam2.bin → target/linux/ar7-2.4/image/sercomm/adam2.bin


+ 0 - 0
target/image/ar7/sercomm/dg834 → target/linux/ar7-2.4/image/sercomm/dg834


+ 0 - 0
target/image/ar7/sercomm/jdr454wb → target/linux/ar7-2.4/image/sercomm/jdr454wb


+ 0 - 0
target/image/ar7/src/LzmaDecode.c → target/linux/ar7-2.4/image/src/LzmaDecode.c


+ 0 - 0
target/image/ar7/src/LzmaDecode.h → target/linux/ar7-2.4/image/src/LzmaDecode.h


+ 0 - 0
target/image/ar7/src/gzip.h → target/linux/ar7-2.4/image/src/gzip.h


+ 0 - 0
target/image/ar7/src/ld.script.in → target/linux/ar7-2.4/image/src/ld.script.in


+ 0 - 0
target/image/ar7/src/loader.c → target/linux/ar7-2.4/image/src/loader.c


+ 0 - 0
target/image/ar7/src/srec2bin.c → target/linux/ar7-2.4/image/src/srec2bin.c


+ 0 - 0
target/image/ar7/src/zimage.script.in → target/linux/ar7-2.4/image/src/zimage.script.in


+ 2 - 2
target/image/aruba/Makefile → 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

+ 0 - 0
target/image/aruba/addVersion → target/linux/aruba-2.6/image/addVersion


+ 0 - 0
target/image/aruba/version → target/linux/aruba-2.6/image/version


+ 3 - 3
target/image/au1000/Makefile → 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) \

+ 1 - 0
target/linux/brcm-2.4/image

@@ -0,0 +1 @@
+../brcm-2.6/image/

+ 0 - 0
target/image/brcm/Makefile → target/linux/brcm-2.6/image/Makefile


+ 0 - 0
target/image/brcm/lzma-loader/Makefile → target/linux/brcm-2.6/image/lzma-loader/Makefile


+ 0 - 0
target/image/brcm/lzma-loader/src/LzmaDecode.c → target/linux/brcm-2.6/image/lzma-loader/src/LzmaDecode.c


+ 0 - 0
target/image/brcm/lzma-loader/src/LzmaDecode.h → target/linux/brcm-2.6/image/lzma-loader/src/LzmaDecode.h


+ 0 - 0
target/image/brcm/lzma-loader/src/Makefile → target/linux/brcm-2.6/image/lzma-loader/src/Makefile


+ 0 - 0
target/image/brcm/lzma-loader/src/README → target/linux/brcm-2.6/image/lzma-loader/src/README


+ 0 - 0
target/image/brcm/lzma-loader/src/decompress.c → target/linux/brcm-2.6/image/lzma-loader/src/decompress.c


+ 0 - 0
target/image/brcm/lzma-loader/src/decompress.lds.in → target/linux/brcm-2.6/image/lzma-loader/src/decompress.lds.in


+ 0 - 0
target/image/brcm/lzma-loader/src/head.S → target/linux/brcm-2.6/image/lzma-loader/src/head.S


+ 0 - 0
target/image/brcm/lzma-loader/src/loader.lds.in → target/linux/brcm-2.6/image/lzma-loader/src/loader.lds.in


+ 2 - 2
target/image/brcm63xx/Makefile → 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

+ 1 - 0
target/linux/generic-2.4/image

@@ -0,0 +1 @@
+../generic-2.6/image/

+ 0 - 0
target/image/generic/Makefile → target/linux/generic-2.6/image/Makefile


+ 0 - 0
target/image/generic/lzma-loader/Makefile → target/linux/generic-2.6/image/lzma-loader/Makefile


+ 0 - 0
target/image/generic/lzma-loader/src/LzmaDecode.c → target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.c


+ 0 - 0
target/image/generic/lzma-loader/src/LzmaDecode.h → target/linux/generic-2.6/image/lzma-loader/src/LzmaDecode.h


+ 0 - 0
target/image/generic/lzma-loader/src/Makefile → target/linux/generic-2.6/image/lzma-loader/src/Makefile


+ 0 - 0
target/image/generic/lzma-loader/src/decompress.c → target/linux/generic-2.6/image/lzma-loader/src/decompress.c


+ 0 - 0
target/image/generic/lzma-loader/src/lzma-copy.lds.in → target/linux/generic-2.6/image/lzma-loader/src/lzma-copy.lds.in


+ 0 - 0
target/image/generic/lzma-loader/src/lzma.lds.in → target/linux/generic-2.6/image/lzma-loader/src/lzma.lds.in


+ 0 - 0
target/image/generic/lzma-loader/src/print.c → target/linux/generic-2.6/image/lzma-loader/src/print.c


+ 0 - 0
target/image/generic/lzma-loader/src/print.h → target/linux/generic-2.6/image/lzma-loader/src/print.h


+ 0 - 0
target/image/generic/lzma-loader/src/printf.c → target/linux/generic-2.6/image/lzma-loader/src/printf.c


+ 0 - 0
target/image/generic/lzma-loader/src/printf.h → target/linux/generic-2.6/image/lzma-loader/src/printf.h


+ 0 - 0
target/image/generic/lzma-loader/src/start.S → target/linux/generic-2.6/image/lzma-loader/src/start.S


+ 0 - 0
target/image/generic/lzma-loader/src/uart16550.c → target/linux/generic-2.6/image/lzma-loader/src/uart16550.c


+ 0 - 0
target/image/generic/lzma-loader/src/uart16550.h → target/linux/generic-2.6/image/lzma-loader/src/uart16550.h


+ 0 - 0
target/image/ixp4xx/Makefile → target/linux/ixp4xx-2.6/image/Makefile


+ 0 - 0
target/image/magicbox/Makefile → target/linux/magicbox-2.6/image/Makefile


+ 1 - 1
target/image/rb532/Makefile → 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

+ 0 - 0
target/image/rdc/Makefile → target/linux/rdc-2.6/image/Makefile


+ 0 - 0
target/image/uml/Makefile → target/linux/uml-2.6/image/Makefile


+ 0 - 0
target/image/x86/Config.in → target/linux/x86-2.6/image/Config.in


+ 0 - 0
target/image/x86/Makefile → target/linux/x86-2.6/image/Makefile


+ 0 - 0
target/image/x86/gen_image.sh → target/linux/x86-2.6/image/gen_image.sh


+ 0 - 0
target/image/x86/grub/Makefile → target/linux/x86-2.6/image/grub/Makefile


+ 0 - 0
target/image/x86/grub/menu.lst → target/linux/x86-2.6/image/grub/menu.lst