Upgrade 2023w33

aosptree/vendor/devices-community/pine64_pinephonepro/pine64_pinephonepro.mk

@@ -34,8 +34,8 @@ SYSFS_MMC1_PATH ?= fe320000.mmc
 UBOOT_DEFCONFIG := pinephone-pro-rk3399_defconfig
 ATF_PLAT        := rk3399
 
-DDR_BLOB := rk33/rk3399_ddr_933MHz_v1.25.bin
-MINILOADER_BLOB := rk33/rk3399_miniloader_v1.26.bin
+DDR_BLOB := rk33/rk3399_ddr_933MHz_v1.30.bin
+MINILOADER_BLOB := rk33/rk3399_miniloader_v1.30.bin
 RKTRUST_INI := RK3399TRUST.ini
 RK33_BIN := bin/rk33
 

manifests/glodroid.xml

@@ -12,17 +12,17 @@
   <remove-project name="platform/external/drm_hwcomposer" />
 
   <project path="glodroid"                        remote="glodroid" name="glodroid_configuration.git" groups="glodroid" revision="refs/tags/basedir-v0.9.0" />
-  <project path="glodroid/configuration"          remote="glodroid" name="glodroid_configuration.git" groups="glodroid" revision="885ea1abc643468f040e8c398719a1fd6a5361bb" />
+  <project path="glodroid/configuration"          remote="glodroid" name="glodroid_configuration.git" groups="glodroid" revision="648ae9c8f885b3c9862c5e82e97fa983d090d167" />
 
   <project path="glodroid/apks"                   remote="glodroid" name="glodroid_external_apks.git" groups="glodroid" revision="refs/tags/apps-v0.8.2" />
 
   <!-- gpu+display components (vendor) -->
-  <project path="glodroid/vendor/minigbm"         remote="aosp" name="platform/external/minigbm"        groups="glodroid" revision="cf10ab71d8b75ba79fffe580326f0d88edfec323" />
+  <project path="glodroid/vendor/minigbm"         remote="aosp" name="platform/external/minigbm"        groups="glodroid" revision="84b3a09ef0e620c1b2ec19c7626c327e68a847bc" />
   <project path="glodroid/vendor/drm_hwcomposer"  remote="aosp" name="platform/external/drm_hwcomposer" groups="glodroid" revision="2bf68c374976d0a7a0e71c1843cbeae2a3210b74" />
-  <project path="glodroid/vendor/mesa3d"          remote="aosp" name="platform/external/mesa3d"         groups="glodroid" revision="refs/tags/upstream-mesa-23.1.3" />
+  <project path="glodroid/vendor/mesa3d"          remote="aosp" name="platform/external/mesa3d"         groups="glodroid" revision="refs/tags/upstream-mesa-23.1.5" />
 
   <!-- camera components (vendor) -->
-  <project path="glodroid/vendor/libcamera"                     remote="libcamera" name="libcamera.git"      groups="glodroid" revision="b9ecd85ed1fee2e9d715368b24592ad3009131d8" />
+  <project path="glodroid/vendor/libcamera"                     remote="libcamera" name="libcamera.git"      groups="glodroid" revision="960d0c1e19feaf310321c906e14bd5410c6be629" />
   <project path="glodroid/vendor/libcamera/subprojects/libyuv"  remote="glodroid"  name="glodroid_forks.git" groups="glodroid" revision="refs/tags/libyuv-v0.8.2" />
   <project path="glodroid/vendor/libcamera/subprojects/libyaml" remote="github"    name="yaml/libyaml.git"   groups="glodroid" revision="refs/tags/0.2.5" />
 
@@ -49,9 +49,9 @@
   <project path="glodroid/vendor/libudev-zero"    remote="glodroid" name="glodroid_forks.git" groups="glodroid" revision="refs/tags/libudev_zero-v0.8.2" />
 
   <!-- bootloader components (platform) -->
