PERFORCE change 95452 for review
Warner Losh
imp at FreeBSD.org
Mon Apr 17 21:38:45 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=95452
Change 95452 by imp at imp_hammer on 2006/04/17 21:37:52
Get pickier about the code, and start to fix things. boot0 now
compiles. bootiic need help.
Affected files ...
.. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#3 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#5 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.c#2 edit
Differences ...
==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#3 (text+ko) ====
@@ -1,6 +1,12 @@
# $FreeBSD$
-CFLAGS=-O2 -mcpu=arm9 -ffreestanding -I${.CURDIR}/../libat91
+CFLAGS=-O2 -mcpu=arm9 -ffreestanding \
+ -I${.CURDIR}/../libat91 \
+ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \
+ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
+ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \
+ -Werror
+
CFLAGS+=-DBOOT0_TSC
#CFLAGS+=-DBOOT0_KB920X
==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/main.c#5 (text) ====
@@ -34,7 +34,7 @@
main(void)
{
char *addr = (char *)SDRAM_BASE + (1 << 20); /* Load to base + 1MB */
- fn_t *fn = (fn_t *)addr;
+ fn_t *fn = (fn_t *)(SDRAM_BASE + (1 << 20)); /* Load to base + 1MB */
while (xmodem_rx(addr) == -1)
continue;
==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#2 (text) ====
@@ -46,7 +46,6 @@
AT91PS_PDC pPDC = (AT91PS_PDC)&(pUSART->US_RPR);
register unsigned value;
- int i;
volatile sdram_size_t *p = (sdram_size_t *)SDRAM_BASE;
#ifdef BOOT0_TSC
==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#2 (text) ====
@@ -52,6 +52,6 @@
#define GetSeconds() (AT91C_BASE_RTC->RTC_TIMR & AT91C_RTC_SEC)
-extern void DefaultSystemInit(void);
+extern void _init(void);
#endif /* _AT91RM9200_LOWLEVEL_H_ */
==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/lib.c#2 (text) ====
@@ -36,6 +36,7 @@
#include "at91rm9200.h"
#include "at91rm9200_lowlevel.h"
+#include "lib.h"
/*
* void putc(int ch)
More information about the p4-projects
mailing list