x86/generic: remove old kernel configs

[openwrt.git] / target / linux / cns3xxx / image / Makefile

diff --git a/target/linux/cns3xxx/image/Makefile b/target/linux/cns3xxx/image/Makefile
index 0265d7c54503a52f2b775363764070d7dd82f28f..6f13fbaf60816621e17e0055073605158e1d89dd 100644 (file)
--- a/target/linux/cns3xxx/image/Makefile
+++ b/target/linux/cns3xxx/image/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2010 OpenWrt.org
+#
+# Copyright (C) 2010-2012 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,29 +7,67 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
+define mkimage
+       mkimage -A arm -O linux -T kernel -C none -a $(2) -e $(2) -n 'OpenWrt Linux-$(LINUX_VERSION)' -d $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/uImage-$(1)
+endef
+
 define Image/Prepare
-       cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
+       $(call mkimage,old,0x00008000)
+       $(call mkimage,new,0x20008000)
 endef
 
-define Image/BuildKernel
-       cp $(KDIR)/uImage $(BIN_DIR)/openwrt-$(BOARD)-uImage
+# Build sysupgrade image
+define BuildFirmware/Generic
+       dd if=$(KDIR)/uImage-old of=$(KDIR)/uImage-old.pad bs=64k conv=sync; \
+       dd if=$(KDIR)/uImage-new of=$(KDIR)/uImage-new.pad bs=64k conv=sync; \
+       dd if=$(KDIR)/root.$(1) of=$(KDIR)/root.$(1).pad bs=128k conv=sync; \
+       sh $(TOPDIR)/scripts/combined-image.sh \
+               $(KDIR)/uImage-old.pad \
+               $(KDIR)/root.$(1).pad \
+               $(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))-old-uboot-sysupgrade.bin
+       sh $(TOPDIR)/scripts/combined-image.sh \
+               $(KDIR)/uImage-new.pad \
+               $(KDIR)/root.$(1).pad \
+               $(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))-sysupgrade.bin
 endef
 
 define Image/Build
        $(call Image/Build/$(1),$(1))
+       $(call BuildFirmware/Generic,$(1))
 endef
 
 define Image/Build/jffs2-64k
-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=65536 conv=sync
+       ( \
+       dd if=$(KDIR)/uImage-old bs=2048k conv=sync; \
+       dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-old-uboot-$(1).bin
+       ( \
+       dd if=$(KDIR)/uImage-new bs=2048k conv=sync; \
+       dd if=$(KDIR)/root.$(1) bs=64k conv=sync; \
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
 endef
 
 define Image/Build/jffs2-128k
-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync
+       ( \
+       dd if=$(KDIR)/uImage-old bs=2048k conv=sync; \
+       dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-old-uboot-$(1).bin
+       ( \
+       dd if=$(KDIR)/uImage-new bs=2048k conv=sync; \
+       dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
 endef
 
 define Image/Build/squashfs
-       $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=131072 conv=sync
+       $(call prepare_generic_squashfs,$(KDIR)/root.$(1))
+       ( \
+       dd if=$(KDIR)/uImage-old bs=2048k conv=sync; \
+       dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-old-uboot-$(1).bin
+       ( \
+       dd if=$(KDIR)/uImage-new bs=2048k conv=sync; \
+       dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
 endef
 
 $(eval $(call BuildImage))