September 2008 - U-Boot

[U-Boot] [PATCH] ppc: Fix typo in include/mpc83xx.h
by Nobuhiro Iwamatsu 24 Sep '08

24 Sep '08

Fixed typo from CONIFG_MPC837X to CONFIG_MPC837X Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro(a)renesas.com> --- include/mpc83xx.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/mpc83xx.h b/include/mpc83xx.h index 5d82bb4..7f30d68 100644 --- a/include/mpc83xx.h +++ b/include/mpc83xx.h @@ -528,7 +528,7 @@ #if defined(CONFIG_MPC834X) #define HRCWH_ROM_LOC_PCI2 0x00200000 #endif -#if defined(CONIFG_MPC837X) +#if defined(CONFIG_MPC837X) #define HRCWH_ROM_LOC_ON_CHIP_ROM 0x00300000 #endif #define HRCWH_ROM_LOC_LOCAL_8BIT 0x00500000 -- 1.5.6.3

1 0

[U-Boot] Uboot-1.2.0 on MPC8360EMDS board
by mike zheng 23 Sep '08

23 Sep '08

Hello, I am having problem when I try to bootup MPC8360EMDS with Uboot1.2. The following are logs. The board reboot when the uboot tried to run on the RAM. Any idea on this issue? Thanks, Mike U-Boot 1.2.1 (Sep 23 2008 - 14:35:42) MPC83XX Clock configuration: Coherent System Bus: 264 MHz Core: 528 MHz QE: 396 MHz Local Bus Controller: 264 MHz Local Bus: 66 MHz DDR: 264 MHz DDR Secondary: 264 MHz SEC: 88 MHz I2C1: 264 MHz I2C2: 264 MHz CPU: MPC8360E, Rev: 21 at 528 MHz Board: Freescale MPC8360EMDS I2C: ready DRAM: cs0_bnds = 0x0000000f cs0_config = 0x80000102 DDR:bar=0x00000000 DDR:ar=0x8000001b DDR:Module maximum data rate is: 400Mhz DDR:Effective data rate is: 266Mhz DDR:The MSB 1 of CAS Latency is: 4 Errata DDR6 (debug_reg=0x002c0000) DDR:timing_cfg_1=0x37353321 DDR:timing_cfg_2=0x00000800 DDR DIMM: data bus width is 64 bit with ECC DDR:sdram_mode=0x00000032 DDR:sdram_interval=0x045b0100 DDR:sdram_clk_cntl=0x00000000 DDRC ECC mode: OFF DDR:sdram_cfg=0xc2000000 SDRAM on Local Bus: 64 MB DDR RAM: 256 MB Top of RAM usable for U-Boot at: 10000000 Reserving 205k for U-Boot at: 0ffcc000 Reserving 136k for malloc() at: 0ffaa000 Reserving 76 Bytes for Board Info at: 0ffa9fb4 Reserving 104 Bytes for Global Data at: 0ffa9f4c Stack Pointer at: 0ffa9f28

2 1

[U-Boot] What's needed for new cpu subdirectory?
by Dirk Behme 23 Sep '08

23 Sep '08

For OMAP3 patch [1] I try to move common files currently in cpu/omap3 to cpu/arm_cortexa8/omap3 as discussed earlier [2]. Moving the files is easy, but how has main Makefile to be configured? I have > ls -a cpu/arm_cortexa8/ . .. omap3 > ls -a cpu/arm_cortexa8/omap3/ . board.c config.mk interrupts.c Makefile nand.c sys_info.c .. clock.c cpu.c lowlevel_init.S mem.c start.S syslib.c and in main Makefile @$(MKCONFIG) $(@:_config=) arm arm_cortexa8 omap3 evm omap3 This results in make -C cpu/arm_cortexa8 start.o which fails as start.S is in cpu/arm_cortexa8/omap3/ Any hint what is necessary to get stuff in cpu/arm_cortexa8/omap3/ compiled? Thanks Dirk [1] http://lists.denx.de/pipermail/u-boot/2008-September/040561.html [2] http://lists.denx.de/pipermail/u-boot/2008-September/040712.html

2 1

Re: [U-Boot] Uboot-1.2.0 on MPC8360EMDS board
by Remi Lefevre 23 Sep '08

23 Sep '08

