diff options
| author | Alessandro Astone <ales.astone@gmail.com> | 2019-01-11 18:46:44 +0100 |
|---|---|---|
| committer | Jan Altensen (Stricted) <info@stricted.net> | 2023-04-08 21:55:26 +0200 |
| commit | 4e4526fc49e5f5b265d72a46d0f0dbc75d210cdb (patch) | |
| tree | 5582d0168f30e415743b0aed3bac0b6040afbb49 | |
| parent | cb765605b20d1a840f4c0159d75ce812b7f8ebfc (diff) | |
recovery: Allow custom bootloader msg offset in block misc
Squash of changes
* Allow custom bootloader msg offset in block misc
Change-Id: I6f3de1c2e3745c5535c3b95399abb8b2e2d01446
* recovery: Move bldrmsg offset symbols to bootloader_message.cpp
Change-Id: I2b902bcce7f5ca13472e0ac30ac01b4991294dbe
Adapted for Android.bp version of libbootloader_message
* For android-11, these definitions are now used outside of
the library itself, so keep them in the header, and export the
necessary c flag to dependant modules
Change-Id: I5768660569d56b0d7c358f562e79483fd5f6db53
| -rw-r--r-- | bootloader_message/Android.bp | 1 | ||||
| -rw-r--r-- | bootloader_message/include/bootloader_message/bootloader_message.h | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/bootloader_message/Android.bp b/bootloader_message/Android.bp index 778fdb93..23b8e70d 100644 --- a/bootloader_message/Android.bp +++ b/bootloader_message/Android.bp @@ -25,6 +25,7 @@ package { cc_defaults { name: "libbootloader_message_defaults", + defaults: ["bootloader_message_offset_defaults"], srcs: ["bootloader_message.cpp"], cflags: [ "-Wall", diff --git a/bootloader_message/include/bootloader_message/bootloader_message.h b/bootloader_message/include/bootloader_message/bootloader_message.h index d58158dd..45041e53 100644 --- a/bootloader_message/include/bootloader_message/bootloader_message.h +++ b/bootloader_message/include/bootloader_message/bootloader_message.h @@ -29,11 +29,11 @@ // 32K - 64K System space, used for miscellanious AOSP features. See below. // Note that these offsets are admitted by bootloader,recovery and uncrypt, so they // are not configurable without changing all of them. -constexpr size_t BOOTLOADER_MESSAGE_OFFSET_IN_MISC = 0; -constexpr size_t VENDOR_SPACE_OFFSET_IN_MISC = 2 * 1024; -constexpr size_t WIPE_PACKAGE_OFFSET_IN_MISC = 16 * 1024; -constexpr size_t SYSTEM_SPACE_OFFSET_IN_MISC = 32 * 1024; -constexpr size_t SYSTEM_SPACE_SIZE_IN_MISC = 32 * 1024; +constexpr size_t BOOTLOADER_MESSAGE_OFFSET_IN_MISC = BOARD_RECOVERY_BLDRMSG_OFFSET; +constexpr size_t VENDOR_SPACE_OFFSET_IN_MISC = 2 * 1024 + BOARD_RECOVERY_BLDRMSG_OFFSET; +constexpr size_t WIPE_PACKAGE_OFFSET_IN_MISC = 16 * 1024 + BOARD_RECOVERY_BLDRMSG_OFFSET; +constexpr size_t SYSTEM_SPACE_OFFSET_IN_MISC = 32 * 1024 + BOARD_RECOVERY_BLDRMSG_OFFSET; +constexpr size_t SYSTEM_SPACE_SIZE_IN_MISC = 32 * 1024 + BOARD_RECOVERY_BLDRMSG_OFFSET; /* Bootloader Message (2-KiB) * |