diff mbox

[U-Boot,v2,22/27] x86: Include FSP and CMC binary in the u-boot.rom build rules

Message ID 1418136613-4909-23-git-send-email-bmeng.cn@gmail.com
State Superseded
Delegated to: Simon Glass
Headers show

Commit Message

Bin Meng Dec. 9, 2014, 2:50 p.m. UTC 
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

---

Changes in v2:
- Update ifdtool flags to indicate FSP and CMC files are in
  the board directory
- Use consistent XXX_FILE name for binary blob file

 Makefile                          | 10 +++++++++-
 include/configs/chromebook_link.h |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

Comments

Simon Glass Dec. 12, 2014, 3:27 a.m. UTC | #1 
On 9 December 2014 at 07:50, Bin Meng <bmeng.cn@gmail.com> wrote:
> Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
>
> ---
>
> Changes in v2:
> - Update ifdtool flags to indicate FSP and CMC files are in
>   the board directory
> - Use consistent XXX_FILE name for binary blob file
>
>  Makefile                          | 10 +++++++++-
>  include/configs/chromebook_link.h |  2 +-
>  2 files changed, 10 insertions(+), 2 deletions(-)

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

>
> diff --git a/Makefile b/Makefile
> index ff4c4aa..81d27cf 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -976,8 +976,16 @@ ifneq ($(CONFIG_HAVE_MRC),)
>  IFDTOOL_FLAGS += -w $(CONFIG_X86_MRC_ADDR):$(srctree)/board/$(BOARDDIR)/mrc.bin
>  endif
>
> +ifneq ($(CONFIG_HAVE_FSP),)
> +IFDTOOL_FLAGS += -w $(CONFIG_FSP_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_FSP_FILE)
> +endif
> +
> +ifneq ($(CONFIG_HAVE_CMC),)
> +IFDTOOL_FLAGS += -w $(CONFIG_CMC_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_CMC_FILE)
> +endif
> +
>  ifneq ($(CONFIG_X86_OPTION_ROM_ADDR),)
> -IFDTOOL_FLAGS += -w $(CONFIG_X86_OPTION_ROM_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_X86_OPTION_ROM_FILENAME)
> +IFDTOOL_FLAGS += -w $(CONFIG_X86_OPTION_ROM_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_X86_OPTION_ROM_FILE)
>  endif
>
>  quiet_cmd_ifdtool = IFDTOOL $@
> diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
> index c9d84e4..b311f4c 100644
> --- a/include/configs/chromebook_link.h
> +++ b/include/configs/chromebook_link.h
> @@ -39,7 +39,7 @@
>         {PCI_VENDOR_ID_INTEL,           \
>                         PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE}
>
> -#define CONFIG_X86_OPTION_ROM_FILENAME         pci8086,0166.bin
> +#define CONFIG_X86_OPTION_ROM_FILE             pci8086,0166.bin
>  #define CONFIG_X86_OPTION_ROM_ADDR             0xfff90000
>  #define CONFIG_VIDEO_X86
>
> --
> 1.8.2.1
>
diff mbox

Patch

diff --git a/Makefile b/Makefile
index ff4c4aa..81d27cf 100644
--- a/Makefile
+++ b/Makefile
@@ -976,8 +976,16 @@  ifneq ($(CONFIG_HAVE_MRC),)
 IFDTOOL_FLAGS += -w $(CONFIG_X86_MRC_ADDR):$(srctree)/board/$(BOARDDIR)/mrc.bin
 endif
 
+ifneq ($(CONFIG_HAVE_FSP),)
+IFDTOOL_FLAGS += -w $(CONFIG_FSP_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_FSP_FILE)
+endif
+
+ifneq ($(CONFIG_HAVE_CMC),)
+IFDTOOL_FLAGS += -w $(CONFIG_CMC_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_CMC_FILE)
+endif
+
 ifneq ($(CONFIG_X86_OPTION_ROM_ADDR),)
-IFDTOOL_FLAGS += -w $(CONFIG_X86_OPTION_ROM_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_X86_OPTION_ROM_FILENAME)
+IFDTOOL_FLAGS += -w $(CONFIG_X86_OPTION_ROM_ADDR):$(srctree)/board/$(BOARDDIR)/$(CONFIG_X86_OPTION_ROM_FILE)
 endif
 
 quiet_cmd_ifdtool = IFDTOOL $@
diff --git a/include/configs/chromebook_link.h b/include/configs/chromebook_link.h
index c9d84e4..b311f4c 100644
--- a/include/configs/chromebook_link.h
+++ b/include/configs/chromebook_link.h
@@ -39,7 +39,7 @@ 
 	{PCI_VENDOR_ID_INTEL,		\
 			PCI_DEVICE_ID_INTEL_PANTHERPOINT_AHCI_MOBILE}
 
-#define CONFIG_X86_OPTION_ROM_FILENAME		pci8086,0166.bin
+#define CONFIG_X86_OPTION_ROM_FILE		pci8086,0166.bin
 #define CONFIG_X86_OPTION_ROM_ADDR		0xfff90000
 #define CONFIG_VIDEO_X86