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

diff --cc doc/memdisk.txt
Simple merge

diff --cc memdisk/Makefile
Simple merge

diff --cc memdisk/memdisk_chs_512.asm
index 0000000,d4b0f75..bb436f3
mode 000000,100644..100644
--- /dev/null
--- 2/memdisk/memdisk_chs_512.asm
+++ b/memdisk/memdisk_chs_512.asm
@@@ -1,0 -1,4 +1,5 @@@
++      [map all memdisk_chs_512.map]
+ %define EDD 0
+ %define ELTORITO 0
+ %define SECTORSIZE_LG2 9      ; log2(sector size)
+ %include "memdisk.inc"

diff --cc memdisk/memdisk_edd_512.asm
index 0000000,02d1737..3a6d5ca
mode 000000,100644..100644
--- /dev/null
--- 2/memdisk/memdisk_edd_512.asm
+++ b/memdisk/memdisk_edd_512.asm
@@@ -1,0 -1,4 +1,5 @@@
++      [map all memdisk_edd_512.map]
+ %define EDD 1
+ %define ELTORITO 0
+ %define SECTORSIZE_LG2 9      ; log2(sector size)
+ %include "memdisk.inc"

diff --cc memdisk/memdisk_iso_2048.asm
index 0000000,0a44497..0c8ffee
mode 000000,100644..100644
--- /dev/null
--- 2/memdisk/memdisk_iso_2048.asm
+++ b/memdisk/memdisk_iso_2048.asm
@@@ -1,0 -1,4 +1,5 @@@
++      [map all memdisk_iso_2048.map]
+ %define EDD 1
+ %define ELTORITO 1
+ %define SECTORSIZE_LG2 11     ; log2(sector size)
+ %include "memdisk.inc"

diff --cc memdisk/memdisk_iso_512.asm
index 0000000,e49b449..1555b77
mode 000000,100644..100644
--- /dev/null
--- 2/memdisk/memdisk_iso_512.asm
+++ b/memdisk/memdisk_iso_512.asm
@@@ -1,0 -1,4 +1,5 @@@
++      [map all memdisk_iso_512.map]
+ %define EDD 1
+ %define ELTORITO 1
+ %define SECTORSIZE_LG2 9      ; log2(sector size)
+ %include "memdisk.inc"

diff --cc memdisk/setup.c
index 5278169,41e87c1..40f3f8c
--- 1/memdisk/setup.c
--- 2/memdisk/setup.c
+++ b/memdisk/setup.c
@@@ -766,8 -801,9 +818,10 @@@ void setup(const struct real_mode_args 
      uint16_t dosmem_k;
      uint32_t stddosmem;
      const struct geometry *geometry;
 -    int total_size, cmdlinelen;
 +    unsigned int total_size;
 +    unsigned int cmdline_len, stack_len, e820_len;
+     const struct edd4_bvd *bvd;
+     const struct edd4_bootcat *boot_cat = 0;
      com32sys_t regs;
      uint32_t ramdisk_image, ramdisk_size;
      uint32_t boot_base, rm_base;