PERFORCE change 227213 for review
Robert Watson
rwatson at FreeBSD.org
Fri Mar 29 13:53:49 UTC 2013
http://p4web.freebsd.org/@@227213?ac=10
Change 227213 by rwatson at rwatson_zenith_cl_cam_ac_uk on 2013/03/29 13:53:30
Relocate driver-related BERI boot2 source files to a common directory
so that they can be reused by the BERI loader. Rename start.s to
start.S for consistency (and because the preprocessor may come in
handy in the future).
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#6 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/altera_jtag_uart.c#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#7 edit
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/cons.h#4 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/drv.h#2 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/flash.c#2 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/start.S#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/start.s#2 delete
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/altera_jtag_uart.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/cons.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/drv.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/common/flash.c#1 branch
Differences ...
==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/Makefile#6 (text+ko) ====
@@ -5,7 +5,7 @@
INSTALLFLAGS= -b
FILES= ${PROG}
-SRCS= start.s \
+SRCS= start.S \
boot2.c \
altera_jtag_uart.c \
flash.c
@@ -30,6 +30,9 @@
-T ${.CURDIR}/linker.cfg \
-G0
+.PATH: ${.CURDIR}/../common
+CFLAGS+= -I${.CURDIR}/../common
+
boot2: linker.cfg
boot2.img: boot2
==== //depot/projects/ctsrd/beribsd/src/sys/boot/mips/beri/boot2/boot2.c#7 (text+ko) ====
@@ -56,8 +56,8 @@
#include <stdarg.h>
-#include "cons.h"
-#include "drv.h"
+#include <cons.h>
+#include <drv.h>
#define IO_KEYBOARD 1
#define IO_SERIAL 2
More information about the p4-projects
mailing list