1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET

Star Zeng posted 1 patch 6 years, 1 month ago
Failed in applying to current master (apply log)
MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET
Posted by Star Zeng 6 years, 1 month ago 
Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET.
This change was missing at e8d2a9805286a2fd4f613697cf0cccb4a1ebc90d.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Thomas Lamprecht <t.lamprecht@proxmox.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
index 5767ac82da21..c30a3ac7200f 100644
--- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
+++ b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
@@ -32,7 +32,7 @@ typedef UINT64 SKU_ID;
 #define PCD_TYPE_VPD          (0x4U << PCD_TYPE_SHIFT)
 #define PCD_TYPE_STRING       (0x1U << PCD_TYPE_SHIFT)
 
-#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
+#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_STRING)
 
 #define PCD_DATUM_TYPE_SHIFT  24
 
-- 
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET
Posted by Thomas Lamprecht 6 years, 1 month ago 
On 03/13/2018 10:04 AM, Star Zeng wrote:
> Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET.
> This change was missing at e8d2a9805286a2fd4f613697cf0cccb4a1ebc90d.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> index 5767ac82da21..c30a3ac7200f 100644
> --- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> +++ b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> @@ -32,7 +32,7 @@ typedef UINT64 SKU_ID;
>  #define PCD_TYPE_VPD          (0x4U << PCD_TYPE_SHIFT)
>  #define PCD_TYPE_STRING       (0x1U << PCD_TYPE_SHIFT)
>  
> -#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
> +#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_STRING)
>  
>  #define PCD_DATUM_TYPE_SHIFT  24
>  
> 

Works again here, much thanks for your fast response!

Tested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET
Posted by Thomas Lamprecht 6 years, 1 month ago 
On 03/13/2018 10:04 AM, Star Zeng wrote:
> Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET.
> This change was missing at e8d2a9805286a2fd4f613697cf0cccb4a1ebc90d.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> index 5767ac82da21..c30a3ac7200f 100644
> --- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> +++ b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> @@ -32,7 +32,7 @@ typedef UINT64 SKU_ID;
>  #define PCD_TYPE_VPD          (0x4U << PCD_TYPE_SHIFT)
>  #define PCD_TYPE_STRING       (0x1U << PCD_TYPE_SHIFT)
>  
> -#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
> +#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_STRING)
>  
>  #define PCD_DATUM_TYPE_SHIFT  24
>  
> 
Oh forgot to mention, had a bit problems to apply this with git am,
could it be that your MTA changed out the edk2 newline format (windows,
\r\n) with an plain UNIX one (\n)?

Sorry that I forgot to mention this in my other mail.

cheers,
Thomas

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET
Posted by Zeng, Star 6 years, 1 month ago 
Maybe.
I am using the MS outlook.