Hi Mike, I'm very new to Powerpc so take my words with a lot of precautions. I see two possibilities with your problem: 1. As U-Boot seems to reset after "Stack Pointer at: 0ffa9f28", you are likely to encounter a relocation issue. As I have learnt it the hard way (I cannot count the number of times my U-Boot hanged there), you may have misconfigured the SDRAM module. Check other code using the same chips, memory refresh timers and memory controller registers (SDRAM init sequence is configured in the initdram() function of your board specific .c file). http://www.denx.de/wiki/view/DULG/UBootCrashAfterRelocation http://www.denx.de/wiki/view/DULG/SDRAM 2. If your board always reboots at the same moment, whatever the U-Boot configuration is, you may have forgot to handle or deactivate your cpu watchdog. On my mpc8270 board, I can disable them with the CFG_SYPCR register; on yours, it seems to be with BCSR5[SWEN], but I'm really not sure (and it seems to be off by default). Also check the CONFIG_WATCHDOG option in U-Boot. Note that if you have slave cores on your board, you may also need to handle them. At last, perhaps try with a current version of U-Boot, you may get more help with it. I hope that this could help you. If not, just ignore, I just try to give back the help I got there. Good luck, Rémi On Tue, Sep 23, 2008 at 10:16 PM, Remi Lefevre <rlefevre(a)gmail.com> wrote: > Hi Mike, > > I'm very new to Powerpc so take my words with a lot of precautions. > > I see two possibilities with your problem: > > 1. As U-Boot seems to reset after "Stack Pointer at: 0ffa9f28", you are > likely to encounter a relocation issue. As I have learnt it the hard > way (I cannot count the number of times my U-Boot hanged there), you may have > misconfigured the SDRAM module. Check other code using the same chips, memory > refresh timers and memory controller registers (SDRAM init sequence is > configured in the initdram() function of your board specific .c file). > > http://www.denx.de/wiki/view/DULG/UBootCrashAfterRelocation > http://www.denx.de/wiki/view/DULG/SDRAM > > 2. If your board always reboots at the same moment, whatever the U-Boot > configuration is, you may have forgot to handle or deactivate your cpu > watchdog. On my mpc8270 board, I can disable them with the CFG_SYPCR > register; on yours, it seems to be with BCSR5[SWEN], but I'm really not > sure (and it seems to be off by default). Also check the CONFIG_WATCHDOG > option in U-Boot. Note that if you have slave cores on your board, you may > also need to handle them. > > At last, perhaps try with a current version of U-Boot, you may get more help > with it. > > I hope that this could help you. If not, just ignore, I just try to > give back the help I got there. > > Good luck, > Rémi > > > On Tue, Sep 23, 2008 at 8:57 PM, mike zheng <mail4mz(a)gmail.com> wrote: >> Hello, >> >> I am having problem when I try to bootup MPC8360EMDS with Uboot1.2. >> The following are logs. The board reboot when the uboot tried to run >> on the RAM. Any idea on this issue? >> >> Thanks, >> >> Mike >> >> >> U-Boot 1.2.1 (Sep 23 2008 - 14:35:42) MPC83XX >> >> Clock configuration: >> Coherent System Bus: 264 MHz >> Core: 528 MHz >> QE: 396 MHz >> Local Bus Controller: 264 MHz >> Local Bus: 66 MHz >> DDR: 264 MHz >> DDR Secondary: 264 MHz >> SEC: 88 MHz >> I2C1: 264 MHz >> I2C2: 264 MHz >> CPU: MPC8360E, Rev: 21 at 528 MHz >> Board: Freescale MPC8360EMDS >> I2C: ready >> DRAM: >> cs0_bnds = 0x0000000f >> cs0_config = 0x80000102 >> DDR:bar=0x00000000 >> DDR:ar=0x8000001b >> DDR:Module maximum data rate is: 400Mhz >> DDR:Effective data rate is: 266Mhz >> DDR:The MSB 1 of CAS Latency is: 4 >> Errata DDR6 (debug_reg=0x002c0000) >> DDR:timing_cfg_1=0x37353321 >> DDR:timing_cfg_2=0x00000800 >> >> DDR DIMM: data bus width is 64 bit with ECC >> DDR:sdram_mode=0x00000032 >> DDR:sdram_interval=0x045b0100 >> DDR:sdram_clk_cntl=0x00000000 >> DDRC ECC mode: OFF >> DDR:sdram_cfg=0xc2000000 >> >> SDRAM on Local Bus: 64 MB >> DDR RAM: 256 MB >> Top of RAM usable for U-Boot at: 10000000 >> Reserving 205k for U-Boot at: 0ffcc000 >> Reserving 136k for malloc() at: 0ffaa000 >> Reserving 76 Bytes for Board Info at: 0ffa9fb4 >> Reserving 104 Bytes for Global Data at: 0ffa9f4c >> Stack Pointer at: 0ffa9f28 >> _______________________________________________ >> U-Boot mailing list >> U-Boot(a)lists.denx.de >> http://lists.denx.de/mailman/listinfo/u-boot >> >

1 0

[U-Boot] [PATCH] 85xx: Remove setting of *cache-line-size in device trees
by Kumar Gala 23 Sep '08

23 Sep '08