-  <project path="glodroid/bootloader/u-boot"         remote="github" name="u-boot/u-boot.git"  groups="glodroid" revision="020520bbc1ff4a542e014f0873c13b4543aea0ea" />
+  <project path="glodroid/bootloader/u-boot"         remote="github" name="u-boot/u-boot.git"  groups="glodroid" revision="refs/tags/v2023.07" />
   <project path="glodroid/bootloader/atf"            name="platform/external/arm-trusted-firmware" groups="glodroid" revision="a127b99d5a063c798d1c6d2e1d4791a630f78355" />
-  <project path="glodroid/bootloader/rockchip-rkbin" remote="github"  name="rockchip-linux/rkbin.git" groups="glodroid" revision="7d631e0d5b2d373b54d4533580d08fb9bd2eaad4" clone-depth="1" />
+  <project path="glodroid/bootloader/rockchip-rkbin" remote="github"  name="rockchip-linux/rkbin.git" groups="glodroid" revision="b4558da0860ca48bf1a571dd33ccba580b9abe23" clone-depth="1" />
 
   <!-- kernel/firmware components (platform) -->
   <project path="glodroid/kernel/mainline-6.3"    remote="aosp" name="kernel/common"  groups="glodroid" revision="457391b0380335d5e9a5babdec90ac53928b23b4" clone-depth="1" />

manifests/update_lineage_manifest.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# This script is used to update the LineageOS manifest file
+
+echo "You are going to update the LineageOS manifest file."
+echo "During the update, the current AOSP work directory (aosptree/) will be updated."
+echo "If you have any local changes, they will be lost."
+echo "Do you want to continue? [y/N]"
+read -r answer
+if [[ ! $answer =~ ^[Yy]$ ]]
+then
+    echo "Aborting"
+    exit 1
+fi
+
+echo Init repo tree using LineageOS manifest
+pushd ../aosptree
+repo init -u https://github.com/LineageOS/android.git -b refs/heads/lineage-20.0
+repo sync -c
+repo manifest -r -o ../manifests/lineage-static.xml
+popd
+
+# Add the warning line at the beginning of the manifest
+sed -i '2i\\n<!-- Autogenerated. Please do not edit. Run update_lineage_manifest.sh to update. -->\n' lineage-static.xml
+
+echo -e "\n\033[32m   Done   \033[0m"

patches-aosp/glodroid/bootloader/u-boot/0001-cmd-adtimg-Add-support-getting-FDT-using-id-field.patch

@@ -1,7 +1,7 @@
-From 21b504378ef8ffc607afbfa1c7d46b20ef86e2e4 Mon Sep 17 00:00:00 2001
+From 9e78966c5ec5dd8dbf4ca04e54930714b2b917a3 Mon Sep 17 00:00:00 2001
 From: Roman Stratiienko <[email protected]>
 Date: Mon, 17 Aug 2020 00:02:12 +0300
-Subject: [PATCH 1/6] cmd: adtimg: Add support getting FDT using 'id' field.
+Subject: [PATCH 01/56] cmd: adtimg: Add support getting FDT using 'id' field.
 
 Idea is based on:
 https://patchwork.ozlabs.org/cover/1202575/
@@ -14,7 +14,7 @@ Signed-off-by: Roman Stratiienko <[email protected]>
  3 files changed, 131 insertions(+)
 
 diff --git a/boot/image-android-dt.c b/boot/image-android-dt.c
