microblaze: bootm: Fix coding style issues
PATCH 1/2 microblaze: bootm: Fix coding style issues
Prepare place for new patch.
--- arch/microblaze/lib/bootm.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
arch/microblaze/lib/bootm.c +11 -9
@@ -32,11 +32,12 @@DECLARE_GLOBAL_DATA_PTR ; -int do_bootm_linux (int flag,int argc,char *const argv[],bootm_headers_t *images) +int do_bootm_linux (int flag,int argc,char *const argv[], +bootm_headers_t *images) {/* First parameter is mapped to $r5 for kernel boot args */ -void (*theKernel) (char *,ulong ,ulong ); -char *commandline =getenv ("bootargs" ); +void (*thekernel) (char *,ulong ,ulong ); +char *commandline =getenv ("bootargs" );ulong rd_data_start, rd_data_end;if ((flag !=0 ) && (flag !=BOOTM_STATE_OS_GO ))
@@ -51,10 +52,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima of_flat_tree = images->ft_addr;#endif - theKernel = (void (*)(char *,ulong ,ulong ))images->ep; + thekernel = (void (*)(char *,ulong ,ulong ))images->ep;/* find ramdisk */ - ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_MICROBLAZE , + ret =boot_get_ramdisk (argc, argv, images,IH_ARCH_MICROBLAZE , &rd_data_start, &rd_data_end);if (ret)return 1 ;
@@ -64,9 +65,10 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *imaif (!of_flat_tree && argc >3 ) of_flat_tree = (char *)simple_strtoul (argv[3 ],NULL ,16 );#ifdef DEBUG -printf ("## Transferring control to Linux (at address 0x%08lx) " \ -"ramdisk 0x%08lx, FDT 0x%08lx...\n" , - (ulong ) theKernel, rd_data_start, (ulong ) of_flat_tree); +printf ("## Transferring control to Linux (at address 0x%08lx) " , + (ulong )thekernel); +printf ("ramdisk 0x%08lx, FDT 0x%08lx...\n" , + rd_data_start, (ulong ) of_flat_tree);#endif #ifdef XILINX_USE_DCACHE
@@ -78,7 +80,7 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima* r6: pointer to ramdisk * r7: pointer to the fdt, followed by the board info data */ -theKernel (commandline, rd_data_start, (ulong ) of_flat_tree); +thekernel (commandline, rd_data_start, (ulong )of_flat_tree);/* does not return */ return 1 ;
--
1.8.2.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130503/52177be9/attachment.pgp>
PATCH 2/2 microblaze: bootm: Add support for loading initrd
fdt_initrd add additional information to DTB about initrd addresses which are later used by kernel.
--- arch/microblaze/lib/bootm.c | 5 +++++ 1 file changed, 5 insertions(+)
arch/microblaze/lib/bootm.c +5 -0
@@ -64,6 +64,11 @@ int do_bootm_linux(int flag, int argc, char * const argv[],if (!of_flat_tree && argc >3 ) of_flat_tree = (char *)simple_strtoul (argv[3 ],NULL ,16 ); + +/* fixup the initrd now that we know where it should be */ +if (images->rd_start && images->rd_end && of_flat_tree) +fdt_initrd (of_flat_tree, images->rd_start, images->rd_end,1 ); +#ifdef DEBUG printf ("## Transferring control to Linux (at address 0x%08lx) " , (ulong )thekernel);
--
1.8.2.1
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130503/6036343f/attachment.pgp>
Michal Simek
maintainerPATCH 2/2 microblaze: bootm: Add support for loading initrd
Quoted 13 lines · Michal Simek
fdt_initrdadd additional information to DTB about initrd addresses which are later used by kernel.Signed-off-by Michal Simek <[email protected]>--- arch/microblaze/lib/bootm.c | 5 +++++ 1 file changed, 5 insertions(+)arch/microblaze/lib/bootm.c +0
-0
arch/microblaze/lib/bootm.c int do_bootm_linux(int flag, int argc, char * const argv[], · line 70
Quoted 7 lines
arch/microblaze/lib/bootm.c +4
-0@@ -64,6 +64,11 @@ int do_bootm_linux(int flag, int argc, char * const argv[],if (!of_flat_tree && argc >3 ) of_flat_tree = (char *)simple_strtoul (argv[3 ],NULL ,16 ); + +/* fixup the initrd now that we know where it should be */ +if (images->rd_start && images->rd_end && of_flat_tree) +fdt_initrd (of_flat_tree, images->rd_start, images->rd_end,1 );
Michal: You should also check return value.
BTW: it should be also checked for arm and ppc.
will send v2.
Thanks,
Michal
Signature · 14 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 263 bytes Desc: OpenPGP digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130506/352c3840/attachment.pgp>