nx: Adapt to new hekate bootloader setup

* Reflect Hekate partition sizes.
* Reflect latest SWR bootloader (rev6).
* Mount `hos_data` and install firmware files on install.

Change-Id: Ib097e323773f914b5d88514459ff241d35598062
This commit is contained in:
Nolen Johnson committed 2024-01-25 14:56:46 -05:00
1 parent c03875880c
commit 3fdb058baf
3 files changed
+16 -11

No files matched your search

+4 -4
View File
@@ -15,12 +15,12 @@
#
BOARD_FLASH_BLOCK_SIZE := 4096
BOARD_BOOTIMAGE_PARTITION_SIZE := 26738688
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 26767360
BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
BOARD_BOOTIMAGE_PARTITION_SIZE := 33554432
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
BOARD_CACHEIMAGE_PARTITION_SIZE := 734003200
BOARD_USERDATAIMAGE_PARTITION_SIZE := 10099646976
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
BOARD_VENDORIMAGE_PARTITION_SIZE := 379584512
BOARD_VENDORIMAGE_PARTITION_SIZE := 1073741824
TARGET_USERIMAGES_USE_EXT4 := true
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
+1 -1
View File
@@ -1 +1 @@
require version-bootloader=2020.04-03755-gf4d532d00d-rev3
require version-bootloader=2020.04-03753-g53ff5d2195-rev6
+11 -6
View File
@@ -24,7 +24,7 @@ DTB_PART = '/dev/block/by-name/DTB'
STAGING_PART = '/dev/block/by-name/USP'
VBMETA_PART = '/dev/block/by-name/vbmeta'
VENDOR_PART = '/dev/block/by-name/vendor'
NX_SD = '/external_sd/switchroot/android/'
NX_FILES = '/mnt/vendor/hos_data'
PUBLIC_KEY_PATH = '/sys/devices/7000f800.efuse/7000f800.efuse:efuse-burn/public_key'
FUSED_PATH = '/sys/devices/7000f800.efuse/7000f800.efuse:efuse-burn/odm_production_mode'
@@ -35,7 +35,7 @@ MODE_FUSED = '0x00000001\n'
NX_ERISTA_PUBLIC_KEY = '0x7e39e100d1135918ceedfe5d66e66496eed21ecb3486d72095cc0b7c60b8bd4f\n'
NX_MARIKO_PUBLIC_KEY = '0x72b9db116837289e5bfa57bb1c69e2c8fa9697151aa975066381e7efa19fb0c9\n'
NX_BL_VERSION = '2020.04-03755-gf4d532d00d-rev3'
NX_BL_VERSION = '2020.04-03753-g53ff5d2195-rev6'
def FullOTA_PostValidate(info):
if 'INSTALL/bin/resize2fs_static' in info.input_zip.namelist():
@@ -43,7 +43,7 @@ def FullOTA_PostValidate(info):
info.script.AppendExtra('run_program("/tmp/install/bin/resize2fs_static", "' + VENDOR_PART + '");');
def FullOTA_Assertions(info):
if 'RADIO/foster_e.blob' in info.input_zip.namelist():
if 'RADIO/coreboot.rom' in info.input_zip.namelist():
CopyBlobs(info.input_zip, info.output_zip)
AddBootloaderFlash(info, info.input_zip)
else:
@@ -87,9 +87,14 @@ def AddBootloaderFlash(info, input_zip):
info.script.AppendExtra(' read_file("' + PUBLIC_KEY_PATH + '") == "' + NX_ERISTA_PUBLIC_KEY + '" || read_file("' + PUBLIC_KEY_PATH + '") == "' + NX_MARIKO_PUBLIC_KEY + '",')
info.script.AppendExtra(' (')
info.script.AppendExtra(' ui_print("Flashing updated bootloader for fused " + getprop(ro.hardware));')
info.script.AppendExtra(' package_extract_file("firmware-update/coreboot.rom", "' + NX_SD + 'coreboot.rom");')
info.script.AppendExtra(' package_extract_file("firmware-update/common.scr", "' + NX_SD + 'common.scr");')
info.script.AppendExtra(' package_extract_file("firmware-update/" + getprop(ro.hardware) + ".scr", "' + NX_SD + 'boot.scr");')
info.script.AppendExtra(' run_program("/system/bin/mkdir", "-p", "' + NX_FILES + '");')
info.script.AppendExtra(' run_program("/system/bin/mount", "/dev/block/by-name/hos_data", "' + NX_FILES + '");')
info.script.AppendExtra(' package_extract_file("firmware-update/coreboot.rom", "' + NX_FILES + '/switchroot/android/coreboot.rom");')
info.script.AppendExtra(' package_extract_file("firmware-update/boot.scr", "' + NX_FILES + '/switchroot/android/boot.scr");')
info.script.AppendExtra(' package_extract_file("firmware-update/bootlogo_android.bmp", "' + NX_FILES + '/switchroot/android/bootlogo_android.bmp");')
info.script.AppendExtra(' package_extract_file("firmware-update/icon_android_hue.bmp", "' + NX_FILES + '/switchroot/android/icon_android_hue.bmp");')
info.script.AppendExtra(' package_extract_file("firmware-update/00-android.ini", "' + NX_FILES + '/bootloader/ini/00-android.ini");')
info.script.AppendExtra(' run_program("/system/bin/umount", "' + NX_FILES + '");')
info.script.AppendExtra(' ),')
info.script.AppendExtra(' (')
info.script.AppendExtra(' ui_print("Unknown public key for nx detected.");')