[cns3xxx]: generate single images for tftp flashing as well as sysupgrade images for boards with old u-boot

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34163 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Imre Kaloz 2012-11-11 20:57:04 +00:00
parent 37b69da0ca
commit e3e30fcfb6
1 changed files with 33 additions and 12 deletions

View File

@ -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. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -16,17 +16,17 @@ define Image/Prepare
$(call mkimage,new,0x20008000) $(call mkimage,new,0x20008000)
endef endef
define Image/BuildKernel
cp $(KDIR)/uImage-old $(BIN_DIR)/openwrt-$(BOARD)-old-uboot-uImage
cp $(KDIR)/uImage-new $(BIN_DIR)/openwrt-$(BOARD)-uImage
endef
# Build sysupgrade image # Build sysupgrade image
define BuildFirmware/Generic define BuildFirmware/Generic
dd if=$(BIN_DIR)/openwrt-$(BOARD)-uImage of=$(KDIR)/uImage.pad bs=64k conv=sync; \ 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; \ dd if=$(KDIR)/root.$(1) of=$(KDIR)/root.$(1).pad bs=128k conv=sync; \
sh $(TOPDIR)/scripts/combined-image.sh \ sh $(TOPDIR)/scripts/combined-image.sh \
$(KDIR)/uImage.pad \ $(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 \ $(KDIR)/root.$(1).pad \
$(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))-sysupgrade.bin $(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))-sysupgrade.bin
endef endef
@ -37,16 +37,37 @@ define Image/Build
endef endef
define Image/Build/jffs2-64k define Image/Build/jffs2-64k
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=64k 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 endef
define Image/Build/jffs2-128k define Image/Build/jffs2-128k
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=128k 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 endef
define Image/Build/squashfs define Image/Build/squashfs
$(call prepare_generic_squashfs,$(KDIR)/root.$(1)) $(call prepare_generic_squashfs,$(KDIR)/root.$(1))
dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/openwrt-$(BOARD)-$(1).img bs=128k 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 endef
$(eval $(call BuildImage)) $(eval $(call BuildImage))