From ca2c5ec68f85d64f588cbd1a6eb6ceb7eb92e12b Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Fri, 21 Apr 2006 13:40:26 +0000 Subject: [PATCH] Move from arm_init.s -> .S. #ifdef linux vs freebsd defaults for the boot loader (linux booting helps regression testing). No repo copy because of limited history. --- sys/boot/arm/at91/bootiic/Makefile | 2 +- .../at91/bootiic/{arm_init.s => arm_init.S} | 21 ++++++++----------- 2 files changed, 10 insertions(+), 13 deletions(-) rename sys/boot/arm/at91/bootiic/{arm_init.s => arm_init.S} (89%) diff --git a/sys/boot/arm/at91/bootiic/Makefile b/sys/boot/arm/at91/bootiic/Makefile index deb30f849f2..639f28e17d2 100644 --- a/sys/boot/arm/at91/bootiic/Makefile +++ b/sys/boot/arm/at91/bootiic/Makefile @@ -2,7 +2,7 @@ P=bootiic 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} diff --git a/sys/boot/arm/at91/bootiic/arm_init.s b/sys/boot/arm/at91/bootiic/arm_init.S similarity index 89% rename from sys/boot/arm/at91/bootiic/arm_init.s rename to sys/boot/arm/at91/bootiic/arm_init.S index e405f89a3af..0aad9772f25 100644 --- a/sys/boot/arm/at91/bootiic/arm_init.s +++ b/sys/boot/arm/at91/bootiic/arm_init.S @@ -85,18 +85,6 @@ InitReset: ldr r1, = SVC_STACK_USE mov sp, r1 @ ; Move the stack to SDRAM -/* Copy the rest of the load image from EEPROM */ - .extern InitEEPROM - - bl InitEEPROM - - .extern ReadEEPROM - - mov r0, #8192 - mov r1, #8192 - mov r2, #8192 - bl ReadEEPROM - /* Start execution at main */ .extern main @@ -114,9 +102,18 @@ infiniteLoop: .global BootCommandSection BootCommandSection: +#ifdef SUPPORT_LINUX .string "Bootloader for KB9202 Evaluation Board." .string "c 0x20210000 0x10100000 0x80000 " .string "m 0 0 0 0 0 0 " .string "t 0x20000100 console=ttyS0,115200 root=/dev/ram rw initrd=0x20210000,654933" .string "e 0x10000000 " .string " " +#else + .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 " +#endif