From a78466af82e4db6ffba40f45dadc904233eb06de Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sun, 19 Jul 2020 13:56:15 -0600
Subject: [PATCH] x86: Move the fdtmap away from the binary blobs
This causes conflicts on chromebook_link64. Move it to after U-Boot where
there should be plenty of space.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---
arch/x86/dts/u-boot.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index f0f8c71761..1e0a985b43 100644
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -92,6 +92,8 @@
u-boot-dtb {
};
#endif
+ fdtmap {
+ };
#ifdef CONFIG_HAVE_X86_FIT
intel-fit {
};
@@ -139,8 +141,6 @@
filename = CONFIG_FSP_FILE_S;
};
#endif
- fdtmap {
- };
#ifdef CONFIG_HAVE_CMC
intel-cmc {
filename = CONFIG_CMC_FILE;
--
2.39.5