Date: Thu, 20 Apr 2006 21:02:49 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 95714 for review Message-ID: <200604202102.k3KL2ncP091657@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=95714 Change 95714 by imp@imp_hammer on 2006/04/20 21:02:10 Make it possible to enable tag support. bootiic is still just under the limit at 8163 bytes (when we cross the 8192 border, we have to add back the reading of the rest of the eeprom into SRAM) Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#4 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#10 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#7 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#6 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/tag_list.c#2 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile#3 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#7 (text+ko) ==== @@ -1,5 +1,8 @@ # $FreeBSD$ +.if !target(__at91_boot_Makefile.inc__) +__at91_boot_Makefile.inc__: + CFLAGS=-O2 -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ -Wall -Waggregate-return -Wcast-align \ @@ -7,8 +10,8 @@ -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ -Werror -CFLAGS+=-DBOOT_TSC -#CFLAGS+=-DBOOT_KB920X +#CFLAGS+=-DBOOT_TSC +CFLAGS+=-DBOOT_KB9202 LIBAT91=${.OBJDIR}/../libat91/libat91.a @@ -21,3 +24,11 @@ CLEANFILES+= ${P} ${P}.out .endif + +.if defined(WITH_TAG_LIST) +MK_TAG_LIST:=yes +.else +MK_TAG_LIST:=no +.endif + +.endif ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#4 (text) ==== @@ -10,4 +10,3 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include <bsd.prog.mk> - ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#10 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/main.c#7 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/Makefile#6 (text+ko) ==== @@ -1,9 +1,16 @@ # $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.2 2006/04/13 17:44:05 imp Exp $ +.include "${.CURDIR}/../Makefile.inc" + LIB= at91 INTERNALLIB= SRCS=at91rm9200_lowlevel.c eeprom.c emac.c env_vars.c getc.c loader_prompt.c \ p_string.c putchar.c printf.c xmodem.c NO_MAN= +.if ${MK_TAG_LIST} != "no" +CFLAGS += -I${.CURDIR}/.. -DSUPPORT_TAG_LIST +SRCS+=tag_list.c +.endif + .include <bsd.lib.mk> ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/tag_list.c#2 (text+ko) ==== @@ -26,7 +26,9 @@ #define u16 unsigned short #define u8 unsigned char -#include "/usr/src/arm/linux/include/asm/setup.h" +// #include "/usr/src/arm/linux/include/asm/setup.h" +#include <linux/asm/setup.h> +#include "tag_list.h" #define PAGE_SIZE 0x1000 #define MEM_SIZE 0x2000000
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200604202102.k3KL2ncP091657>