From c3c4dfb57beebd26c0534698b8687c2c7c94e1f5 Mon Sep 17 00:00:00 2001
From: Mike Baker <mbm@openwrt.org>
Date: Tue, 28 Nov 2006 20:14:41 +0000
Subject: [PATCH] move target/image/platform to target/linux/platform/image
platform directories are now self contained
SVN-Revision: 5669
---
Config.in | 2 +-
target/Makefile | 11 +++++++----
target/{image/ar7 => linux/ar7-2.4/image}/Makefile | 0
.../ar7 => linux/ar7-2.4/image}/sercomm/adam2.bin | Bin
.../ar7 => linux/ar7-2.4/image}/sercomm/dg834 | Bin
.../ar7 => linux/ar7-2.4/image}/sercomm/jdr454wb | Bin
.../ar7 => linux/ar7-2.4/image}/src/LzmaDecode.c | 0
.../ar7 => linux/ar7-2.4/image}/src/LzmaDecode.h | 0
.../{image/ar7 => linux/ar7-2.4/image}/src/gzip.h | 0
.../ar7 => linux/ar7-2.4/image}/src/ld.script.in | 0
.../{image/ar7 => linux/ar7-2.4/image}/src/loader.c | 0
.../ar7 => linux/ar7-2.4/image}/src/srec2bin.c | 0
.../ar7-2.4/image}/src/zimage.script.in | 0
.../{image/aruba => linux/aruba-2.6/image}/Makefile | 4 ++--
.../aruba => linux/aruba-2.6/image}/addVersion | Bin
.../{image/aruba => linux/aruba-2.6/image}/version | 0
.../au1000 => linux/au1000-2.6/image}/Makefile | 6 +++---
target/linux/brcm-2.4/image | 1 +
.../{image/brcm => linux/brcm-2.6/image}/Makefile | 0
.../brcm-2.6/image}/lzma-loader/Makefile | 0
.../brcm-2.6/image}/lzma-loader/src/LzmaDecode.c | 0
.../brcm-2.6/image}/lzma-loader/src/LzmaDecode.h | 0
.../brcm-2.6/image}/lzma-loader/src/Makefile | 0
.../brcm-2.6/image}/lzma-loader/src/README | 0
.../brcm-2.6/image}/lzma-loader/src/decompress.c | 0
.../image}/lzma-loader/src/decompress.lds.in | 0
.../brcm-2.6/image}/lzma-loader/src/head.S | 0
.../brcm-2.6/image}/lzma-loader/src/loader.lds.in | 0
.../brcm63xx => linux/brcm63xx-2.6/image}/Makefile | 4 ++--
target/linux/generic-2.4/image | 1 +
.../generic => linux/generic-2.6/image}/Makefile | 0
.../generic-2.6/image}/lzma-loader/Makefile | 0
.../generic-2.6/image}/lzma-loader/src/LzmaDecode.c | 0
.../generic-2.6/image}/lzma-loader/src/LzmaDecode.h | 0
.../generic-2.6/image}/lzma-loader/src/Makefile | 0
.../generic-2.6/image}/lzma-loader/src/decompress.c | 0
.../image}/lzma-loader/src/lzma-copy.lds.in | 0
.../generic-2.6/image}/lzma-loader/src/lzma.lds.in | 0
.../generic-2.6/image}/lzma-loader/src/print.c | 0
.../generic-2.6/image}/lzma-loader/src/print.h | 0
.../generic-2.6/image}/lzma-loader/src/printf.c | 0
.../generic-2.6/image}/lzma-loader/src/printf.h | 0
.../generic-2.6/image}/lzma-loader/src/start.S | 0
.../generic-2.6/image}/lzma-loader/src/uart16550.c | 0
.../generic-2.6/image}/lzma-loader/src/uart16550.h | 0
.../ixp4xx => linux/ixp4xx-2.6/image}/Makefile | 0
.../magicbox => linux/magicbox-2.6/image}/Makefile | 0
.../{image/rb532 => linux/rb532-2.6/image}/Makefile | 2 +-
target/{image/rdc => linux/rdc-2.6/image}/Makefile | 0
target/{image/uml => linux/uml-2.6/image}/Makefile | 0
target/{image/x86 => linux/x86-2.6/image}/Config.in | 0
target/{image/x86 => linux/x86-2.6/image}/Makefile | 0
.../{image/x86 => linux/x86-2.6/image}/gen_image.sh | 0
.../x86 => linux/x86-2.6/image}/grub/Makefile | 0
.../x86 => linux/x86-2.6/image}/grub/menu.lst | 0
55 files changed, 18 insertions(+), 13 deletions(-)
rename target/{image/ar7 => linux/ar7-2.4/image}/Makefile (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/sercomm/adam2.bin (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/sercomm/dg834 (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/sercomm/jdr454wb (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/src/LzmaDecode.c (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/src/LzmaDecode.h (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/src/gzip.h (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/src/ld.script.in (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/src/loader.c (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/src/srec2bin.c (100%)
rename target/{image/ar7 => linux/ar7-2.4/image}/src/zimage.script.in (100%)
rename target/{image/aruba => linux/aruba-2.6/image}/Makefile (87%)
rename target/{image/aruba => linux/aruba-2.6/image}/addVersion (100%)
rename target/{image/aruba => linux/aruba-2.6/image}/version (100%)
rename target/{image/au1000 => linux/au1000-2.6/image}/Makefile (89%)
create mode 120000 target/linux/brcm-2.4/image
rename target/{image/brcm => linux/brcm-2.6/image}/Makefile (100%)
rename target/{image/brcm => linux/brcm-2.6/image}/lzma-loader/Makefile (100%)
rename target/{image/brcm => linux/brcm-2.6/image}/lzma-loader/src/LzmaDecode.c (100%)
rename target/{image/brcm => linux/brcm-2.6/image}/lzma-loader/src/LzmaDecode.h (100%)
rename target/{image/brcm => linux/brcm-2.6/image}/lzma-loader/src/Makefile (100%)
rename target/{image/brcm => linux/brcm-2.6/image}/lzma-loader/src/README (100%)
rename target/{image/brcm => linux/brcm-2.6/image}/lzma-loader/src/decompress.c (100%)
rename target/{image/brcm => linux/brcm-2.6/image}/lzma-loader/src/decompress.lds.in (100%)
rename target/{image/brcm => linux/brcm-2.6/image}/lzma-loader/src/head.S (100%)
rename target/{image/brcm => linux/brcm-2.6/image}/lzma-loader/src/loader.lds.in (100%)
rename target/{image/brcm63xx => linux/brcm63xx-2.6/image}/Makefile (83%)
create mode 120000 target/linux/generic-2.4/image
rename target/{image/generic => linux/generic-2.6/image}/Makefile (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/Makefile (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/LzmaDecode.c (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/LzmaDecode.h (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/Makefile (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/decompress.c (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/lzma-copy.lds.in (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/lzma.lds.in (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/print.c (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/print.h (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/printf.c (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/printf.h (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/start.S (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/uart16550.c (100%)
rename target/{image/generic => linux/generic-2.6/image}/lzma-loader/src/uart16550.h (100%)
rename target/{image/ixp4xx => linux/ixp4xx-2.6/image}/Makefile (100%)
rename target/{image/magicbox => linux/magicbox-2.6/image}/Makefile (100%)
rename target/{image/rb532 => linux/rb532-2.6/image}/Makefile (96%)
rename target/{image/rdc => linux/rdc-2.6/image}/Makefile (100%)
rename target/{image/uml => linux/uml-2.6/image}/Makefile (100%)
rename target/{image/x86 => linux/x86-2.6/image}/Config.in (100%)
rename target/{image/x86 => linux/x86-2.6/image}/Makefile (100%)
rename target/{image/x86 => linux/x86-2.6/image}/gen_image.sh (100%)
rename target/{image/x86 => linux/x86-2.6/image}/grub/Makefile (100%)
rename target/{image/x86 => linux/x86-2.6/image}/grub/menu.lst (100%)
diff --git a/Config.in b/Config.in
index 78df56383d..acb27b47ea 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 c00eea0d66..d5e6bea01c 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
similarity index 100%
rename from target/image/ar7/Makefile
rename to 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
similarity index 100%
rename from target/image/ar7/sercomm/adam2.bin
rename to 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
similarity index 100%
rename from target/image/ar7/sercomm/dg834
rename to 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
similarity index 100%
rename from target/image/ar7/sercomm/jdr454wb
rename to 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
similarity index 100%
rename from target/image/ar7/src/LzmaDecode.c
rename to 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
similarity index 100%
rename from target/image/ar7/src/LzmaDecode.h
rename to 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
similarity index 100%
rename from target/image/ar7/src/gzip.h
rename to 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
similarity index 100%
rename from target/image/ar7/src/ld.script.in
rename to 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
similarity index 100%
rename from target/image/ar7/src/loader.c
rename to 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
similarity index 100%
rename from target/image/ar7/src/srec2bin.c
rename to 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
similarity index 100%
rename from target/image/ar7/src/zimage.script.in
rename to 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
similarity index 87%
rename from target/image/aruba/Makefile
rename to target/linux/aruba-2.6/image/Makefile
index 09aa8eabd4..37dd6fccb0 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
similarity index 100%
rename from target/image/aruba/addVersion
rename to target/linux/aruba-2.6/image/addVersion
diff --git a/target/image/aruba/version b/target/linux/aruba-2.6/image/version
similarity index 100%
rename from target/image/aruba/version
rename to target/linux/aruba-2.6/image/version
diff --git a/target/image/au1000/Makefile b/target/linux/au1000-2.6/image/Makefile
similarity index 89%
rename from target/image/au1000/Makefile
rename to target/linux/au1000-2.6/image/Makefile
index fa3f06e318..9c7bb06d3a 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 0000000000..9813e361e3
--- /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
similarity index 100%
rename from target/image/brcm/Makefile
rename to 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
similarity index 100%
rename from target/image/brcm/lzma-loader/Makefile
rename to 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
similarity index 100%
rename from target/image/brcm/lzma-loader/src/LzmaDecode.c
rename to 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
similarity index 100%
rename from target/image/brcm/lzma-loader/src/LzmaDecode.h
rename to 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
similarity index 100%
rename from target/image/brcm/lzma-loader/src/Makefile
rename to 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
similarity index 100%
rename from target/image/brcm/lzma-loader/src/README
rename to 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
similarity index 100%
rename from target/image/brcm/lzma-loader/src/decompress.c
rename to 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
similarity index 100%
rename from target/image/brcm/lzma-loader/src/decompress.lds.in
rename to 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
similarity index 100%
rename from target/image/brcm/lzma-loader/src/head.S
rename to 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
similarity index 100%
rename from target/image/brcm/lzma-loader/src/loader.lds.in
rename to 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
similarity index 83%
rename from target/image/brcm63xx/Makefile
rename to target/linux/brcm63xx-2.6/image/Makefile
index 6aa72c2920..27c7b49c39 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 0000000000..a96fdd0abb
--- /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
similarity index 100%
rename from target/image/generic/Makefile
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/Makefile
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/LzmaDecode.c
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/LzmaDecode.h
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/Makefile
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/decompress.c
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/lzma-copy.lds.in
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/lzma.lds.in
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/print.c
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/print.h
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/printf.c
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/printf.h
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/start.S
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/uart16550.c
rename to 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
similarity index 100%
rename from target/image/generic/lzma-loader/src/uart16550.h
rename to 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
similarity index 100%
rename from target/image/ixp4xx/Makefile
rename to target/linux/ixp4xx-2.6/image/Makefile
diff --git a/target/image/magicbox/Makefile b/target/linux/magicbox-2.6/image/Makefile
similarity index 100%
rename from target/image/magicbox/Makefile
rename to target/linux/magicbox-2.6/image/Makefile
diff --git a/target/image/rb532/Makefile b/target/linux/rb532-2.6/image/Makefile
similarity index 96%
rename from target/image/rb532/Makefile
rename to target/linux/rb532-2.6/image/Makefile
index 7213cf8b8a..6bf3f9d056 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
similarity index 100%
rename from target/image/rdc/Makefile
rename to target/linux/rdc-2.6/image/Makefile
diff --git a/target/image/uml/Makefile b/target/linux/uml-2.6/image/Makefile
similarity index 100%
rename from target/image/uml/Makefile
rename to target/linux/uml-2.6/image/Makefile
diff --git a/target/image/x86/Config.in b/target/linux/x86-2.6/image/Config.in
similarity index 100%
rename from target/image/x86/Config.in
rename to target/linux/x86-2.6/image/Config.in
diff --git a/target/image/x86/Makefile b/target/linux/x86-2.6/image/Makefile
similarity index 100%
rename from target/image/x86/Makefile
rename to 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
similarity index 100%
rename from target/image/x86/gen_image.sh
rename to 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
similarity index 100%
rename from target/image/x86/grub/Makefile
rename to 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
similarity index 100%
rename from target/image/x86/grub/menu.lst
rename to target/linux/x86-2.6/image/grub/menu.lst
--
GitLab