- Re-enable custom and Linux boot menu entries.
- Fix compilation and add address limit checks for x64 build of linux loader.
{
{"ReactOSSetup", EditCustomBootReactOSSetup, LoadReactOSSetup},
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
{"Drive" , EditCustomBootDisk , LoadAndBootDevice},
{"Partition" , EditCustomBootPartition , LoadAndBootDevice},
{"BootSector" , EditCustomBootSectorFile, LoadAndBootDevice},
-
{"Linux" , EditCustomBootLinux, LoadAndBootLinux },
+#endif
+#ifdef _M_IX86
{"WindowsNT40" , EditCustomBootNTOS , LoadAndBootWindows},
#endif
{"Windows" , EditCustomBootNTOS , LoadAndBootWindows},
/* GLOBALS ********************************************************************/
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
const CHAR BootSectorFilePrompt[] = "Enter the boot sector file path.\n\nExamples:\n\\BOOTSECT.DOS\n/boot/bootsect.dos";
const CHAR LinuxKernelPrompt[] = "Enter the Linux kernel image path.\n\nExamples:\n/vmlinuz\n/boot/vmlinuz-2.4.18";
const CHAR LinuxInitrdPrompt[] = "Enter the initrd image path.\n\nExamples:\n/initrd.gz\n/boot/root.img.gz\n\nLeave blank for no initial ram disk.";
const CHAR LinuxCommandLinePrompt[] = "Enter the Linux kernel command line.\n\nExamples:\nroot=/dev/hda1\nroot=/dev/fd0 read-only\nroot=/dev/sdb1 init=/sbin/init";
-#endif // _M_IX86
+#endif /* _M_IX86 || _M_AMD64 */
const CHAR BootDrivePrompt[] = "Enter the boot drive.\n\nExamples:\nfd0 - first floppy drive\nhd0 - first hard drive\nhd1 - second hard drive\ncd0 - first CD-ROM drive.\n\nBIOS drive numbers may also be used:\n0 - first floppy drive\n0x80 - first hard drive\n0x81 - second hard drive";
const CHAR BootPartitionPrompt[] = "Enter the boot partition.\n\nEnter 0 for the active (bootable) partition.";
VOID OptionMenuCustomBoot(VOID)
{
PCSTR CustomBootMenuList[] = {
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
"Disk",
"Partition",
"Boot Sector File",
OperatingSystem.SectionId = 0;
switch (SelectedMenuItem)
{
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
case 0: // Disk
EditCustomBootDisk(&OperatingSystem);
break;
case 1: // ReactOS Setup
EditCustomBootReactOS(&OperatingSystem, TRUE);
break;
-#endif
+#endif /* _M_IX86 || _M_AMD64 */
}
/* And boot it */
#endif // HAS_OPTION_MENU_CUSTOM_BOOT
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
VOID
EditCustomBootDisk(
OperatingSystem->LoadIdentifier = "Custom Linux Setup";
}
-#endif // _M_IX86
+#endif /* _M_IX86 || _M_AMD64 */
VOID
EditCustomBootReactOS(
VOID OptionMenuCustomBoot(VOID);
#endif
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
VOID
EditCustomBootDisk(
EditCustomBootLinux(
IN OUT OperatingSystemItem* OperatingSystem);
-#endif // _M_IX86
+#endif /* _M_IX86 || _M_AMD64 */
VOID
EditCustomBootReactOS(
#ifndef __LINUX_H
#define __LINUX_H
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
#define LINUX_LOADER_TYPE_LILO 0x01
#define LINUX_LOADER_TYPE_LOADLIN 0x11
IN PCHAR Argv[],
IN PCHAR Envp[]);
-#endif // _M_IX86
+#endif /* _M_IX86 || _M_AMD64 */
#endif // defined __LINUX_H
#pragma once
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
ARC_STATUS
LoadAndBootDevice(
IN PCHAR Argv[],
IN PCHAR Envp[]);
-#endif // _M_IX86
+#endif /* _M_IX86 || _M_AMD64 */
* https://www.kernel.org/doc/Documentation/x86/boot.txt
*/
-#ifndef _M_ARM
-
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
/* INCLUDES *******************************************************************/
Position.QuadPart = 512 + SetupSectorSize;
if (ArcSeek(LinuxKernelFile, &Position, SeekAbsolute) != ESUCCESS)
return FALSE;
- for (BytesLoaded=0; BytesLoaded<LinuxKernelSize; )
+ for (BytesLoaded = 0; BytesLoaded < LinuxKernelSize; )
{
if (ArcRead(LinuxKernelFile, LoadAddress, LINUX_READ_CHUNK_SIZE, NULL) != ESUCCESS)
return FALSE;
static BOOLEAN LinuxReadInitrd(ULONG LinuxInitrdFile)
{
- ULONG BytesLoaded;
- CHAR StatusText[260];
+ ULONG BytesLoaded;
+ CHAR StatusText[260];
RtlStringCbPrintfA(StatusText, sizeof(StatusText), "Loading %s", LinuxInitrdName);
UiDrawStatusText(StatusText);
- // Allocate memory for the ramdisk
- //LinuxInitrdLoadAddress = MmAllocateMemory(LinuxInitrdSize);
- // Try to align it at the next MB boundary after the kernel
- //LinuxInitrdLoadAddress = MmAllocateMemoryAtAddress(LinuxInitrdSize, (PVOID)ROUND_UP((LINUX_KERNEL_LOAD_ADDRESS + LinuxKernelSize), 0x100000));
+ /* Allocate memory for the ramdisk, below 4GB */
+ // LinuxInitrdLoadAddress = MmAllocateMemory(LinuxInitrdSize);
+ /* Try to align it at the next MB boundary after the kernel */
+ // LinuxInitrdLoadAddress = MmAllocateMemoryAtAddress(LinuxInitrdSize, (PVOID)ROUND_UP((LINUX_KERNEL_LOAD_ADDRESS + LinuxKernelSize), 0x100000));
if (LinuxSetupSector->Version <= 0x0202)
{
+#ifdef _M_AMD64
+ C_ASSERT(LINUX_MAX_INITRD_ADDRESS < 0x100000000);
+#endif
LinuxInitrdLoadAddress = MmAllocateHighestMemoryBelowAddress(LinuxInitrdSize, (PVOID)LINUX_MAX_INITRD_ADDRESS, LoaderSystemCode);
}
else
{
- LinuxInitrdLoadAddress = MmAllocateHighestMemoryBelowAddress(LinuxInitrdSize, (PVOID)LinuxSetupSector->InitrdAddressMax, LoaderSystemCode);
+ LinuxInitrdLoadAddress = MmAllocateHighestMemoryBelowAddress(LinuxInitrdSize, UlongToPtr(LinuxSetupSector->InitrdAddressMax), LoaderSystemCode);
}
if (LinuxInitrdLoadAddress == NULL)
{
return FALSE;
}
+#ifdef _M_AMD64
+ ASSERT((ULONG_PTR)LinuxInitrdLoadAddress < 0x100000000);
+#endif
/* Set the information in the setup struct */
- LinuxSetupSector->RamdiskAddress = (ULONG)LinuxInitrdLoadAddress;
+ LinuxSetupSector->RamdiskAddress = PtrToUlong(LinuxInitrdLoadAddress);
LinuxSetupSector->RamdiskSize = LinuxInitrdSize;
TRACE("RamdiskAddress: 0x%x\n", LinuxSetupSector->RamdiskAddress);
}
/* Load the ramdisk */
- for (BytesLoaded=0; BytesLoaded<LinuxInitrdSize; )
+ for (BytesLoaded = 0; BytesLoaded < LinuxInitrdSize; )
{
- if (ArcRead(LinuxInitrdFile, (PVOID)LinuxInitrdLoadAddress, LINUX_READ_CHUNK_SIZE, NULL) != ESUCCESS)
+ if (ArcRead(LinuxInitrdFile, LinuxInitrdLoadAddress, LINUX_READ_CHUNK_SIZE, NULL) != ESUCCESS)
return FALSE;
BytesLoaded += LINUX_READ_CHUNK_SIZE;
return TRUE;
}
-#endif // _M_IX86
-
-#endif
+#endif /* _M_IX86 || _M_AMD64 */
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#ifdef _M_IX86
+#if defined(_M_IX86) || defined(_M_AMD64)
/* INCLUDES *******************************************************************/
return ESUCCESS;
}
-#endif // _M_IX86
+#endif /* _M_IX86 || _M_AMD64 */