* [U-Boot-Users] [PATCH] 5/5: progress
@ 2003-03-31 9:35 Robert Schwebel
2003-03-31 10:17 ` Wolfgang Denk
2003-03-31 17:43 ` Wolfgang Denk
0 siblings, 2 replies; 4+ messages in thread
From: Robert Schwebel @ 2003-03-31 9:35 UTC (permalink / raw)
To: u-boot
progress:
- fix BOOT_PROGRESS in armlinux.c
- cosmetic changes (must be allowed as I've touched the file anyway :^)
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);
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH] 5/5: progress
2003-03-31 9:35 [U-Boot-Users] [PATCH] 5/5: progress Robert Schwebel
@ 2003-03-31 10:17 ` Wolfgang Denk
2003-03-31 10:37 ` Robert Schwebel
2003-03-31 17:43 ` Wolfgang Denk
1 sibling, 1 reply; 4+ messages in thread
From: Wolfgang Denk @ 2003-03-31 10:17 UTC (permalink / raw)
To: u-boot
In message <20030331093502.GP7702@pengutronix.de> you wrote:
>
> - fix BOOT_PROGRESS in armlinux.c
> - cosmetic changes (must be allowed as I've touched the file anyway :^)
Nothing "must" be allowed. I even allow myself to change my own
opinion ;-)
> @@ -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);
Willignore this change.
> @@ -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);
> }
I will ignore this one, too.
> @@ -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);
And, as I have told you about 10 times before, I will definitely
ignore all patches that add trailing white space.
Best regards,
Wolfgang Denk
--
Software Engineering: Embedded and Realtime Systems, Embedded Linux
Phone: (+49)-8142-4596-87 Fax: (+49)-8142-4596-88 Email: wd at denx.de
Well, the way I see it, logic is only a way of being ignorant by num-
bers. - Terry Pratchett, _Small Gods_
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH] 5/5: progress
2003-03-31 10:17 ` Wolfgang Denk
@ 2003-03-31 10:37 ` Robert Schwebel
0 siblings, 0 replies; 4+ messages in thread
From: Robert Schwebel @ 2003-03-31 10:37 UTC (permalink / raw)
To: u-boot
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);
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot-Users] [PATCH] 5/5: progress
2003-03-31 9:35 [U-Boot-Users] [PATCH] 5/5: progress Robert Schwebel
2003-03-31 10:17 ` Wolfgang Denk
@ 2003-03-31 17:43 ` Wolfgang Denk
1 sibling, 0 replies; 4+ messages in thread
From: Wolfgang Denk @ 2003-03-31 17:43 UTC (permalink / raw)
To: u-boot
In message <20030331093502.GP7702@pengutronix.de> you wrote:
>
> - fix BOOT_PROGRESS in armlinux.c
Rejected. This code is already present!!!
> - cosmetic changes (must be allowed as I've touched the file anyway :^)
Wolfgang Denk
--
Software Engineering: Embedded and Realtime Systems, Embedded Linux
Phone: (+49)-8142-4596-87 Fax: (+49)-8142-4596-88 Email: wd at denx.de
Dope will get you through times of no money better that money will
get you through times of no dope. - Gilbert Shelton
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2003-03-31 17:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-03-31 9:35 [U-Boot-Users] [PATCH] 5/5: progress Robert Schwebel
2003-03-31 10:17 ` Wolfgang Denk
2003-03-31 10:37 ` Robert Schwebel
2003-03-31 17:43 ` Wolfgang Denk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox