summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-07-31 23:09:50 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-07-31 23:09:50 +0000
commitc48bcd5433eb9beff249011f0fc26caa3f7b3021 (patch)
tree8804e1aee4cd2f92bae65d7d9d9432818a9904cb
parent37b335aace14ff435155a0e64553d36e991b01c6 (diff)
[mcs814x] properly generate squashfs, jffs2 and initramfs images and kernels
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32927 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/mcs814x/Makefile2
-rw-r--r--target/linux/mcs814x/image/Makefile23
2 files changed, 9 insertions, 16 deletions
diff --git a/target/linux/mcs814x/Makefile b/target/linux/mcs814x/Makefile
index f8f71204d9..a5818491cd 100644
--- a/target/linux/mcs814x/Makefile
+++ b/target/linux/mcs814x/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
ARCH:=arm
BOARD:=mcs814x
BOARDNAME:=Moschip MCS814x
-FEATURES:=pci usb
+FEATURES:=pci usb squashfs jffs2
CFLAGS=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves
MAINTAINER:=Florian Fainelli <florian@openwrt.org>
diff --git a/target/linux/mcs814x/image/Makefile b/target/linux/mcs814x/image/Makefile
index 1e3c6b831a..293013a105 100644
--- a/target/linux/mcs814x/image/Makefile
+++ b/target/linux/mcs814x/image/Makefile
@@ -11,6 +11,11 @@ TARGET_DTBS := rbt-832 dlan-usb-extender
LOADADDR:=0x00008000
+UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+ UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs
+endif
+
define Image/Build/MkuImage
mkimage -A arm -O linux -T kernel -a $(LOADADDR) -C none -e $(LOADADDR) \
-n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(1) $(2);
@@ -24,25 +29,13 @@ define Image/BuildKernel
$(foreach dtb,$(TARGET_DTBS),cp $(KDIR)/zImage $(KDIR)/zImage-$(dtb);)
$(foreach dtb,$(TARGET_DTBS),cat $(LINUX_DIR)/arch/$(ARCH)/boot/$(dtb).dtb >> $(KDIR)/zImage-$(dtb);)
$(foreach dtb,$(TARGET_DTBS),$(call Image/Build/MkuImage,$(KDIR)/zImage-$(dtb),$(KDIR)/uImage-$(dtb)))
+ $(foreach dtb,$(TARGET_DTBS),cp $(KDIR)/uImage-$(dtb) $(UIMAGE)-$(dtb);)
$(call Image/Build/Initramfs)
endef
-define Image/Build/squashfs
- $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-endef
-
-define Image/Build/ext2
- cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-ext2.img
-endef
-
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
-define Image/Build/Initramfs
- $(foreach dtb,$(TARGET_DTBS),cp $(KDIR)/uImage-$(dtb) $(BIN_DIR)/uImage-$(IMG_PREFIX)-$(dtb)-initramfs;)
-endef
-endif
-
define Image/Build
- $(call Image/Build/$(1),$(1))
+ $(call Image/Build/$(1))
+ dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
endef
$(eval $(call BuildImage))