mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

build: make MkuImage more generic

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

SVN-Revision: 38516
This commit is contained in:
Luka Perkov 2013-10-23 22:16:09 +00:00
parent 86aff32701
commit 7938d16451
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/image.mk
View File

@ -67,6 +67,10 @@ define add_jffs2_mark
echo -ne '\xde\xad\xc0\xde' >> $(1)
endef
define toupper
$(shell echo $(1) | tr '[:lower:]' '[:upper:]')
endef
# pad to 4k, 8k, 64k, 128k 256k and add jffs2 end-of-filesystem mark
define prepare_generic_squashfs
$(STAGING_DIR_HOST)/bin/padjffs2 $(1) 4 8 64 128 256
@ -82,9 +86,9 @@ else
endef
endif
define Image/BuildKernel/MkuImageARM
mkimage -A arm -O linux -T kernel -a $(1) -C none -e $(1) \
-n 'ARM OpenWrt Linux-$(LINUX_VERSION)' -d $(2) $(3)
define Image/BuildKernel/MkuImage
mkimage -A $(ARCH) -O linux -T kernel -C $(1) -a $(2) -e $(3) \
-n '$(call toupper,$(ARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $(4) $(5)
endef
define Image/BuildKernel/MkFIT

16
target/linux/kirkwood/image/Makefile
View File

@ -13,8 +13,8 @@ define Image/BuildKernel/Template
$(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-zImage
echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage
$(call Image/BuildKernel/MkuImageARM, \
0x00008000, \
$(call Image/BuildKernel/MkuImage, \
none, 0x00008000, 0x00008000, \
$(BIN_DIR)/$(IMG_PREFIX)-zImage, \
$(BIN_DIR)/$(IMG_PREFIX)-uImage \
)
@ -22,8 +22,8 @@ define Image/BuildKernel/Template
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
echo -ne '\x00\x00\x00\x00' >> $(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs
$(call Image/BuildKernel/MkuImageARM, \
0x00008000, \
$(call Image/BuildKernel/MkuImage, \
none, 0x00008000, 0x00008000, \
$(BIN_DIR)/$(IMG_PREFIX)-zImage-initramfs, \
$(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs \
)
@ -34,8 +34,8 @@ define Image/BuildKernel/Template
$(CP) $(KDIR)/zImage $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage
cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage
$(call Image/BuildKernel/MkuImageARM, \
0x00008000, \
$(call Image/BuildKernel/MkuImage, \
none, 0x00008000, 0x00008000, \
$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage, \
$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-uImage \
)
@ -43,8 +43,8 @@ define Image/BuildKernel/Template
ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),)
$(CP) $(KDIR)/zImage-initramfs $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage-initramfs
cat $(BIN_DIR)/$(IMG_PREFIX)-$(1).dtb >> $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage-initramfs
$(call Image/BuildKernel/MkuImageARM, \
0x00008000, \
$(call Image/BuildKernel/MkuImage, \
none, 0x00008000, 0x00008000,
$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-zImage-initramfs, \
$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-uImage-initramfs \
)