[U-Boot] [PATCH 1/3] x86: Kconfig: Add options to configure the descriptor.bin / me.bin filenames
This introduces two Kconfig options to enable board specific filenames for the Intel binary blobs to be used to generate the SPI flash image.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org --- arch/x86/Kconfig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index dfdd7564ea..6ce127a23c 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -316,6 +316,22 @@ config X86_RAMTEST to work correctly. It is not exhaustive but can save time by detecting obvious failures.
+config FLASH_DESCRIPTOR_FILE + string "Flash descriptor binary filename" + depends on HAVE_INTEL_ME + default "descriptor.bin" + help + The filename of the file to use as flash descriptor in the + board directory. + +config INTEL_ME_FILE + string "Intel Management Engine binary filename" + depends on HAVE_INTEL_ME + default "me.bin" + help + The filename of the file to use as Intel Management Engine in the + board directory. + config HAVE_FSP bool "Add an Firmware Support Package binary" depends on !EFI
Since we now have the file names configurable via Kconfig for the flash descriptor and intel-me files, add these from Kconfig in the corresponding dts nodes.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org --- arch/x86/dts/u-boot.dtsi | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi index 69c1c1d498..a4321d33de 100644 --- a/arch/x86/dts/u-boot.dtsi +++ b/arch/x86/dts/u-boot.dtsi @@ -17,8 +17,10 @@ size = <CONFIG_ROM_SIZE>; #ifdef CONFIG_HAVE_INTEL_ME intel-descriptor { + filename = CONFIG_FLASH_DESCRIPTOR_FILE; }; intel-me { + filename = CONFIG_INTEL_ME_FILE; }; #endif #ifdef CONFIG_SPL
On Thu, Mar 30, 2017 at 6:58 PM, Stefan Roese sr@denx.de wrote:
Since we now have the file names configurable via Kconfig for the flash descriptor and intel-me files, add these from Kconfig in the corresponding dts nodes.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org
arch/x86/dts/u-boot.dtsi | 2 ++ 1 file changed, 2 insertions(+)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Fri, Mar 31, 2017 at 11:45 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Thu, Mar 30, 2017 at 6:58 PM, Stefan Roese sr@denx.de wrote:
Since we now have the file names configurable via Kconfig for the flash descriptor and intel-me files, add these from Kconfig in the corresponding dts nodes.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org
arch/x86/dts/u-boot.dtsi | 2 ++ 1 file changed, 2 insertions(+)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
Now that we have added file names from Kconfig in x86 u-boot.dtsi, update binman to avoid using hard-coded names.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org --- tools/binman/etype/intel_descriptor.py | 3 --- tools/binman/etype/intel_me.py | 3 --- 2 files changed, 6 deletions(-)
diff --git a/tools/binman/etype/intel_descriptor.py b/tools/binman/etype/intel_descriptor.py index 7f4ea0b21b..6435749e7c 100644 --- a/tools/binman/etype/intel_descriptor.py +++ b/tools/binman/etype/intel_descriptor.py @@ -37,9 +37,6 @@ class Entry_intel_descriptor(Entry_blob): Entry_blob.__init__(self, image, etype, node) self._regions = []
- def GetDefaultFilename(self): - return 'descriptor.bin' - def GetPositions(self): pos = self.data.find(FD_SIGNATURE) if pos == -1: diff --git a/tools/binman/etype/intel_me.py b/tools/binman/etype/intel_me.py index 45ab50c1ec..5e1c7993b7 100644 --- a/tools/binman/etype/intel_me.py +++ b/tools/binman/etype/intel_me.py @@ -12,6 +12,3 @@ from blob import Entry_blob class Entry_intel_me(Entry_blob): def __init__(self, image, etype, node): Entry_blob.__init__(self, image, etype, node) - - def GetDefaultFilename(self): - return 'me.bin'
On Thu, Mar 30, 2017 at 6:58 PM, Stefan Roese sr@denx.de wrote:
Now that we have added file names from Kconfig in x86 u-boot.dtsi, update binman to avoid using hard-coded names.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org
tools/binman/etype/intel_descriptor.py | 3 --- tools/binman/etype/intel_me.py | 3 --- 2 files changed, 6 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Hi,
On 31 March 2017 at 09:45, Bin Meng bmeng.cn@gmail.com wrote:
On Thu, Mar 30, 2017 at 6:58 PM, Stefan Roese sr@denx.de wrote:
Now that we have added file names from Kconfig in x86 u-boot.dtsi, update binman to avoid using hard-coded names.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org
tools/binman/etype/intel_descriptor.py | 3 --- tools/binman/etype/intel_me.py | 3 --- 2 files changed, 6 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Please do check that the tests still work (binman -t).
Regards, Simon
Hi Simon,
On Sat, Apr 1, 2017 at 12:22 PM, Simon Glass sjg@chromium.org wrote:
Hi,
On 31 March 2017 at 09:45, Bin Meng bmeng.cn@gmail.com wrote:
On Thu, Mar 30, 2017 at 6:58 PM, Stefan Roese sr@denx.de wrote:
Now that we have added file names from Kconfig in x86 u-boot.dtsi, update binman to avoid using hard-coded names.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org
tools/binman/etype/intel_descriptor.py | 3 --- tools/binman/etype/intel_me.py | 3 --- 2 files changed, 6 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Please do check that the tests still work (binman -t).
Patch posted @ http://patchwork.ozlabs.org/patch/747091/
Regards, Bin
On Fri, Mar 31, 2017 at 11:45 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Thu, Mar 30, 2017 at 6:58 PM, Stefan Roese sr@denx.de wrote:
Now that we have added file names from Kconfig in x86 u-boot.dtsi, update binman to avoid using hard-coded names.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org
tools/binman/etype/intel_descriptor.py | 3 --- tools/binman/etype/intel_me.py | 3 --- 2 files changed, 6 deletions(-)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
On Thu, Mar 30, 2017 at 6:58 PM, Stefan Roese sr@denx.de wrote:
This introduces two Kconfig options to enable board specific filenames for the Intel binary blobs to be used to generate the SPI flash image.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org
arch/x86/Kconfig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
On Fri, Mar 31, 2017 at 11:45 PM, Bin Meng bmeng.cn@gmail.com wrote:
On Thu, Mar 30, 2017 at 6:58 PM, Stefan Roese sr@denx.de wrote:
This introduces two Kconfig options to enable board specific filenames for the Intel binary blobs to be used to generate the SPI flash image.
Signed-off-by: Stefan Roese sr@denx.de Cc: Bin Meng bmeng.cn@gmail.com Cc: Simon Glass sjg@chromium.org
arch/x86/Kconfig | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
Reviewed-by: Bin Meng bmeng.cn@gmail.com
applied to u-boot-x86, thanks!
participants (3)
-
Bin Meng -
Simon Glass -
Stefan Roese