All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards
@ 2016-12-26  4:52 Bin Meng
  2016-12-26  4:52 ` [U-Boot] [PATCH 2/3] x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi Bin Meng
                   ` (2 more replies)
  0 siblings, 3 replies; 9+ messages in thread
From: Bin Meng @ 2016-12-26  4:52 UTC (permalink / raw)
  To: u-boot

With the conversion to use binman to build x86 boards, Intel Galileo
board does not build anymore due to missing ucode entry. In fact
ucode is not needed for quark-based boards.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

 arch/x86/dts/quark-u-boot.dtsi | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 arch/x86/dts/quark-u-boot.dtsi

diff --git a/arch/x86/dts/quark-u-boot.dtsi b/arch/x86/dts/quark-u-boot.dtsi
new file mode 100644
index 0000000..04eb985
--- /dev/null
+++ b/arch/x86/dts/quark-u-boot.dtsi
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2016, Bin Meng <bmeng.cn@gmail.com>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <u-boot.dtsi>
+
+#ifdef CONFIG_ROM_SIZE
+/ {
+	binman {
+		u-boot-with-ucode-ptr {
+			optional-ucode;
+		};
+	};
+};
+#endif
-- 
2.9.2

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/3] x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi
  2016-12-26  4:52 [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards Bin Meng
@ 2016-12-26  4:52 ` Bin Meng
  2016-12-26  5:29   ` Simon Glass
  2016-12-26  4:52 ` [U-Boot] [PATCH 3/3] binman: Remove hard-coded file name for x86 CMC/FSP/VGA Bin Meng
  2016-12-26  5:29 ` [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards Simon Glass
  2 siblings, 1 reply; 9+ messages in thread
From: Bin Meng @ 2016-12-26  4:52 UTC (permalink / raw)
  To: u-boot

Since we already have a bunch of Kconfig options for CMC/FSP/VGA file
names, add these from Kconfig in the corresponding dts nodes.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
---

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

diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 724913f..31f0b1a 100644
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -36,16 +36,19 @@
 #endif
 #ifdef CONFIG_HAVE_FSP
 		intel-fsp {
+			filename = CONFIG_FSP_FILE;
 			pos = <CONFIG_FSP_ADDR>;
 		};
 #endif
 #ifdef CONFIG_HAVE_CMC
 		intel-cmc {
+			filename = CONFIG_CMC_FILE;
 			pos = <CONFIG_CMC_ADDR>;
 		};
 #endif
 #ifdef CONFIG_HAVE_VGA_BIOS
 		intel-vga {
+			filename = CONFIG_VGA_BIOS_FILE;
 			pos = <CONFIG_VGA_BIOS_ADDR>;
 		};
 #endif
-- 
2.9.2

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 3/3] binman: Remove hard-coded file name for x86 CMC/FSP/VGA
  2016-12-26  4:52 [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards Bin Meng
  2016-12-26  4:52 ` [U-Boot] [PATCH 2/3] x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi Bin Meng
@ 2016-12-26  4:52 ` Bin Meng
  2016-12-26  5:29   ` Simon Glass
  2016-12-26  5:29 ` [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards Simon Glass
  2 siblings, 1 reply; 9+ messages in thread
From: Bin Meng @ 2016-12-26  4:52 UTC (permalink / raw)
  To: u-boot

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: Bin Meng <bmeng.cn@gmail.com>
---

 tools/binman/etype/intel_cmc.py | 3 ---
 tools/binman/etype/intel_fsp.py | 3 ---
 tools/binman/etype/intel_vga.py | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/tools/binman/etype/intel_cmc.py b/tools/binman/etype/intel_cmc.py
index 9bce8ae..30676c8 100644
--- a/tools/binman/etype/intel_cmc.py
+++ b/tools/binman/etype/intel_cmc.py
@@ -12,6 +12,3 @@ from blob import Entry_blob
 class Entry_intel_cmc(Entry_blob):
     def __init__(self, image, etype, node):
         Entry_blob.__init__(self, image, etype, node)
-
-    def GetDefaultFilename(self):
-        return 'cmc.bin'
diff --git a/tools/binman/etype/intel_fsp.py b/tools/binman/etype/intel_fsp.py
index d75be5b..13c9f05 100644
--- a/tools/binman/etype/intel_fsp.py
+++ b/tools/binman/etype/intel_fsp.py
@@ -12,6 +12,3 @@ from blob import Entry_blob
 class Entry_intel_fsp(Entry_blob):
     def __init__(self, image, etype, node):
         Entry_blob.__init__(self, image, etype, node)
-
-    def GetDefaultFilename(self):
-        return 'fsp.bin'
diff --git a/tools/binman/etype/intel_vga.py b/tools/binman/etype/intel_vga.py
index d8f270b..6693607 100644
--- a/tools/binman/etype/intel_vga.py
+++ b/tools/binman/etype/intel_vga.py
@@ -12,6 +12,3 @@ from blob import Entry_blob
 class Entry_intel_vga(Entry_blob):
     def __init__(self, image, etype, node):
         Entry_blob.__init__(self, image, etype, node)
-
-    def GetDefaultFilename(self):
-        return 'vga.bin'
-- 
2.9.2

^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards
  2016-12-26  4:52 [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards Bin Meng
  2016-12-26  4:52 ` [U-Boot] [PATCH 2/3] x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi Bin Meng
  2016-12-26  4:52 ` [U-Boot] [PATCH 3/3] binman: Remove hard-coded file name for x86 CMC/FSP/VGA Bin Meng
@ 2016-12-26  5:29 ` Simon Glass
  2016-12-26  5:38   ` Bin Meng
  2 siblings, 1 reply; 9+ messages in thread
From: Simon Glass @ 2016-12-26  5:29 UTC (permalink / raw)
  To: u-boot

On 26 December 2016 at 17:52, Bin Meng <bmeng.cn@gmail.com> wrote:
> With the conversion to use binman to build x86 boards, Intel Galileo
> board does not build anymore due to missing ucode entry. In fact
> ucode is not needed for quark-based boards.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/dts/quark-u-boot.dtsi | 17 +++++++++++++++++
>  1 file changed, 17 insertions(+)
>  create mode 100644 arch/x86/dts/quark-u-boot.dtsi

Reviewed-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/3] x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi
  2016-12-26  4:52 ` [U-Boot] [PATCH 2/3] x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi Bin Meng
@ 2016-12-26  5:29   ` Simon Glass
  2016-12-26  5:38     ` Bin Meng
  0 siblings, 1 reply; 9+ messages in thread
From: Simon Glass @ 2016-12-26  5:29 UTC (permalink / raw)
  To: u-boot

On 26 December 2016 at 17:52, Bin Meng <bmeng.cn@gmail.com> wrote:
> Since we already have a bunch of Kconfig options for CMC/FSP/VGA file
> names, add these from Kconfig in the corresponding dts nodes.
>
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  arch/x86/dts/u-boot.dtsi | 3 +++
>  1 file changed, 3 insertions(+)

Reviewed-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 3/3] binman: Remove hard-coded file name for x86 CMC/FSP/VGA
  2016-12-26  4:52 ` [U-Boot] [PATCH 3/3] binman: Remove hard-coded file name for x86 CMC/FSP/VGA Bin Meng
@ 2016-12-26  5:29   ` Simon Glass
  2016-12-26  5:38     ` Bin Meng
  0 siblings, 1 reply; 9+ messages in thread
From: Simon Glass @ 2016-12-26  5:29 UTC (permalink / raw)
  To: u-boot

On 26 December 2016 at 17:52, Bin Meng <bmeng.cn@gmail.com> 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: Bin Meng <bmeng.cn@gmail.com>
> ---
>
>  tools/binman/etype/intel_cmc.py | 3 ---
>  tools/binman/etype/intel_fsp.py | 3 ---
>  tools/binman/etype/intel_vga.py | 3 ---
>  3 files changed, 9 deletions(-)

Reviewed-by: Simon Glass <sjg@chromium.org>

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards
  2016-12-26  5:29 ` [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards Simon Glass
@ 2016-12-26  5:38   ` Bin Meng
  0 siblings, 0 replies; 9+ messages in thread
From: Bin Meng @ 2016-12-26  5:38 UTC (permalink / raw)
  To: u-boot

On Mon, Dec 26, 2016 at 1:29 PM, Simon Glass <sjg@chromium.org> wrote:
> On 26 December 2016 at 17:52, Bin Meng <bmeng.cn@gmail.com> wrote:
>> With the conversion to use binman to build x86 boards, Intel Galileo
>> board does not build anymore due to missing ucode entry. In fact
>> ucode is not needed for quark-based boards.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  arch/x86/dts/quark-u-boot.dtsi | 17 +++++++++++++++++
>>  1 file changed, 17 insertions(+)
>>  create mode 100644 arch/x86/dts/quark-u-boot.dtsi
>
> Reviewed-by: Simon Glass <sjg@chromium.org>

applied to u-boot-x86, thanks!

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 2/3] x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi
  2016-12-26  5:29   ` Simon Glass
@ 2016-12-26  5:38     ` Bin Meng
  0 siblings, 0 replies; 9+ messages in thread
From: Bin Meng @ 2016-12-26  5:38 UTC (permalink / raw)
  To: u-boot

On Mon, Dec 26, 2016 at 1:29 PM, Simon Glass <sjg@chromium.org> wrote:
> On 26 December 2016 at 17:52, Bin Meng <bmeng.cn@gmail.com> wrote:
>> Since we already have a bunch of Kconfig options for CMC/FSP/VGA file
>> names, add these from Kconfig in the corresponding dts nodes.
>>
>> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  arch/x86/dts/u-boot.dtsi | 3 +++
>>  1 file changed, 3 insertions(+)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>

applied to u-boot-x86, thanks!

^ permalink raw reply	[flat|nested] 9+ messages in thread

* [U-Boot] [PATCH 3/3] binman: Remove hard-coded file name for x86 CMC/FSP/VGA
  2016-12-26  5:29   ` Simon Glass
@ 2016-12-26  5:38     ` Bin Meng
  0 siblings, 0 replies; 9+ messages in thread
From: Bin Meng @ 2016-12-26  5:38 UTC (permalink / raw)
  To: u-boot

On Mon, Dec 26, 2016 at 1:29 PM, Simon Glass <sjg@chromium.org> wrote:
> On 26 December 2016 at 17:52, Bin Meng <bmeng.cn@gmail.com> 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: Bin Meng <bmeng.cn@gmail.com>
>> ---
>>
>>  tools/binman/etype/intel_cmc.py | 3 ---
>>  tools/binman/etype/intel_fsp.py | 3 ---
>>  tools/binman/etype/intel_vga.py | 3 ---
>>  3 files changed, 9 deletions(-)
>
> Reviewed-by: Simon Glass <sjg@chromium.org>

applied to u-boot-x86, thanks!

^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2016-12-26  5:38 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-12-26  4:52 [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards Bin Meng
2016-12-26  4:52 ` [U-Boot] [PATCH 2/3] x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi Bin Meng
2016-12-26  5:29   ` Simon Glass
2016-12-26  5:38     ` Bin Meng
2016-12-26  4:52 ` [U-Boot] [PATCH 3/3] binman: Remove hard-coded file name for x86 CMC/FSP/VGA Bin Meng
2016-12-26  5:29   ` Simon Glass
2016-12-26  5:38     ` Bin Meng
2016-12-26  5:29 ` [U-Boot] [PATCH 1/3] x86: quark: Fix build error for quark-based boards Simon Glass
2016-12-26  5:38   ` Bin Meng

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.