From a8de4fb9f24fea095e80a3fcd5c69bd6029e39d2 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 21 Jun 2006 14:02:29 +0000
Subject: move target/linux/image to target/image

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4040 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/image/aruba/Makefile   |  38 ++++++++++++++++++++++++++++++++++++++
 target/image/aruba/addVersion | Bin 0 -> 34464 bytes
 target/image/aruba/version    |   1 +
 3 files changed, 39 insertions(+)
 create mode 100644 target/image/aruba/Makefile
 create mode 100755 target/image/aruba/addVersion
 create mode 100644 target/image/aruba/version

(limited to 'target/image/aruba')

diff --git a/target/image/aruba/Makefile b/target/image/aruba/Makefile
new file mode 100644
index 000000000..ad13ffd54
--- /dev/null
+++ b/target/image/aruba/Makefile
@@ -0,0 +1,38 @@
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/image.mk
+
+LOADADDR = 0x81000000		# RAM start + 16M 
+KERNEL_ENTRY = 0x80100000
+RAMSIZE = 0x00100000		# 1MB
+
+LOADER_MAKEOPTS= \
+		KDIR=$(KDIR) \
+		LOADADDR=$(LOADADDR) \
+		KERNEL_ENTRY=$(KERNEL_ENTRY) \
+		RAMSIZE=$(RAMSIZE)
+
+define Build/Clean
+	$(MAKE) -C ../generic/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
+endef
+
+define Image/BuildKernel
+	./addVersion -n ArubaOS $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari version
+endef
+
+define Image/Build/jffs2-64k
+	@dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=655360 conv=sync
+	@cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
+	@dd if=$(KDIR)/image.tmp of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin bs=3604480 conv=sync
+	@rm -f $(KDIR)/image.tmp
+endef
+
+define Image/Build
+	$(call Image/Build/$(1),$(1))
+endef
+
+$(eval $(call BuildImage))
diff --git a/target/image/aruba/addVersion b/target/image/aruba/addVersion
new file mode 100755
index 000000000..796f73ad1
Binary files /dev/null and b/target/image/aruba/addVersion differ
diff --git a/target/image/aruba/version b/target/image/aruba/version
new file mode 100644
index 000000000..fff5589e1
--- /dev/null
+++ b/target/image/aruba/version
@@ -0,0 +1 @@
+3.0.0.0
-- 
cgit v1.2.3


From 02cdebbb91a33d8e24da1c94a9d93ac39be168a7 Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 27 Jun 2006 00:35:46 +0000
Subject: credit where credit is due

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4091 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/image/aruba/Makefile | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'target/image/aruba')

diff --git a/target/image/aruba/Makefile b/target/image/aruba/Makefile
index ad13ffd54..1d2aebfb1 100644
--- a/target/image/aruba/Makefile
+++ b/target/image/aruba/Makefile
@@ -1,3 +1,9 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-- 
cgit v1.2.3


From abf6ca14dc718d6a54e6f85f96a2d6660f609167 Mon Sep 17 00:00:00 2001
From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sat, 19 Aug 2006 15:00:01 +0000
Subject: don't pad aruba images - unnecessary with the jffs2 hack

git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4610 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/image/aruba/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'target/image/aruba')

diff --git a/target/image/aruba/Makefile b/target/image/aruba/Makefile
index 1d2aebfb1..09aa8eabd 100644
--- a/target/image/aruba/Makefile
+++ b/target/image/aruba/Makefile
@@ -33,8 +33,7 @@ endef
 define Image/Build/jffs2-64k
 	@dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=655360 conv=sync
 	@cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
-	@dd if=$(KDIR)/image.tmp of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin bs=3604480 conv=sync
-	@rm -f $(KDIR)/image.tmp
+	mv $(KDIR)/image.tmp $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin
 endef
 
 define Image/Build
-- 
cgit v1.2.3