LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: Use multiple images 

We already use binman's 'multiple-images' feature with Chrome OS and we
want to use it for Edison. There is no real down-side.

Adjust x86 to always use multiple-images.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
This commit is contained in:
Simon Glass 2020-09-06 10:35:31 -06:00 committed by Bin Meng
parent 308b1a960e
commit 2463f165a3
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/x86/dts/emulation-u-boot.dtsi
View File

@ -7,17 +7,15 @@
#include <u-boot.dtsi>
#ifdef CONFIG_ROM_SIZE
/ {
binman {
&rom {
#ifdef CONFIG_SPL
u-boot-spl-with-ucode-ptr {
optional-ucode;
};
#else
u-boot-with-ucode-ptr {
optional-ucode;
};
#endif
u-boot-spl-with-ucode-ptr {
optional-ucode;
};
#else
u-boot-with-ucode-ptr {
optional-ucode;
};
#endif
};
#endif

8
arch/x86/dts/quark-u-boot.dtsi
View File

@ -6,11 +6,9 @@
#include <u-boot.dtsi>
#ifdef CONFIG_ROM_SIZE
/ {
binman {
u-boot-with-ucode-ptr {
optional-ucode;
};
&rom {
u-boot-with-ucode-ptr {
optional-ucode;
};
};
#endif

7
arch/x86/dts/u-boot.dtsi
View File

@ -6,7 +6,6 @@
#include <config.h>
#ifdef CONFIG_CHROMEOS
/ {
binman {
multiple-images;
@ -14,12 +13,6 @@
};
};
};
#else
/ {
rom: binman {
};
};
#endif
#ifdef CONFIG_ROM_SIZE
&rom {