From a2d77f3d694f4339b364fee2a5062eb32ab79348 Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Wed, 24 Jan 2024 21:00:21 -0500 Subject: [PATCH] radxa0: Refactor how we handle installation Change-Id: I6ebc47378dee9cf602215bac20005a358b391123 (cherry picked from commit cef861a609f1869ad43d8be6c069ac5ede5ed826) (cherry picked from commit ba0c8e6ebd088b684174a6644a13a62c5b282523) --- factory.mk | 33 ++++++++++++++++-------- factory/image_install.cfg | 16 ++++++++++++ factory/{image.cfg => image_upgrade.cfg} | 0 3 files changed, 38 insertions(+), 11 deletions(-) create mode 100644 factory/image_install.cfg rename factory/{image.cfg => image_upgrade.cfg} (100%) diff --git a/factory.mk b/factory.mk index 701ddf0..1c91df3 100644 --- a/factory.mk +++ b/factory.mk @@ -18,8 +18,8 @@ FACTORY_PATH := device/radxa/radxa0/factory PRODUCT_INSTALL_OUT := $(PRODUCT_OUT)/aml_install PRODUCT_UPGRADE_OUT := $(PRODUCT_OUT)/aml_upgrade -INSTALL_PACKAGE_CONFIG_FILE := $(PRODUCT_INSTALL_OUT)/image.cfg -UPGRADE_PACKAGE_CONFIG_FILE := $(PRODUCT_UPGRADE_OUT)/image.cfg +INSTALL_PACKAGE_CONFIG_FILE := $(PRODUCT_INSTALL_OUT)/image_install.cfg +UPGRADE_PACKAGE_CONFIG_FILE := $(PRODUCT_UPGRADE_OUT)/image_upgrade.cfg AML_IMAGE_TOOL := $(HOST_OUT_EXECUTABLES)/aml_image_packer$(HOST_EXECUTABLE_SUFFIX) INSTALLED_AML_INSTALL_PACKAGE_TARGET := $(PRODUCT_OUT)/aml_install_package.img @@ -33,7 +33,7 @@ define aml-copy-upgrade-file $(hide) $(ACP) $(1) $(PRODUCT_UPGRADE_OUT)/$(strip $(if $(2), $(2), $(notdir $(1)))) endef -NEEDED_IMAGES := \ +UPGRADE_IMAGES := \ boot.img \ recovery.img \ dtbo.img \ @@ -42,18 +42,28 @@ NEEDED_IMAGES := \ super_empty.img \ logo.img -$(INSTALLED_AML_INSTALL_PACKAGE_TARGET): $(addprefix $(PRODUCT_OUT)/,$(NEEDED_IMAGES)) $(ACP) $(AML_IMAGE_TOOL) +INSTALL_IMAGES := \ + boot.img \ + recovery.img \ + dtbo.img \ + vbmeta.img \ + super.img \ + super_empty.img \ + logo.img \ + misc.img + +$(INSTALLED_AML_INSTALL_PACKAGE_TARGET): $(addprefix $(PRODUCT_OUT)/,$(INSTALL_IMAGES)) $(ACP) $(AML_IMAGE_TOOL) $(hide) mkdir -p $(PRODUCT_INSTALL_OUT) ifneq ("$(wildcard $(FACTORY_PATH)/u-boot.bin)","") $(hide) $(call aml-copy-install-file, $(FACTORY_PATH)/u-boot.bin) -else ifneq ("$(wildcard vendor/amlogic/radxa0/radio/bootloader-recovery.img)","") - $(hide) $(call aml-copy-install-file, vendor/amlogic/radxa0/radio/bootloader-recovery.img, u-boot.bin) +else ifneq ("$(wildcard vendor/amlogic/radxa0/radio/bootloader.img)","") + $(hide) $(call aml-copy-install-file, vendor/amlogic/radxa0/radio/bootloader.img, u-boot.bin) else $(error "no u-boot.bin found in $(FACTORY_PATH)") endif $(hide) $(call aml-copy-install-file, $(PRODUCT_OUT)/logo.img) $(hide) $(call aml-copy-install-file, $(FACTORY_PATH)/aml_sdc_burn.ini) - $(hide) $(call aml-copy-install-file, $(FACTORY_PATH)/image.cfg) + $(hide) $(call aml-copy-install-file, $(FACTORY_PATH)/image_install.cfg, image.cfg) $(hide) $(call aml-copy-install-file, $(FACTORY_PATH)/platform.conf) $(hide) $(call aml-copy-install-file, $(PRODUCT_OUT)/boot.img) $(hide) $(call aml-copy-install-file, $(PRODUCT_OUT)/recovery.img) @@ -61,14 +71,15 @@ endif $(hide) $(call aml-copy-install-file, $(PRODUCT_OUT)/dtbo.img) $(hide) $(call aml-copy-install-file, $(PRODUCT_OUT)/super_empty.img, super.img) $(hide) $(call aml-copy-install-file, $(PRODUCT_OUT)/vbmeta.img) - $(hide) $(AML_IMAGE_TOOL) -r $(INSTALL_PACKAGE_CONFIG_FILE) $(PRODUCT_INSTALL_OUT)/ $@ + $(hide) $(call aml-copy-install-file, $(PRODUCT_OUT)/misc.img) + $(hide) $(AML_IMAGE_TOOL) -r $(PRODUCT_INSTALL_OUT)/image.cfg $(PRODUCT_INSTALL_OUT)/ $@ $(hide) rm -rf $(PRODUCT_INSTALL_OUT) $(hide) echo " $@ created" .PHONY: aml_install aml_install: $(INSTALLED_AML_INSTALL_PACKAGE_TARGET) -$(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): $(addprefix $(PRODUCT_OUT)/,$(NEEDED_IMAGES)) $(ACP) $(AML_IMAGE_TOOL) +$(INSTALLED_AML_UPGRADE_PACKAGE_TARGET): $(addprefix $(PRODUCT_OUT)/,$(UPGRADE_IMAGES)) $(ACP) $(AML_IMAGE_TOOL) $(hide) mkdir -p $(PRODUCT_UPGRADE_OUT) ifneq ("$(wildcard $(FACTORY_PATH)/u-boot.bin)","") $(hide) $(call aml-copy-upgrade-file, $(FACTORY_PATH)/u-boot.bin) @@ -79,7 +90,7 @@ else endif $(hide) $(call aml-copy-upgrade-file, $(PRODUCT_OUT)/logo.img) $(hide) $(call aml-copy-upgrade-file, $(FACTORY_PATH)/aml_sdc_burn.ini) - $(hide) $(call aml-copy-upgrade-file, $(FACTORY_PATH)/image.cfg) + $(hide) $(call aml-copy-upgrade-file, $(FACTORY_PATH)/image_upgrade.cfg, image.cfg) $(hide) $(call aml-copy-upgrade-file, $(FACTORY_PATH)/platform.conf) $(hide) $(call aml-copy-upgrade-file, $(PRODUCT_OUT)/boot.img) $(hide) $(call aml-copy-upgrade-file, $(PRODUCT_OUT)/recovery.img) @@ -87,7 +98,7 @@ endif $(hide) $(call aml-copy-upgrade-file, $(PRODUCT_OUT)/dtbo.img) $(hide) $(call aml-copy-upgrade-file, $(PRODUCT_OUT)/super.img) $(hide) $(call aml-copy-upgrade-file, $(PRODUCT_OUT)/vbmeta.img) - $(hide) $(AML_IMAGE_TOOL) -r $(UPGRADE_PACKAGE_CONFIG_FILE) $(PRODUCT_UPGRADE_OUT)/ $@ + $(hide) $(AML_IMAGE_TOOL) -r $(PRODUCT_UPGRADE_OUT)/image.cfg $(PRODUCT_UPGRADE_OUT)/ $@ $(hide) rm -rf $(PRODUCT_UPGRADE_OUT) $(hide) echo " $@ created" diff --git a/factory/image_install.cfg b/factory/image_install.cfg new file mode 100644 index 0000000..68c2144 --- /dev/null +++ b/factory/image_install.cfg @@ -0,0 +1,16 @@ +[LIST_NORMAL] +file="u-boot.bin" main_type="USB" sub_type="DDR" +file="u-boot.bin" main_type="USB" sub_type="UBOOT" +file="u-boot.bin" main_type="UBOOT" sub_type="aml_sdc_burn" +file="aml_sdc_burn.ini" main_type="ini" sub_type="aml_sdc_burn" +file="dtb.img" main_type="dtb" sub_type="meson1" +file="platform.conf" main_type="conf" sub_type="platform" +file="dtb.img" main_type="PARTITION" sub_type="_aml_dtb" +file="boot.img" main_type="PARTITION" sub_type="boot" +file="u-boot.bin" main_type="PARTITION" sub_type="bootloader" +file="dtbo.img" main_type="PARTITION" sub_type="dtbo" +file="logo.img" main_type="PARTITION" sub_type="logo" +file="recovery.img" main_type="PARTITION" sub_type="recovery" +file="super.img" main_type="PARTITION" sub_type="super" +file="vbmeta.img" main_type="PARTITION" sub_type="vbmeta" +file="misc.img" main_type="PARTITION" sub_type="misc" diff --git a/factory/image.cfg b/factory/image_upgrade.cfg similarity index 100% rename from factory/image.cfg rename to factory/image_upgrade.cfg -- 2.20.1