summaryrefslogtreecommitdiff
authorSam Wu <yihui.wu@amlogic.com>2020-04-16 10:45:43 (GMT)
committer Xindong Xu <xindong.xu@amlogic.com>2020-11-16 07:17:28 (GMT)
commite3b9416964eb1c783f8b7952a2948e1ffdf3e6a5 (patch)
treef29a849656372f4c80b83d4771253c598eb767b7
parent2a0e74b0c9cc20f1dedbd2c42b6957338584b4fb (diff)
downloadcommon-e3b9416964eb1c783f8b7952a2948e1ffdf3e6a5.zip
common-e3b9416964eb1c783f8b7952a2948e1ffdf3e6a5.tar.gz
common-e3b9416964eb1c783f8b7952a2948e1ffdf3e6a5.tar.bz2
upgrade: makefile: add support make out emmc mirror [2/2]
PD#SWPL-21508 Problem: need compile out emmc mirror for emmc burner Solution: add makefile target aml_emmc_bin Verify: frankline Change-Id: Ib59023738be5188a4e30ace56a390433ef5f5750 Signed-off-by: Sam Wu <yihui.wu@amlogic.com>
Diffstat
-rw-r--r--factory.mk26
1 files changed, 15 insertions, 11 deletions
diff --git a/factory.mk b/factory.mk
index d150bd4..0d439cf 100644
--- a/factory.mk
+++ b/factory.mk
@@ -1,6 +1,5 @@
IMGPACK := $(BUILD_OUT_EXECUTABLES)/logo_img_packer$(BUILD_EXECUTABLE_SUFFIX)
PRODUCT_UPGRADE_OUT := $(PRODUCT_OUT)/upgrade
-AML_EMMC_BIN_GENERATOR := $(BOARD_AML_VENDOR_PATH)/tools/aml_upgrade/amlogic_emmc_bin_maker.sh
PRODUCT_COMMON_DIR := device/amlogic/common/products/$(PRODUCT_TYPE)
#$(warning Build dtbo image here, make sure BOARD_PREBUILT_DTBOIMAGE is defined before this warning)
@@ -452,7 +451,7 @@ $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): \
cp $(AML_TARGET)/IMAGES/$(file) $(PRODUCT_OUT)/;\
)
ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS), true)
- cp $(INTERNAL_SUPERIMAGE_DIST_TARGET) $(PRODUCT_UPGRADE_OUT)/
+ ln -sf $(shell readlink -f $(INTERNAL_SUPERIMAGE_DIST_TARGET)) $(PRODUCT_UPGRADE_OUT)/super.img
endif
$(hide) $(foreach file,$(UPGRADE_FILES), \
echo cp $(file) $(PRODUCT_UPGRADE_OUT)/$(notdir $(file)); \
@@ -613,18 +612,23 @@ ota_amlogic: $(AMLOGIC_OTA_PACKAGE_TARGET)
ifeq ($(TARGET_SUPPORT_USB_BURNING_V2),true)
INSTALLED_AML_EMMC_BIN := $(PRODUCT_OUT)/aml_emmc_mirror.bin.gz
-PRODUCT_CFG_EMMC_LGC_TABLE := $(TARGET_DEVICE_DIR)/upgrade/aml_emmc_logic_table.xml
-ifeq ($(wildcard $(PRODUCT_CFG_EMMC_LGC_TABLE)),)
- PRODUCT_CFG_EMMC_LGC_TABLE := \
- $(PRODUCT_COMMON_DIR)/upgrade_4.9/$(notdir $(PRODUCT_CFG_EMMC_LGC_TABLE))
-endif#ifeq ($(wildcard $(PRODUCT_CFG_EMMC_LGC_TABLE)),)
-PRODUCT_CFG_EMMC_CAP := bootloader/uboot-repo/bl33/include/emmc_partitions.h
+AML_EMMC_BIN_GENERATOR := $(BOARD_AML_VENDOR_PATH)/tools/aml_upgrade/aml_emmc_bin_maker.app
+PRODUCT_CFG_EMMC_LGC_TABLE := $(KERNEL_ROOTDIR)/$(KERNEL_DEVICETREE_DIR)/$(TARGET_PARTITION_DTSI)
+AML_DTB_CRC_TOOL := $(BOARD_AML_VENDOR_PATH)/tools/aml_upgrade/dtb_pc
+AML_IMG_PKG_TOOL := $(BOARD_AML_VENDOR_PATH)/tools/aml_upgrade/aml_image_v2_packer
+ifeq ($(PRODUCT_CFG_EMMC_CAP),)
+ PRODUCT_CFG_EMMC_CAP := bootloader/uboot-repo/bl33/v2015/include/emmc_partitions.h
+endif
$(INSTALLED_AML_EMMC_BIN): $(INSTALLED_AML_UPGRADE_PACKAGE_TARGET) $(PRODUCT_CFG_EMMC_CAP) \
- $(PRODUCT_CFG_EMMC_LGC_TABLE) | $(SIMG2IMG) $(MINIGZIP)
+ $(PRODUCT_CFG_EMMC_LGC_TABLE) $(AML_EMMC_BIN_GENERATOR) | $(SIMG2IMG) $(MINIGZIP)
@echo "Packaging $(INSTALLED_AML_EMMC_BIN)"
- @echo $(AML_EMMC_BIN_GENERATOR) $(PRODUCT_CFG_EMMC_CAP) $(PRODUCT_CFG_EMMC_LGC_TABLE) $< $(basename $@) $(SIMG2IMG)
- $(AML_EMMC_BIN_GENERATOR) $(PRODUCT_CFG_EMMC_CAP) $(PRODUCT_CFG_EMMC_LGC_TABLE) $< $(basename $@) $(SIMG2IMG)
+ @echo $(AML_EMMC_BIN_GENERATOR) --emmcCHeader $(PRODUCT_CFG_EMMC_CAP) --partCfg $(PRODUCT_CFG_EMMC_LGC_TABLE) \
+ --simg2img $(SIMG2IMG) --dtb_pc $(AML_DTB_CRC_TOOL) --amlImgPacker $(AML_IMG_PKG_TOOL) \
+ --burnPkg $< --output $(basename $@)
+ $(hide) $(AML_EMMC_BIN_GENERATOR) --appimage-extract-and-run --emmcCHeader $(PRODUCT_CFG_EMMC_CAP) --partCfg $(PRODUCT_CFG_EMMC_LGC_TABLE) \
+ --simg2img $(SIMG2IMG) --dtb_pc $(AML_DTB_CRC_TOOL) --amlImgPacker $(AML_IMG_PKG_TOOL) \
+ --burnPkg $< --output $(basename $@)
$(MINIGZIP) $(basename $@)
@echo "installed $@"