Author: wigyori Date: 2015-08-15 16:56:21 +0200 (Sat, 15 Aug 2015) New Revision: 46607
Modified: trunk/target/linux/sunxi/image/Makefile Log: sunxi: create KDIR_TMP, build boot.img in it It's nice to have a distinction between files which are built during the normal OpenWrt build process and ones that are created by the ImageBuilder (like it already exists on some other targets). This also gives boot.img a profile-specific prefix as it contains profile- specific data. KDIR_TMP does not need to be specified since include/image.mk already sets it. Signed-off-by: Matthias Schiffer <[email protected]> Signed-off-by: Zoltan HERPAI <[email protected]> Modified: trunk/target/linux/sunxi/image/Makefile =================================================================== --- trunk/target/linux/sunxi/image/Makefile 2015-08-15 14:49:06 UTC (rev 46606) +++ trunk/target/linux/sunxi/image/Makefile 2015-08-15 14:56:21 UTC (rev 46607) @@ -12,6 +12,8 @@ FAT32_BLOCKS=$(shell echo $$(($(CONFIG_SUNXI_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) define Image/BuildKernel + -mkdir -p $(KDIR_TMP) + mkimage -A arm -O linux -T kernel -C none \ -a 0x40008000 -e 0x40008000 \ -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' \ @@ -29,16 +31,16 @@ endef define Image/Build/SDCard - rm -f $(KDIR)/boot.img - mkdosfs $(KDIR)/boot.img -C $(FAT32_BLOCKS) + rm -f $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img + mkdosfs $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img -C $(FAT32_BLOCKS) - mcopy -i $(KDIR)/boot.img $(KDIR)/uboot-sunxi-$(PROFILE)-boot.scr ::boot.scr - mcopy -i $(KDIR)/boot.img $(DTS_DIR)/$(2).dtb ::dtb - mcopy -i $(KDIR)/boot.img $(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage + mcopy -i $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img $(KDIR)/uboot-sunxi-$(PROFILE)-boot.scr ::boot.scr + mcopy -i $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img $(DTS_DIR)/$(2).dtb ::dtb + mcopy -i $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img $(BIN_DIR)/$(IMG_PREFIX)-uImage ::uImage ./gen_sunxi_sdcard_img.sh \ $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-sdcard-vfat-$(1).img \ - $(KDIR)/boot.img \ + $(KDIR_TMP)/$(IMG_PREFIX)-$(PROFILE)-boot.img \ $(KDIR)/root.$(1) \ $(CONFIG_SUNXI_SD_BOOT_PARTSIZE) \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) \ _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
