diff options
author | imp <imp@FreeBSD.org> | 2006-08-17 00:14:32 +0000 |
---|---|---|
committer | imp <imp@FreeBSD.org> | 2006-08-17 00:14:32 +0000 |
commit | b3160d204fc81f13c71edebc9d67009715c26bac (patch) | |
tree | 2270164cf2f470a0b9c532b609a208378aa20217 /sys | |
parent | f9cac16acedf0c143b01c0cbd8b2804d1a995a95 (diff) | |
download | FreeBSD-src-b3160d204fc81f13c71edebc9d67009715c26bac.zip FreeBSD-src-b3160d204fc81f13c71edebc9d67009715c26bac.tar.gz |
MFp4: changes since .s -> .S rename. Use correct header for size
Diffstat (limited to 'sys')
-rw-r--r-- | sys/boot/arm/at91/bootspi/arm_init.S | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/sys/boot/arm/at91/bootspi/arm_init.S b/sys/boot/arm/at91/bootspi/arm_init.S index f9e6655..499bd8b 100644 --- a/sys/boot/arm/at91/bootspi/arm_init.S +++ b/sys/boot/arm/at91/bootspi/arm_init.S @@ -23,7 +23,6 @@ * $FreeBSD$ ******************************************************************************/ - .equ TWI_EEPROM_SIZE, 0x2000 .equ ARM_MODE_USER, 0x10 .equ ARM_MODE_FIQ, 0x11 .equ ARM_MODE_IRQ, 0x12 @@ -60,7 +59,7 @@ pabtvec: dabtvec: B dabtvec @; Data Abort rsvdvec: - .long (TWI_EEPROM_SIZE >> 9) + .long ((1056 << 17) | (13 << 13) | (12 * 2)) irqvec: ldr pc, [pc,#-0xF20] @; IRQ : read the AIC fiqvec: @@ -102,9 +101,25 @@ 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 +#if 0 + .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 " +#else + .string "m 42 53 44 0 0 1" + .string "k 0x20000000" + .string "e 0x20000000" +#endif + .word 0 +#endif |