ePAPR says if the *cache-block-size is the same as *cache-line-size than we don't need the *cache-line-size property. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- cpu/mpc85xx/fdt.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/cpu/mpc85xx/fdt.c b/cpu/mpc85xx/fdt.c index bc1550d..037a60f 100644 --- a/cpu/mpc85xx/fdt.c +++ b/cpu/mpc85xx/fdt.c @@ -152,7 +152,6 @@ static inline void ft_fixup_l2cache(void *blob) } fdt_setprop(blob, off, "cache-unified", NULL, 0); fdt_setprop_cell(blob, off, "cache-block-size", line_size); - fdt_setprop_cell(blob, off, "cache-line-size", line_size); fdt_setprop_cell(blob, off, "cache-size", size); fdt_setprop_cell(blob, off, "cache-sets", num_sets); fdt_setprop_cell(blob, off, "cache-level", 2); @@ -181,7 +180,6 @@ static inline void ft_fixup_cache(void *blob) dnum_sets = dsize / (dline_size * dnum_ways); fdt_setprop_cell(blob, off, "d-cache-block-size", dline_size); - fdt_setprop_cell(blob, off, "d-cache-line-size", dline_size); fdt_setprop_cell(blob, off, "d-cache-size", dsize); fdt_setprop_cell(blob, off, "d-cache-sets", dnum_sets); @@ -192,7 +190,6 @@ static inline void ft_fixup_cache(void *blob) inum_sets = isize / (iline_size * inum_ways); fdt_setprop_cell(blob, off, "i-cache-block-size", iline_size); - fdt_setprop_cell(blob, off, "i-cache-line-size", iline_size); fdt_setprop_cell(blob, off, "i-cache-size", isize); fdt_setprop_cell(blob, off, "i-cache-sets", inum_sets); -- 1.5.5.1

1 1

[U-Boot] erase and saveenv stop working after using fw_setenv
by Petri Lehtinen 23 Sep '08

23 Sep '08

Hi! I'm using U-Boot 1.3.4 and Linux 2.6.26.5 on MPC8323E-RDB. After using fw_printenv in Linux, erase and saveenv stop working in U-Boot. In Linux, fw_* still work. When using erase, this is the result: => protect off fe040000 fe05ffff Un-Protected 1 sectors => erase fe040000 fe05ffff Flash erase error at address fe040000 Block Erase Error. Block locked. done Erased 1 sectors => md fe040000 fe040000: c7be9eae 626f6f74 636d643d 73657465 ....bootcmd=sete fe040010: 6e762062 6f6f7461 72677320 726f6f74 nv bootargs root ... So the sector doesn't get erased. Errors are similar when using saveenv: => saveenv Saving Environment to Flash... Un-Protected 1 sectors Erasing Flash... Flash erase error at address fe040000 Block Erase Error. Block locked. done Erased 1 sectors I tracked the error message down to cfi_flash.c, where this function call fails: flash_isequal (info, sector, 0, FLASH_STATUS_DONE) However, I have no clue on how CFI works, so my ability to debug it further stops here. A possible reason I can think of is that the ioctl calls in fw_setenv are somehow messing up the Flash status. Any ideas? -- Petri Lehtinen Inoi Oy Tel. : +358 40 758 0229 Email: petri.lehtinen(a)inoi.fi

4 4

[U-Boot] [RFC] exposing finding a command for subcommands
by Kumar Gala 23 Sep '08

23 Sep '08

How about something like this for exposing the command table code for subcommands. I'll follow this up with an example of usage based on the bootm subcommand patch - k A --- common/command.c | 14 ++++++++++---- include/command.h | 7 +++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/common/command.c b/common/command.c index aca57b2..d8e1495 100644 --- a/common/command.c +++ b/common/command.c @@ -341,10 +341,10 @@ cmd_tbl_t __u_boot_cmd_question_mark Struct_Section = { /*************************************************************************** * find command table entry for a command */ -cmd_tbl_t *find_cmd (const char *cmd) +cmd_tbl_t *__find_cmd (const char *cmd, cmd_tbl_t *table, int table_len) { cmd_tbl_t *cmdtp; - cmd_tbl_t *cmdtp_temp = &__u_boot_cmd_start; /*Init value */ + cmd_tbl_t *cmdtp_temp = table; /*Init value */ const char *p; int len; int n_found = 0; @@ -355,8 +355,8 @@ cmd_tbl_t *find_cmd (const char *cmd) */ len = ((p = strchr(cmd, '.')) == NULL) ? strlen (cmd) : (p - cmd); - for (cmdtp = &__u_boot_cmd_start; - cmdtp != &__u_boot_cmd_end; + for (cmdtp = table; + cmdtp != table + table_len; cmdtp++) { if (strncmp (cmd, cmdtp->name, len) == 0) { if (len == strlen (cmdtp->name)) @@ -373,6 +373,12 @@ cmd_tbl_t *find_cmd (const char *cmd) return NULL; /* not found or ambiguous command */ } +cmd_tbl_t *find_cmd (const char *cmd) +{ + int len = &__u_boot_cmd_end - &__u_boot_cmd_start; + return __find_cmd(cmd, &__u_boot_cmd_start, len); +} + #ifdef CONFIG_AUTO_COMPLETE int var_complete(int argc, char *argv[], char last_char, int maxv, char *cmdv[]) diff --git a/include/command.h b/include/command.h index f92383d..03d340c 100644 --- a/include/command.h +++ b/include/command.h @@ -62,6 +62,7 @@ extern cmd_tbl_t __u_boot_cmd_end; /* common/command.c */ cmd_tbl_t *find_cmd(const char *cmd); +cmd_tbl_t *__find_cmd (const char *cmd, cmd_tbl_t *table, int table_len); #ifdef CONFIG_AUTO_COMPLETE extern void install_auto_complete(void); @@ -102,11 +103,17 @@ extern int cmd_get_data_size(char* arg, int default_size); #define U_BOOT_CMD(name,maxargs,rep,cmd,usage,help) \ cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage, help} +#define U_BOOT_CMD_INIT(name,maxargs,rep,cmd,usage,help) \ +{#name, maxargs, rep, cmd, usage, help} + #else /* no long help info */ #define U_BOOT_CMD(name,maxargs,rep,cmd,usage,help) \ cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage} +#define U_BOOT_CMD_INIT(name,maxargs,rep,cmd,usage,help) \ +{#name, maxargs, rep, cmd, usage} + #endif /* CFG_LONGHELP */ #endif /* __COMMAND_H */ -- 1.5.5.1

