kirkwood: add support for UBI (3.10.x)

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

diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 51af440d34e4c93d6bcc563cdc62cdfec5e45b87..b3d25f56b016eb914a6afc5222a1180aa5282d64 100644 (file)
--- 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 \