diff options
| author | nyan <nyan@FreeBSD.org> | 2000-11-05 12:35:41 +0000 |
|---|---|---|
| committer | nyan <nyan@FreeBSD.org> | 2000-11-05 12:35:41 +0000 |
| commit | 48503b7c5c0457713d7787367598c6e68425e6f7 (patch) | |
| tree | 4dac50c841b6a9cbbe20300875cdc3fe1d5c83bc /sys/boot/pc98/btx | |
| parent | c3b27201d1fa4f0149196757101c35192e8d247c (diff) | |
| download | FreeBSD-src-48503b7c5c0457713d7787367598c6e68425e6f7.zip FreeBSD-src-48503b7c5c0457713d7787367598c6e68425e6f7.tar.gz | |
Merged from the following changes.
sys/boot/i386/btx/btx/Makefile 1.9
sys/boot/i386/btx/btx/btx.s 1.23
sys/boot/i386/libi386/biosdisk.c 1.32 and 1.33
sys/boot/i386/libi386/biosmem.c 1.5
sys/boot/i386/libi386/comconsole.c 1.8
sys/boot/i386/libi386/gatea20.c 1.3
sys/boot/i386/libi386/time.c 1.4
sys/boot/i386/libi386/vidconsole.c 1.13
sys/boot/i386/loader/Makefile 1.48
sys/boot/i386/loader/main.c 1.22
Diffstat (limited to 'sys/boot/pc98/btx')
| -rw-r--r-- | sys/boot/pc98/btx/btx/Makefile | 9 | ||||
| -rw-r--r-- | sys/boot/pc98/btx/btx/btx.S | 2 | ||||
| -rw-r--r-- | sys/boot/pc98/btx/btx/btx.s | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/sys/boot/pc98/btx/btx/Makefile b/sys/boot/pc98/btx/btx/Makefile index fd29676..2299632 100644 --- a/sys/boot/pc98/btx/btx/Makefile +++ b/sys/boot/pc98/btx/btx/Makefile @@ -6,10 +6,17 @@ M4?= m4 M4FLAGS+= -DPAGING .endif -ORG= 0x9000 +.if defined(BOOT_BTX_NOHANG) +BOOT_BTX_FLAGS=0x1 +.else +BOOT_BTX_FLAGS=0x0 +.endif +AFLAGS+= --defsym BTX_FLAGS=${BOOT_BTX_FLAGS} AFLAGS+= --defsym PC98=1 +ORG= 0x9000 + all: btx btx: btx.o diff --git a/sys/boot/pc98/btx/btx/btx.S b/sys/boot/pc98/btx/btx/btx.S index 14a5b0d..cc8f0f5 100644 --- a/sys/boot/pc98/btx/btx/btx.S +++ b/sys/boot/pc98/btx/btx/btx.S @@ -114,7 +114,7 @@ btx_hdr: .byte 0xeb # Machine ID .ascii "BTX" # Magic .byte 0x1 # Major version .byte 0x1 # Minor version - .byte 0x0 # Flags + .byte BTX_FLAGS # Flags .word PAG_CNT-MEM_ORG>>0xc # Paging control .word break-start # Text size .long 0x0 # Entry address diff --git a/sys/boot/pc98/btx/btx/btx.s b/sys/boot/pc98/btx/btx/btx.s index 14a5b0d..cc8f0f5 100644 --- a/sys/boot/pc98/btx/btx/btx.s +++ b/sys/boot/pc98/btx/btx/btx.s @@ -114,7 +114,7 @@ btx_hdr: .byte 0xeb # Machine ID .ascii "BTX" # Magic .byte 0x1 # Major version .byte 0x1 # Minor version - .byte 0x0 # Flags + .byte BTX_FLAGS # Flags .word PAG_CNT-MEM_ORG>>0xc # Paging control .word break-start # Text size .long 0x0 # Entry address |
