Date: Sun, 12 Nov 2006 07:49:02 GMT From: Warner Losh <imp@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 109782 for review Message-ID: <200611120749.kAC7n2wv014865@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109782 Change 109782 by imp@imp_lighthouse on 2006/11/12 07:48:17 Merge the last copy of arm_init.s into arm_init.S. Also, don't compile in the command tables for boot2, since that will save us 104 bytes. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#10 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot0/arm_init.s#2 delete .. //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#9 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#19 edit .. //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#17 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#3 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0/Makefile#10 (text) ==== @@ -1,11 +1,14 @@ # $FreeBSD: src/sys/boot/arm/at91/boot0/Makefile,v 1.4 2006/08/18 20:26:54 imp Exp $ +.PATH: ${.CURDIR}/../libat91 + P=boot0 FILES=${P} -SRCS=arm_init.s main.c +SRCS=arm_init.S main.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include <bsd.prog.mk> +CFLAGS+=-DBOOT_BOOT0 ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0iic/Makefile#9 (text) ==== @@ -1,12 +1,14 @@ # $FreeBSD: src/sys/boot/arm/at91/boot0iic/Makefile,v 1.2 2006/08/16 23:14:52 imp Exp $ -.PATH: ${.CURDIR}/../boot0 +.PATH: ${.CURDIR}/../libat91 P=boot0iic FILES=${P} -SRCS=arm_init.s main.c +SRCS=arm_init.S main.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include <bsd.prog.mk> + +CFLAGS+=-DBOOT_BOOT0 ==== //depot/projects/arm/src/sys/boot/arm/at91/boot0spi/Makefile#8 (text) ==== @@ -1,13 +1,14 @@ # $FreeBSD: src/sys/boot/arm/at91/boot0spi/Makefile,v 1.2 2006/08/16 23:18:07 imp Exp $ -.PATH: ${.CURDIR}/../boot0 +.PATH: ${.CURDIR}/../libat91 P=boot0spi FILES=${P} -SRCS=arm_init.s main.c +SRCS=arm_init.S main.c NO_MAN= LDFLAGS=-e 0 -T ${.CURDIR}/../linker.cfg OBJS+= ${SRCS:N*.h:R:S/$/.o/g} .include <bsd.prog.mk> +CFLAGS+=-DBOOT_BOOT0 ==== //depot/projects/arm/src/sys/boot/arm/at91/bootiic/Makefile#19 (text+ko) ==== @@ -11,4 +11,4 @@ .include <bsd.prog.mk> -CFLAGS += -DBOOT_IIC +CFLAGS += -DBOOT_IIC -DBOOT_COMMANDS ==== //depot/projects/arm/src/sys/boot/arm/at91/bootspi/Makefile#17 (text+ko) ==== @@ -14,3 +14,4 @@ .if ${MK_FPGA} == "yes" CFLAGS += -DTSC_FPGA .endif +CFLAGS += -DBOOT_COMMANDS ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/arm_init.S#3 (text+ko) ==== @@ -31,7 +31,6 @@ .equ ARM_MODE_ABORT, 0x17 .equ ARM_MODE_UNDEF, 0x1B .equ ARM_MODE_SYS, 0x1F - .equ I_BIT, 0x80 .equ F_BIT, 0x40 .equ T_BIT, 0x20 @@ -41,7 +40,6 @@ * * Start near top of internal RAM. */ - .equ END_INT_SRAM, 0x4000 .equ SVC_STACK_START, (END_INT_SRAM - 0x4) .equ SVC_STACK_USE, 0x21800000 @@ -70,7 +68,6 @@ fiqvec: B fiqvec @; FIQ - InitReset: /* Set stack and init for SVC */ @@ -83,24 +80,22 @@ /* Perform system initialization */ .extern _init - bl _init - +#ifndef BOOT_BOOT0 ldr r1, = SVC_STACK_USE mov sp, r1 @ ; Move the stack to SDRAM +#endif /* Start execution at main */ - .extern main _main: __main: bl main - /* main should not return. If it does, spin forever */ - infiniteLoop: b infiniteLoop +#ifdef BOOT_COMMANDS /* the following section is used to store boot commands in */ /* non-volatile memory. */ @@ -127,3 +122,4 @@ #endif .word 0 #endif +#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611120749.kAC7n2wv014865>