From fa3ab0c237b76eed2a7ee5f56d47802adfdc5c3a Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Fri, 4 Oct 2013 03:45:52 +0000
Subject: kirkwood: add support for UBI (3.10.x)

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38301
---
 target/linux/kirkwood/image/Makefile | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'target/linux/kirkwood/image/Makefile')

diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 51af440d34..b3d25f56b0 100644
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -8,21 +8,39 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 NAND_BLOCKSIZE := 2048:128k
+UBIFS_OPTS := -m 2048 -e 126KiB -c 4096 -U
+UBINIZE_OPTS := -m 2048 -p 128KiB -s 512
 
 define Image/BuildKernel
-	cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
+	$(CP) $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
+
 ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
 	$(CP) $(KDIR)/uImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs
 endif
+
+ $(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
+ )
 endef
 
-define Image/Build
+define Image/InstallKernel
+ 
+ ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),)
+	$(INSTALL_DIR) $(TARGET_DIR)/boot
+	$(CP) $(KDIR)/uImage $(TARGET_DIR)/boot/
+ endif
+
+ ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
+	$(INSTALL_DIR) $(TARGET_DIR)/boot
 	$(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 ;
+	  $(CP) $(BIN_DIR)/$(IMG_PREFIX)-$(board).dtb $(TARGET_DIR)/boot/
 	)
+ endif
+endef
 
+define Image/Build
 	$(if $(Image/Build/$(1)), \
 		$(call Image/Build/$(1),$(1)), \
 		$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1).img \
-- 
cgit v1.2.3