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>

diff --git a/arch/x86/dts/emulation-u-boot.dtsi b/arch/x86/dts/emulation-u-boot.dtsi
index 6b651a3..7245fe5 100644 (file)
--- a/arch/x86/dts/emulation-u-boot.dtsi
+++ b/arch/x86/dts/emulation-u-boot.dtsi
@@ -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;
-               };
+       u-boot-spl-with-ucode-ptr {
+               optional-ucode;
+       };
 #else
-               u-boot-with-ucode-ptr {
-                       optional-ucode;
-               };
-#endif
+       u-boot-with-ucode-ptr {
+               optional-ucode;
        };
+#endif
 };
 #endif

diff --git a/arch/x86/dts/quark-u-boot.dtsi b/arch/x86/dts/quark-u-boot.dtsi
index 7ebc301..60ffffc 100644 (file)
--- a/arch/x86/dts/quark-u-boot.dtsi
+++ b/arch/x86/dts/quark-u-boot.dtsi
@@ -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

diff --git a/arch/x86/dts/u-boot.dtsi b/arch/x86/dts/u-boot.dtsi
index fa8106c..90badcc 100644 (file)
--- a/arch/x86/dts/u-boot.dtsi
+++ b/arch/x86/dts/u-boot.dtsi
@@ -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 {