| Message ID | 20180823160743.45638-17-ming.huang@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Upload for D06 platform | expand |
Can you add Hi1620 to the subject line, so it's clear that this is a D06-specific library? With that Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org> / Leif On Fri, Aug 24, 2018 at 12:07:28AM +0800, Ming Huang wrote: > From: Yang XinYi <yangxingyi@huawei.com> > > Add Setup Item "EnableGOP" for D06, This Item only takes > effect on SM750. The SM750 is a VGA device under BMC and > the KVM output to SM750. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ming Huang <ming.huang@linaro.org> > --- > Silicon/Hisilicon/Include/Library/OemConfigData.h | 1 + > Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c | 1 + > Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr | 7 +++++++ > Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni | 4 ++-- > 4 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/Silicon/Hisilicon/Include/Library/OemConfigData.h b/Silicon/Hisilicon/Include/Library/OemConfigData.h > index 8ab402144c..f120e3123c 100644 > --- a/Silicon/Hisilicon/Include/Library/OemConfigData.h > +++ b/Silicon/Hisilicon/Include/Library/OemConfigData.h > @@ -60,6 +60,7 @@ typedef struct { > /*Misc Config*/ > UINT8 EnableSmmu; > UINT8 EnableFdtTable; > + UINT8 EnableGOP; > /*RAS Config*/ > UINT8 EnRasSupport; > UINT8 EnPoison; > diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c > index f49fb3533b..012d45bc02 100644 > --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c > +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c > @@ -294,6 +294,7 @@ OemConfigUiLibConstructor ( > // > Configuration.EnableSmmu = 1; > Configuration.EnableFdtTable = 0; > + Configuration.EnableGOP = 0; > // > //Set the default value of the Ras option > // > diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr > index 819c2b988d..16ce27b95b 100644 > --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr > +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr > @@ -31,4 +31,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 53eb1622c4..2fd92fedff 100644 > --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni > +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni > @@ -23,5 +23,5 @@ > #string STR_FDT_CONFIG_HELP #language en-US "Enable or Disable Fdt Table." > #string STR_ENABLE_SPCR_TABLE #language en-US "Support SPCR" > #string STR_ENABLE_SPCR_HELP #language en-US "Enable or Disable SPCR Table." > -#string STR_ENABLE_GOP_FRAME_BUFFER #language en-US "Support GOP FB" > -#string STR_ENABLE_GOP_FRAME_BUFFER_HELP #language en-US "Enable or Disable GOP frame buffer." > +#string STR_ENABLE_GOP_FRAME_BUFFER #language en-US "Support GOP FB for SM750" > +#string STR_ENABLE_GOP_FRAME_BUFFER_HELP #language en-US "Enable or Disable GOP frame buffer for SM750." > -- > 2.18.0 > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/Silicon/Hisilicon/Include/Library/OemConfigData.h b/Silicon/Hisilicon/Include/Library/OemConfigData.h index 8ab402144c..f120e3123c 100644 --- a/Silicon/Hisilicon/Include/Library/OemConfigData.h +++ b/Silicon/Hisilicon/Include/Library/OemConfigData.h @@ -60,6 +60,7 @@ typedef struct { /*Misc Config*/ UINT8 EnableSmmu; UINT8 EnableFdtTable; + UINT8 EnableGOP; /*RAS Config*/ UINT8 EnRasSupport; UINT8 EnPoison; diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c index f49fb3533b..012d45bc02 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/OemConfig.c @@ -294,6 +294,7 @@ OemConfigUiLibConstructor ( // Configuration.EnableSmmu = 1; Configuration.EnableFdtTable = 0; + Configuration.EnableGOP = 0; // //Set the default value of the Ras option // diff --git a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr index 819c2b988d..16ce27b95b 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.hfr @@ -31,4 +31,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 53eb1622c4..2fd92fedff 100644 --- a/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni +++ b/Silicon/Hisilicon/Hi1620/Hi1620OemConfigUiLib/MiscConfig.uni @@ -23,5 +23,5 @@ #string STR_FDT_CONFIG_HELP #language en-US "Enable or Disable Fdt Table." #string STR_ENABLE_SPCR_TABLE #language en-US "Support SPCR" #string STR_ENABLE_SPCR_HELP #language en-US "Enable or Disable SPCR Table." -#string STR_ENABLE_GOP_FRAME_BUFFER #language en-US "Support GOP FB" -#string STR_ENABLE_GOP_FRAME_BUFFER_HELP #language en-US "Enable or Disable GOP frame buffer." +#string STR_ENABLE_GOP_FRAME_BUFFER #language en-US "Support GOP FB for SM750" +#string STR_ENABLE_GOP_FRAME_BUFFER_HELP #language en-US "Enable or Disable GOP frame buffer for SM750."