bootm refactoring
cover bootm refactoring
[PATCH 01/15] Update linux bootm to support ePAPR client interface [PATCH 02/15] add ability to disable ft_board_setup as part of bootm
possibly drop this patch if the boots method is acceptable
[PATCH 03/15] Clean up usage of icache_disable/dcache_disable
[PATCH 04/15] fdt: added the ability to set initrd start/end via chosen command [PATCH 05/15] fdt: fdt addr w/o any args reports back the current working address [PATCH 06/15] bootm: refactor entry point code
[PATCH 07/15] bootm: refactor ramdisk locating code
[PATCH 08/15] bootm: refactor fdt locating and relocation code [PATCH 09/15] bootm: Set working fdt address as part of the bootm flow [PATCH 10/15] bootm: move lmb into the bootm_headers_t structure [PATCH 11/15] bootm: refactor image detection and os load steps [PATCH 12/15] fdt: refactor fdt resize code
[PATCH 13/15] fdt: refactor initrd related code
[PATCH 14/15] fdt: Added resize command
[PATCH 15/15] boots: start of sub commands
I believe all the patches except 15/15 should be in a reasonable state for u-boot-testing. I need to add an 'interrupt enable/disable' command but with a small hack I'm able to mimic the bootm command on ppc by:
boots start <A> <B> <C>
boots load_os /* hacked to disable interrupts */
boots prep_os
boots initrd_relocate
boots fdt_relocate
fdt chosen $initrd_start $initrd_end
fdt boardsetup
boots jump
Right now 15/15 is focused on only PPC w/Linux. If this looks acceptable I'll split 15/15 into proper patches an add support for the other ARCHes and OSes.
- k
RFC PATCH 1/15 Update linux bootm to support ePAPR client interface
the ePAPR spec has some subtle differences from the current device tree based boot interface to the powerpc linux kernel. The powerpc linux kernel currently ignores the differences that ePAPR specifies.
Signed-off-by Kumar Gala <[email protected]>
--- lib_ppc/bootm.c | 33 +++++++++++++++++++++++---------- 1 files changed, 23 insertions(+), 10 deletions(-)
lib_ppc/bootm.c +23 -10
@@ -80,7 +80,8 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],ulong cmd_start, cmd_end, bootmap_base;bd_t *kbd;ulong ep =0 ; -void (*kernel)(bd_t *,ulong ,ulong ,ulong ,ulong ); +void (*kernel)(bd_t *,ulong r4,ulong r5,ulong r6, +ulong r7,ulong r8,ulong r9);int ret;ulong of_size =0 ;struct lmb *lmb = images->lmb;
@@ -166,8 +167,8 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],puts ("Could not find kernel entry point!\n" ); goto error; } - kernel = (void (*)(bd_t *,ulong ,ulong ,ulong ,ulong ))ep; - + kernel = (void (*)(bd_t *,ulong ,ulong ,ulong , +ulong ,ulong ,ulong ))ep;/* find ramdisk */ ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_PPC , &rd_data_start, &rd_data_end);
@@ -282,14 +283,23 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],if (of_flat_tree) {/* device tree; boot new style */ /* * Linux Kernel Parameters (passing device tree): -* r3: pointer to the fdt, followed by the board info data -* r4: physical pointer to the kernel itself -* r5: NULL -* r6: NULL -* r7: NULL +* r3: pointer to the fdt +* r4: 0 +* r5: 0 +* r6: epapr magic +* r7: size of IMA in bytes +* r8: 0 +* r9: 0 */ +#if defined(CONFIG_85xx) || defined(CONFIG_440 ) +#define EPAPR_MAGIC (0x45504150) +#else +#define EPAPR_MAGIC (0x65504150) +#endif +debug (" Booting using OF flat tree...\n" ); - (*kernel) ((bd_t *)of_flat_tree, (ulong )kernel,0 ,0 ,0 ); + (*kernel) ((bd_t *)of_flat_tree,0 ,0 ,EPAPR_MAGIC , +CFG_BOOTMAPSZ ,0 ,0 );/* does not return */ } else#endif
@@ -301,9 +311,12 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],* r5: initrd_end - unused if r4 is 0 * r6: Start of command line string * r7: End of command line string +* r8: 0 +* r9: 0 */ debug (" Booting using board info...\n" ); - (*kernel) (kbd, initrd_start, initrd_end, cmd_start, cmd_end); + (*kernel) (kbd, initrd_start, initrd_end, + cmd_start, cmd_end,0 ,0 );/* does not return */ }return ;
Signature · 1 line
1.5.5.1
RFC PATCH 2/15 add ability to disable ft_board_setup as part of bootm
if the environment variable 'no_ft_board_setup' is set we skip doing the ft_board_setup().
Signed-off-by Kumar Gala <[email protected]>
--- lib_ppc/bootm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
lib_ppc/bootm.c +2 -1
@@ -193,7 +193,8 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], }#ifdef CONFIG_OF_BOARD_SETUP /* Call the board-specific fixup routine */ -ft_board_setup (of_flat_tree, gd->bd); +if (!getenv ("no_ft_board_setup" )) +ft_board_setup (of_flat_tree, gd->bd);#endif }
Signature · 1 line
1.5.5.1
RFC PATCH 3/15 Clean up usage of icache_disable/dcache_disable
There is no point in disabling the icache on 7xx/74xx/86xx parts and not also flushing the icache. All callers of invalidate_l1_instruction_cache() call icache_disable() right after. Make it so icache_disable() calls invalidate_l1_instruction_cache() for us.
Also, dcache_disable() already calls dcache_flush() so there is no point in the explicit calls of dcache_flush().
Signed-off-by Kumar Gala <[email protected]>
--- board/Marvell/db64360/db64360.c | 5 ----- board/Marvell/db64460/db64460.c | 5 ----- board/esd/cpci750/cpci750.c | 4 ---- board/freescale/mpc7448hpc2/mpc7448hpc2.c | 2 -- board/prodrive/p3mx/p3mx.c | 2 -- common/cmd_bootm.c | 2 -- cpu/74xx_7xx/cache.S | 4 ++++ cpu/mpc86xx/cache.S | 4 ++++ 8 files changed, 8 insertions(+), 20 deletions(-)
board/Marvell/db64360/db64360.c +0 -5
@@ -51,9 +51,6 @@#define DP (x)#endif -extern void flush_data_cache (void ); -extern void invalidate_l1_instruction_cache (void ); -/* ------------------------------------------------------------------------- */ /* this is the current GT register space location */
@@ -930,7 +927,5 @@ void board_prebootm_init ()my_remap_gt_regs_bootm (CFG_GT_REGS ,BRIDGE_REG_BASE_BOOTM );icache_disable (); -invalidate_l1_instruction_cache (); -flush_data_cache ();dcache_disable (); }
board/Marvell/db64460/db64460.c +0 -5
@@ -51,9 +51,6 @@#define DP (x)#endif -extern void flush_data_cache (void ); -extern void invalidate_l1_instruction_cache (void ); -/* ------------------------------------------------------------------------- */ /* this is the current GT register space location */
@@ -930,7 +927,5 @@ void board_prebootm_init ()my_remap_gt_regs_bootm (CFG_GT_REGS ,BRIDGE_REG_BASE_BOOTM );icache_disable (); -invalidate_l1_instruction_cache (); -flush_data_cache ();dcache_disable (); }
board/esd/cpci750/cpci750.c +0 -4
@@ -120,8 +120,6 @@ static char show_config_tab[][15] = {{"PCI0DLL_2 "}, /* 31 */ {"DRAMPLL_NDiv_1"}, /* 01 */ {"DRAMPLL_NDiv_0"}}; /* 00 */ -extern void flush_data_cache (void ); -extern void invalidate_l1_instruction_cache (void );extern flash_info_t flash_info[];/* ------------------------------------------------------------------------- */
@@ -961,8 +959,6 @@ void board_prebootm_init ()my_remap_gt_regs_bootm (CFG_GT_REGS ,CFG_DFL_GT_REGS );icache_disable (); -invalidate_l1_instruction_cache (); -flush_data_cache ();dcache_disable (); }
board/freescale/mpc7448hpc2/mpc7448hpc2.c +0 -2
@@ -37,8 +37,6 @@DECLARE_GLOBAL_DATA_PTR ; -extern void flush_data_cache (void ); -extern void invalidate_l1_instruction_cache (void );extern void tsi108_init_f (void );int display_mem_map (void );
board/prodrive/p3mx/p3mx.c +0 -2
@@ -62,8 +62,6 @@ DECLARE_GLOBAL_DATA_PTR;#define DP (x)#endif -extern void flush_data_cache (void ); -extern void invalidate_l1_instruction_cache (void );extern flash_info_t flash_info[];/* ------------------------------------------------------------------------- */
common/cmd_bootm.c +0 -2
@@ -236,8 +236,6 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])* bios emulation, so turn them off again */ icache_disable (); -invalidate_l1_instruction_cache (); -flush_data_cache ();dcache_disable ();#endif
cpu/74xx_7xx/cache.S +4 -0
@@ -245,6 +245,10 @@ _GLOBAL(icache_enable) * Disable L1 Instruction cache */ _GLOBAL(icache_disable) + mflr r4 + bl invalidate_l1_instruction_cache /* uses r3 */ + sync + mtlr r4 mfspr r3, HID0 li r5, 0 ori r5, r5, HID0_ICE
cpu/mpc86xx/cache.S +4 -0
@@ -232,6 +232,10 @@ _GLOBAL(icache_enable) * Disable L1 Instruction cache */ _GLOBAL(icache_disable) + mflr r4 + bl invalidate_l1_instruction_cache /* uses r3 */ + sync + mtlr r4 mfspr r3, HID0 li r5, 0 ori r5, r5, HID0_ICE
Signature · 1 line
1.5.5.1
RFC PATCH 4/15 fdt: added the ability to set initrd start/end via chosen command
Signed-off-by Kumar Gala <[email protected]>
--- common/cmd_fdt.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-)
common/cmd_fdt.c +17 -4
@@ -417,9 +417,21 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])ft_board_setup (working_fdt, gd->bd);#endif /* Create a chosen node */ - else if (argv[1][0] == 'c') - fdt_chosen(working_fdt, 0, 0, 1); - else { + else if (argv[1][0] == 'c') { +unsigned long initrd_start =0 , initrd_end =0 ; + +if ((argc !=2 ) && (argc !=4 )) { +printf ("Usage:\n%s\n" , cmdtp->usage); +return 1 ; + } + +if (argc ==4 ) { + initrd_start =simple_strtoul (argv[2 ],NULL ,16 ); + initrd_end =simple_strtoul (argv[3 ],NULL ,16 ); + } + +fdt_chosen (working_fdt, initrd_start, initrd_end,1 ); + } else {/* Unrecognized command */ printf ("Usage:\n%s\n" , cmdtp->usage);return 1 ;
@@ -798,7 +810,8 @@ U_BOOT_CMD("fdt rsvmem print - Show current mem reserves\n" "fdt rsvmem add <addr> <size> - Add a mem reserve\n" "fdt rsvmem delete <index> - Delete a mem reserves\n" -"fdt chosen - Add/update the /chosen branch in the tree\n" +"fdt chosen [<start> <end>] - Add/update the /chosen branch in the tree\n" +" <start>/<end> - initrd start/end addr\n" "NOTE: If the path or property you are setting/printing has a '#' character\n" " or spaces, you MUST escape it with a \\ character or quote it with \".\n" );
Signature · 1 line
1.5.5.1
RFC PATCH 5/15 fdt: fdt addr w/o any args reports back the current working address
Signed-off-by Kumar Gala <[email protected]>
--- common/cmd_fdt.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
common/cmd_fdt.c +8 -0
@@ -67,6 +67,14 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])/* * Set the address [and length] of the fdt. */ +if (argc ==2 ) { +if (!fdt_valid ()) { +return 1 ; + } +printf ("The address of the fdt is %p\n" , working_fdt); +return 0 ; + } + working_fdt = (struct fdt_header *)simple_strtoul (argv[2 ],NULL ,16 );if (!fdt_valid ()) {
Signature · 1 line
1.5.5.1
RFC PATCH 6/15 bootm: refactor entry point code
Move entry point code out of each arch and into common code. Keep the entry point in the bootm_headers_t images struct.
Signed-off-by Kumar Gala <[email protected]>
--- common/cmd_bootm.c | 31 ++++++++++++++++++++++--------- include/image.h | 2 ++ lib_arm/bootm.c | 19 +------------------ lib_avr32/bootm.c | 19 +------------------ lib_blackfin/bootm.c | 19 +------------------ lib_m68k/bootm.c | 19 +------------------ lib_microblaze/bootm.c | 19 +------------------ lib_mips/bootm.c | 18 +----------------- lib_nios2/bootm.c | 20 +------------------- lib_ppc/bootm.c | 22 +++------------------- lib_sh/bootm.c | 19 +------------------ lib_sparc/bootm.c | 12 ++---------- 12 files changed, 37 insertions(+), 182 deletions(-)
common/cmd_bootm.c +22 -9
@@ -205,6 +205,23 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])return 1 ; } +/* find kernel entry point */ +if (images.legacy_hdr_valid) { + images.ep =image_get_ep (&images.legacy_hdr_os_copy); +#if defined(CONFIG_FIT ) + } else if (images.fit_uname_os) { + ret =fit_image_get_entry (images.fit_hdr_os, + images.fit_noffset_os, &images.ep); +if (ret) { +puts ("Can't get entry point property!\n" ); +return 1 ; + } +#endif + }else { +puts ("Could not find kernel entry point!\n" ); +return 1 ; + } + image_start = (ulong )os_hdr; load_end =0 ; type_name =genimg_get_type_name (type);
@@ -942,7 +959,7 @@ static void do_bootm_netbsd (cmd_tbl_t *cmdtp, int flag, cmdline ="" ; } - loader = (void (*)(bd_t *,image_header_t *,char *,char *))image_get_ep (hdr); + loader = (void (*)(bd_t *,image_header_t *,char *,char *))images->ep;printf ("## Transferring control to NetBSD stage-2 loader (at address %08lx) ...\n" , (ulong )loader);
@@ -981,7 +998,6 @@ static void do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], bootm_headers_t *images) { - image_header_t *hdr = &images->legacy_hdr_os_copy; void (*entry_point)(bd_t *);#if defined(CONFIG_FIT )
@@ -991,7 +1007,7 @@ static void do_bootm_rtems (cmd_tbl_t *cmdtp, int flag, }#endif - entry_point = (void (*)(bd_t *))image_get_ep (hdr); + entry_point = (void (*)(bd_t *))images->ep;printf ("## Transferring control to RTEMS (at address %08lx) ...\n" , (ulong )entry_point);
@@ -1011,7 +1027,6 @@ static void do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag, bootm_headers_t *images) {char str[80 ]; -image_header_t *hdr = &images->legacy_hdr_os_copy;#if defined(CONFIG_FIT )if (!images->legacy_hdr_valid) {
@@ -1020,7 +1035,7 @@ static void do_bootm_vxworks (cmd_tbl_t *cmdtp, int flag, }#endif -sprintf (str,"%x" ,image_get_ep (hdr));/* write entry-point into string */ +sprintf (str,"%lx" , images->ep);/* write entry-point into string */ setenv ("loadaddr" , str);do_bootvx (cmdtp,0 ,0 ,NULL ); }
@@ -1031,7 +1046,6 @@ static void do_bootm_qnxelf(cmd_tbl_t *cmdtp, int flag, {char *local_args[2 ];char str[16 ]; -image_header_t *hdr = &images->legacy_hdr_os_copy;#if defined(CONFIG_FIT )if (!images->legacy_hdr_valid) {
@@ -1040,7 +1054,7 @@ static void do_bootm_qnxelf(cmd_tbl_t *cmdtp, int flag, }#endif -sprintf (str,"%x" ,image_get_ep (hdr));/* write entry-point into string */ +sprintf (str,"%lx" , images->ep);/* write entry-point into string */ local_args[0 ] = argv[0 ]; local_args[1 ] = str;/* and provide it via the arguments */ do_bootelf (cmdtp,0 ,2 , local_args);
@@ -1058,7 +1072,6 @@ static void do_bootm_artos (cmd_tbl_t *cmdtp, int flag,int i, j, nxt, len, envno, envsz;bd_t *kbd;void (*entry)(bd_t *bd,char *cmdline,char **fwenv,ulong top); -image_header_t *hdr = &images->legacy_hdr_os_copy;#if defined(CONFIG_FIT )if (!images->legacy_hdr_valid) {
@@ -1133,7 +1146,7 @@ static void do_bootm_artos (cmd_tbl_t *cmdtp, int flag, } *ss++ =NULL ;/* terminate */ - entry = (void (*)(bd_t *,char *,char **,ulong ))image_get_ep (hdr); + entry = (void (*)(bd_t *,char *,char **,ulong ))images->ep; (*entry) (kbd, cmdline, fwenv, top); }#endif
include/image.h +2 -0
@@ -219,6 +219,8 @@ typedef struct bootm_headers {#endif #endif +ulong ep;/* entry point of OS */ +int verify;/* getenv("verify")[0] != 'n' */ struct lmb *lmb;/* for memory mgmt */ } bootm_headers_t;
lib_arm/bootm.c +1 -18
@@ -62,7 +62,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], bootm_headers_t *images) {ulong initrd_start, initrd_end; -ulong ep =0 ;bd_t *bd = gd->bd;char *s;int machid = bd->bi_arch_number;
@@ -73,23 +72,7 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],char *commandline =getenv ("bootargs" );#endif -/* find kernel entry point */ -if (images->legacy_hdr_valid) { - ep =image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT ) - } else if (images->fit_uname_os) { - ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } -#endif - }else { -puts ("Could not find kernel entry point!\n" ); - goto error; - } - theKernel = (void (*)(int ,int ,uint ))ep; + theKernel = (void (*)(int ,int ,uint ))images->ep; s =getenv ("machid" );if (s) {
lib_avr32/bootm.c +1 -18
@@ -177,29 +177,12 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], bootm_headers_t *images) {ulong initrd_start, initrd_end; -ulong ep =0 ;void (*theKernel)(int magic,void *tagtable);struct tag *params, *params_start;char *commandline =getenv ("bootargs" );int ret; -/* find kernel entry point */ -if (images->legacy_hdr_valid) { - ep =image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT ) - } else if (images->fit_uname_os) { - ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } -#endif - }else { -puts ("Could not find kernel entry point!\n" ); - goto error; - } - theKernel = (void *)ep; + theKernel = (void *)images->ep; ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_AVR32 , &initrd_start, &initrd_end);
lib_blackfin/bootm.c +1 -18
@@ -38,29 +38,12 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], {int (*appl) (char *cmdline);char *cmdline; -ulong ep =0 ;#ifdef SHARED_RESOURCES swap_to (FLASH );#endif -/* find kernel entry point */ -if (images->legacy_hdr_valid) { - ep =image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT ) - } else if (images->fit_uname_os) { -int ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } -#endif - }else { -puts ("Could not find kernel entry point!\n" ); - goto error; - } - appl = (int (*)(char *))ep; + appl = (int (*)(char *))images->ep;printf ("Starting Kernel at = %x\n" , appl); cmdline =make_command_line ();
lib_m68k/bootm.c +1 -18
@@ -57,7 +57,6 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag,ulong cmd_start, cmd_end;ulong bootmap_base;bd_t *kbd; -ulong ep =0 ;void (*kernel) (bd_t *,ulong ,ulong ,ulong ,ulong );struct lmb *lmb = images->lmb;
@@ -94,23 +93,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, }set_clocks_in_mhz (kbd); -/* find kernel entry point */ -if (images->legacy_hdr_valid) { - ep =image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT ) - } else if (images->fit_uname_os) { - ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } -#endif - }else { -puts ("Could not find kernel entry point!\n" ); - goto error; - } - kernel = (void (*)(bd_t *,ulong ,ulong ,ulong ,ulong ))ep; + kernel = (void (*)(bd_t *,ulong ,ulong ,ulong ,ulong ))images->ep;/* find ramdisk */ ret = boot_get_ramdisk (argc, argv, images, IH_ARCH_M68K,
lib_microblaze/bootm.c +1 -18
@@ -40,25 +40,8 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],/* First parameter is mapped to $r5 for kernel boot args */ void (*theKernel) (char *);char *commandline =getenv ("bootargs" ); -ulong ep =0 ; -/* find kernel entry point */ -if (images->legacy_hdr_valid) { - ep =image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT ) - } else if (images->fit_uname_os) { -int ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } -#endif - }else { -puts ("Could not find kernel entry point!\n" ); - goto error; - } - theKernel = (void (*)(char *))ep; + theKernel = (void (*)(char *))images->ep;show_boot_progress (15 );
lib_mips/bootm.c +1 -17
@@ -49,7 +49,6 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], bootm_headers_t *images) {ulong initrd_start, initrd_end; -ulong ep =0 ;void (*theKernel) (int ,char **,char **,int *);char *commandline =getenv ("bootargs" );char env_buf[12 ];
@@ -57,22 +56,7 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],char *cp;/* find kernel entry point */ -if (images->legacy_hdr_valid) { - ep =image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT ) - } else if (images->fit_uname_os) { - ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } -#endif - }else { -puts ("Could not find kernel entry point!\n" ); - goto error; - } - theKernel = (void (*)(int ,char **,char **,int *))ep; + theKernel = (void (*)(int ,char **,char **,int *))images->ep; ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_MIPS , &initrd_start, &initrd_end);
lib_nios2/bootm.c +1 -19
@@ -30,25 +30,7 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);void do_bootm_linux (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[],bootm_headers_t *images) { -ulong ep =0 ; - -/* find kernel entry point */ -if (images->legacy_hdr_valid) { - ep =image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT ) - } else if (images->fit_uname_os) { -int ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } -#endif - }else { -puts ("Could not find kernel entry point!\n" ); - goto error; - } -void (*kernel)(void ) = (void (*)(void ))ep; +void (*kernel)(void ) = (void (*)(void ))images->ep;/* For now we assume the Microtronix linux ... which only * needs to be called ;-)
lib_ppc/bootm.c +3 -19
@@ -79,7 +79,6 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],ulong cmd_start, cmd_end, bootmap_base;bd_t *kbd; -ulong ep =0 ;void (*kernel)(bd_t *,ulong r4,ulong r5,ulong r6,ulong r7,ulong r8,ulong r9);int ret;
@@ -90,6 +89,9 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],char *of_flat_tree =NULL ;#endif + kernel = (void (*)(bd_t *,ulong ,ulong ,ulong , +ulong ,ulong ,ulong ))images->ep; + bootmap_base =getenv_bootm_low (); bootm_size =getenv_bootm_size ();
@@ -151,24 +153,6 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],set_clocks_in_mhz (kbd); } -/* find kernel entry point */ -if (images->legacy_hdr_valid) { - ep =image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT ) - } else if (images->fit_uname_os) { - ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } -#endif - }else { -puts ("Could not find kernel entry point!\n" ); - goto error; - } - kernel = (void (*)(bd_t *,ulong ,ulong ,ulong , -ulong ,ulong ,ulong ))ep;/* find ramdisk */ ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_PPC , &rd_data_start, &rd_data_end);
lib_sh/bootm.c +1 -18
@@ -62,26 +62,9 @@ static void hexdump (unsigned char *buf, int len)void do_bootm_linux (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[],bootm_headers_t *images) { -ulong ep =0 ;char *bootargs =getenv ("bootargs" ); -/* find kernel entry point */ -if (images->legacy_hdr_valid) { - ep =image_get_ep (&images->legacy_hdr_os_copy); -#if defined(CONFIG_FIT ) - } else if (images->fit_uname_os) { -int ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } -#endif - }else { -puts ("Could not find kernel entry point!\n" ); - goto error; - } -void (*kernel) (void ) = (void (*)(void ))ep; +void (*kernel) (void ) = (void (*)(void ))images->ep;/* Setup parameters */ memset (PARAM ,0 ,0x1000 );/* Clear zero page */
lib_sparc/bootm.c +2 -10
@@ -87,7 +87,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], bootm_headers_t * images) {char *bootargs; -ulong ep, load; +ulong load;ulong initrd_start, initrd_end;ulong rd_data_start, rd_data_end, rd_len;unsigned int data, len, checksum;
@@ -97,17 +97,9 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],int ret;if (images->legacy_hdr_valid) { - ep =image_get_ep (images->legacy_hdr_os); load =image_get_load (images->legacy_hdr_os);#if defined(CONFIG_FIT ) } else if (images->fit_uname_os) { -int ret =fit_image_get_entry (images->fit_hdr_os, - images->fit_noffset_os, &ep); -if (ret) { -puts ("Can't get entry point property!\n" ); - goto error; - } - ret =fit_image_get_load (images->fit_hdr_os, images->fit_noffset_os, &load);if (ret) {
@@ -124,7 +116,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[], linux_hdr = (void *)load;/* */ - kernel = (void (*)(struct linux_romvec *,void *))ep; + kernel = (void (*)(struct linux_romvec *,void *))images->ep;/* check for a SPARC kernel */ if ((linux_hdr->hdr[0] != 'H') ||
Signature · 1 line
1.5.5.1
RFC PATCH 7/15 bootm: refactor ramdisk locating code
Move determing if we have a ramdisk and where its located into the common code. Keep track of the ramdisk start and end in the bootm_headers_t image struct.
Signed-off-by Kumar Gala <[email protected]>
--- common/cmd_bootm.c | 38 ++++++++++++++++++++++++++++++++++++++ include/image.h | 2 ++ lib_arm/bootm.c | 10 ++-------- lib_avr32/bootm.c | 12 +++--------- lib_i386/bootm.c | 8 +------- lib_m68k/bootm.c | 12 +++--------- lib_mips/bootm.c | 12 +++--------- lib_ppc/bootm.c | 16 +++++----------- lib_sparc/bootm.c | 17 +++-------------- 9 files changed, 60 insertions(+), 67 deletions(-)
common/cmd_bootm.c +38 -0
@@ -116,6 +116,33 @@ void __board_lmb_reserve(struct lmb *lmb) }void board_lmb_reserve (struct lmb *lmb) __attribute__((weak,alias ("__board_lmb_reserve" ))); +#if defined(__ARM__) +#define IH_INITRD_ARCH IH_ARCH_ARM +#elif defined(__avr32__) +#define IH_INITRD_ARCH IH_ARCH_AVR32 +#elif defined(__bfin__) +#define IH_INITRD_ARCH IH_ARCH_BLACKFIN +#elif defined(__I386__) +#define IH_INITRD_ARCH IH_ARCH_I386 +#elif defined(__M68K__) +#define IH_INITRD_ARCH IH_ARCH_M68K +#elif defined(__microblaze__) +#define IH_INITRD_ARCH IH_ARCH_MICROBLAZE +#elif defined(__mips__) +#define IH_INITRD_ARCH IH_ARCH_MIPS +#elif defined(__nios__) +#define IH_INITRD_ARCH IH_ARCH_NIOS +#elif defined(__nios2__) +#define IH_INITRD_ARCH IH_ARCH_NIOS2 +#elif defined(__PPC__) +#define IH_INITRD_ARCH IH_ARCH_PPC +#elif defined(__sh__) +#define IH_INITRD_ARCH IH_ARCH_SH +#elif defined(__sparc__) +#define IH_INITRD_ARCH IH_ARCH_SPARC +#else +# error Unknown CPU type +#endif /*******************************************************************/ /* bootm - boot application image from image in memory */
@@ -133,6 +160,7 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])ulong load_start, load_end;ulong mem_start;phys_size_t mem_size; +int ret;struct lmb lmb;
@@ -222,6 +250,16 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])return 1 ; } +if (os ==IH_OS_LINUX ) { +/* find ramdisk */ + ret =boot_get_ramdisk (argc, argv, &images,IH_INITRD_ARCH , + &images.rd_start, &images.rd_end); +if (ret) { +puts ("Ramdisk image is corrupt\n" ); +return 1 ; + } + } + image_start = (ulong )os_hdr; load_end =0 ; type_name =genimg_get_type_name (type);
include/image.h +2 -0
@@ -221,6 +221,8 @@ typedef struct bootm_headers {ulong ep;/* entry point of OS */ +ulong rd_start, rd_end;/* ramdisk start/end */ +int verify;/* getenv("verify")[0] != 'n' */ struct lmb *lmb;/* for memory mgmt */ } bootm_headers_t;
lib_arm/bootm.c +2 -8
@@ -61,7 +61,6 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);void do_bootm_linux (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[],bootm_headers_t *images) { -ulong initrd_start, initrd_end;bd_t *bd = gd->bd;char *s;int machid = bd->bi_arch_number;
@@ -80,11 +79,6 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],printf ("Using machid 0x%x from environment\n" , machid); } - ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_ARM , - &initrd_start, &initrd_end); -if (ret) - goto error; -show_boot_progress (15 ); debug ("## Transferring control to Linux (at address %08lx) ...\n",
@@ -111,8 +105,8 @@ void do_bootm_linux (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],setup_commandline_tag (bd, commandline);#endif #ifdef CONFIG_INITRD_TAG -if (initrd_start && initrd_end) -setup_initrd_tag (bd, initrd_start, initrd_end); +if (images->rd_start && images->rd_end) +setup_initrd_tag (bd, images->rd_start, images->rd_end);#endif #if defined (CONFIG_VFD ) || defined (CONFIG_LCD )setup_videolfb_tag ((gd_t *) gd);
lib_avr32/bootm.c +3 -9
@@ -176,7 +176,6 @@ static void setup_end_tag(struct tag *params)void do_bootm_linux (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[],bootm_headers_t *images) { -ulong initrd_start, initrd_end;void (*theKernel)(int magic,void *tagtable);struct tag *params, *params_start;char *commandline =getenv ("bootargs" );
@@ -184,20 +183,15 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], theKernel = (void *)images->ep; - ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_AVR32 , - &initrd_start, &initrd_end); -if (ret) - goto error; -show_boot_progress (15 ); params = params_start = (struct tag *)gd->bd->bi_boot_params; params =setup_start_tag (params); params =setup_memory_tags (params); -if (initrd_start) { +if (images->rd_start) { params =setup_ramdisk_tag (params, -PHYSADDR (initrd_start), -PHYSADDR (initrd_end)); +PHYSADDR (images->rd_start), +PHYSADDR (images->rd_end)); } params =setup_commandline_tag (params, commandline); params =setup_clock_tags (params);
lib_i386/bootm.c +1 -7
@@ -36,7 +36,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], {void *base_ptr;ulong os_data, os_len; -ulong initrd_start, initrd_end;image_header_t *hdr;int ret;#if defined(CONFIG_FIT )
@@ -44,11 +43,6 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],size_t len;#endif - ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_I386 , - &initrd_start, &initrd_end); -if (ret) - goto error; -if (images->legacy_hdr_valid) { hdr = images->legacy_hdr_os;if (image_check_type (hdr,IH_TYPE_MULTI )) {
@@ -76,7 +70,7 @@ void do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], } base_ptr =load_zimage ((void *)os_data, os_len, - initrd_start, initrd_end - initrd_start,0 ); + images->rd_start, images->rd_end - images->rd_start,0 );if (NULL == base_ptr) {printf ("## Kernel loading failed ...\n" );
lib_m68k/bootm.c +3 -9
@@ -50,7 +50,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, {ulong sp; -ulong rd_data_start, rd_data_end, rd_len; +ulong rd_len;ulong initrd_start, initrd_end;int ret;
@@ -95,14 +95,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, kernel = (void (*)(bd_t *,ulong ,ulong ,ulong ,ulong ))images->ep; -/* find ramdisk */ - ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_M68K , - &rd_data_start, &rd_data_end); -if (ret) - goto error; - - rd_len = rd_data_end - rd_data_start; - ret =boot_ramdisk_high (lmb, rd_data_start, rd_len, + rd_len = images->rd_end - images->rd_start; + ret =boot_ramdisk_high (lmb, images->rd_start, rd_len, &initrd_start, &initrd_end);if (ret) goto error;
lib_mips/bootm.c +3 -9
@@ -48,7 +48,6 @@ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);void do_bootm_linux (cmd_tbl_t * cmdtp,int flag,int argc,char *argv[],bootm_headers_t *images) { -ulong initrd_start, initrd_end;void (*theKernel) (int ,char **,char **,int *);char *commandline =getenv ("bootargs" );char env_buf[12 ];
@@ -58,11 +57,6 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],/* find kernel entry point */ theKernel = (void (*)(int ,char **,char **,int *))images->ep; - ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_MIPS , - &initrd_start, &initrd_end); -if (ret) - goto error; -show_boot_progress (15 );#ifdef DEBUG
@@ -82,10 +76,10 @@ void do_bootm_linux (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],linux_env_set ("memsize" , env_buf); -sprintf (env_buf,"0x%08X" , (uint )UNCACHED_SDRAM (initrd_start)); -linux_env_set ("initrd_start" , env_buf); +sprintf (env_buf,"0x%08X" , (uint )UNCACHED_SDRAM (images->rd_start)); +linux_env_set ("images->rd_start" , env_buf); -sprintf (env_buf,"0x%X" , (uint) (initrd_end - initrd_start)); +sprintf (env_buf,"0x%X" , (uint) (images->rd_end - images->rd_start));linux_env_set ("initrd_size" , env_buf);sprintf (env_buf,"0x%08X" , (uint) (gd->bd->bi_flashstart));
lib_ppc/bootm.c +5 -11
@@ -73,7 +73,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],ulong sp;ulong initrd_start, initrd_end; -ulong rd_data_start, rd_data_end, rd_len; +ulong rd_len;ulong size;phys_size_t bootm_size;
@@ -153,13 +153,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],set_clocks_in_mhz (kbd); } -/* find ramdisk */ - ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_PPC , - &rd_data_start, &rd_data_end); -if (ret) - goto error; - - rd_len = rd_data_end - rd_data_start; + rd_len = images->rd_end - images->rd_start;#if defined(CONFIG_OF_LIBFDT ) ret = boot_relocate_fdt (lmb, bootmap_base,
@@ -171,7 +165,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],*/ if (of_size) {/* pass in dummy initrd info, we'll fix up later */ -if (fdt_chosen (of_flat_tree, rd_data_start, rd_data_end,0 ) <0 ) { +if (fdt_chosen (of_flat_tree, images->rd_start, images->rd_end,0 ) <0 ) {fdt_error ("/chosen node create failed" ); goto error; }
@@ -222,7 +216,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[], }#endif /* CONFIG_OF_LIBFDT */ - ret =boot_ramdisk_high (lmb, rd_data_start, rd_len, &initrd_start, &initrd_end); + ret =boot_ramdisk_high (lmb, images->rd_start, rd_len, &initrd_start, &initrd_end);if (ret) goto error;
@@ -236,7 +230,7 @@ do_bootm_linux(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[],/* Look for the dummy entry and delete it */ for (j =0 ; j < total; j++) {fdt_get_mem_rsv (of_flat_tree, j, &addr, &size); -if (addr == rd_data_start) { +if (addr == images->rd_start) {fdt_del_mem_rsv (of_flat_tree, j);break ; }
lib_sparc/bootm.c +3 -14
@@ -89,7 +89,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],char *bootargs;ulong load;ulong initrd_start, initrd_end; -ulong rd_data_start, rd_data_end, rd_len; +ulong rd_len;unsigned int data, len, checksum;unsigned int initrd_addr, kernend;void (*kernel) (struct linux_romvec *,void *);
@@ -139,19 +139,8 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],* extracted and is writeable. */ -/* -* Are we going to use an initrd image? -*/ - ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_SPARC , - &rd_data_start, &rd_data_end); -if (ret) { -/* RAM disk found but was corrupt */ -puts ("RAM Disk corrupt\n" ); - goto error; - } -/* Calc length of RAM disk, if zero no ramdisk available */ - rd_len = rd_data_end - rd_data_start; + rd_len = images->rd_end - images->rd_start;if (rd_len) {
@@ -161,7 +150,7 @@ void do_bootm_linux(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[],*/ lmb_reserve (lmb,CFG_RELOC_MONITOR_BASE ,CFG_RAM_END ); - ret =boot_ramdisk_high (lmb, rd_data_start, rd_len, + ret =boot_ramdisk_high (lmb, images->rd_start, rd_len, &initrd_start, &initrd_end);if (ret) {puts ("### Failed to relocate RAM disk\n" );
Signature · 1 line
1.5.5.1
RFC PATCH 8/15 bootm: refactor fdt locating and relocation code
Move the code that handles finding a device tree blob and relocating it (if needed) into common code so all arch's have access to it.
Signed-off-by Kumar Gala <[email protected]>
--- common/cmd_bootm.c | 10 + common/image.c | 502 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/image.h | 13 ++ lib_ppc/bootm.c | 492 +-------------------------------------------------- 4 files changed, 533 insertions(+), 484 deletions(-)
common/cmd_bootm.c +10 -0
@@ -258,6 +258,16 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])puts ("Ramdisk image is corrupt\n" );return 1 ; } + +#if defined(CONFIG_OF_LIBFDT ) +/* find flattened device tree */ + ret =boot_get_fdt (cmdtp, flag, argc, argv, + &images, &images.ft_addr, &images.ft_len); +if (ret) { +puts ("Could not find a valid device tree\n" ); +return 1 ; + } +#endif } image_start = (ulong )os_hdr;
common/image.c +502 -0
508 lines not on this page · raw message
include/image.h +13 -0
@@ -223,6 +223,11 @@ typedef struct bootm_headers {ulong rd_start, rd_end;/* ramdisk start/end */ +#ifdef CONFIG_OF_LIBFDT +char *ft_addr;/* flat dev tree address */ +#endif +ulong ft_len;/* length of flat device tree */ +int verify;/* getenv("verify")[0] != 'n' */ struct lmb *lmb;/* for memory mgmt */ } bootm_headers_t;
@@ -273,6 +278,14 @@ ulong genimg_get_image (ulong img_addr);int boot_get_ramdisk (int argc,char *argv[],bootm_headers_t *images,uint8_t arch,ulong *rd_start,ulong *rd_end); + +#ifdef CONFIG_OF_LIBFDT +int boot_get_fdt (cmd_tbl_t *cmdtp,int flag,int argc,char *argv[], +bootm_headers_t *images,char **of_flat_tree,ulong *of_size); +int boot_relocate_fdt (struct lmb *lmb,ulong bootmap_base, +char **of_flat_tree,ulong *of_size); +#endif +#if defined(CONFIG_PPC ) || defined(CONFIG_M68K )int boot_ramdisk_high (struct lmb *lmb,ulong rd_data,ulong rd_len,ulong *initrd_start,ulong *initrd_end);
lib_ppc/bootm.c +8 -484
534 lines not on this page · raw message
Signature · 1 line
1.5.5.1
RFC PATCH 9/15 bootm: Set working fdt address as part of the bootm flow
Set the fdt working address so "fdt FOO" commands can be used as part of the bootm flow.
Signed-off-by Kumar Gala <[email protected]>
--- common/cmd_bootm.c | 9 +++++++++ common/cmd_fdt.c | 5 +++++ common/image.c | 1 + include/fdt_support.h | 2 ++ 4 files changed, 17 insertions(+), 0 deletions(-)
common/cmd_bootm.c +9 -0
@@ -44,6 +44,13 @@#include <hush.h> #endif +#if defined(CONFIG_OF_LIBFDT ) +#include <fdt.h> +#include <libfdt.h> +#include <fdt_support.h> +#endif + +DECLARE_GLOBAL_DATA_PTR ;extern int gunzip (void *dst,int dstlen,unsigned char *src,unsigned long *lenp);
@@ -267,6 +274,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])puts ("Could not find a valid device tree\n" ); return 1; } + +set_working_fdt_addr (images.ft_addr);#endif }
common/cmd_fdt.c +5 -0
@@ -50,6 +50,11 @@ static int fdt_print(const char *pathp, char *prop, int depth);*/ struct fdt_header *working_fdt; +void set_working_fdt_addr (void *addr) +{ + working_fdt = addr; +} +/* * Flattened Device Tree command, see the help for parameter definitions. */
common/image.c +1 -0
@@ -1245,6 +1245,7 @@ int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base, *of_size = of_len; } +set_working_fdt_addr (*of_flat_tree);return 0 ; error:
include/fdt_support.h +2 -0
@@ -68,5 +68,7 @@ void ft_cpu_setup(void *blob, bd_t *bd);void ft_pci_setup (void *blob,bd_t *bd);#endif +void set_working_fdt_addr (void *addr); +#endif /* ifdef CONFIG_OF_LIBFDT */ #endif /* ifndef __FDT_SUPPORT_H */
Signature · 1 line
1.5.5.1
cover bootm refactoring
In reply to Kumar GalaHi Kumar,
I'm on the road this week, so my ability to review code this week is suboptimal. Having said that, this looks good!
Quoted 4 lines · Kumar Gala
[PATCH 01/15] Update linux bootm to support ePAPR client interface [PATCH 02/15] add ability to disable
ft_board_setupas part of bootmpossibly drop this patch if the boots method is acceptable
I don't follow what this remark is saying.
Is there a reason scripting in the "fdt boardsetup" command, eliminating the need to call ft_board_setup() as part of the bootm command chain?
Quoted 14 lines
[PATCH 03/15] Clean up usage of icache_disable/dcache_disable
[PATCH 04/15] fdt: added the ability to set initrd start/end via chosen command [PATCH 05/15] fdt: fdt addr w/o any args reports back the current working address [PATCH 06/15] bootm: refactor entry point code
[PATCH 07/15] bootm: refactor ramdisk locating code
[PATCH 08/15] bootm: refactor fdt locating and relocation code [PATCH 09/15] bootm: Set working fdt address as part of the bootm flow [PATCH 10/15] bootm: move lmb into thebootm_headers_tstructure [PATCH 11/15] bootm: refactor image detection and os load steps [PATCH 12/15] fdt: refactor fdt resize code
[PATCH 13/15] fdt: refactor initrd related code
[PATCH 14/15] fdt: Added resize command
[PATCH 15/15] boots: start of sub commands
Quoted 5 lines
I believe all the patches except 15/15 should be in a reasonable state for u-boot-testing. I need to add an 'interrupt enable/disable' command but with a small hack I'm able to mimic the bootm command on ppc by:
boots start <A> <B> <C>
Per my previous comment: boots is already taken.
Quoted 7 lines
boots
load_os/* hacked to disable interrupts */
bootsprep_os
bootsinitrd_relocate
bootsfdt_relocate
fdt chosen $initrd_start $initrd_end
fdt boardsetup
boots jump
Would "bootm go" be better than "bootm jump"? I'm thinking we have a "go" command, so "bootm go" sounds better, more symmetric, to me. Maybe I'm painting the bikeshed?
Quoted 5 lines
Right now 15/15 is focused on only PPC w/Linux. If this looks acceptable I'll split 15/15 into proper patches an add support for the other ARCHes and OSes.
- k
Thanks for working this,
gvb
cover bootm refactoring
Quoted 10 lines · Jerry Van Baren
Hi Kumar,
I'm on the road this week, so my ability to review code this week is suboptimal. Having said that, this looks good!
Quoted 3 lines · Kumar Gala
[PATCH 01/15] Update linux bootm to support ePAPR client interface [PATCH 02/15] add ability to disable
ft_board_setupas part of bootm possibly drop this patch if the boots method is acceptable
Quoted 5 lines
I don't follow what this remark is saying.
Is there a reason scripting in the "fdt boardsetup" command, eliminating the need to call
ft_board_setup()as part of the bootm command chain?
I just meant that the patch adds an 'env' var to stop calling 'fdt boardsetup' Once we have sub commands that isn't really needed anymore so I'm ok w/dropping the patch. It was a stop gap before subcommands are working.
Quoted 23 lines
Quoted 21 lines
[PATCH 03/15] Clean up usage of icache_disable/dcache_disable [PATCH 04/15] fdt: added the ability to set initrd start/end via chosen command
[PATCH 05/15] fdt: fdt addr w/o any args reports back the current working address
[PATCH 06/15] bootm: refactor entry point code
[PATCH 07/15] bootm: refactor ramdisk locating code [PATCH 08/15] bootm: refactor fdt locating and relocation code [PATCH 09/15] bootm: Set working fdt address as part of the bootm flow
[PATCH 10/15] bootm: move lmb into thebootm_headers_tstructure [PATCH 11/15] bootm: refactor image detection and os load steps [PATCH 12/15] fdt: refactor fdt resize code
[PATCH 13/15] fdt: refactor initrd related code
[PATCH 14/15] fdt: Added resize command
[PATCH 15/15] boots: start of sub commands
I believe all the patches except 15/15 should be in a reasonable state
for u-boot-testing. I need to add an 'interrupt enable/disable' command
but with a small hack I'm able to mimic the bootm command on ppc by:Quoted 1 line
boots start <A> <B> <C>
Quoted 1 line
Per my previous comment: boots is already taken.
Yeah, I need to understand wd's concerns here.
Quoted 11 lines
Quoted 7 lines
boots
load_os/* hacked to disable interrupts */
bootsprep_os
bootsinitrd_relocate
bootsfdt_relocate
fdt chosen $initrd_start $initrd_end
fdt boardsetup
boots jumpWould "bootm go" be better than "bootm jump"? I'm thinking we have a "go" command, so "bootm go" sounds better, more symmetric, to me. Maybe I'm painting the bikeshed?
got not issue w/renaming.
Quoted 9 lines
Quoted 6 lines
Right now 15/15 is focused on only PPC w/Linux. If this looks acceptable
I'll split 15/15 into proper patches an add support for the other ARCHes
and OSes.
- kThanks for working this,
gvb
- k
cover bootm refactoring
Quoted 15 lines · Kumar Gala
Quoted 12 lines · Jerry Van Baren
Hi Kumar,
I'm on the road this week, so my ability to review code this week is suboptimal. Having said that, this looks good!
Quoted 3 lines · Kumar Gala
[PATCH 01/15] Update linux bootm to support ePAPR client interface [PATCH 02/15] add ability to disable
ft_board_setupas part of bootm possibly drop this patch if the boots method is acceptableI don't follow what this remark is saying.
Quoted 8 lines
Quoted 3 lines
Is there a reason scripting in the "fdt boardsetup" command, eliminating the need to call
ft_board_setup()as part of the bootm command chain?I just meant that the patch adds an 'env' var to stop calling 'fdt boardsetup' Once we have sub commands that isn't really needed anymore so I'm ok w/dropping the patch. It was a stop gap before subcommands are working.
Ahh, OK, I understand now.
Thanks,
gvb