bootm: Add sub commands
PATCH v5 1/1 bootm: Add sub commands
Signed-off-by Kumar Gala <[email protected]>
--- common/cmd_bootm.c | 149 ++++++++++++++++++++++++++++- include/image.h | 20 ++++- lib_ppc/bootm.c | 272 ++++++++++++++++++++++++++++++++++------------------ 3 files changed, 347 insertions(+), 94 deletions(-)
* Added flushing the data cache in multicore cases so images are visible to both cores
* Added an arch_lmb_reserve() as a way for arch's to reserve regions of memory that shouldnt get loaded on to (like the stack)
* fixed up some comments pointed by Jerry
common/cmd_bootm.c +148 -1
@@ -34,6 +34,7 @@#include <bzlib.h> #include <environment.h> #include <lmb.h> +#include <linux/ctype.h> #include <asm/byteorder.h> #if defined(CONFIG_CMD_USB )
@@ -128,6 +129,12 @@ void __board_lmb_reserve(struct lmb *lmb) }void board_lmb_reserve (struct lmb *lmb) __attribute__((weak,alias ("__board_lmb_reserve" ))); +void __arch_lmb_reserve (struct lmb *lmb) +{ +/* please define platform specific arch_lmb_reserve() */ +} +void arch_lmb_reserve (struct lmb *lmb) __attribute__((weak,alias ("__arch_lmb_reserve" ))); +#if defined(__ARM__)#define IH_INITRD_ARCH IH_ARCH_ARM#elif defined(__avr32__)
@@ -173,6 +180,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])lmb_add (&images.lmb, (phys_addr_t )mem_start, mem_size); +arch_lmb_reserve (&images.lmb);board_lmb_reserve (&images.lmb);/* get kernel image header, start address and length */
@@ -273,7 +281,7 @@ static int bootm_start(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } images.os.start = (ulong )os_hdr; - images.valid =1 ; + images.state =BOOTM_STATE_START ;return 0 ; }
@@ -376,6 +384,113 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress)return 0 ; } +/* we overload the cmd field with our state machine info instead of a +* function pointer */ +cmd_tbl_t cmd_bootm_sub[] = { +U_BOOT_CMD_MKENT (start,0 ,1 , (void *)BOOTM_STATE_START ,"" ,"" ), +U_BOOT_CMD_MKENT (loados,0 ,1 , (void *)BOOTM_STATE_LOADOS ,"" ,"" ), +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC) +U_BOOT_CMD_MKENT (ramdisk,0 ,1 , (void *)BOOTM_STATE_RAMDISK ,"" ,"" ), +#endif +#ifdef CONFIG_OF_LIBFDT +U_BOOT_CMD_MKENT (fdt,0 ,1 , (void *)BOOTM_STATE_FDT ,"" ,"" ), +#endif +U_BOOT_CMD_MKENT (bdt,0 ,1 , (void *)BOOTM_STATE_OS_BD_T ,"" ,"" ), +U_BOOT_CMD_MKENT (cmdline,0 ,1 , (void *)BOOTM_STATE_OS_CMDLINE ,"" ,"" ), +U_BOOT_CMD_MKENT (prep,0 ,1 , (void *)BOOTM_STATE_OS_PREP ,"" ,"" ), +U_BOOT_CMD_MKENT (go,0 ,1 , (void *)BOOTM_STATE_OS_GO ,"" ,"" ), +}; + +int do_bootm_subcommand (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[]) +{ +int ret =0 ; +int state; +cmd_tbl_t *c; + + c =find_cmd_tbl (argv[1 ], &cmd_bootm_sub[0 ],ARRAY_SIZE (cmd_bootm_sub)); + +if (c) { + state = (int )c->cmd; + +/* treat start special since it resets the state machine */ +if (state ==BOOTM_STATE_START ) { + argc--; + argv++; +return bootm_start (cmdtp, flag, argc, argv); + } + } +/* Unrecognized command */ +else { +printf ("Usage:\n%s\n" , cmdtp->usage); +return 1 ; + } + +if (images.state >= state) { +printf ("Trying to execute a command out of order\n" ); +printf ("Usage:\n%s\n" , cmdtp->usage); +return 1 ; + } + + images.state |= state; + +switch (state) { +ulong load_end; +case BOOTM_STATE_START : +/* should never occur */ +break ; +case BOOTM_STATE_LOADOS : + ret =bootm_load_os (images.os, &load_end,0 ); +if (ret) +return ret; + +lmb_reserve (&images.lmb, images.os.load, + (load_end - images.os.load)); +break ; +#if defined(CONFIG_PPC ) || defined(CONFIG_M68K ) || defined(CONFIG_SPARC ) +case BOOTM_STATE_RAMDISK : + { +ulong rd_len = images.rd_end - images.rd_start; +char str[17 ]; + + ret =boot_ramdisk_high (&images.lmb, images.rd_start, + rd_len, &images.initrd_start, &images.initrd_end); +if (ret) +return ret; + +sprintf (str,"%lx" , images.initrd_start); +setenv ("initrd_start" , str); +sprintf (str,"%lx" , images.initrd_end); +setenv ("initrd_end" , str); + } +break ; +#endif +#ifdef CONFIG_OF_LIBFDT +case BOOTM_STATE_FDT : + { +ulong bootmap_base =getenv_bootm_low (); + ret =boot_relocate_fdt (&images.lmb, bootmap_base, + &images.ft_addr, &images.ft_len); +break ; + } +#endif +case BOOTM_STATE_OS_CMDLINE : +do_bootm_linux (BOOTM_STATE_OS_CMDLINE , argc, argv, &images); +break ; +case BOOTM_STATE_OS_BD_T : +do_bootm_linux (BOOTM_STATE_OS_BD_T , argc, argv, &images); +break ; +case BOOTM_STATE_OS_PREP : +do_bootm_linux (BOOTM_STATE_OS_PREP , argc, argv, &images); +break ; +case BOOTM_STATE_OS_GO : +disable_interrupts (); +do_bootm_linux (BOOTM_STATE_OS_GO , argc, argv, &images); +break ; + } + +return ret; +} +/*******************************************************************/ /* bootm - boot application image from image in memory */ /*******************************************************************/
@@ -386,6 +501,23 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])ulong load_end =0 ;int ret; +/* determine if we have a sub command */ +if (argc >1 ) { +char *endp; + +simple_strtoul (argv[1 ], &endp,16 ); +/* endp pointing to NULL means that argv[1] was just a +* valid number, pass it along to the normal bootm processing +* +* If endp is ':' or '#' assume a FIT identifier so pass +* along for normal processing. +* +* Right now we assume the first arg should never be '-' +*/ +if ((*endp !=0 ) && (*endp !=':' ) && (*endp !='#' )) +return do_bootm_subcommand (cmdtp, flag, argc, argv); + } +if (bootm_start (cmdtp, flag, argc, argv))return 1 ;
@@ -782,6 +914,21 @@ U_BOOT_CMD("\tUse iminfo command to get the list of existing component\n" "\timages and configurations.\n"#endif +"\nSub-commands to do part of the bootm sequence. The sub-commands " +"must be\n" +"issued in the order below (it's ok to not issue all sub-commands):\n" +"\tstart [addr [arg ...]]\n" + "\tloados - load OS image\n" +#if defined(CONFIG_PPC ) || defined(CONFIG_M68K ) || defined(CONFIG_SPARC ) + "\tramdisk - relocate initrd, set env initrd_start/initrd_end\n" +#endif +#if defined(CONFIG_OF_LIBFDT ) +"\tfdt - relocate flat device tree\n" +#endif +"\tbdt - OS specific bd_t processing\n" +"\tcmdline - OS specific command line processing/setup\n" +"\tprep - OS specific prep before relocation or go\n" +"\tgo - start OS\n" );/*******************************************************************/
include/image.h +19 -1
@@ -228,6 +228,7 @@ typedef struct bootm_headers {#endif #endif +#ifndef USE_HOSTCC image_info_t os;/* os image info */ ulong ep;/* entry point of OS */
@@ -238,8 +239,25 @@ typedef struct bootm_headers {#endif ulong ft_len;/* length of flat device tree */ +ulong initrd_start; +ulong initrd_end; +ulong cmdline_start; +ulong cmdline_end; +bd_t *kbd; +#endif +int verify;/* getenv("verify")[0] != 'n' */ -int valid;/* set to 1 if we've set values in the header */ + +#define BOOTM_STATE_START (0x00000001) +#define BOOTM_STATE_LOADOS (0x00000002) +#define BOOTM_STATE_RAMDISK (0x00000004) +#define BOOTM_STATE_FDT (0x00000008) +#define BOOTM_STATE_OS_CMDLINE (0x00000010) +#define BOOTM_STATE_OS_BD_T (0x00000020) +#define BOOTM_STATE_OS_PREP (0x00000040) +#define BOOTM_STATE_OS_GO (0x00000080) +int state; +#ifndef USE_HOSTCC struct lmb lmb;/* for memory mgmt */ #endif
lib_ppc/bootm.c +180 -92
343 lines not on this page · raw message
Signature · 1 line
1.5.5.1