aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/image
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-14 15:41:16 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-14 15:41:16 +0000
commitbbad6b5e944e0d099d4bde7523ade5bec94e475f (patch)
tree0b8837896cc1662e7873ce0cee2413140ddd38a3 /target/linux/ar7/image
parent6bab195e7bd7493a7e6ea7effe417adaff92579a (diff)
downloadupstream-bbad6b5e944e0d099d4bde7523ade5bec94e475f.tar.gz
upstream-bbad6b5e944e0d099d4bde7523ade5bec94e475f.tar.bz2
upstream-bbad6b5e944e0d099d4bde7523ade5bec94e475f.zip
attitude_adjustment: backport ar7 changes r33744 to r33756 changes
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33764 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/image')
-rw-r--r--target/linux/ar7/image/Makefile10
1 files changed, 9 insertions, 1 deletions
diff --git a/target/linux/ar7/image/Makefile b/target/linux/ar7/image/Makefile
index d27c2e8888..6278b31275 100644
--- a/target/linux/ar7/image/Makefile
+++ b/target/linux/ar7/image/Makefile
@@ -41,7 +41,9 @@ define Image/Prepare
$(LOADER_MAKEOPTS) \
clean compile
$(OBJCOPY_SREC) $(KDIR)/loader.elf $(KDIR)/loader.srec
+ $(OBJCOPY_SREC) $(KDIR)/vmlinux.elf $(KDIR)/vmlinux.srec
srec2bin $(KDIR)/loader.srec $(KDIR)/loader.bin
+ srec2bin $(KDIR)/vmlinux.srec $(KDIR)/vmlinux.bin
endef
define align/jffs2-64k
@@ -53,7 +55,6 @@ bs=131072 conv=sync
endef
define align/squashfs
-bs=65536 conv=sync
endef
define Image/Build/CyberTAN
@@ -81,6 +82,10 @@ define Image/Build/EVA
$(call prepare_generic_squashfs,$(BIN_DIR)/openwrt-$(2)-$(KERNEL)-$(1).bin)
endef
+define Image/Build/Initramfs
+ $(CP) $(KDIR)/vmlinux.bin $(BIN_DIR)/$(IMG_PREFIX)-initramfs.bin
+endef
+
define Image/Build
dd if=$(KDIR)/loader.bin $(call align/$(1)) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
cat $(KDIR)/root.$(1) >> $(BIN_DIR)/$(IMG_PREFIX)-$(1).bin
@@ -104,6 +109,9 @@ define Image/Build
# $(call Image/Build/sErCoMm,$(1),jdr454wb,$(1))
$(call Image/Build/EVA,$(1),EVA)
$(call Image/Build/Titan,$(1),Titan,Titan,$(1))
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+ $(call Image/Build/Initramfs)
+endif
endef
$(eval $(call BuildImage))