projects
/
platform
/
kernel
/
u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
5a11405
)
x86: Move the fdtmap away from the binary blobs
author
Simon Glass
<sjg@chromium.org>
Sun, 19 Jul 2020 19:56:15 +0000
(13:56 -0600)
committer
Simon Glass
<sjg@chromium.org>
Wed, 29 Jul 2020 01:30:39 +0000
(19:30 -0600)
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
patch
|
blob
|
history
diff --git
a/arch/x86/dts/u-boot.dtsi
b/arch/x86/dts/u-boot.dtsi
index f0f8c71761a7ddc79cd6a92a348c618d3701f5dd..1e0a985b43b5ab74f956cf9fca3ccc702536009c 100644
(file)
--- 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;