4 files changed, 41 insertions, 9 deletions
diff --git a/package/grub/files/grub-dual.cfg b/package/grub/files/grub-efi-dual-serial.cfg
index bae2fa414..fde844e09 100644
--- a/package/grub/files/grub-dual.cfg
+++ b/package/grub/files/grub-efi-dual-serial.cfg
@@ -1,13 +1,17 @@
+serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
+terminal_input serial
+terminal_output serial
+
 if [ "x\${timeout}" != "x-1" ]; then
   if keystatus; then
     if keystatus --shift; then
       set timeout=-1
     else
-      set timeout=0
+      set timeout=2
     fi
   else
     if sleep --interruptible 2; then
-      set timeout=0
+      set timeout=2
     fi
   fi
 fi
@@ -40,11 +44,15 @@ function savedefault {
 }
 
 menuentry "OpenADK1" {
-  set root=(hd0,2)
-  linux (hd0,2)/kernel root=/dev/@@ROOTDEV@@2 rootfstype=ext4 rootwait panic=5
+  insmod part_gpt
+  insmod ext2
+  set root=(hd0,gpt2)
+  linux (hd0,2)/boot/kernel root=/dev/@@ROOTDEV@@2 rootfstype=ext4 rootwait panic=5
 }
 menuentry "OpenADK2" {
-  set root=(hd0,3)
-  linux (hd0,3)/kernel root=/dev/@@ROOTDEV@@3 rootfstype=ext4 rootwait panic=5
+  insmod part_gpt
+  insmod ext2
+  set root=(hd0,gpt3)
+  linux (hd0,3)/boot/kernel root=/dev/@@ROOTDEV@@3 rootfstype=ext4 rootwait panic=5
 }
 
diff --git a/package/grub/files/grub.cfg b/package/grub/files/grub-efi-serial.cfg
index 8d20ab243..3fdc48eda 100644
--- a/package/grub/files/grub.cfg
+++ b/package/grub/files/grub-efi-serial.cfg
@@ -6,9 +6,9 @@ set default=0
 set timeout=3
 
 menuentry "OpenADK" {
-  insmod part_msdos
+  insmod part_gpt
   insmod ext2
-  set root='hd0,msdos1'
+  set root='hd0,gpt2'
   echo "Loading OpenADK"
-  linux16 /boot/kernel root=/dev/sda1 rootfstype=ext4 rootwait panic=10
+  linux /boot/kernel root=/dev/sda2 rootfstype=ext4 rootwait panic=10
 }
diff --git a/package/grub/files/grub-pc-serial.cfg b/package/grub/files/grub-pc-serial.cfg
new file mode 100644
index 000000000..d48b82c45
--- /dev/null
+++ b/package/grub/files/grub-pc-serial.cfg
@@ -0,0 +1,14 @@
+serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
+terminal_input serial
+terminal_output serial
+
+set default=0
+set timeout=3
+
+menuentry "OpenADK" {
+  insmod msdospart
+  insmod ext2
+  set root='hd0,1'
+  echo "Loading OpenADK"
+  linux /boot/kernel rootfstype=ext4 rootwait panic=10
+}
diff --git a/package/grub/files/grub-pc-vga.cfg b/package/grub/files/grub-pc-vga.cfg
new file mode 100644
index 000000000..8200624d6
--- /dev/null
+++ b/package/grub/files/grub-pc-vga.cfg
@@ -0,0 +1,10 @@
+set default=0
+set timeout=3
+
+menuentry "OpenADK" {
+  insmod msdospart
+  insmod ext2
+  set root='hd0,1'
+  echo "Loading OpenADK"
+  linux /boot/kernel console=tty0 rootfstype=ext4 rootwait panic=10
+}