-index fb014190d4..9c5bfe96c7 100644
+index fb014190d44..9c5bfe96c7d 100644
 --- a/boot/image-android-dt.c
 +++ b/boot/image-android-dt.c
 @@ -73,6 +73,49 @@ bool android_dt_get_fdt_by_index(ulong hdr_addr, u32 index, ulong *addr,
@@ -68,7 +68,7 @@ index fb014190d4..9c5bfe96c7 100644
  static void android_dt_print_fdt_info(const struct fdt_header *fdt)
  {
 diff --git a/cmd/adtimg.c b/cmd/adtimg.c
-index f4b5cbf35b..279d94ebb2 100644
+index f4b5cbf35b9..279d94ebb2f 100644
 --- a/cmd/adtimg.c
 +++ b/cmd/adtimg.c
 @@ -11,6 +11,7 @@
@@ -186,7 +186,7 @@ index f4b5cbf35b..279d94ebb2 100644
  	return CMD_RET_FAILURE;
  }
 diff --git a/include/image-android-dt.h b/include/image-android-dt.h
-index 9a3aa8fa30..69f28ddf9e 100644
+index 9a3aa8fa30f..69f28ddf9ec 100644
 --- a/include/image-android-dt.h
 +++ b/include/image-android-dt.h
 @@ -12,6 +12,8 @@
@@ -199,5 +199,5 @@ index 9a3aa8fa30..69f28ddf9e 100644
  #if !defined(CONFIG_SPL_BUILD)
  void android_dt_print_contents(ulong hdr_addr);
 -- 
-2.37.2
+2.39.2
 

patches-aosp/glodroid/bootloader/u-boot/0002-avb-Fix-support-for-unlocked-state.patch

@@ -1,15 +1,15 @@
-From 4a53042bffc028bd7c19f666260e2f7aee3b24c6 Mon Sep 17 00:00:00 2001
+From 3fdd68b5382032b43f3661fc8e704b26e2bf4de1 Mon Sep 17 00:00:00 2001
 From: Roman Stratiienko <[email protected]>
 Date: Mon, 9 May 2022 20:56:05 +0300
-Subject: [PATCH 2/6] avb: Fix support for unlocked state
+Subject: [PATCH 02/56] avb: Fix support for unlocked state
 
 Signed-off-by: Roman Stratiienko <[email protected]>
 ---
  cmd/avb.c | 13 ++++++-------
  1 file changed, 6 insertions(+), 7 deletions(-)
 
 diff --git a/cmd/avb.c b/cmd/avb.c
-index 783f51b816..e95e36657f 100644
+index 783f51b8169..e95e36657f3 100644
 --- a/cmd/avb.c
 +++ b/cmd/avb.c
 @@ -265,22 +265,21 @@ int do_avb_verify_part(struct cmd_tbl *cmdtp, int flag,
@@ -42,5 +42,5 @@ index 783f51b816..e95e36657f 100644
  			cmdline = append_cmd_line(out_data->cmdline,
  						  extra_args);
 -- 
-2.37.2
+2.39.2
 

patches-aosp/glodroid/bootloader/u-boot/0003-android-Fix-ramdisk-loading-for-bootimage-v3.patch

@@ -1,15 +1,15 @@
-From 1622c37c387e79cae48b3a336c37d5a6a823b0d4 Mon Sep 17 00:00:00 2001
+From 2a7a05a56d0bed37e86ed2dc2ad990d8d84ded76 Mon Sep 17 00:00:00 2001
 From: Roman Stratiienko <[email protected]>
 Date: Fri, 7 Apr 2023 00:12:38 +0300
-Subject: [PATCH 3/6] android: Fix ramdisk loading for bootimage v3+
+Subject: [PATCH 03/56] android: Fix ramdisk loading for bootimage v3+
 
 Signed-off-by: Roman Stratiienko <[email protected]>
 ---
  boot/image-android.c | 17 ++++++++---------
  1 file changed, 8 insertions(+), 9 deletions(-)
 
 diff --git a/boot/image-android.c b/boot/image-android.c
-index 88e40bc7ec..da8003f370 100644
+index 88e40bc7ec6..da8003f3706 100644
 --- a/boot/image-android.c
 +++ b/boot/image-android.c
 @@ -64,7 +64,6 @@ static void android_boot_image_v3_v4_parse_hdr(const struct andr_boot_img_hdr_v3
@@ -62,5 +62,5 @@ index 88e40bc7ec..da8003f370 100644
  	*rd_len = img_data.ramdisk_size;
  	return 0;
 -- 
-2.37.2
+2.39.2
 

patches-aosp/glodroid/bootloader/u-boot/0004-ab_select-Add-ab_test-command.patch

@@ -1,7 +1,7 @@
-From 683ce8416e5008bbc61b1e26209b870e14c1c244 Mon Sep 17 00:00:00 2001
+From 40db952b63f1324bc3f7f1941f6fa3357fd4e177 Mon Sep 17 00:00:00 2001
 From: Roman Stratiienko <[email protected]>
 Date: Wed, 5 Apr 2023 10:00:49 +0300
-Subject: [PATCH 4/6] ab_select: Add ab_test command
+Subject: [PATCH 04/56] ab_select: Add ab_test command
 
 We don't want to update BCB when for example, booting into the recovery
 or fastbootd.
@@ -18,7 +18,7 @@ Signed-off-by: Roman Stratiienko <[email protected]>
  3 files changed, 25 insertions(+), 7 deletions(-)
 
 diff --git a/boot/android_ab.c b/boot/android_ab.c
-index 2d7b392666..92886a7137 100644
+index 2d7b3926665..92886a71378 100644
 --- a/boot/android_ab.c
 +++ b/boot/android_ab.c
 @@ -181,7 +181,7 @@ static int ab_compare_slots(const struct slot_metadata *a,
@@ -40,7 +40,7 @@ index 2d7b392666..92886a7137 100644
  		ab_control_store(dev_desc, part_info, abc);
  	}
 diff --git a/cmd/ab_select.c b/cmd/ab_select.c
-index 3e46663d6e..26acf84d6d 100644
+index 3e46663d6ea..26acf84d6d7 100644
 --- a/cmd/ab_select.c
 +++ b/cmd/ab_select.c
 @@ -9,8 +9,7 @@
@@ -97,7 +97,7 @@ index 3e46663d6e..26acf84d6d 100644
 +	   "Same as ab_select, but does not update the BCB.\n"
 +);
 diff --git a/include/android_ab.h b/include/android_ab.h
-index 3eb61125c6..67a67b54c2 100644
+index 3eb61125c66..67a67b54c20 100644
 --- a/include/android_ab.h
 +++ b/include/android_ab.h
 @@ -28,8 +28,9 @@ struct disk_partition;
@@ -112,5 +112,5 @@ index 3eb61125c6..67a67b54c2 100644
 
  #endif /* __ANDROID_AB_H */
 -- 
-2.37.2
+2.39.2
 

patches-aosp/glodroid/bootloader/u-boot/0005-rockchip-Use-default-fastboot_set_reboot_flag-implem.patch

@@ -1,7 +1,7 @@
-From 426ae258b1dbf29538c0e314e1f3339c6d1bc848 Mon Sep 17 00:00:00 2001
+From f31848449897b9c9f352e557635289913a160e0d Mon Sep 17 00:00:00 2001
 From: Roman Stratiienko <[email protected]>
 Date: Fri, 30 Apr 2021 10:53:12 +0300
-Subject: [PATCH 4/6] rockchip: Use default fastboot_set_reboot_flag
+Subject: [PATCH 05/56] rockchip: Use default fastboot_set_reboot_flag
  implementation
 
 Signed-off-by: Roman Stratiienko <[email protected]>
@@ -10,10 +10,10 @@ Signed-off-by: Roman Stratiienko <[email protected]>
  1 file changed, 14 deletions(-)
 
 diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
-index f1f70c81d0..c13eb37c4e 100644
+index 45d9eae8700..e2fe42446de 100644
 --- a/arch/arm/mach-rockchip/board.c
 +++ b/arch/arm/mach-rockchip/board.c
-@@ -306,20 +306,6 @@ int board_usb_init(int index, enum usb_init_type init)
+@@ -313,20 +313,6 @@ int board_usb_init(int index, enum usb_init_type init)
 
  #endif /* CONFIG_USB_GADGET */
 
@@ -35,5 +35,5 @@ index f1f70c81d0..c13eb37c4e 100644
  __weak int misc_init_r(void)
  {
 -- 
-2.37.2
+2.39.2