dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-02 17:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

x86: Use multiple images

Browse Source 
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
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> #include <u-boot.dtsi>
#ifdef CONFIG_ROM_SIZE #ifdef CONFIG_ROM_SIZE
/ { &rom {
binman {
#ifdef CONFIG_SPL #ifdef CONFIG_SPL
u-boot-spl-with-ucode-ptr { u-boot-spl-with-ucode-ptr {
optional-ucode; optional-ucode;
};
#else
u-boot-with-ucode-ptr {
optional-ucode;
};
#endif
}; };
#else
u-boot-with-ucode-ptr {
optional-ucode;
};
#endif
}; };
#endif #endif

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

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

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

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