kirkwood: enable dts compilation

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

diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 0989d35..51af440 100644 (file)
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,46 +7,31 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-JFFS2OPTS_NAND += --little-endian --pagesize=0x800 --no-cleanmarkers --pad
-
-define Image/mkfs/jffs2/sub/sub
-       $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) \
-               -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(1)-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
-endef
-
-define Image/mkfs/jffs2/sub
-       # Do not remov this line
-       $(call Image/mkfs/jffs2/sub/sub,$(1),nor,$(JFFS2OPTS))
-       ( \
-               dd if=$(KDIR)/uImage bs=4096k conv=sync; \
-               dd if=$(KDIR)/root.jffs2-$(1)-nor bs=128k conv=sync; \
-       ) > $(BIN_DIR)/$(IMG_PREFIX)-jffs2-$(1)-nor.img
-
-       $(call Image/mkfs/jffs2/sub/sub,$(1),nand,$(JFFS2OPTS) $(JFFS2OPTS_NAND))
-       $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1)-nand)
-       cp $(KDIR)/root.jffs2-$(1)-nand $(BIN_DIR)/$(IMG_PREFIX)-jffs2-$(1)-nand.img
-endef
-
-define Image/Prepare
-       cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
-endef
+NAND_BLOCKSIZE := 2048:128k
 
 define Image/BuildKernel
-# do mach-id fixup here, if needed
        cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
+       $(CP) $(KDIR)/uImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs
+endif
 endef
 
 define Image/Build
-       $(call Image/Build/$(1),$(1))
+       $(foreach board,$(BOARDS),
+               $(LINUX_DIR)/scripts/dtc/dtc \
+                       -O dtb -o $(BIN_DIR)/$(IMG_PREFIX)-$(board).dtb \
+                       -I dts $(LINUX_DIR)/arch/arm/boot/dts/kirkwood-$(board).dts ;
+       )
+
+       $(if $(Image/Build/$(1)), \
+               $(call Image/Build/$(1),$(1)), \
+               $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
+       )
 endef
 
-define Image/Build/jffs2-128k
-       ( \
-               dd if=$(KDIR)/uImage bs=4096k conv=sync; \
-               dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1)-nor.img
-
-       cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-nand.img
+define Image/Build/jffs2-nand-2048-128k
+       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
+               bs=2048 conv=sync
 endef
 
 define Image/Build/squashfs