• Juan Castillo's avatar
    TBB: apply TBBR naming convention to certificates and extensions · 516beb58
    Juan Castillo authored
    This patch applies the TBBR naming convention to the certificates
    and the corresponding extensions defined by the CoT:
    
        * Certificate UUID names
        * Certificate identifier names
        * OID names
    
    Changes apply to:
    
        * Generic code (variables and defines)
        * The default certificate identifiers provided in the generic
          code
        * Build system
        * ARM platforms port
        * cert_create tool internal definitions
        * fip_create and cert_create tools command line options
        * Documentation
    
    IMPORTANT: this change breaks the compatibility with platforms
    that use TBBR. The platform will need to adapt the identifiers
    and OIDs to the TBBR naming convention introduced by this patch:
    
    Certificate UUIDs:
    
        UUID_TRUSTED_BOOT_FIRMWARE_BL2_CERT --> UUID_TRUSTED_BOOT_FW_CERT
        UUID_SCP_FIRMWARE_BL30_KEY_CERT --> UUID_SCP_FW_KEY_CERT
        UUID_SCP_FIRMWARE_BL30_CERT --> UUID_SCP_FW_CONTENT_CERT
        UUID_EL3_RUNTIME_FIRMWARE_BL31_KEY_CERT --> UUID_SOC_FW_KEY_CERT
        UUID_EL3_RUNTIME_FIRMWARE_BL31_CERT --> UUID_SOC_FW_CONTENT_CERT
        UUID_SECURE_PAYLOAD_BL32_KEY_CERT --> UUID_TRUSTED_OS_FW_KEY_CERT
        UUID_SECURE_PAYLOAD_BL32_CERT --> UUID_TRUSTED_OS_FW_CONTENT_CERT
        UUID_NON_TRUSTED_FIRMWARE_BL33_KEY_CERT --> UUID_NON_TRUSTED_FW_KEY_CERT
        UUID_NON_TRUSTED_FIRMWARE_BL33_CERT --> UUID_NON_TRUSTED_FW_CONTENT_CERT
    
    Certificate identifiers:
    
        BL2_CERT_ID --> TRUSTED_BOOT_FW_CERT_ID
        BL30_KEY_CERT_ID --> SCP_FW_KEY_CERT_ID
        BL30_CERT_ID --> SCP_FW_CONTENT_CERT_ID
        BL31_KEY_CERT_ID --> SOC_FW_KEY_CERT_ID
        BL31_CERT_ID --> SOC_FW_CONTENT_CERT_ID
        BL32_KEY_CERT_ID --> TRUSTED_OS_FW_KEY_CERT_ID
        BL32_CERT_ID --> TRUSTED_OS_FW_CONTENT_CERT_ID
        BL33_KEY_CERT_ID --> NON_TRUSTED_FW_KEY_CERT_ID
        BL33_CERT_ID --> NON_TRUSTED_FW_CONTENT_CERT_ID
    
    OIDs:
    
        TZ_FW_NVCOUNTER_OID --> TRUSTED_FW_NVCOUNTER_OID
        NTZ_FW_NVCOUNTER_OID --> NON_TRUSTED_FW_NVCOUNTER_OID
        BL2_HASH_OID --> TRUSTED_BOOT_FW_HASH_OID
        TZ_WORLD_PK_OID --> TRUSTED_WORLD_PK_OID
        NTZ_WORLD_PK_OID --> NON_TRUSTED_WORLD_PK_OID
        BL30_CONTENT_CERT_PK_OID --> SCP_FW_CONTENT_CERT_PK_OID
        BL30_HASH_OID --> SCP_FW_HASH_OID
        BL31_CONTENT_CERT_PK_OID --> SOC_FW_CONTENT_CERT_PK_OID
        BL31_HASH_OID --> SOC_AP_FW_HASH_OID
        BL32_CONTENT_CERT_PK_OID --> TRUSTED_OS_FW_CONTENT_CERT_PK_OID
        BL32_HASH_OID --> TRUSTED_OS_FW_HASH_OID
        BL33_CONTENT_CERT_PK_OID --> NON_TRUSTED_FW_CONTENT_CERT_PK_OID
        BL33_HASH_OID --> NON_TRUSTED_WORLD_BOOTLOADER_HASH_OID
        BL2U_HASH_OID --> AP_FWU_CFG_HASH_OID
        SCP_BL2U_HASH_OID --> SCP_FWU_CFG_HASH_OID
        NS_BL2U_HASH_OID --> FWU_HASH_OID
    
    Change-Id: I1e047ae046299ca913911c39ac3a6e123bd41079
    516beb58
arm_io_storage.c 7.92 KB