在 8/3/2018 9:32 PM, Leif Lindholm 写道:
On Tue, Jul 24, 2018 at 03:09:02PM +0800, Ming Huang wrote:
From: Yang XinYi yangxingyi@huawei.com
Add Setup Item "EnableGOP" for D06, This Item only takes effect on SM750
What is SM750? Please add more detail to commit message.
SM750 is a VGA device on board. Add it in v2.
Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yang XinYi yangxingyi@huawei.com Signed-off-by: Ming Huang ming.huang@linaro.org Signed-off-by: Heyi Guo heyi.guo@linaro.org
Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr | 7 +++++++ Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni | 8 ++++---- Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c | 2 +- Silicon/Hisilicon/Include/Library/OemConfigData.h | 1 + 4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr index 9e3ac73116..c0b6e294a6 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr @@ -38,4 +38,11 @@ form formid = MISC_CONFIG_FORM_ID, option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = 0; endoneof;
- oneof varid = OEM_CONFIG_DATA.EnableGOP,
prompt = STRING_TOKEN(STR_ENABLE_GOP_FRAME_BUFFER),help = STRING_TOKEN(STR_ENABLE_GOP_FRAME_BUFFER_HELP),option text = STRING_TOKEN(STR_DISABLED), value = 0, flags = DEFAULT;option text = STRING_TOKEN(STR_ENABLED), value = 1, flags = 0;- endoneof;
endform; diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni index 5ad1d1df30..0170c84ff6 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni @@ -30,7 +30,7 @@ #language fr-FR "Support SPCR" #string STR_ENABLE_SPCR_HELP #language en-US "Enable or Disable SPCR Table." #language fr-FR "Activer ou désactiver la table SPCR." -#string STR_ENABLE_GOP_FRAME_BUFFER #language en-US "Support GOP FB"
#language fr-FR "Support GOP FB"-#string STR_ENABLE_GOP_FRAME_BUFFER_HELP #language en-US "Enable or Disable GOP frame buffer."
#language fr-FR "Activer ou désactiver Buffer de frame GOP."+#string STR_ENABLE_GOP_FRAME_BUFFER #language en-US "Support GOP FB for SM750"
#language fr-FR "Soutien GOP FB pour SM750"+#string STR_ENABLE_GOP_FRAME_BUFFER_HELP #language en-US "Enable or Disable GOP frame buffer for SM750."
#language fr-FR "Activer ou désactiver Buffer de frame GOP pour SM750."diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c index 586094dfbf..88051493cf 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c @@ -311,7 +311,7 @@ OemConfigUiLibConstructor ( Configuration.EnableSmmu = 1; Configuration.EnableFdtTable = 0; Configuration.EnableSpcr = 0;
//Configuration.EnableGOP=0;
Configuration.EnableGOP = 0;I _think_ I commented to delete that line on a previous patch. If not, please delete the commented out line from wherever it was introduced.
OK, do it in v2. Thanks.
/ Leif
// //Set the default value of the Ras option //diff --git a/Silicon/Hisilicon/Include/Library/OemConfigData.h b/Silicon/Hisilicon/Include/Library/OemConfigData.h index 478821ae2c..e4d5917046 100644 --- a/Silicon/Hisilicon/Include/Library/OemConfigData.h +++ b/Silicon/Hisilicon/Include/Library/OemConfigData.h @@ -61,6 +61,7 @@ typedef struct { UINT8 EnableSmmu; UINT8 EnableFdtTable; UINT8 EnableSpcr;
- UINT8 EnableGOP; /*RAS Config*/ UINT8 EnRasSupport; UINT8 EnPoison;
-- 2.17.0