x86: Kconfig: Add options to configure the descriptor.bin / me.bin filenames

PATCH New Stefan Roese 3 participants 11 messages Mar 30, 2017 – Apr 5, 2017 x86

Share & tools

Stefan Roese

author

2017-03-30 10:58 UTC #0 lore raw

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 <[email protected]>

Cc Bin Meng <[email protected]>

Cc Simon Glass <[email protected]>

---
 arch/x86/Kconfig | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

arch/x86/Kconfig +16 -0

index dfdd7564ea..6ce127a23c 100644
@@ -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

Signature · 1 line

2.12.2

Stefan Roese

author

2017-03-30 10:58 UTC #1 lore raw

PATCH 2/3 x86: Add file names from Kconfig in descriptor/intel-me nodes in u-boot.dtsi

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 <[email protected]>

Cc Bin Meng <[email protected]>

Cc Simon Glass <[email protected]>

---
 arch/x86/dts/u-boot.dtsi | 2 ++
 1 file changed, 2 insertions(+)

arch/x86/dts/u-boot.dtsi +2 -0

index 69c1c1d498..a4321d33de 100644
@@ -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

Signature · 1 line

2.12.2

Bin Meng

2017-03-31 15:45 UTC #2 lore raw

PATCH 2/3 x86: Add file names from Kconfig in descriptor/intel-me nodes in u-boot.dtsi

Quoted 11 lines · Stefan Roese

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 <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 arch/x86/dts/u-boot.dtsi | 2 ++
 1 file changed, 2 insertions(+)

Reviewed-by Bin Meng <[email protected]>

Bin Meng

2017-04-05 04:13 UTC #3 lore raw

PATCH 2/3 x86: Add file names from Kconfig in descriptor/intel-me nodes in u-boot.dtsi

Quoted 13 lines · Bin Meng

Quoted 11 lines · Stefan Roese
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 <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 arch/x86/dts/u-boot.dtsi | 2 ++
 1 file changed, 2 insertions(+)

Quoted 1 line

Reviewed-by Bin Meng <[email protected]>

applied to u-boot-x86, thanks!

Stefan Roese

author

2017-03-30 10:58 UTC #4 lore raw

PATCH 3/3 binman: Remove hard-coded file name for x86 flash-descriptor & intel-me

In reply to Stefan Roese

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 <[email protected]>

Cc Bin Meng <[email protected]>

Cc Simon Glass <[email protected]>

---
 tools/binman/etype/intel_descriptor.py | 3 ---
 tools/binman/etype/intel_me.py         | 3 ---
 2 files changed, 6 deletions(-)

tools/binman/etype/intel_descriptor.py +0 -3

index 7f4ea0b21b..6435749e7c 100644
@@ -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:

tools/binman/etype/intel_me.py +0 -3

index 45ab50c1ec..5e1c7993b7 100644
@@ -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'

Signature · 1 line

2.12.2

Bin Meng

2017-03-31 15:45 UTC #5 lore raw

PATCH 3/3 binman: Remove hard-coded file name for x86 flash-descriptor & intel-me

Quoted 11 lines · Stefan Roese

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 <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 tools/binman/etype/intel_descriptor.py | 3 ---
 tools/binman/etype/intel_me.py         | 3 ---
 2 files changed, 6 deletions(-)

Reviewed-by Bin Meng <[email protected]>

Simon Glass

2017-04-01 04:22 UTC #6 lore raw

PATCH 3/3 binman: Remove hard-coded file name for x86 flash-descriptor & intel-me

Hi,

Quoted 13 lines · Bin Meng

Quoted 11 lines · Stefan Roese
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 <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 tools/binman/etype/intel_descriptor.py | 3 ---
 tools/binman/etype/intel_me.py         | 3 ---
 2 files changed, 6 deletions(-)

Quoted 1 line

Reviewed-by Bin Meng <[email protected]>

Please do check that the tests still work (binman -t).

Regards,
Simon

Bin Meng

2017-04-05 04:14 UTC #7 lore raw

PATCH 3/3 binman: Remove hard-coded file name for x86 flash-descriptor & intel-me

Hi Simon,

Quoted 16 lines · Simon Glass

Hi,
Quoted 13 lines · Bin Meng
Quoted 11 lines · Stefan Roese
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 <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 tools/binman/etype/intel_descriptor.py | 3 ---
 tools/binman/etype/intel_me.py         | 3 ---
 2 files changed, 6 deletions(-)

Quoted 4 lines

Quoted 1 line
Reviewed-by Bin Meng <[email protected]>
Please do check that the tests still work (binman -t).

Patch posted @ http://patchwork.ozlabs.org/patch/747091/

Regards,
Bin

Bin Meng

2017-04-05 04:14 UTC #8 lore raw

PATCH 3/3 binman: Remove hard-coded file name for x86 flash-descriptor & intel-me

In reply to Bin Meng

Quoted 13 lines · Bin Meng

Quoted 11 lines · Stefan Roese
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 <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 tools/binman/etype/intel_descriptor.py | 3 ---
 tools/binman/etype/intel_me.py         | 3 ---
 2 files changed, 6 deletions(-)

Quoted 1 line

Reviewed-by Bin Meng <[email protected]>

applied to u-boot-x86, thanks!

Bin Meng

2017-03-31 15:45 UTC #9 lore raw

PATCH 1/3 x86: Kconfig: Add options to configure the descriptor.bin / me.bin filenames

In reply to Stefan Roese

Quoted 10 lines · Stefan Roese

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 <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 arch/x86/Kconfig | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Reviewed-by Bin Meng <[email protected]>

Bin Meng

2017-04-05 04:13 UTC #10 lore raw

PATCH 1/3 x86: Kconfig: Add options to configure the descriptor.bin / me.bin filenames

Quoted 12 lines · Bin Meng

Quoted 10 lines · Stefan Roese
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 <[email protected]>
Cc Bin Meng <[email protected]>
Cc Simon Glass <[email protected]>
---
 arch/x86/Kconfig | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

Quoted 1 line

Reviewed-by Bin Meng <[email protected]>

applied to u-boot-x86, thanks!