2 2

[U-Boot] [RFC][PATCH v3] bootm: Add sub commands
by Kumar Gala 23 Sep '08

23 Sep '08

* Use explicit command name matches - k --- common/cmd_bootm.c | 150 +++++++++++++++++++++++++++++- include/image.h | 20 ++++- lib_ppc/bootm.c | 262 ++++++++++++++++++++++++++++++++++------------------ 3 files changed, 338 insertions(+), 94 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 19257bb..3a20ad2 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -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) @@ -273,7 +274,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 +377,121 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) return 0; } +int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + int ret = 0; + int state; + + /* start */ + if (strcmp(argv[1], "start") == 0) { + argc--; + argv++; + return bootm_start(cmdtp, flag, argc, argv); + } + /* loados */ + else if (strcmp(argv[1], "loados") == 0) { + state = BOOTM_STATE_LOADOS; + } + /* ramdisk relocate */ +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC) + else if (strcmp(argv[1], "ramdisk") == 0) { + state = BOOTM_STATE_RAMDISK; + } +#endif +#ifdef CONFIG_OF_LIBFDT + /* fdt relocate */ + else if (strcmp(argv[1], "fdt") == 0) { + state = BOOTM_STATE_FDT; + } +#endif + /* bd_t setup */ + else if (strcmp(argv[1], "bdt") == 0) { + state = BOOTM_STATE_OS_BD_T; + } + /* cmdline setup */ + else if (strcmp(argv[1], "cmdline") == 0) { + state = BOOTM_STATE_OS_CMDLINE; + } + /* prep os */ + else if (strcmp(argv[1], "prepos") == 0) { + state = BOOTM_STATE_OS_PREP; + } + /* go */ + else if (strcmp(argv[1], "go") == 0) { + state = BOOTM_STATE_OS_GO; + } + /* 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 +502,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 +915,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 (its 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" + "\tprepos - OS specific prep before relocation or go\n" + "\tgo - start OS\n" ); /*******************************************************************/ diff --git a/include/image.h b/include/image.h index 82e6345..557e72a 100644 --- a/include/image.h +++ b/include/image.h @@ -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 diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index 38266e1..8ac0de0 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -47,6 +47,7 @@ DECLARE_GLOBAL_DATA_PTR; +extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); extern ulong get_effective_memsize(void); static ulong get_sp (void); static void set_clocks_in_mhz (bd_t *kbd); @@ -55,30 +56,78 @@ static void set_clocks_in_mhz (bd_t *kbd); #define CFG_LINUX_LOWMEM_MAX_SIZE (768*1024*1024) #endif -__attribute__((noinline)) -int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) +static void boot_jump_linux(bootm_headers_t *images) { - ulong sp; - - ulong initrd_start, initrd_end; - ulong rd_len; - ulong size; - phys_size_t bootm_size; - - ulong cmd_start, cmd_end, bootmap_base; - bd_t *kbd; void (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6, ulong r7, ulong r8, ulong r9); - int ret; - ulong of_size = images->ft_len; - struct lmb *lmb = &images->lmb; - -#if defined(CONFIG_OF_LIBFDT) - char *of_flat_tree = images->ft_addr; +#ifdef CONFIG_OF_LIBFDT + char *of_flat_tree = images->ft_addr; #endif kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong, ulong, ulong))images->ep; + debug ("## Transferring control to Linux (at address %08lx) ...\n", + (ulong)kernel); + + show_boot_progress (15); + +#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500) + unlock_ram_in_cache(); +#endif + +#if defined(CONFIG_OF_LIBFDT) + if (of_flat_tree) { /* device tree; boot new style */ + /* + * Linux Kernel Parameters (passing device tree): + * 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, 0, 0, EPAPR_MAGIC, + CFG_BOOTMAPSZ, 0, 0); + /* does not return */ + } else +#endif + { + /* + * Linux Kernel Parameters (passing board info data): + * r3: ptr to board info data + * r4: initrd_start or 0 if no initrd + * r5: initrd_end - unused if r4 is 0 + * r6: Start of command line string + * r7: End of command line string + * r8: 0 + * r9: 0 + */ + ulong cmd_start = images->cmdline_start; + ulong cmd_end = images->cmdline_end; + ulong initrd_start = images->initrd_start; + ulong initrd_end = images->initrd_end; + bd_t *kbd = images->kbd; + + debug (" Booting using board info...\n"); + (*kernel) (kbd, initrd_start, initrd_end, + cmd_start, cmd_end, 0, 0); + /* does not return */ + } + return ; +} + +static void boot_prep_linux(struct lmb *lmb) +{ + phys_size_t bootm_size; + ulong size, sp, bootmap_base; bootmap_base = getenv_bootm_low(); bootm_size = getenv_bootm_size(); @@ -116,127 +165,156 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) sp -= 1024; lmb_reserve(lmb, sp, (CFG_SDRAM_BASE + get_effective_memsize() - sp)); + return ; +} + +static int boot_cmdline_linux(bootm_headers_t *images) +{ + ulong bootmap_base = getenv_bootm_low(); + ulong of_size = images->ft_len; + struct lmb *lmb = &images->lmb; + ulong *cmd_start = &images->cmdline_start; + ulong *cmd_end = &images->cmdline_end; + + int ret = 0; + if (!of_size) { /* allocate space and init command line */ - ret = boot_get_cmdline (lmb, &cmd_start, &cmd_end, bootmap_base); + ret = boot_get_cmdline (lmb, cmd_start, cmd_end, bootmap_base); if (ret) { puts("ERROR with allocation of cmdline\n"); - goto error; + return ret; } + } + + return ret; +} + +static int boot_bd_t_linux(bootm_headers_t *images) +{ + ulong bootmap_base = getenv_bootm_low(); + ulong of_size = images->ft_len; + struct lmb *lmb = &images->lmb; + bd_t **kbd = &images->kbd; + int ret = 0; + + if (!of_size) { /* allocate space for kernel copy of board info */ - ret = boot_get_kbd (lmb, &kbd, bootmap_base); + ret = boot_get_kbd (lmb, kbd, bootmap_base); if (ret) { puts("ERROR with allocation of kernel bd\n"); - goto error; + return ret; } - set_clocks_in_mhz(kbd); + set_clocks_in_mhz(*kbd); } + return ret; +} + +static int boot_body_linux(bootm_headers_t *images) +{ + ulong rd_len, bootmap_base = getenv_bootm_low(); + ulong of_size = images->ft_len; + struct lmb *lmb = &images->lmb; + ulong *initrd_start = &images->initrd_start; + ulong *initrd_end = &images->initrd_end; +#if defined(CONFIG_OF_LIBFDT) + char **of_flat_tree = &images->ft_addr; +#endif + + int ret; + + /* allocate space and init command line */ + ret = boot_cmdline_linux(images); + if (ret) + return ret; + + /* allocate space for kernel copy of board info */ + ret = boot_bd_t_linux(images); + if (ret) + return ret; + rd_len = images->rd_end - images->rd_start; + ret = boot_ramdisk_high (lmb, images->rd_start, rd_len, initrd_start, initrd_end); + if (ret) + return ret; #if defined(CONFIG_OF_LIBFDT) - ret = boot_relocate_fdt(lmb, bootmap_base, &of_flat_tree, &of_size); + ret = boot_relocate_fdt(lmb, bootmap_base, of_flat_tree, &of_size); if (ret) - goto error; + return ret; /* * Add the chosen node if it doesn't exist, add the env and bd_t * if the user wants it (the logic is in the subroutines). */ if (of_size) { - if (fdt_chosen(of_flat_tree, 0) < 0) { + if (fdt_chosen(*of_flat_tree, 0) < 0) { puts ("ERROR: "); puts ("/chosen node create failed"); puts (" - must RESET the board to recover.\n"); - goto error; + return -1; } #ifdef CONFIG_OF_BOARD_SETUP /* Call the board-specific fixup routine */ - ft_board_setup(of_flat_tree, gd->bd); + ft_board_setup(*of_flat_tree, gd->bd); #endif - } - /* Fixup the fdt memreserve now that we know how big it is */ - if (of_flat_tree) { /* Delete the old LMB reservation */ - lmb_free(lmb, (phys_addr_t)(u32)of_flat_tree, - (phys_size_t)fdt_totalsize(of_flat_tree)); + lmb_free(lmb, (phys_addr_t)(u32)*of_flat_tree, + (phys_size_t)fdt_totalsize(*of_flat_tree)); - ret = fdt_resize(of_flat_tree); + ret = fdt_resize(*of_flat_tree); if (ret < 0) - goto error; + return ret; of_size = ret; - if ((of_flat_tree) && (initrd_start && initrd_end)) + if (*initrd_start && *initrd_end) of_size += FDT_RAMDISK_OVERHEAD; /* Create a new LMB reservation */ - lmb_reserve(lmb, (ulong)of_flat_tree, of_size); + lmb_reserve(lmb, (ulong)*of_flat_tree, of_size); + + /* fixup the initrd now that we know where it should be */ + if (*initrd_start && *initrd_end) + fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1); } #endif /* CONFIG_OF_LIBFDT */ + return 0; +} - ret = boot_ramdisk_high (lmb, images->rd_start, rd_len, &initrd_start, &initrd_end); - if (ret) - goto error; - -#if defined(CONFIG_OF_LIBFDT) - /* fixup the initrd now that we know where it should be */ - if ((of_flat_tree) && (initrd_start && initrd_end)) - fdt_initrd(of_flat_tree, initrd_start, initrd_end, 1); -#endif - debug ("## Transferring control to Linux (at address %08lx) ...\n", - (ulong)kernel); +__attribute__((noinline)) +int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) +{ + int ret; - show_boot_progress (15); + if (flag & BOOTM_STATE_OS_CMDLINE) { + boot_cmdline_linux(images); + return 0; + } -#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500) - unlock_ram_in_cache(); -#endif + if (flag & BOOTM_STATE_OS_BD_T) { + boot_bd_t_linux(images); + return 0; + } -#if defined(CONFIG_OF_LIBFDT) - if (of_flat_tree) { /* device tree; boot new style */ - /* - * Linux Kernel Parameters (passing device tree): - * 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 + if (flag & BOOTM_STATE_OS_PREP) { + boot_prep_linux(&images->lmb); + return 0; + } - debug (" Booting using OF flat tree...\n"); - (*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC, - CFG_BOOTMAPSZ, 0, 0); - /* does not return */ - } else -#endif - { - /* - * Linux Kernel Parameters (passing board info data): - * r3: ptr to board info data - * r4: initrd_start or 0 if no initrd - * 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, 0, 0); - /* does not return */ + if (flag & BOOTM_STATE_OS_GO) { + boot_jump_linux(images); + return 0; } - return 1; -error: - return 1; + boot_prep_linux(&images->lmb); + ret = boot_body_linux(images); + if (ret) + return ret; + boot_jump_linux(images); + + return 0; } static ulong get_sp (void) -- 1.5.5.1

