aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSimon Glass2020-09-06 10:35:34 -0600
committerBin Meng2020-09-25 11:27:28 +0800
commit2e3b8830140065184604e6acdadf7242d300bec6 (patch)
tree12f276e0bc88f6f8d37f97799fc838c803d1d5a4 /arch
parentfb91d5675edf9a45141b69740f10979e221dd72e (diff)
x86: edison: Generate an image suitable for xFSTK
It is useful to be able to flash Edison directly without relying on the installed U-Boot being functional. Add a binman image for this. It includes a 'OSIP' header (which happens to look like an MBR / (Master-Boot Record), U-Boot binary and an environment. I am not able to find a specification for OSIP. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/cpu/tangier/Kconfig1
-rw-r--r--arch/x86/dts/edison.dts34
2 files changed, 35 insertions, 0 deletions
diff --git a/arch/x86/cpu/tangier/Kconfig b/arch/x86/cpu/tangier/Kconfig
index d2b7edecd60..571470c74b2 100644
--- a/arch/x86/cpu/tangier/Kconfig
+++ b/arch/x86/cpu/tangier/Kconfig
@@ -12,6 +12,7 @@ config INTEL_TANGIER
imply MMC_SDHCI_TANGIER
imply USB
imply USB_DWC3
+ imply BINMAN
if INTEL_TANGIER
diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts
index df24aa0d26a..e2f9469de32 100644
--- a/arch/x86/dts/edison.dts
+++ b/arch/x86/dts/edison.dts
@@ -22,6 +22,10 @@
serial2 = &serial2;
};
+ binman: binman {
+ multiple-images;
+ };
+
chosen {
stdout-path = &serial2;
};
@@ -130,3 +134,33 @@
};
};
};
+
+&binman {
+ u-boot-edison {
+ filename = "u-boot-edison.img";
+
+ /* This is the OSIP */
+ blob {
+ filename = "edison-osip.dat";
+ };
+
+ u-boot {
+ offset = <0x200>;
+ };
+
+ u-boot-env {
+ offset = <0x200200>;
+ filename = "edison-environment.txt";
+ size = <0x10000>;
+ fill-byte = [ff];
+ };
+
+ u-boot-env2 {
+ type = "u-boot-env";
+ offset = <0x500200>;
+ filename = "edison-environment.txt";
+ size = <0x10000>;
+ fill-byte = [ff];
+ };
+ };
+};