From 7438ee768f0471e2be282a6b1eab6383575b2e5d Mon Sep 17 00:00:00 2001
From: Mark <alnyan@airmail.cc>
Date: Thu, 17 Sep 2020 23:53:56 +0300
Subject: [PATCH] Use yboot2 (My new rust-based EFI loader)

---
 .gitmodules                     | 3 +++
 arch/amd64/boot/yboot.S         | 2 +-
 boot/yboot2                     | 1 +
 include/arch/amd64/boot/yboot.h | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)
 create mode 160000 boot/yboot2

diff --git a/.gitmodules b/.gitmodules
index e69de29..698b2f8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "boot/yboot2"]
+	path = boot/yboot2
+	url = https://git.alnyan.me/yggdrasil/yboot2.git
diff --git a/arch/amd64/boot/yboot.S b/arch/amd64/boot/yboot.S
index 9f5ec00..9ff852b 100644
--- a/arch/amd64/boot/yboot.S
+++ b/arch/amd64/boot/yboot.S
@@ -1,6 +1,6 @@
 #include <config.h>
 // For loader magic
-#include <yboot/include/protocol.h>
+#include <yboot2/include/protocol.h>
 
 .section .text
 .global _entry_yboot
diff --git a/boot/yboot2 b/boot/yboot2
new file mode 160000
index 0000000..052d08f
--- /dev/null
+++ b/boot/yboot2
@@ -0,0 +1 @@
+Subproject commit 052d08f1b21cce3b5e0c2708a59770537b97879c
diff --git a/include/arch/amd64/boot/yboot.h b/include/arch/amd64/boot/yboot.h
index 01c98b5..e3c4eee 100644
--- a/include/arch/amd64/boot/yboot.h
+++ b/include/arch/amd64/boot/yboot.h
@@ -1,4 +1,4 @@
 #pragma once
-#include "yboot/include/protocol.h"
+#include <yboot2/include/protocol.h>
 
 extern struct yboot_v1 yboot_data;