diff mbox series

[1/9] UBUNTU: [Config] aws: Update arm64 annotation for CONFIG_NITRO_ENCLAVES

Message ID 20211202134622.14875-2-tim.gardner@canonical.com
State New
Headers show
Series Enable arm64 nitro enclaves | expand

Commit Message

Tim Gardner Dec. 2, 2021, 1:46 p.m. UTC
BugLink: https://bugs.launchpad.net/bugs/1951873

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.aws/config/amd64/config.common.amd64 | 2 +-
 debian.aws/config/annotations               | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Krzysztof Kozlowski Dec. 17, 2021, 2:05 p.m. UTC | #1
On 02/12/2021 14:46, Tim Gardner wrote:
> BugLink: https://bugs.launchpad.net/bugs/1951873
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.aws/config/amd64/config.common.amd64 | 2 +-
>  debian.aws/config/annotations               | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
> index 486e412aa94a..8da00dc238e2 100644
> --- a/debian.aws/config/amd64/config.common.amd64
> +++ b/debian.aws/config/amd64/config.common.amd64
> @@ -12,7 +12,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
>  CONFIG_ATA_GENERIC=y
>  CONFIG_ATA_PIIX=y
>  # CONFIG_BCM_VK_TTY is not set
> -CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-7ubuntu1) 11.2.0"
> +CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0"

This should not be the part of this commit.


>  # CONFIG_CMA is not set
>  CONFIG_CRC8=m
>  CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
> diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
> index 09320b56b6e1..b2d3ee984663 100644
> --- a/debian.aws/config/annotations
> +++ b/debian.aws/config/annotations
> @@ -4,6 +4,7 @@
>  
>  include ../../debian.master/config/annotations
>  
> +CONFIG_NITRO_ENCLAVES                              policy<{'amd64': 'm', 'arm64': 'm'}>
>  CONFIG_ACCESSIBILITY                               policy<{'amd64': 'n', 'arm64': 'n'}> 
>  CONFIG_SPEAKUP                                     policy<{'amd64': '-', 'arm64': '-'}> 
>  CONFIG_DRM_AMD_DC_SI                               policy<{'amd64': 'n', 'arm64': 'n'}> 
> 


Best regards,
Krzysztof
Tim Gardner Dec. 17, 2021, 2:23 p.m. UTC | #2
On 12/17/21 7:05 AM, Krzysztof Kozlowski wrote:
> On 02/12/2021 14:46, Tim Gardner wrote:
>> BugLink: https://bugs.launchpad.net/bugs/1951873
>>
>> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
>> ---
>>   debian.aws/config/amd64/config.common.amd64 | 2 +-
>>   debian.aws/config/annotations               | 1 +
>>   2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
>> index 486e412aa94a..8da00dc238e2 100644
>> --- a/debian.aws/config/amd64/config.common.amd64
>> +++ b/debian.aws/config/amd64/config.common.amd64
>> @@ -12,7 +12,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
>>   CONFIG_ATA_GENERIC=y
>>   CONFIG_ATA_PIIX=y
>>   # CONFIG_BCM_VK_TTY is not set
>> -CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-7ubuntu1) 11.2.0"
>> +CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0"
> 
> This should not be the part of this commit.
I can clean this up when I apply it.
Krzysztof Kozlowski Dec. 17, 2021, 2:30 p.m. UTC | #3
On 17/12/2021 15:23, Tim Gardner wrote:
> 
> 
> On 12/17/21 7:05 AM, Krzysztof Kozlowski wrote:
>> On 02/12/2021 14:46, Tim Gardner wrote:
>>> BugLink: https://bugs.launchpad.net/bugs/1951873
>>>
>>> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
>>> ---
>>>   debian.aws/config/amd64/config.common.amd64 | 2 +-
>>>   debian.aws/config/annotations               | 1 +
>>>   2 files changed, 2 insertions(+), 1 deletion(-)
>>>
>>> diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
>>> index 486e412aa94a..8da00dc238e2 100644
>>> --- a/debian.aws/config/amd64/config.common.amd64
>>> +++ b/debian.aws/config/amd64/config.common.amd64
>>> @@ -12,7 +12,7 @@ CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
>>>   CONFIG_ATA_GENERIC=y
>>>   CONFIG_ATA_PIIX=y
>>>   # CONFIG_BCM_VK_TTY is not set
>>> -CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-7ubuntu1) 11.2.0"
>>> +CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0"
>>
>> This should not be the part of this commit.
> I can clean this up when I apply it.

Sounds good, then:

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>


Best regards,
Krzysztof
diff mbox series

Patch

diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
index 486e412aa94a..8da00dc238e2 100644
--- a/debian.aws/config/amd64/config.common.amd64
+++ b/debian.aws/config/amd64/config.common.amd64
@@ -12,7 +12,7 @@  CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
 CONFIG_ATA_GENERIC=y
 CONFIG_ATA_PIIX=y
 # CONFIG_BCM_VK_TTY is not set
-CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-7ubuntu1) 11.2.0"
+CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 11.2.0-7ubuntu2) 11.2.0"
 # CONFIG_CMA is not set
 CONFIG_CRC8=m
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index 09320b56b6e1..b2d3ee984663 100644
--- a/debian.aws/config/annotations
+++ b/debian.aws/config/annotations
@@ -4,6 +4,7 @@ 
 
 include ../../debian.master/config/annotations
 
+CONFIG_NITRO_ENCLAVES                              policy<{'amd64': 'm', 'arm64': 'm'}>
 CONFIG_ACCESSIBILITY                               policy<{'amd64': 'n', 'arm64': 'n'}> 
 CONFIG_SPEAKUP                                     policy<{'amd64': '-', 'arm64': '-'}> 
 CONFIG_DRM_AMD_DC_SI                               policy<{'amd64': 'n', 'arm64': 'n'}>