diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-10-04 03:45:52 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-10-04 03:45:52 +0000 |
| commit | 05ccf0c6dd7b3973275d52fc2fe3cf52f0085162 (patch) | |
| tree | f37a99d4bb07a033ae75e4576408ded85b76deda /target/linux/kirkwood/image | |
| parent | c8eba693d02c505acb6ea68666fae3d5f5a25c84 (diff) | |
| download | upstream-05ccf0c6dd7b3973275d52fc2fe3cf52f0085162.tar.gz upstream-05ccf0c6dd7b3973275d52fc2fe3cf52f0085162.tar.bz2 upstream-05ccf0c6dd7b3973275d52fc2fe3cf52f0085162.zip | |
kirkwood: add support for UBI (3.10.x)
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38301 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/kirkwood/image')
| -rw-r--r-- | target/linux/kirkwood/image/Makefile | 28 | ||||
| -rw-r--r-- | target/linux/kirkwood/image/ubinize.cfg | 13 |
2 files changed, 36 insertions, 5 deletions
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 \ diff --git a/target/linux/kirkwood/image/ubinize.cfg b/target/linux/kirkwood/image/ubinize.cfg new file mode 100644 index 0000000000..e4149ec7d7 --- /dev/null +++ b/target/linux/kirkwood/image/ubinize.cfg @@ -0,0 +1,13 @@ +[rootfs] +# Volume mode (other option is static) +mode=ubi +# Source image +image=root.ubifs +# Volume ID in UBI image +vol_id=0 +# Allow for dynamic resize +vol_type=dynamic +# Volume name +vol_name=rootfs +# Autoresize volume at first mount +vol_flags=autoresize |