[PATCH] fix redwood boot (linuxppc-2.4, from linuxppc_2_4_devel)

[PATCH] fix redwood boot (linuxppc-2.4, from linuxppc_2_4_devel)

[Andreas Oberritter]

[-- Attachment #1: Type: text/plain, Size: 140 bytes --]

Hi,

without this patch booting stops at "Calibrating delay loop" (jiffies
don't increase). Please apply to linuxppc-2.4.

Regards,
Andreas

[-- Attachment #2: embed_config.diff --]
[-- Type: text/plain, Size: 1230 bytes --]

===== arch/ppc/boot/simple/embed_config.c 1.16 vs edited =====
--- 1.16/arch/ppc/boot/simple/embed_config.c	Thu Sep 25 00:55:59 2003
+++ edited/arch/ppc/boot/simple/embed_config.c	Tue Oct 14 01:12:29 2003
@@ -684,26 +684,23 @@
 			bd->bi_pci_enetaddr[i] = *cp++;
 #endif
 		}
+		bd->bi_tbfreq = 200000000;
 		bd->bi_intfreq = 200000000;
 		bd->bi_busfreq = 100000000;
 #ifdef CONFIG_PCI
 		bd->bi_pci_busfreq = 66666666;
 #endif
-		/* Yeah, this look weird, but on Redwood 4 they are
-		 * different object in the structure.  When RW5 uses
-		 * OpenBIOS, it requires a special value.
-		 */
-#ifdef CONFIG_REDWOOD_5
-	bd->bi_intfreq = 200 * 1000 * 1000;
-	bd->bi_busfreq = 0;
-
-		bd->bi_tbfreq = 27 * 1000 * 1000;
-#elif CONFIG_REDWOOD_4
-		bd->bi_tbfreq = bd->bi_intfreq;
-#endif
 	}
-}
+	/* Yeah, this look weird, but on Redwood 4 they are
+	 * different object in the structure.  When RW5 uses
+	 * OpenBIOS, it requires a special value.
+	 */
+#if defined(CONFIG_REDWOOD_5) || defined (CONFIG_REDWOOD_6)
+	bd->bi_tbfreq = 27000000;
 #endif
+	timebase_period_ns = 1000000000 / bd->bi_tbfreq;
+}
+#endif /* CONFIG_IBM_OPENBIOS */

 #ifdef CONFIG_ARCTIC2
 /* Several bootloaders have been used on the Arctic.  We assume either

Re: [PATCH] fix redwood boot (linuxppc-2.4, from linuxppc_2_4_devel)

[Tom Rini]

On Tue, Oct 14, 2003 at 01:37:30AM +0200, Andreas Oberritter wrote:

> Hi,
>
> without this patch booting stops at "Calibrating delay loop" (jiffies
> don't increase). Please apply to linuxppc-2.4.

Applied, thanks.

--
Tom Rini
http://gate.crashing.org/~trini/

** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/