diff options
Diffstat (limited to 'mbr')
| -rw-r--r-- | mbr/Makefile | 3 | ||||
| -rw-r--r-- | mbr/altmbr.S | 2 | ||||
| -rw-r--r-- | mbr/isohdpfx.S | 31 |
3 files changed, 34 insertions, 2 deletions
diff --git a/mbr/Makefile b/mbr/Makefile index c3eb97a7..993bb100 100644 --- a/mbr/Makefile +++ b/mbr/Makefile @@ -16,7 +16,8 @@ # topdir = .. -include $(topdir)/MCONFIG.embedded +MAKEDIR = $(topdir)/mk +include $(MAKEDIR)/embedded.mk all: mbr.bin altmbr.bin gptmbr.bin isohdpfx.bin isohdppx.bin \ mbr_c.bin altmbr_c.bin gptmbr_c.bin isohdpfx_c.bin isohdppx_c.bin \ diff --git a/mbr/altmbr.S b/mbr/altmbr.S index 1b609051..c66b4ddc 100644 --- a/mbr/altmbr.S +++ b/mbr/altmbr.S @@ -204,7 +204,7 @@ scan_partition_table: 5: decb (partition) jz boot - addw $16, %bx + addw $16, %si loopw 5b popw %cx /* %cx <- 4 */ diff --git a/mbr/isohdpfx.S b/mbr/isohdpfx.S index 2784fb80..17e1efe1 100644 --- a/mbr/isohdpfx.S +++ b/mbr/isohdpfx.S @@ -66,6 +66,37 @@ bootsec: .globl _start _start: .byte 0x33, 0xed /* xorw %bp, %bp */ + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + nop + .byte 0x33, 0xed /* xorw %bp, %bp */ cli movw %bp, %ss movw $stack, %sp |