From c5c2b4d7a7dd53b84fd8b5d2d3cf5d9e13f144fe Mon Sep 17 00:00:00 2001 From: Roland Mikhel Date: Fri, 30 Jun 2023 15:19:47 +0200 Subject: [PATCH] bootutil: Revert changes to cap values This commit reverts the changes to the cap values made in 206b914. Signed-off-by: Roland Mikhel Change-Id: Ie47c3f253409932b960f4fc12e3b722b000b3093 --- boot/bootutil/include/bootutil/caps.h | 35 ++++++++++++++------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/boot/bootutil/include/bootutil/caps.h b/boot/bootutil/include/bootutil/caps.h index 6448f537..e29b9365 100644 --- a/boot/bootutil/include/bootutil/caps.h +++ b/boot/bootutil/include/bootutil/caps.h @@ -34,23 +34,24 @@ extern "C" { uint32_t bootutil_get_caps(void); #define BOOTUTIL_CAP_RSA2048 (1<<0) -#define BOOTUTIL_CAP_ECDSA_P256 (1<<1) -#define BOOTUTIL_CAP_SWAP_USING_SCRATCH (1<<2) -#define BOOTUTIL_CAP_OVERWRITE_UPGRADE (1<<3) -#define BOOTUTIL_CAP_ENC_RSA (1<<4) -#define BOOTUTIL_CAP_ENC_KW (1<<5) -#define BOOTUTIL_CAP_VALIDATE_PRIMARY_SLOT (1<<6) -#define BOOTUTIL_CAP_RSA3072 (1<<7) -#define BOOTUTIL_CAP_ED25519 (1<<8) -#define BOOTUTIL_CAP_ENC_EC256 (1<<9) -#define BOOTUTIL_CAP_SWAP_USING_MOVE (1<<10) -#define BOOTUTIL_CAP_DOWNGRADE_PREVENTION (1<<11) -#define BOOTUTIL_CAP_ENC_X25519 (1<<12) -#define BOOTUTIL_CAP_BOOTSTRAP (1<<13) -#define BOOTUTIL_CAP_AES256 (1<<14) -#define BOOTUTIL_CAP_RAM_LOAD (1<<15) -#define BOOTUTIL_CAP_DIRECT_XIP (1<<16) -#define BOOTUTIL_CAP_HW_ROLLBACK_PROT (1<<17) + /* reserved (1<<1) */ +#define BOOTUTIL_CAP_ECDSA_P256 (1<<2) +#define BOOTUTIL_CAP_SWAP_USING_SCRATCH (1<<3) +#define BOOTUTIL_CAP_OVERWRITE_UPGRADE (1<<4) +#define BOOTUTIL_CAP_ENC_RSA (1<<5) +#define BOOTUTIL_CAP_ENC_KW (1<<6) +#define BOOTUTIL_CAP_VALIDATE_PRIMARY_SLOT (1<<7) +#define BOOTUTIL_CAP_RSA3072 (1<<8) +#define BOOTUTIL_CAP_ED25519 (1<<9) +#define BOOTUTIL_CAP_ENC_EC256 (1<<10) +#define BOOTUTIL_CAP_SWAP_USING_MOVE (1<<11) +#define BOOTUTIL_CAP_DOWNGRADE_PREVENTION (1<<12) +#define BOOTUTIL_CAP_ENC_X25519 (1<<13) +#define BOOTUTIL_CAP_BOOTSTRAP (1<<14) +#define BOOTUTIL_CAP_AES256 (1<<15) +#define BOOTUTIL_CAP_RAM_LOAD (1<<16) +#define BOOTUTIL_CAP_DIRECT_XIP (1<<17) +#define BOOTUTIL_CAP_HW_ROLLBACK_PROT (1<<18) /* * Query the number of images this bootloader is configured for. This