Thanks,
Star
-----Original Message-----
From: Thomas Lamprecht [mailto:t.lamprecht@proxmox.com] 
Sent: Tuesday, March 13, 2018 5:22 PM
To: Zeng, Star <star.zeng@intel.com>; edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>
Subject: Re: [edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET

On 03/13/2018 10:04 AM, Star Zeng wrote:
> Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET.
> This change was missing at e8d2a9805286a2fd4f613697cf0cccb4a1ebc90d.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h 
> b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> index 5767ac82da21..c30a3ac7200f 100644
> --- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> +++ b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> @@ -32,7 +32,7 @@ typedef UINT64 SKU_ID;
>  #define PCD_TYPE_VPD          (0x4U << PCD_TYPE_SHIFT)
>  #define PCD_TYPE_STRING       (0x1U << PCD_TYPE_SHIFT)
>  
> -#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
> +#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_STRING)
>  
>  #define PCD_DATUM_TYPE_SHIFT  24
>  
> 
Oh forgot to mention, had a bit problems to apply this with git am, could it be that your MTA changed out the edk2 newline format (windows,
\r\n) with an plain UNIX one (\n)?

Sorry that I forgot to mention this in my other mail.

cheers,
Thomas

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET
Posted by Ard Biesheuvel 6 years, 1 month ago 
On 13 March 2018 at 09:04, Star Zeng <star.zeng@intel.com> wrote:
> Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET.
> This change was missing at e8d2a9805286a2fd4f613697cf0cccb4a1ebc90d.
>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>

Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Please apply


> ---
>  MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> index 5767ac82da21..c30a3ac7200f 100644
> --- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> +++ b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> @@ -32,7 +32,7 @@ typedef UINT64 SKU_ID;
>  #define PCD_TYPE_VPD          (0x4U << PCD_TYPE_SHIFT)
>  #define PCD_TYPE_STRING       (0x1U << PCD_TYPE_SHIFT)
>
> -#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
> +#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_STRING)
>
>  #define PCD_DATUM_TYPE_SHIFT  24
>
> --
> 2.7.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET
Posted by Zeng, Star 6 years, 1 month ago 
Not wait more time any more as it is an urgent build failure.
Pushed at d154a4dfaec4bf25acaca643e9ac15a3bc8d7a12.
Thanks all.

Star
-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Ard Biesheuvel
Sent: Tuesday, March 13, 2018 8:42 PM
To: Zeng, Star <star.zeng@intel.com>
Cc: edk2-devel@lists.01.org; Thomas Lamprecht <t.lamprecht@proxmox.com>; Gao, Liming <liming.gao@intel.com>
Subject: Re: [edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET

On 13 March 2018 at 09:04, Star Zeng <star.zeng@intel.com> wrote:
> Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET.
> This change was missing at e8d2a9805286a2fd4f613697cf0cccb4a1ebc90d.
>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Thomas Lamprecht <t.lamprecht@proxmox.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>

Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

Please apply


> ---
>  MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> index 5767ac82da21..c30a3ac7200f 100644
> --- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> +++ b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
> @@ -32,7 +32,7 @@ typedef UINT64 SKU_ID;
>  #define PCD_TYPE_VPD          (0x4U << PCD_TYPE_SHIFT)
>  #define PCD_TYPE_STRING       (0x1U << PCD_TYPE_SHIFT)
>
> -#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
> +#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_STRING)
>
>  #define PCD_DATUM_TYPE_SHIFT  24
>
> --
> 2.7.0.windows.1
>
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET
Posted by Dong, Eric 6 years, 1 month ago 
Reviewed-by: Eric Dong <eric.dong@intel.com>

-----Original Message-----
From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Star Zeng
Sent: Tuesday, March 13, 2018 5:04 PM
To: edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>; Zeng, Star <star.zeng@intel.com>; Thomas Lamprecht <t.lamprecht@proxmox.com>
Subject: [edk2] [PATCH] MdeModulePkg PCD: Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET

Remove PCD_TYPE_SKU_ENABLED in PCD_TYPE_ALL_SET.
This change was missing at e8d2a9805286a2fd4f613697cf0cccb4a1ebc90d.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Thomas Lamprecht <t.lamprecht@proxmox.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
index 5767ac82da21..c30a3ac7200f 100644
--- a/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
+++ b/MdeModulePkg/Include/Guid/PcdDataBaseSignatureGuid.h
@@ -32,7 +32,7 @@ typedef UINT64 SKU_ID;
 #define PCD_TYPE_VPD          (0x4U << PCD_TYPE_SHIFT)
 #define PCD_TYPE_STRING       (0x1U << PCD_TYPE_SHIFT)
 
-#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_SKU_ENABLED | PCD_TYPE_STRING)
+#define PCD_TYPE_ALL_SET      (PCD_TYPE_DATA | PCD_TYPE_HII | PCD_TYPE_VPD | PCD_TYPE_STRING)
 
 #define PCD_DATUM_TYPE_SHIFT  24
 
-- 
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.