developer | 23f9f0f | 2023-06-15 13:06:25 +0800 | [diff] [blame] | 1 | --- a/include/image.mk |
| 2 | +++ b/include/image.mk |
| 3 | @@ -227,8 +227,7 @@ $(eval $(foreach S,$(NAND_BLOCKSIZE),$(c |
| 4 | define Image/mkfs/squashfs-common |
| 5 | $(STAGING_DIR_HOST)/bin/mksquashfs4 $(call mkfs_target_dir,$(1)) $@ \ |
| 6 | -nopad -noappend -root-owned \ |
| 7 | - -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) \ |
| 8 | - -processors 1 |
| 9 | + -comp $(SQUASHFSCOMP) $(SQUASHFSOPT) |
| 10 | endef |
| 11 | |
| 12 | ifeq ($(CONFIG_TARGET_ROOTFS_SECURITY_LABELS),y) |
| 13 | @@ -441,6 +440,9 @@ else |
| 14 | DEVICE_CHECK_PROFILE = $(CONFIG_TARGET_$(if $(CONFIG_TARGET_MULTI_PROFILE),DEVICE_)$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_$(1)) |
| 15 | endif |
| 16 | |
| 17 | +DEVICE_CHECK_FIT_KEY = $(if $(wildcard $(FIT_KEY_DIR)/$(FIT_KEY_NAME).key),install-images,install-disabled) |
| 18 | +DEVICE_CHECK_FIT_DIR = $(if $(FIT_KEY_DIR),$(DEVICE_CHECK_FIT_KEY),install-images) |
| 19 | + |
| 20 | DEVICE_EXTRA_PACKAGES = $(call qstrip,$(CONFIG_TARGET_DEVICE_PACKAGES_$(call target_conf,$(BOARD)$(if $(SUBTARGET),_$(SUBTARGET)))_DEVICE_$(1))) |
| 21 | |
| 22 | define merge_packages |
| 23 | @@ -463,7 +465,7 @@ endef |
| 24 | define Device/Check |
| 25 | $(Device/Check/Common) |
| 26 | KDIR_KERNEL_IMAGE := $(KDIR)/$(1)$$(KERNEL_SUFFIX) |
| 27 | - _TARGET := $$(if $$(_PROFILE_SET),install-images,install-disabled) |
| 28 | + _TARGET := $$(if $$(_PROFILE_SET),$$(DEVICE_CHECK_FIT_DIR),install-disabled) |
| 29 | ifndef IB |
| 30 | _COMPILE_TARGET := $$(if $(CONFIG_IB)$$(_PROFILE_SET),compile,compile-disabled) |
| 31 | endif |
| 32 | @@ -527,6 +527,21 @@ define Device/Build/compile |
| 33 | |
| 34 | endef |
| 35 | |
| 36 | +define Device/Build/per-device-fs |
| 37 | + ROOTFS/$(1)/$(3) := \ |
| 38 | + $(KDIR)/root.$(1)$$(strip \ |
| 39 | + $$(if $$(FS_OPTIONS/$(1)),+fs=$$(call param_mangle,$$(FS_OPTIONS/$(1)))) \ |
| 40 | + )$$(strip \ |
| 41 | + $(if $(TARGET_PER_DEVICE_ROOTFS),+pkg=$$(ROOTFS_ID/$(3))) \ |
| 42 | + ) |
| 43 | + ifndef IB |
| 44 | + $$(ROOTFS/$(1)/$(3)): $(if $(TARGET_PER_DEVICE_ROOTFS),target-dir-$$(ROOTFS_ID/$(3))) |
| 45 | + endif |
| 46 | + |
| 47 | + $$(KDIR_KERNEL_IMAGE): $$(ROOTFS/$(1)/$(3)) |
| 48 | + |
| 49 | +endef |
| 50 | + |
| 51 | ifndef IB |
| 52 | define Device/Build/dtb |
| 53 | ifndef BUILD_DTS_$(1) |
| 54 | @@ -571,15 +586,6 @@ define Device/Build/image |
| 55 | $(BIN_DIR)/$(call IMAGE_NAME,$(1),$(2))$$(GZ_SUFFIX)) |
| 56 | $(eval $(call Device/Export,$(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)),$(1))) |
| 57 | |
| 58 | - ROOTFS/$(1)/$(3) := \ |
| 59 | - $(KDIR)/root.$(1)$$(strip \ |
| 60 | - $$(if $$(FS_OPTIONS/$(1)),+fs=$$(call param_mangle,$$(FS_OPTIONS/$(1)))) \ |
| 61 | - )$$(strip \ |
| 62 | - $(if $(TARGET_PER_DEVICE_ROOTFS),+pkg=$$(ROOTFS_ID/$(3))) \ |
| 63 | - ) |
| 64 | - ifndef IB |
| 65 | - $$(ROOTFS/$(1)/$(3)): $(if $(TARGET_PER_DEVICE_ROOTFS),target-dir-$$(ROOTFS_ID/$(3))) |
| 66 | - endif |
| 67 | $(KDIR)/tmp/$(call IMAGE_NAME,$(1),$(2)): $$(KDIR_KERNEL_IMAGE) $$(ROOTFS/$(1)/$(3)) |
| 68 | @rm -f $$@ |
| 69 | [ -f $$(word 1,$$^) -a -f $$(word 2,$$^) ] |
| 70 | @@ -640,6 +646,10 @@ define Device/Build/artifact |
| 71 | endef |
| 72 | |
| 73 | define Device/Build |
| 74 | + $$(eval $$(foreach image,$$(IMAGES), \ |
| 75 | + $$(foreach fs,$$(filter $(TARGET_FILESYSTEMS),$$(FILESYSTEMS)), \ |
| 76 | + $$(call Device/Build/per-device-fs,$$(fs),$$(image),$(1))))) |
| 77 | + |
| 78 | $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS),$(call Device/Build/initramfs,$(1))) |
| 79 | $(call Device/Build/kernel,$(1)) |
| 80 | |
| 81 | --- a/include/image-commands.mk |
| 82 | +++ b/include/image-commands.mk |
| 83 | @@ -87,7 +87,7 @@ define Build/append-ubi |
| 84 | $(if $(UBOOTENV_IN_UBI),--uboot-env) \ |
| 85 | $(if $(KERNEL_IN_UBI),--kernel $(IMAGE_KERNEL)) \ |
| 86 | $(foreach part,$(UBINIZE_PARTS),--part $(part)) \ |
| 87 | - $(IMAGE_ROOTFS) \ |
| 88 | + $(call param_get_default,rootfs,$(1),$(IMAGE_ROOTFS)) \ |
| 89 | $@.tmp \ |
| 90 | -p $(BLOCKSIZE:%k=%KiB) -m $(PAGESIZE) \ |
| 91 | $(if $(SUBPAGESIZE),-s $(SUBPAGESIZE)) \ |
| 92 | --- a/target/linux/mediatek/image/Makefile |
| 93 | +++ b/target/linux/mediatek/image/Makefile |
| 94 | @@ -16,6 +16,53 @@ define Build/sysupgrade-emmc |
| 95 | $(IMAGE_ROOTFS) |
| 96 | endef |
| 97 | |
| 98 | +# build squashfs-hashed |
| 99 | +define Build/squashfs-hashed |
| 100 | + $(CP) $(ROOTFS/$(FILESYSTEMS)/$(DEVICE_NAME)) $(ROOTFS/$(FILESYSTEMS)/$(DEVICE_NAME))-hashed |
| 101 | + $(TOPDIR)/scripts/make-squashfs-hashed.sh \ |
| 102 | + $(ROOTFS/$(FILESYSTEMS)/$(DEVICE_NAME))-hashed \ |
| 103 | + $(STAGING_DIR_HOST) \ |
| 104 | + $(TOPDIR) \ |
| 105 | + $(ROOTFS/$(FILESYSTEMS)/$(DEVICE_NAME))-hashed-summary |
| 106 | + fdt-patch-dm-verify $(ROOTFS/$(FILESYSTEMS)/$(DEVICE_NAME))-hashed-summary \ |
| 107 | + $(KDIR)/image-$(firstword $(DEVICE_DTS)).dtb $(KDIR)/image-sb-$(firstword $(DEVICE_DTS)).dtb \ |
| 108 | + $(HASHED_BOOT_DEVICE) |
| 109 | +endef |
| 110 | + |
| 111 | +# build fw-ar-ver |
| 112 | +get_fw_ar_ver = \ |
| 113 | + $(if $(wildcard $(2)),$(shell rm -rf $(2))) \ |
| 114 | + $(if $(wildcard $(1)),$(info $(shell $(STAGING_DIR_HOST)/bin/ar-tool fw_ar_table create_ar_conf $(1) $(2)))) \ |
| 115 | + $(if $(wildcard $(2)),$(eval include $(2))) \ |
| 116 | + $(if $(FW_AR_VER),$(info FW_AR_VER = $(FW_AR_VER))) |
| 117 | + |
| 118 | +define Build/fw-ar-ver |
| 119 | + $(call get_fw_ar_ver,$(ANTI_ROLLBACK_TABLE),$(AUTO_AR_CONF)) |
| 120 | +endef |
| 121 | + |
| 122 | +# build signed fit |
| 123 | +define Build/fit-sign |
| 124 | + $(TOPDIR)/scripts/mkits.sh \ |
| 125 | + -D $(DEVICE_NAME) \ |
| 126 | + -o $@.its \ |
| 127 | + -k $@ \ |
| 128 | + $(if $(word 2,$(1)),-d $(word 2,$(1))) -C $(word 1,$(1)) \ |
| 129 | + -a $(KERNEL_LOADADDR) \ |
| 130 | + -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ |
| 131 | + -c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \ |
| 132 | + -A $(LINUX_KARCH) \ |
| 133 | + -v $(LINUX_VERSION) \ |
| 134 | + $(if $(FIT_KEY_NAME),-S $(FIT_KEY_NAME)) \ |
| 135 | + $(if $(FW_AR_VER),-r $(FW_AR_VER)) \ |
| 136 | + $(if $(CONFIG_TARGET_ROOTFS_SQUASHFS),-R $(ROOTFS/squashfs/$(DEVICE_NAME))) |
| 137 | + PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage \ |
| 138 | + -f $@.its \ |
| 139 | + $(if $(FIT_KEY_DIR),-k $(FIT_KEY_DIR)) \ |
| 140 | + -r \ |
| 141 | + $@.new |
| 142 | + @mv $@.new $@ |
| 143 | +endef |
| 144 | + |
| 145 | # default all platform image(fit) build |
| 146 | define Device/Default |
| 147 | PROFILES = Default $$(DEVICE_NAME) |
| 148 | @@ -29,6 +79,8 @@ define Device/Default |
| 149 | IMAGES := sysupgrade.bin |
| 150 | IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | \ |
| 151 | pad-rootfs | append-metadata |
| 152 | + FIT_KEY_DIR := |
| 153 | + FIT_KEY_NAME := |
| 154 | endef |
| 155 | |
| 156 | include $(SUBTARGET).mk |