From: Bin Meng <bmeng.cn@gmail.com>
Date: Mon, 26 Dec 2016 04:52:46 +0000 (-0800)
Subject: x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi
X-Git-Tag: v2017.01-rc3~36
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=79e550e0f39144cd9de57a7d8fb71916d2b96f1b;p=u-boot

x86: Add file names from Kconfig in CMC/FSP/VGA nodes in u-boot.dtsi

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>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index 724913f619..31f0b1aa10 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