Commit 1648a375 authored by Simon Schwarz's avatar Simon Schwarz Committed by Albert ARIBAUD

Add cmd_spl command

This adds a spl command to the u-boot.

Related config:
CONFIG_CMD_SPL
	activate/deactivate the command
CONFIG_CMD_SPL_NAND_OFS
	Offset in NAND to use
Signed-off-by: default avatarSimon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: default avatarStefano Babic <sbabic@denx.de>
CC: Tom Rini <tom.rini@gmail.com>
CC: Wolfgang Denk <wd@denx.de>
parent 19db9be4
......@@ -162,6 +162,7 @@ COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o
endif
COBJS-$(CONFIG_CMD_XIMG) += cmd_ximg.o
COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o
COBJS-$(CONFIG_CMD_SPL) += cmd_spl.o
# others
ifdef CONFIG_DDR_SPD
......
/*
* Copyright (C) 2011
* Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#include <common.h>
#include <command.h>
#include <cmd_spl.h>
DECLARE_GLOBAL_DATA_PTR;
static const char **subcmd_list[] = {
[SPL_EXPORT_FDT] = (const char * []) {
#ifdef CONFIG_OF_LIBFDT
"start",
"loados",
#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
"ramdisk",
#endif
"fdt",
"cmdline",
"bdt",
"prep",
#endif
NULL,
},
[SPL_EXPORT_ATAGS] = (const char * []) {
#if defined(CONFIG_SETUP_MEMORY_TAGS) || \
defined(CONFIG_CMDLINE_TAG) || \
defined(CONFIG_INITRD_TAG) || \
defined(CONFIG_SERIAL_TAG) || \
defined(CONFIG_REVISION_TAG)
"start",
"loados",
#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
"ramdisk",
#endif
"cmdline",
"bdt",
"prep",
#endif
NULL,
},
NULL
};
/* Calls bootm with the parameters given */
static int call_bootm(int argc, char * const argv[], const char *subcommand[])
{
char *bootm_argv[5];
int i = 0;
int ret = 0;
int j;
/* create paramter array */
bootm_argv[0] = "do_bootm";
switch (argc) {
case 3:
bootm_argv[4] = argv[2]; /* fdt addr */
case 2:
bootm_argv[3] = argv[1]; /* initrd addr */
case 1:
bootm_argv[2] = argv[0]; /* kernel addr */
}
/*
* - do the work -
* exec subcommands of do_bootm to init the images
* data structure
*/
while (subcommand[i] != NULL) {
bootm_argv[1] = (char *)subcommand[i];
debug("args %d: %s %s ", argc, bootm_argv[0], bootm_argv[1]);
for (j = 0; j < argc; j++)
debug("%s ", bootm_argv[j + 2]);
debug("\n");
ret = do_bootm(find_cmd("do_bootm"), 0, argc+2,
bootm_argv);
debug("Subcommand retcode: %d\n", ret);
i++;
}
if (ret) {
printf("ERROR prep subcommand failed!\n");
return -1;
}
return 0;
}
static cmd_tbl_t cmd_spl_export_sub[] = {
U_BOOT_CMD_MKENT(fdt, 0, 1, (void *)SPL_EXPORT_FDT, "", ""),
U_BOOT_CMD_MKENT(atags, 0, 1, (void *)SPL_EXPORT_ATAGS, "", ""),
};
static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
const cmd_tbl_t *c;
if (argc < 2) /* no subcommand */
return cmd_usage(cmdtp);
c = find_cmd_tbl(argv[1], &cmd_spl_export_sub[0],
ARRAY_SIZE(cmd_spl_export_sub));
if ((c) && ((int)c->cmd <= SPL_EXPORT_LAST)) {
argc -= 2;
argv += 2;
if (call_bootm(argc, argv, subcmd_list[(int)c->cmd]))
return -1;
switch ((int)c->cmd) {
case SPL_EXPORT_FDT:
printf("Argument image is now in RAM: 0x%p\n",
(void *)images.ft_addr);
break;
case SPL_EXPORT_ATAGS:
printf("Argument image is now in RAM at: 0x%p\n",
(void *)gd->bd->bi_boot_params);
break;
}
} else {
/* Unrecognized command */
return cmd_usage(cmdtp);
}
return 0;
}
static cmd_tbl_t cmd_spl_sub[] = {
U_BOOT_CMD_MKENT(export, 0, 1, (void *)SPL_EXPORT, "", ""),
};
static int do_spl(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
const cmd_tbl_t *c;
int cmd;
if (argc < 2) /* no subcommand */
return cmd_usage(cmdtp);
c = find_cmd_tbl(argv[1], &cmd_spl_sub[0], ARRAY_SIZE(cmd_spl_sub));
if (c) {
cmd = (int)c->cmd;
switch (cmd) {
case SPL_EXPORT:
argc--;
argv++;
if (spl_export(cmdtp, flag, argc, argv))
printf("Subcommand failed\n");
break;
default:
/* unrecognized command */
return cmd_usage(cmdtp);
}
} else {
/* Unrecognized command */
return cmd_usage(cmdtp);
}
return 0;
}
U_BOOT_CMD(
spl, 6 , 1, do_spl, "SPL configuration",
"export <img=atags|fdt> [kernel_addr] [initrd_addr] "
"[fdt_addr if <img> = fdt] - export a kernel parameter image\n"
"\t initrd_img can be set to \"-\" if fdt_addr without initrd img is"
"used");
The spl command is used to export a boot parameter image to RAM. Later
it may implement more functions connected to the SPL.
SUBCOMMAND EXPORT
To execute the command everything has to be in place as if bootm should be
used. (kernel image, initrd-image, fdt-image etc.)
export has two subcommands:
atags: exports the ATAGS
fdt: exports the FDT
Call is:
spl export <ftd|atags> [kernel_addr] [initrd_addr] [fdt_addr if fdt]
TYPICAL CALL
on OMAP3:
nandecc hw
nand read 0x82000000 0x280000 0x400000 /* Read kernel image from NAND*/
spl export atags /* export ATAGS */
nand erase 0x680000 0x20000 /* erase - one page */
nand write 0x80000100 0x680000 0x20000 /* write the image - one page */
call with FDT:
nandecc hw
nand read 0x82000000 0x280000 0x400000 /* Read kernel image from NAND*/
tftpboot 0x80000100 devkit8000.dtb /* Read fdt */
spl export fdt 0x82000000 - 0x80000100 /* export FDT */
nand erase 0x680000 0x20000 /* erase - one page */
nand write <adress shown by spl export> 0x680000 0x20000
/* Copyright (C) 2011
* Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef _NAND_SPL_H_
#define _NAND_SPL_H_
#define SPL_EXPORT (0x00000001)
#define SPL_EXPORT_FDT (0x00000001)
#define SPL_EXPORT_ATAGS (0x00000002)
#define SPL_EXPORT_LAST SPL_EXPORT_ATAGS
#endif /* _NAND_SPL_H_ */
......@@ -268,6 +268,8 @@ typedef struct bootm_headers {
#endif
} bootm_headers_t;
extern bootm_headers_t images;
/*
* Some systems (for example LWMON) have very short watchdog periods;
* we must make sure to split long operations like memmove() or
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment