183130227/tn3399_openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

include/image.mk: Introduce generic option to wrap kernel into JFFS2

Browse Source 
Some devices require the kernel to be in a JFFS2 file system. Make the
support for this more generic so that it can be used by other devices.

Signed-off-by: Benjamin Berg <benjamin@sipsolutions.net>

SVN-Revision: 47404
This commit is contained in:
Felix Fietkau 2015-11-07 12:51:31 +00:00
parent 141793c96c
commit 46f6626052
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/image.mk
View File

@ -347,6 +347,21 @@ define Build/gzip
@mv $@.new $@
endef
define Build/jffs2
rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 && \
mkdir -p $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$$(dirname $(1)) && \
cp $@ $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/$(1) && \
$(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad \
$(if $(CONFIG_BIG_ENDIAN),--big-endian,--little-endian) \
--squash-uids -v -e $(patsubst %k,%KiB,$(BLOCKSIZE)) \
-o $@.new \
-d $(KDIR_TMP)/$(DEVICE_NAME)/jffs2 \
2>&1 1>/dev/null | awk '/^.+$$$$/' && \
$(STAGING_DIR_HOST)/bin/padjffs2 $@.new -J $(patsubst %k,,$(BLOCKSIZE))
-rm -rf $(KDIR_TMP)/$(DEVICE_NAME)/jffs2/
@mv $@.new $@
endef
define Build/kernel-bin
rm -f $@
cp $^ $@

19
target/linux/ar71xx/image/Makefile
View File

@ -140,20 +140,6 @@ endef
DEVICE_VARS += UBNT_BOARD UBNT_CHIP UBNT_TYPE
define Build/mkubntkernelimage
rm -rf $(KDIR_TMP)/ubnt-$(KERNEL_IMAGE)/image && \
mkdir -p $(KDIR_TMP)/ubnt-$(KERNEL_IMAGE)/image && \
cp $@ $(KDIR_TMP)/ubnt-$(KERNEL_IMAGE)/image/kernel0 && \
$(STAGING_DIR_HOST)/bin/mkfs.jffs2 \
--pad --big-endian --squash-uids -v -e 64KiB \
-o $@.new \
-d $(KDIR_TMP)/ubnt-$(KERNEL_IMAGE)/image \
2>&1 && \
$(STAGING_DIR_HOST)/bin/padjffs2 $@.new -J 64
-rm -rf $(KDIR_TMP)/ubnt-$(KERNEL_IMAGE)/image
@mv $@.new $@
endef
define Device/Default
BOARDNAME :=
DEVICE_PROFILE = $$(BOARDNAME)
@ -1135,15 +1121,16 @@ endef
TARGET_DEVICES += ubnt-rs ubnt-rspro ubnt-ls-sr71
define Device/ubnt-uap-pro
KERNEL_SIZE := 1536k
IMAGE_SIZE := 15744k
MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1536k(kernel),14208k(rootfs),256k(cfg)ro,64k(EEPROM)ro,15744k@0x50000(firmware)
UBNT_TYPE := BZ
UBNT_CHIP := ar934x
BOARDNAME := UAP-PRO
DEVICE_PROFILE := UBNT UAPPRO
KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | mkubntkernelimage
KERNEL := kernel-bin | patch-cmdline | lzma | uImage lzma | jffs2 kernel0
IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin = append-kernel 1536k | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
IMAGE/sysupgrade.bin = append-kernel $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
IMAGE/factory.bin = $$(IMAGE/sysupgrade.bin) | mkubntimage2
endef