diff options
| author | imp <imp@FreeBSD.org> | 2006-04-21 13:40:26 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2006-04-21 13:40:26 +0000 |
| commit | a894bea56ea25173bed9887a6fe5505bd3c08a63 (patch) | |
| tree | ccc0b11af8b90ba1964401d0d049449484a62772 /sys/boot | |
| parent | 65471b2ff830818568c0771ccb869e1fa6c362ce (diff) | |
| download | FreeBSD-src-a894bea56ea25173bed9887a6fe5505bd3c08a63.zip FreeBSD-src-a894bea56ea25173bed9887a6fe5505bd3c08a63.tar.gz | |
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.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/arm/at91/bootiic/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/arm/at91/bootiic/arm_init.S (renamed from sys/boot/arm/at91/bootiic/arm_init.s) | 21 |
2 files changed, 10 insertions, 13 deletions
diff --git a/sys/boot/arm/at91/bootiic/Makefile b/sys/boot/arm/at91/bootiic/Makefile index deb30f8..639f28e 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 index e405f89..0aad977 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 |
