imx8m: Update Boardconfig.mk and ShareBoardConfig for Android 13

- OTA: Remove bootloader from OTA - Updates OTA to align with Variscite Android 13 Signed-off-by: Harshesh Valera <[email protected]>
varigit · Sep 6, 2023 · d6911f4 · d6911f4
1 parent e7b5d4f
commit d6911f4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/imx8m/dart_mx8mm/BoardConfig.mk b/imx8m/dart_mx8mm/BoardConfig.mk
@@ -37,6 +37,8 @@ SOONG_CONFIG_IMXPLUGIN_POWERSAVE = false
 SOONG_CONFIG_IMXPLUGIN_CFG_SECURE_IOCTRL_REGS = false
 SOONG_CONFIG_IMXPLUGIN_ENABLE_SEC_DMABUF_HEAP = false
 
+BOARD_BOOTLOADER_IN_UPDATE_PACKAGE := false
+
 IMX_DEVICE_PATH := device/variscite/imx8m/dart_mx8mm
 # -------@block_memory-------
 USE_ION_ALLOCATOR := true
@@ -74,7 +76,6 @@ BOARD_PREBUILT_DTBOIMAGE := $(OUT_DIR)/target/product/$(PRODUCT_DEVICE)/dtbo-imx
 BOARD_USES_METADATA_PARTITION := true
 BOARD_ROOT_EXTRA_FOLDERS += metadata
 
-AB_OTA_PARTITIONS += bootloader
 # -------@block_security-------
 ENABLE_CFI=false
 

diff --git a/imx8m/dart_mx8mm/SharedBoardConfig.mk b/imx8m/dart_mx8mm/SharedBoardConfig.mk
@@ -195,5 +195,3 @@ LOW_MEMORY := false
 # -------@block_security-------
 #Enable this to include trusty support
 PRODUCT_IMX_TRUSTY := true
-
-BOARD_OTA_BOOTLOADERIMAGE := u-boot-imx8mm-var-dart.imx
diff --git a/imx8m/dart_mx8mp/BoardConfig.mk b/imx8m/dart_mx8mp/BoardConfig.mk
@@ -33,8 +33,11 @@ SOONG_CONFIG_IMXPLUGIN_POWERSAVE = false
 SOONG_CONFIG_IMXPLUGIN_CFG_SECURE_IOCTRL_REGS = true
 SOONG_CONFIG_IMXPLUGIN_ENABLE_SEC_DMABUF_HEAP = true
 
+BOARD_BOOTLOADER_IN_UPDATE_PACKAGE := false
+
 IMX_DEVICE_PATH := device/variscite/imx8m/dart_mx8mp
 
+
 # -------@block_memory-------
 USE_ION_ALLOCATOR := true
 USE_GPU_ALLOCATOR := false

diff --git a/imx8m/dart_mx8mp/SharedBoardConfig.mk b/imx8m/dart_mx8mp/SharedBoardConfig.mk
@@ -246,5 +246,3 @@ LOW_MEMORY := false
 # -------@block_security-------
 #Enable this to include trusty support
 PRODUCT_IMX_TRUSTY := true
-
-BOARD_OTA_BOOTLOADERIMAGE := u-boot-imx8mp-var-dart.imx