diff options
| author | Bernhard Walle <bernhard@bwalle.de> | 2012-02-12 19:36:17 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-02-14 21:58:01 +0100 |
| commit | 9f6e5452c8b10a361ad7072058c2d13b69005eb9 (patch) | |
| tree | e38d7d2c081b31720131d9a1bdf8ebb67cdca902 | |
| parent | d6d9db7b152b14d2c5e1df6e41a430fd4a70dc3e (diff) | |
| download | ptxdist-9f6e5452c8b10a361ad7072058c2d13b69005eb9.tar.gz ptxdist-9f6e5452c8b10a361ad7072058c2d13b69005eb9.tar.xz | |
u-boot: Allow copying of u-boot SPL to images
This patch adds two options:
1) U_BOOT_INSTALL_MLO copies the "MLO" (u-boot SPL which replaces
x-loader for OMAP CPUs) to the images directory.
2) U_BOOT_INSTALL_U_BOOT_IMG copies "u-boot.img" in addition to the
u-boot binary because u-boot SPL expects the u-boot.img (which
contains an additional u-boot header) on a SD card.
Because of the file name conflict, U_BOOT_INSTALL_MLO is only selectable
when x-loader is not built.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | platforms/u-boot.in | 19 | ||||
| -rw-r--r-- | rules/u-boot.make | 6 |
2 files changed, 25 insertions, 0 deletions
diff --git a/platforms/u-boot.in b/platforms/u-boot.in index 86f0703cb..1cac07bf7 100644 --- a/platforms/u-boot.in +++ b/platforms/u-boot.in @@ -60,5 +60,24 @@ config U_BOOT_INSTALL_ELF help Installing the U-Boot ELF binary into platform image directory. +config U_BOOT_INSTALL_MLO + prompt "install MLO" + bool + depends on !X_LOAD + help + Installing the U-Boot SPL ("MLO") binary needed for OMAP CPUs into platform + image directory. + +if U_BOOT_INSTALL_MLO + +config U_BOOT_INSTALL_U_BOOT_IMG + prompt "install u-boot.img" + bool + help + Installing the u-boot image with header ("u-boot.img") which is executed + by u-boot SPL ("MLO") into platform image directory. + +endif + endif diff --git a/rules/u-boot.make b/rules/u-boot.make index bee7faf90..36760eeca 100644 --- a/rules/u-boot.make +++ b/rules/u-boot.make @@ -70,6 +70,12 @@ endif ifdef PTXCONF_U_BOOT_INSTALL_ELF @install -D -m644 $(U_BOOT_DIR)/u-boot $(IMAGEDIR)/u-boot.elf endif +ifdef PTXCONF_U_BOOT_INSTALL_MLO + @install -D -m644 $(U_BOOT_DIR)/MLO $(IMAGEDIR)/MLO +endif +ifdef PTXCONF_U_BOOT_INSTALL_U_BOOT_IMG + @install -D -m644 $(U_BOOT_DIR)/u-boot.img $(IMAGEDIR)/u-boot.img +endif @$(call touch) # ---------------------------------------------------------------------------- |