From 132899e9ac6186bf934d0097e3e35b81813321e9 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 29 Jun 2022 17:34:28 +0530 Subject: dragonboards: Update vendor-package to 20220629 release Update to the 20220629 release, which: * adds support for boot image header v4 in the bootloader * updates Mesa/main (commit: 42a4a123a6f5) based prebuilt binaries Signed-off-by: Amit Pundir Change-Id: Iff286cd2f2dabd565705b665f0b066c928fa4082 --- vendor-package-ver.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor-package-ver.sh b/vendor-package-ver.sh index 6179fc9..777975b 100755 --- a/vendor-package-ver.sh +++ b/vendor-package-ver.sh @@ -1,9 +1,9 @@ #!/bin/bash -export EXPECTED_LINARO_VENDOR_VERSION=20220303 +export EXPECTED_LINARO_VENDOR_VERSION=20220629 #make sure to use sha512sum here -export EXPECTED_LINARO_VENDOR_SHA=1119c59e80094fc11624b19531f584e798fd048f0adfdbb5113d2539202898c7d2b13dc1d2ad679c555f1c79a64d3ffc1b45cdf414787e5a821499276ca0b36c -export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220303.tgz +export EXPECTED_LINARO_VENDOR_SHA=344c60c78b36b991e966cec79534ca4a41224b792619296575d2f05c6cd4f2987bd6614fa1f093256ae69f430674ae36483839458cf8002b6c8eff08da721de4 +export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220629.tgz if [ "$1" = "url" ]; then echo $VND_PKG_URL -- cgit v1.2.3 From 21e42a31e003cbb6ee0393a0784ebc63baf8ef09 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Thu, 19 May 2022 13:41:10 +0530 Subject: dragonboards: Add boot image header v4 support and remove v2 Boot image header v3 remains the default header version for db845c-userdebug builds because android11-5.4 kernel do not have bootconfig support. To build v4 header images set TARGET_USES_BOOT_HDR_V3=false at build time. Also removed v2 header support for DB845c because of lack of users. Boot image header v4 is the default header version for rb5-userdebug builds. Signed-off-by: Amit Pundir Change-Id: Icdfef0d348a87fb10a0f56f1a98490070077aa55 --- db845c/BoardConfig.mk | 13 +++++++------ rb5/BoardConfig.mk | 7 ++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk index 5b6bfa0..25187de 100644 --- a/db845c/BoardConfig.mk +++ b/db845c/BoardConfig.mk @@ -21,16 +21,16 @@ TARGET_NO_KERNEL := false BOARD_INCLUDE_DTB_IN_BOOTIMG := true ifeq ($(TARGET_USES_BOOT_HDR_V3), true) BOARD_BOOT_HEADER_VERSION := 3 - BOARD_KERNEL_PAGESIZE := 4096 - BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 103079215104 #96M + BOARD_KERNEL_CMDLINE += androidboot.hardware=db845c androidboot.boot_devices=soc@0/1d84000.ufshc else - BOARD_BOOT_HEADER_VERSION := 2 - BOARD_KERNEL_PAGESIZE := 2048 + BOARD_BOOT_HEADER_VERSION := 4 + BOARD_BOOTCONFIG += androidboot.hardware=db845c androidboot.boot_devices=soc@0/1d84000.ufshc endif BOARD_MKBOOTIMG_ARGS := --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_KERNEL_BASE := 0x80000000 -BOARD_KERNEL_CMDLINE := earlycon firmware_class.path=/vendor/firmware/ androidboot.hardware=db845c -BOARD_KERNEL_CMDLINE += init=/init androidboot.boot_devices=soc@0/1d84000.ufshc printk.devkmsg=on +BOARD_KERNEL_PAGESIZE := 4096 +BOARD_KERNEL_CMDLINE += earlycon firmware_class.path=/vendor/firmware/ +BOARD_KERNEL_CMDLINE += init=/init printk.devkmsg=on BOARD_KERNEL_CMDLINE += deferred_probe_timeout=30 BOARD_KERNEL_CMDLINE += pcie_pme=nomsi #For WiFi to work on rb5 BOARD_KERNEL_CMDLINE += qcom_geni_serial.con_enabled=1 @@ -38,6 +38,7 @@ BOARD_KERNEL_CMDLINE += console=ttyMSM0 # Image Configuration BOARD_BOOTIMAGE_PARTITION_SIZE := 103079215104 #96M +BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 103079215104 #96M BOARD_USERDATAIMAGE_PARTITION_SIZE := 21474836480 #20G BOARD_FLASH_BLOCK_SIZE := 512 # Super partition diff --git a/rb5/BoardConfig.mk b/rb5/BoardConfig.mk index c90b8f8..e9503ac 100644 --- a/rb5/BoardConfig.mk +++ b/rb5/BoardConfig.mk @@ -22,15 +22,16 @@ BOARD_KERNEL_BASE := 0x80000000 BOARD_KERNEL_PAGESIZE := 4096 BOARD_INCLUDE_DTB_IN_BOOTIMG := true -BOARD_BOOT_HEADER_VERSION := 3 +BOARD_BOOT_HEADER_VERSION := 4 BOARD_MKBOOTIMG_ARGS := --header_version $(BOARD_BOOT_HEADER_VERSION) -BOARD_KERNEL_CMDLINE := earlycon firmware_class.path=/vendor/firmware/ androidboot.hardware=rb5 -BOARD_KERNEL_CMDLINE += init=/init androidboot.boot_devices=soc@0/1d84000.ufshc printk.devkmsg=on +BOARD_KERNEL_CMDLINE := earlycon firmware_class.path=/vendor/firmware/ +BOARD_KERNEL_CMDLINE += init=/init printk.devkmsg=on BOARD_KERNEL_CMDLINE += pcie_pme=nomsi #For WiFi to work BOARD_KERNEL_CMDLINE += deferred_probe_timeout=30 BOARD_KERNEL_CMDLINE += qcom_geni_serial.con_enabled=1 BOARD_KERNEL_CMDLINE += console=ttyMSM0 +BOARD_BOOTCONFIG += androidboot.hardware=rb5 androidboot.boot_devices=soc@0/1d84000.ufshc # Image Configuration BOARD_BOOTIMAGE_PARTITION_SIZE := 103079215104 #96M -- cgit v1.2.3 From e23d67200652d1d3d74aa81fca5ad3dd953a3664 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Tue, 5 Jul 2022 18:31:03 +0530 Subject: fetch-vendor-package.sh: Remove the older vendor-package Remove the older Linaro vendor-package, if any, before downloading/installing the new package. Because upstream mesa prebuilts in vendor-package ain't declared within a contained namespace and we can run into build errors because of redefinition of mesa prebuilt modules from the previous vendor-package. This is hopefully a temporary workaround while we move Mesa prebuilt targets from Android.mk to Android.bp. Signed-off-by: Amit Pundir Change-Id: I86709b9c6f07c2e4753e17eda2a3e90e41ba4184 --- device-common.mk | 10 ++++------ fetch-vendor-package.sh | 8 ++++++++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/device-common.mk b/device-common.mk index 6601cda..3fd5687 100644 --- a/device-common.mk +++ b/device-common.mk @@ -38,16 +38,14 @@ ifneq (,$(wildcard $(LINARO_VENDOR_PATH)/db845c/$(EXPECTED_LINARO_VENDOR_VERSION include $(LINARO_VENDOR_PATH)/db845c/$(EXPECTED_LINARO_VENDOR_VERSION)/version.mk ifneq ($(TARGET_LINARO_VENDOR_VERSION), $(EXPECTED_LINARO_VENDOR_VERSION)) $(warning TARGET_LINARO_VENDOR_VERSION ($(TARGET_LINARO_VENDOR_VERSION)) does not match exiting the build ($(EXPECTED_LINARO_VENDOR_VERSION)).) - $(warning Please download new binaries here:) - $(warning $(VND_PKG_URL) ) - $(warning And extract in the ANDROID_TOP_DIR) + $(warning Please download and extract the new binaries by running the following script:) + $(warning ./device/linaro/dragonboard/fetch-vendor-package.sh ) # Would be good to error out here, but that causes other issues endif else $(warning Missing Linaro Vendor Package!) - $(warning Please download new binaries here:) - $(warning $(VND_PKG_URL) ) - $(warning And extract in the ANDROID_TOP_DIR) + $(warning Please download and extract the vendor binaries by running the following script:) + $(warning ./device/linaro/dragonboard/fetch-vendor-package.sh ) # Would be good to error out here, but that causes other issues endif diff --git a/fetch-vendor-package.sh b/fetch-vendor-package.sh index 5e8d727..eb11206 100755 --- a/fetch-vendor-package.sh +++ b/fetch-vendor-package.sh @@ -13,6 +13,14 @@ PKG_FILE=extract-linaro_devices-${EXPECTED_LINARO_VENDOR_VERSION} pushd ${ANDROID_BUILD_TOP} +# remove the older vendor-package, if any, because upstream +# mesa prebuilts in linaro-vendor-package ain't declared +# within a contained namespace and we can run into build +# errors because of redefinition of mesa prebuilt modules +# from the previous vendor-package. +# FIXME move mesa prebuilts from Android.mk to Android.bp +rm -rf ${ANDROID_BUILD_TOP}/vendor/linaro/ + if [ ! -e "${PKG_FILE}.tgz" ]; then curl -L ${VND_PKG_URL} -o ${PKG_FILE}.tgz fi -- cgit v1.2.3 From 2a5ca1a30fc9e7eb9e09244385444e0ca6cf222a Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Mon, 25 Jul 2022 16:48:38 +0530 Subject: db845c: Set the flash block size to 4096 While running system/core/fs_mgr/tests/adb-remount-test.sh device-mapper reports h/w logical block size to be 4096. So updating the BOARD_FLASH_BLOCK_SIZE accordingly. Signed-off-by: Amit Pundir Change-Id: Ia300194969da0bfb5ab47b77b130da7be3acc577 --- db845c/BoardConfig.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db845c/BoardConfig.mk b/db845c/BoardConfig.mk index 25187de..38f086b 100644 --- a/db845c/BoardConfig.mk +++ b/db845c/BoardConfig.mk @@ -40,7 +40,7 @@ BOARD_KERNEL_CMDLINE += console=ttyMSM0 BOARD_BOOTIMAGE_PARTITION_SIZE := 103079215104 #96M BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 103079215104 #96M BOARD_USERDATAIMAGE_PARTITION_SIZE := 21474836480 #20G -BOARD_FLASH_BLOCK_SIZE := 512 +BOARD_FLASH_BLOCK_SIZE := 4096 # Super partition BOARD_SUPER_PARTITION_SIZE := 12437225472 BOARD_DB_DYNAMIC_PARTITIONS_SIZE := 12433031168 # Reserve 4M for DAP metadata -- cgit v1.2.3 From 6c52dd7b3c032055b2fc13b3f6cb639ede35ce72 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Tue, 26 Jul 2022 15:01:04 +0530 Subject: dragonboards: Update vendor-package to 20220726 release The 20220726 release fixes the recent AOSP build failures due to usage of deprecated "notice:" property in the vendor-package Android.bp files. vendor-package binary: https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220726.tgz vendor-package source: https://gitlab.com/Linaro/linaro-aosp/linaro-vendor-package/-/commits/master/ Signed-off-by: Amit Pundir Change-Id: I6d07eb42dcba90c8f0751dd9f054719085b4aa71 --- vendor-package-ver.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vendor-package-ver.sh b/vendor-package-ver.sh index 777975b..35b3ae4 100755 --- a/vendor-package-ver.sh +++ b/vendor-package-ver.sh @@ -1,9 +1,9 @@ #!/bin/bash -export EXPECTED_LINARO_VENDOR_VERSION=20220629 +export EXPECTED_LINARO_VENDOR_VERSION=20220726 #make sure to use sha512sum here -export EXPECTED_LINARO_VENDOR_SHA=344c60c78b36b991e966cec79534ca4a41224b792619296575d2f05c6cd4f2987bd6614fa1f093256ae69f430674ae36483839458cf8002b6c8eff08da721de4 -export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220629.tgz +export EXPECTED_LINARO_VENDOR_SHA=62ff5d98eb9ab568aff035857379fa1cc2dbd69e5cdb13124e577ac1abd70ff21013c19956b5ae9834e1f5dbed672f52663c22d404c060c2cb7fff8aa85067f1 +export VND_PKG_URL=https://releases.linaro.org/android/aosp-linaro-vendor-package/extract-linaro_devices-20220726.tgz if [ "$1" = "url" ]; then echo $VND_PKG_URL -- cgit v1.2.3 From 4714ee4dc0c75f1c91f98a0114a0bf8befb02ef2 Mon Sep 17 00:00:00 2001 From: Amit Pundir Date: Wed, 2 Mar 2022 18:20:13 +0530 Subject: Cleanup the last pixel3_mainline reference pixel3_mainline is no longer supported in this project. So removing the last reference of pixel3_mainline. Signed-off-by: Amit Pundir Change-Id: I82092789330f429ad82fb168048d89b9c19e9158 --- Android.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/Android.mk b/Android.mk index 2b6c64a..d1957d6 100644 --- a/Android.mk +++ b/Android.mk @@ -31,7 +31,6 @@ $(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.rc)) $(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.sh)) $(eval $(call declare-1p-copy-files,device/linaro/dragonboard,.xml)) $(eval $(call declare-1p-copy-files,device/linaro/dragonboard,fstab.db845c)) -$(eval $(call declare-1p-copy-files,device/linaro/dragonboard,fstab.pixel3_mainline)) $(eval $(call declare-1p-copy-files,device/linaro/dragonboard,fstab.rb5)) # If some modules are built directly from this directory (not subdirectories), -- cgit v1.2.3