Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f988435 authored by Roman Kiryanov's avatar Roman Kiryanov Committed by Automerger Merge Worker
Browse files

Merge "Switch emulator targets to use BOARD_BOOT_HEADER_VERSION=4" am: ac46742e am: 56c9341b 

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

Change-Id: I7a9333c02dcd5aa9f71cec21da5e2afc89d1ae2d
parents 69bb4537 56c9341b

target/board/BoardConfigEmuCommon.mk

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ endif 


#vendor boot

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_VENDOR_BOOTIMAGE_PARTITION_SIZE := 0x06000000

BOARD_RAMDISK_USE_LZ4 := true

target/board/emulator_arm64/BoardConfig.mk

+0 −3
Original line number Diff line number Diff line
@@ -57,9 +57,6 @@ BOARD_USES_RECOVERY_AS_BOOT := true 
BOARD_BOOTIMAGE_PARTITION_SIZE := 0x02000000

BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800



BOARD_BOOT_HEADER_VERSION := 3

BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION)



# Wifi.

BOARD_WLAN_DEVICE           := emulator

BOARD_HOSTAPD_DRIVER        := NL80211