Date: Tue, 8 Aug 2006 22:09:44 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 103476 for review Message-ID: <200608082209.k78M9iPF060177@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=103476 Change 103476 by imp@imp_lighthouse on 2006/08/08 22:08:57 Only do the watchdog for automated boot Boot from SPI part Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#5 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#15 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/arm_init.S#5 (text+ko) ==== @@ -109,11 +109,17 @@ .string "e 0x10000000 " .string " " #else +#if 0 .string "Bootloader for KB9202 Evaluation Board." .string "m 42 53 44 0 0 1 " .string "ip 206 168 13 194 " .string "server_ip 206 168 13 207 " .string "tftp 0x20000000 kernel.bin " .string "e 0x20000000 " +#else + .string "m 42 53 44 0 0 1" + .string "k 0x20000000" + .string "e 0x20000000" +#endif .word 0 #endif ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/main.c#15 (text+ko) ==== @@ -53,10 +53,11 @@ fpga_load(); #endif EMAC_Init(); - start_wdog(30); LoadBootCommands(); - if (getc(1) == -1) + if (getc(1) == -1) { + start_wdog(30); ExecuteEnvironmentFunctions(); + } Bootloader(getc); return (1); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608082209.k78M9iPF060177>