summaryrefslogtreecommitdiffhomepage
path: root/src/boot
diff options
context:
space:
mode:
Diffstat (limited to 'src/boot')
-rw-r--r--src/boot/BootKit/BootKit.h2
-rw-r--r--src/boot/BootKit/Config.h4
-rw-r--r--src/boot/BootKit/Device.h10
-rw-r--r--src/boot/amd64-desktop.make6
4 files changed, 11 insertions, 11 deletions
diff --git a/src/boot/BootKit/BootKit.h b/src/boot/BootKit/BootKit.h
index b00fd112..c7057d4b 100644
--- a/src/boot/BootKit/BootKit.h
+++ b/src/boot/BootKit/BootKit.h
@@ -337,4 +337,4 @@ inline Boolean BDiskFormatFactory<BootDev>::Format(const Char* part_name) {
}
} // namespace Boot
-#endif // __BOOTKIT_H__ \ No newline at end of file
+#endif // __BOOTKIT_H__ \ No newline at end of file
diff --git a/src/boot/BootKit/Config.h b/src/boot/BootKit/Config.h
index b2641b24..42063d45 100644
--- a/src/boot/BootKit/Config.h
+++ b/src/boot/BootKit/Config.h
@@ -10,7 +10,7 @@
#include <NeKit/Config.h>
namespace Boot {
- using namespace Kernel;
+using namespace Kernel;
}
-#endif // ! __BOOTKIT_CONFIG_H__ \ No newline at end of file
+#endif // ! __BOOTKIT_CONFIG_H__ \ No newline at end of file
diff --git a/src/boot/BootKit/Device.h b/src/boot/BootKit/Device.h
index efe27659..e54d0bf1 100644
--- a/src/boot/BootKit/Device.h
+++ b/src/boot/BootKit/Device.h
@@ -12,7 +12,7 @@
#include <modules/ATA/ATA.h>
namespace Boot {
-/// @brief Physical/Virtual device type.
+/// @brief Physical/Virtual device type.
class Device {
public:
explicit Device() = default;
@@ -21,7 +21,7 @@ class Device {
NE_MOVE_DEFAULT(Device)
struct Trait {
- Lba mBase{0};
+ Lba mBase{0};
SizeT mSize{0};
};
@@ -31,9 +31,9 @@ class Device {
virtual Device& Write(Char* Buf, SizeT SecCount) = 0;
};
-using BootDevice = Device;
+using BootDevice = Device;
using NetworkDevice = Device;
-using DiskDevice = Device;
+using DiskDevice = Device;
} // namespace Boot
-#endif \ No newline at end of file
+#endif \ No newline at end of file
diff --git a/src/boot/amd64-desktop.make b/src/boot/amd64-desktop.make
index 2ddc4659..88779211 100644
--- a/src/boot/amd64-desktop.make
+++ b/src/boot/amd64-desktop.make
@@ -48,13 +48,13 @@ ifneq ($(DEBUG_SUPPORT), )
DEBUG_MACRO = -D__DEBUG__
endif
-ifeq ($(shell uname), Darwin)
+ifeq ($(KVM_SUPPORT),)
EMU_FLAGS=-M q35 -smp 4 -m 8G \
-bios $(BIOS) -cdrom $(BOOT) -boot d
endif
-ifneq ($(shell uname), Darwin)
-EMU_FLAGS= -smp 4 -m 8G \
+ifneq ($(KVM_SUPPORT),)
+EMU_FLAGS=-M q35 -smp 4 -m 8G \
-bios $(BIOS) -M q35 -cdrom $(BOOT) -boot d -accel kvm
endif