From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Schwebel Date: Mon, 31 Mar 2003 12:37:33 +0200 Subject: [U-Boot-Users] [PATCH] 5/5: progress In-Reply-To: <20030331101711.99559C587C@atlas.denx.de> References: <20030331093502.GP7702@pengutronix.de> <20030331101711.99559C587C@atlas.denx.de> Message-ID: <20030331103733.GR7702@pengutronix.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Mon, Mar 31, 2003 at 12:17:06PM +0200, Wolfgang Denk wrote: > And, as I have told you about 10 times before, I will definitely > ignore all patches that add trailing white space. I would really love to run indent over my sources before submitting patches, but if I'd do it patch size would EXPLODE. Attached without the white space. Robert -- Dipl.-Ing. Robert Schwebel | http://www.pengutronix.de Pengutronix - Linux Solutions for Science and Industry Braunschweiger Str. 79, 31134 Hildesheim, Germany Handelsregister: Amtsgericht Hildesheim, HRA 2686 Phone: +49-5121-28619-0 | Fax: +49-5121-28619-4 -------------- next part -------------- --- u-boot/lib_arm/armlinux.c 2002-11-05 01:18:03.000000000 +0100 +++ u-boot-ptx/lib_arm/armlinux.c 2003-03-31 11:21:38.000000000 +0200 @@ -32,6 +32,13 @@ #define tag_size(type) ((sizeof(struct tag_header) + sizeof(struct type)) >> 2) #define tag_next(t) ((struct tag *)((u32 *)(t) + (t)->hdr.size)) + +#ifdef CONFIG_SHOW_BOOT_PROGRESS +# define SHOW_BOOT_PROGRESS(arg) show_boot_progress(arg) +#else +# define SHOW_BOOT_PROGRESS(arg) +#endif + #if defined (CONFIG_SETUP_MEMORY_TAGS) || \ defined (CONFIG_CMDLINE_TAG) || \ defined (CONFIG_INITRD_TAG) || \ @@ -88,7 +95,6 @@ */ if (argc >= 3) { SHOW_BOOT_PROGRESS (9); - addr = simple_strtoul(argv[2], NULL, 16); printf ("## Loading Ramdisk Image at %08lx ...\n", addr); @@ -98,7 +104,7 @@ if (ntohl(hdr->ih_magic) != IH_MAGIC) { printf ("Bad Magic Number\n"); - SHOW_BOOT_PROGRESS (-10); + SHOW_BOOT_PROGRESS (-10); do_reset (cmdtp, flag, argc, argv); } @@ -175,11 +181,7 @@ data = 0; } -#ifdef DEBUG - if (!data) { - printf ("No initrd\n"); - } -#endif + if (!data) debug("No initrd\n"); if (data) { initrd_start = data; @@ -191,10 +193,8 @@ SHOW_BOOT_PROGRESS (15); -#ifdef DEBUG - printf ("## Transferring control to Linux (at address %08lx) ...\n", + debug("## Transferring control to Linux (at address %08lx) ...\n", (ulong)theKernel); -#endif #if defined (CONFIG_SETUP_MEMORY_TAGS) || \ defined (CONFIG_CMDLINE_TAG) || \ @@ -235,7 +235,7 @@ static void setup_start_tag(bd_t *bd) { params = (struct tag *)bd->bi_boot_params; - + params->hdr.tag = ATAG_CORE; params->hdr.size = tag_size(tag_core);