diff options
| author | Tom Rini <trini@konsulko.com> | 2016-08-12 08:31:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-08-20 11:35:07 -0400 |
| commit | 5db28905c952560843212236963e9f711341cad5 (patch) | |
| tree | 9e2546824158101b69ac0e2a102d7c34920c9d69 /common | |
| parent | f2a9942fbc47491cc5f5151670c42d43dc0544cb (diff) | |
| download | u-boot-imx-5db28905c952560843212236963e9f711341cad5.zip u-boot-imx-5db28905c952560843212236963e9f711341cad5.tar.gz u-boot-imx-5db28905c952560843212236963e9f711341cad5.tar.bz2 | |
cmd: Split 'bootz' and 'booti' out from 'bootm'
The bootz and booti commands rely on common functionality that is found
in common/bootm.c and common/bootm_os.c. They do not however rely on
the rest of cmd/bootm.c to be implemented so split them into their own
files. Have various Makefiles include the required infrastructure for
CONFIG_CMD_BOOT[IZ] as well as CONFIG_CMD_BOOTM. Move the declaration
of 'images' over to common/bootm.c.
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'common')
| -rw-r--r-- | common/Makefile | 2 | ||||
| -rw-r--r-- | common/bootm.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/common/Makefile b/common/Makefile index e08cd3e..21619b3 100644 --- a/common/Makefile +++ b/common/Makefile @@ -26,6 +26,8 @@ obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o +obj-$(CONFIG_CMD_BOOTZ) += bootm.o bootm_os.o +obj-$(CONFIG_CMD_BOOTI) += bootm.o bootm_os.o # environment obj-y += env_attr.o diff --git a/common/bootm.c b/common/bootm.c index 9ed6428..a4d22a6 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -41,6 +41,8 @@ DECLARE_GLOBAL_DATA_PTR; +bootm_headers_t images; /* pointers to os/initrd/fdt images */ + static const void *boot_get_kernel(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], bootm_headers_t *images, ulong *os_data, ulong *os_len); |