From 1773aa5163cc3039ae29f3261d84f98c14836937 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Fri, 20 Mar 2015 08:49:08 +0000
Subject: octeon: add er8 sysupgrade support

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 44902
---
 target/linux/octeon/image/Makefile | 46 +++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 15 deletions(-)

(limited to 'target/linux/octeon/image')

diff --git a/target/linux/octeon/image/Makefile b/target/linux/octeon/image/Makefile
index f06dd6bcfe..24bca9b48d 100644
--- a/target/linux/octeon/image/Makefile
+++ b/target/linux/octeon/image/Makefile
@@ -7,30 +7,46 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-define Image/BuildKernel
+define Image/BuildKernel/Template
 	# Workaround pre-SDK-1.9.0 u-boot versions not handling the .notes section
-	$(TARGET_CROSS)strip -R .notes $(KDIR)/vmlinux.elf -o $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
-	$(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7
-	dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux.lzma bs=65536 conv=sync
-	$(CP) $(KDIR)/vmlinux.elf $(BIN_DIR)/vmlinux.64
-	md5sum  $(BIN_DIR)/vmlinux.64 | cut -d " " -f 1 | tee $(BIN_DIR)/vmlinux.64.md5
+	$(TARGET_CROSS)strip -R .notes $(KDIR)/vmlinux.elf -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux.64
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux.64 '$(strip $(2))'
+	md5sum $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux.64 | cut -d " " -f 1 | tee $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux.64.md5
 endef
 
-define Image/Build/squashfs
-    $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+define Image/BuildKernel/Initramfs/Template
+	$(TARGET_CROSS)strip -R .notes $(KDIR)/vmlinux-initramfs.elf -o $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux-initramfs.elf
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(BIN_DIR)/$(IMG_PREFIX)-$(1)-vmlinux-initramfs.elf '$(strip $(2))'
+endef
+
+ER_CMDLINE:=-mtdparts=phys_mapped_flash:640k(boot0)ro,640k(boot1)ro,64k(eeprom)ro block2mtd.block2mtd=/dev/mmcblk0p2,65536,rootfs,5 root=/dev/mtdblock3 rootfstype=squashfs rootwait
+
+define Image/BuildKernel
+	$(call Image/BuildKernel/Template,generic,)
+	$(call Image/BuildKernel/Template,er,$(ER_CMDLINE))
 endef
 
-define Image/Build/ext4/erlite
-	mkdir -p $(KDIR)/sysupgrade-erlite/
-	echo "BOARD=erlite" > $(KDIR)/sysupgrade-erlite/CONTROL
-	$(CP) $(KDIR)/vmlinux.elf $(KDIR)/sysupgrade-erlite/kernel
-	$(CP) $(KDIR)/root.ext4 $(KDIR)/sysupgrade-erlite/root
+define Image/BuildKernel/Initramfs
+	$(call Image/BuildKernel/Initramfs/Template,generic,)
+	$(call Image/BuildKernel/Initramfs/Template,er,$(ER_CMDLINE))
+endef
+
+define Image/Build/sysupgrade
+	mkdir -p $(KDIR)/sysupgrade-$(1)/
+	echo "BOARD=er" > $(KDIR)/sysupgrade-$(1)/CONTROL
+	$(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(2)-vmlinux.64 $(KDIR)/sysupgrade-$(1)/kernel
+	$(CP) $(KDIR)/root.$(3) $(KDIR)/sysupgrade-$(1)/root
 	(cd $(KDIR); $(TAR) cvf \
-		$(BIN_DIR)/$(IMG_PREFIX)-erlite-sysupgrade.tar sysupgrade-erlite)
+		$(BIN_DIR)/$(IMG_PREFIX)-$(1)-sysupgrade.tar sysupgrade-$(1))
 endef
 
 define Image/Build/ext4
-    $(call Image/Build/ext4/erlite)
+	$(call Image/Build/sysupgrade,erlite,generic,ext4)
+endef
+
+define Image/Build/squashfs
+	$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
+	$(call Image/Build/sysupgrade,er,er,squashfs)
 endef
 
 define Image/Build
-- 
cgit v1.2.3