diff options
author | jhb <jhb@FreeBSD.org> | 2000-05-23 12:31:32 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2000-05-23 12:31:32 +0000 |
commit | 29384c9340da62f40600b592c514110024d165aa (patch) | |
tree | 6d51ec91d2d381573d1ca1d5ff94c34eb8aa6f58 /sys/boot/i386/pxeldr | |
parent | bb04c4fd93f735f81db7fa6471be98f6398905a1 (diff) | |
download | FreeBSD-src-29384c9340da62f40600b592c514110024d165aa.zip FreeBSD-src-29384c9340da62f40600b592c514110024d165aa.tar.gz |
Grrr, fix a silly 'movl' -> 'movw' typo in both pxeldr and cdldr. Also,
remove unnecessary cruft from the Makefiles for both.
Diffstat (limited to 'sys/boot/i386/pxeldr')
-rw-r--r-- | sys/boot/i386/pxeldr/Makefile | 3 | ||||
-rw-r--r-- | sys/boot/i386/pxeldr/pxeldr.S | 2 | ||||
-rw-r--r-- | sys/boot/i386/pxeldr/pxeldr.s | 2 |
3 files changed, 2 insertions, 5 deletions
diff --git a/sys/boot/i386/pxeldr/Makefile b/sys/boot/i386/pxeldr/Makefile index da9fc2d..0b6826c 100644 --- a/sys/boot/i386/pxeldr/Makefile +++ b/sys/boot/i386/pxeldr/Makefile @@ -33,9 +33,6 @@ ${LDR}: ${LDR}.o objcopy -S -O binary ${LDR}.out ${.TARGET} .endif -${LDR}.o: ${.CURDIR}/${LDR}.s - ${AS} ${AFLAGS} -o ${.TARGET} ${.CURDIR}/${LDR}.s - CLEANFILES+= ${LDR} ${LDR}.out ${LDR}.o ${BOOT}.tmp .include <bsd.prog.mk> diff --git a/sys/boot/i386/pxeldr/pxeldr.S b/sys/boot/i386/pxeldr/pxeldr.S index c9854f9..510aff8 100644 --- a/sys/boot/i386/pxeldr/pxeldr.S +++ b/sys/boot/i386/pxeldr/pxeldr.S @@ -91,7 +91,7 @@ start: cld # string ops inc # movw $bootinfo_msg, %si # %ds:(%si) -> boot args message callw putstr # display the message - movl $MEM_ARG, %bx # %ds:(%bx) -> boot args + movw $MEM_ARG, %bx # %ds:(%bx) -> boot args movw %bx, %di # %es:(%di) -> boot args xorl %eax, %eax # zero %eax movw $(MEM_ARG_SIZE/4), %cx # Size of arguments in 32-bit diff --git a/sys/boot/i386/pxeldr/pxeldr.s b/sys/boot/i386/pxeldr/pxeldr.s index c9854f9..510aff8 100644 --- a/sys/boot/i386/pxeldr/pxeldr.s +++ b/sys/boot/i386/pxeldr/pxeldr.s @@ -91,7 +91,7 @@ start: cld # string ops inc # movw $bootinfo_msg, %si # %ds:(%si) -> boot args message callw putstr # display the message - movl $MEM_ARG, %bx # %ds:(%bx) -> boot args + movw $MEM_ARG, %bx # %ds:(%bx) -> boot args movw %bx, %di # %es:(%di) -> boot args xorl %eax, %eax # zero %eax movw $(MEM_ARG_SIZE/4), %cx # Size of arguments in 32-bit |