StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e38 am: 56c9341ba1 am: 3f988435a7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1676586

Change-Id: I3e38f8fd604c36f9c3223c4509ae3e9fdf3a8838
This commit is contained in:
Roman Kiryanov
2021-04-15 08:07:27 +00:00
committed by Automerger Merge Worker
parent eb3515b3d0 3f988435a7
commit 1eaa526e97
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
target/board/BoardConfigEmuCommon.mk
View File

@@ -74,7 +74,7 @@ endif
#vendor boot #vendor boot
BOARD_INCLUDE_DTB_IN_BOOTIMG := false BOARD_INCLUDE_DTB_IN_BOOTIMG := false
BOARD_BOOT_HEADER_VERSION := 3 BOARD_BOOT_HEADER_VERSION := 4
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x06000000 BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x06000000
BOARD_RAMDISK_USE_LZ4 := true BOARD_RAMDISK_USE_LZ4 := true

3
target/board/emulator_arm64/BoardConfig.mk
View File

@@ -57,9 +57,6 @@ BOARD_USES_RECOVERY_AS_BOOT := true
BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000 BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000
BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800
BOARD_BOOT_HEADER_VERSION := 3
BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)
# Wifi. # Wifi.
BOARD_WLAN_DEVICE := emulator BOARD_WLAN_DEVICE := emulator
BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_DRIVER := NL80211