aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-11-11 20:57:04 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-11-11 20:57:04 +0000
commitdcfd6cd5a496f06567f6614f7bc3316d110d4d2d (patch)
tree4646a36690b4dbd993e3bd3eace40c222d2a8799 /target/linux
parent16275bdd159c525f7ba4cb3c65828dc5ff012910 (diff)
downloadupstream-dcfd6cd5a496f06567f6614f7bc3316d110d4d2d.tar.gz
upstream-dcfd6cd5a496f06567f6614f7bc3316d110d4d2d.tar.bz2
upstream-dcfd6cd5a496f06567f6614f7bc3316d110d4d2d.zip
generate single images for tftp flashing as well as sysupgrade images for boards with old u-boot
SVN-Revision: 34163
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/cns3xxx/image/Makefile45
1 files changed, 33 insertions, 12 deletions
diff --git a/target/linux/cns3xxx/image/Makefile b/target/linux/cns3xxx/image/Makefile
index 05a0f4f7a1..6f13fbaf60 100644
--- 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.
@@ -16,17 +16,17 @@ define Image/Prepare
$(call mkimage,new,0x20008000)
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
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; \
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 \
$(BIN_DIR)/$(IMG_PREFIX)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))-sysupgrade.bin
endef
@@ -37,16 +37,37 @@ define Image/Build
endef
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
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
define Image/Build/squashfs
$(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
$(eval $(call BuildImage))