1 0

[U-Boot] U-Boot on ARM9
by Roman Mashak 23 Sep '08

23 Sep '08

Hello. I have a few questions on arm926 initialization code, located in ${U_BOOT}/cpu/arm926ejs/start.S: 1) what is the point of deliberately setting up SVC mode, as it's already in this mode right upon the reset? 2) I can't quite understand what 'CONFIG_USE_IRQ' is used for. It is defined on just a few targets. 3) The stack set up -- commonly startup code initializes stacks for all modes, but it's not clear how it's done in 'start.S'. Seems like somehow stacks are run-time configured, but I didn't perceive how. Thanks in advance for comments. -- Roman Mashak

2 2

[U-Boot] [RFC][PATCH v2] bootm: Add sub commands
by Kumar Gala 23 Sep '08

23 Sep '08

This version: * cleans ups issues pointed out by Jerry * adds a state machine to the command processing * adds bd_t and cmdline process on linux for ppc If this looks good I'll go ahead and clean it up for the other arches and OSes. - k Posting this again for discussion. The two features I'm interested in enabling are: * Having the ability to modify the device tree before its passed to the kernel but after 'fdt boardsetup' * Ability to do all setup but not actually jumping to the kernel. (This is useful as a way to setup the memory image [kernel, ramdisk, fdt, etc] for a different cpu than the boot one) Having bootm sub-commands allows both of these as we can break up the sequeunce of steps that are part of the bootm process. --- common/cmd_bootm.c | 150 +++++++++++++++++++++++++++++- include/image.h | 20 ++++- lib_ppc/bootm.c | 262 ++++++++++++++++++++++++++++++++++------------------ 3 files changed, 338 insertions(+), 94 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 19257bb..1de11c2 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -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) @@ -273,7 +274,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 +377,121 @@ static int bootm_load_os(image_info_t os, ulong *load_end, int boot_progress) return 0; } +int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +{ + int ret = 0; + int state; + + /* start */ + if (argv[1][0] == 's') { + argc--; + argv++; + return bootm_start(cmdtp, flag, argc, argv); + } + /* loados */ + else if (argv[1][0] == 'l') { + state = BOOTM_STATE_LOADOS; + } + /* ramdisk relocate */ +#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_SPARC) + else if (argv[1][0] == 'r') { + state = BOOTM_STATE_RAMDISK; + } +#endif +#ifdef CONFIG_OF_LIBFDT + /* fdt relocate */ + else if (argv[1][0] == 'f') { + state = BOOTM_STATE_FDT; + } +#endif + /* bd_t setup */ + else if (argv[1][0] == 'b') { + state = BOOTM_STATE_OS_BD_T; + } + /* cmdline setup */ + else if (argv[1][0] == 'c') { + state = BOOTM_STATE_OS_CMDLINE; + } + /* prep os */ + else if (argv[1][0] == 'p') { + state = BOOTM_STATE_OS_PREP; + } + /* go */ + else if (argv[1][0] == 'g') { + state = BOOTM_STATE_OS_GO; + } + /* 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 +502,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 +915,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 (its 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" + "\tprepos - OS specific prep before relocation or go\n" + "\tgo - start OS\n" ); /*******************************************************************/ diff --git a/include/image.h b/include/image.h index 82e6345..557e72a 100644 --- a/include/image.h +++ b/include/image.h @@ -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 diff --git a/lib_ppc/bootm.c b/lib_ppc/bootm.c index 38266e1..8ac0de0 100644 --- a/lib_ppc/bootm.c +++ b/lib_ppc/bootm.c @@ -47,6 +47,7 @@ DECLARE_GLOBAL_DATA_PTR; +extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); extern ulong get_effective_memsize(void); static ulong get_sp (void); static void set_clocks_in_mhz (bd_t *kbd); @@ -55,30 +56,78 @@ static void set_clocks_in_mhz (bd_t *kbd); #define CFG_LINUX_LOWMEM_MAX_SIZE (768*1024*1024) #endif -__attribute__((noinline)) -int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) +static void boot_jump_linux(bootm_headers_t *images) { - ulong sp; - - ulong initrd_start, initrd_end; - ulong rd_len; - ulong size; - phys_size_t bootm_size; - - ulong cmd_start, cmd_end, bootmap_base; - bd_t *kbd; void (*kernel)(bd_t *, ulong r4, ulong r5, ulong r6, ulong r7, ulong r8, ulong r9); - int ret; - ulong of_size = images->ft_len; - struct lmb *lmb = &images->lmb; - -#if defined(CONFIG_OF_LIBFDT) - char *of_flat_tree = images->ft_addr; +#ifdef CONFIG_OF_LIBFDT + char *of_flat_tree = images->ft_addr; #endif kernel = (void (*)(bd_t *, ulong, ulong, ulong, ulong, ulong, ulong))images->ep; + debug ("## Transferring control to Linux (at address %08lx) ...\n", + (ulong)kernel); + + show_boot_progress (15); + +#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500) + unlock_ram_in_cache(); +#endif + +#if defined(CONFIG_OF_LIBFDT) + if (of_flat_tree) { /* device tree; boot new style */ + /* + * Linux Kernel Parameters (passing device tree): + * 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, 0, 0, EPAPR_MAGIC, + CFG_BOOTMAPSZ, 0, 0); + /* does not return */ + } else +#endif + { + /* + * Linux Kernel Parameters (passing board info data): + * r3: ptr to board info data + * r4: initrd_start or 0 if no initrd + * r5: initrd_end - unused if r4 is 0 + * r6: Start of command line string + * r7: End of command line string + * r8: 0 + * r9: 0 + */ + ulong cmd_start = images->cmdline_start; + ulong cmd_end = images->cmdline_end; + ulong initrd_start = images->initrd_start; + ulong initrd_end = images->initrd_end; + bd_t *kbd = images->kbd; + + debug (" Booting using board info...\n"); + (*kernel) (kbd, initrd_start, initrd_end, + cmd_start, cmd_end, 0, 0); + /* does not return */ + } + return ; +} + +static void boot_prep_linux(struct lmb *lmb) +{ + phys_size_t bootm_size; + ulong size, sp, bootmap_base; bootmap_base = getenv_bootm_low(); bootm_size = getenv_bootm_size(); @@ -116,127 +165,156 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) sp -= 1024; lmb_reserve(lmb, sp, (CFG_SDRAM_BASE + get_effective_memsize() - sp)); + return ; +} + +static int boot_cmdline_linux(bootm_headers_t *images) +{ + ulong bootmap_base = getenv_bootm_low(); + ulong of_size = images->ft_len; + struct lmb *lmb = &images->lmb; + ulong *cmd_start = &images->cmdline_start; + ulong *cmd_end = &images->cmdline_end; + + int ret = 0; + if (!of_size) { /* allocate space and init command line */ - ret = boot_get_cmdline (lmb, &cmd_start, &cmd_end, bootmap_base); + ret = boot_get_cmdline (lmb, cmd_start, cmd_end, bootmap_base); if (ret) { puts("ERROR with allocation of cmdline\n"); - goto error; + return ret; } + } + + return ret; +} + +static int boot_bd_t_linux(bootm_headers_t *images) +{ + ulong bootmap_base = getenv_bootm_low(); + ulong of_size = images->ft_len; + struct lmb *lmb = &images->lmb; + bd_t **kbd = &images->kbd; + int ret = 0; + + if (!of_size) { /* allocate space for kernel copy of board info */ - ret = boot_get_kbd (lmb, &kbd, bootmap_base); + ret = boot_get_kbd (lmb, kbd, bootmap_base); if (ret) { puts("ERROR with allocation of kernel bd\n"); - goto error; + return ret; } - set_clocks_in_mhz(kbd); + set_clocks_in_mhz(*kbd); } + return ret; +} + +static int boot_body_linux(bootm_headers_t *images) +{ + ulong rd_len, bootmap_base = getenv_bootm_low(); + ulong of_size = images->ft_len; + struct lmb *lmb = &images->lmb; + ulong *initrd_start = &images->initrd_start; + ulong *initrd_end = &images->initrd_end; +#if defined(CONFIG_OF_LIBFDT) + char **of_flat_tree = &images->ft_addr; +#endif + + int ret; + + /* allocate space and init command line */ + ret = boot_cmdline_linux(images); + if (ret) + return ret; + + /* allocate space for kernel copy of board info */ + ret = boot_bd_t_linux(images); + if (ret) + return ret; + rd_len = images->rd_end - images->rd_start; + ret = boot_ramdisk_high (lmb, images->rd_start, rd_len, initrd_start, initrd_end); + if (ret) + return ret; #if defined(CONFIG_OF_LIBFDT) - ret = boot_relocate_fdt(lmb, bootmap_base, &of_flat_tree, &of_size); + ret = boot_relocate_fdt(lmb, bootmap_base, of_flat_tree, &of_size); if (ret) - goto error; + return ret; /* * Add the chosen node if it doesn't exist, add the env and bd_t * if the user wants it (the logic is in the subroutines). */ if (of_size) { - if (fdt_chosen(of_flat_tree, 0) < 0) { + if (fdt_chosen(*of_flat_tree, 0) < 0) { puts ("ERROR: "); puts ("/chosen node create failed"); puts (" - must RESET the board to recover.\n"); - goto error; + return -1; } #ifdef CONFIG_OF_BOARD_SETUP /* Call the board-specific fixup routine */ - ft_board_setup(of_flat_tree, gd->bd); + ft_board_setup(*of_flat_tree, gd->bd); #endif - } - /* Fixup the fdt memreserve now that we know how big it is */ - if (of_flat_tree) { /* Delete the old LMB reservation */ - lmb_free(lmb, (phys_addr_t)(u32)of_flat_tree, - (phys_size_t)fdt_totalsize(of_flat_tree)); + lmb_free(lmb, (phys_addr_t)(u32)*of_flat_tree, + (phys_size_t)fdt_totalsize(*of_flat_tree)); - ret = fdt_resize(of_flat_tree); + ret = fdt_resize(*of_flat_tree); if (ret < 0) - goto error; + return ret; of_size = ret; - if ((of_flat_tree) && (initrd_start && initrd_end)) + if (*initrd_start && *initrd_end) of_size += FDT_RAMDISK_OVERHEAD; /* Create a new LMB reservation */ - lmb_reserve(lmb, (ulong)of_flat_tree, of_size); + lmb_reserve(lmb, (ulong)*of_flat_tree, of_size); + + /* fixup the initrd now that we know where it should be */ + if (*initrd_start && *initrd_end) + fdt_initrd(*of_flat_tree, *initrd_start, *initrd_end, 1); } #endif /* CONFIG_OF_LIBFDT */ + return 0; +} - ret = boot_ramdisk_high (lmb, images->rd_start, rd_len, &initrd_start, &initrd_end); - if (ret) - goto error; - -#if defined(CONFIG_OF_LIBFDT) - /* fixup the initrd now that we know where it should be */ - if ((of_flat_tree) && (initrd_start && initrd_end)) - fdt_initrd(of_flat_tree, initrd_start, initrd_end, 1); -#endif - debug ("## Transferring control to Linux (at address %08lx) ...\n", - (ulong)kernel); +__attribute__((noinline)) +int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) +{ + int ret; - show_boot_progress (15); + if (flag & BOOTM_STATE_OS_CMDLINE) { + boot_cmdline_linux(images); + return 0; + } -#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500) - unlock_ram_in_cache(); -#endif + if (flag & BOOTM_STATE_OS_BD_T) { + boot_bd_t_linux(images); + return 0; + } -#if defined(CONFIG_OF_LIBFDT) - if (of_flat_tree) { /* device tree; boot new style */ - /* - * Linux Kernel Parameters (passing device tree): - * 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 + if (flag & BOOTM_STATE_OS_PREP) { + boot_prep_linux(&images->lmb); + return 0; + } - debug (" Booting using OF flat tree...\n"); - (*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC, - CFG_BOOTMAPSZ, 0, 0); - /* does not return */ - } else -#endif - { - /* - * Linux Kernel Parameters (passing board info data): - * r3: ptr to board info data - * r4: initrd_start or 0 if no initrd - * 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, 0, 0); - /* does not return */ + if (flag & BOOTM_STATE_OS_GO) { + boot_jump_linux(images); + return 0; } - return 1; -error: - return 1; + boot_prep_linux(&images->lmb); + ret = boot_body_linux(images); + if (ret) + return ret; + boot_jump_linux(images); + + return 0; } static ulong get_sp (void) -- 1.5.5.1

3 2