root/memdisk/memdisk_iso_2048.asm

Revision 235864576279688ab7e191cdfc9e8533b6d75fe9, 134 bytes (checked in by Shao Miller <shao.miller@…>, 3 years ago)

Merge branch 'memdisk-iso-SAFE' into memdisk-iso

Conflicts:

memdisk/memdisk_chs.asm
memdisk/memdisk_edd.asm
memdisk/setup.c

Resolved:

Deleted memdisk/memdisk_chs.asm
Deleted memdisk/memdisk_edd.asm
Modified memdisk/setup.c
  • Property mode set to 100644
Line 
1        [map all memdisk_iso_2048.map]
2%define EDD 1
3%define ELTORITO 1
4%define SECTORSIZE_LG2 11       ; log2(sector size)
5%include "memdisk.inc"
Note: See TracBrowser for help on using the browser.