From d112a2569770198329d8ec1df2c5887a9d2cbafe Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 5 Apr 2015 18:51:32 +0300
Subject: [PATCH] scripts/mkimage: use same syslinux.cfg for uefi and legacy

... and use the new 'live' mode. cleanup fancy graphics bootstuff
---
 scripts/mkimage | 46 +++++-----------------------------------------
 1 file changed, 5 insertions(+), 41 deletions(-)

diff --git a/scripts/mkimage b/scripts/mkimage
index 2a56a66b5e..c885486ea2 100755
--- a/scripts/mkimage
+++ b/scripts/mkimage
@@ -111,44 +111,18 @@ if [ "$BOOTLOADER" = "syslinux" ]; then
   # create bootloader configuration
     echo "image: creating bootloader configuration..."
     cat << EOF > "$OE_TMP"/syslinux.cfg
-UI vesamenu.c32
-PROMPT 0
-MENU TITLE Boot Menu
-MENU BACKGROUND splash.png
-TIMEOUT 50
+SAY Press <TAB> to edit options
 DEFAULT installer
-
-MENU WIDTH 70
-MENU MARGIN 15
-MENU ROWS 2
-MENU HSHIFT 4
-MENU VSHIFT 13
-MENU TIMEOUTROW 10
-MENU TABMSGROW 8
-MENU CMDLINEROW 8
-MENU HELPMSGROW 13
-MENU HELPMSGENDROW 26
-MENU CLEAR
-
-MENU COLOR border       30;44   #40ffffff #00000000 std
-MENU COLOR title        1;36;44 #ff8bbfe3 #00000000 std
-MENU COLOR sel          7;37;40 #80f0f0f0 #ff606060 all
-MENU COLOR unsel        37;44   #50ffffff #00000000 std
-MENU COLOR help         37;40   #c0ffffff #a0000000 std
-MENU COLOR timeout_msg  37;40   #80ffffff #00000000 std
-MENU COLOR timeout      1;37;40 #c0ffffff #00000000 std
-MENU COLOR msg07        37;40   #90ffffff #a0000000 std
-MENU COLOR tabmsg       31;40   #ff868787 #00000000 std
+TIMEOUT 50
+PROMPT 1
 
 LABEL installer
-  MENU LABEL Run $DISTRONAME Installer
   KERNEL /$KERNEL_NAME
   APPEND boot=UUID=$UUID_SYSTEM installer quiet tty vga=current
 
 LABEL live
-  MENU LABEL Run $DISTRONAME Live
   KERNEL /$KERNEL_NAME
-  APPEND boot=UUID=$UUID_SYSTEM disk=UUID=$UUID_STORAGE quiet vga=current
+  APPEND boot=UUID=$UUID_SYSTEM live quiet tty vga=current
 EOF
 
   # install extlinux
@@ -159,20 +133,10 @@ EOF
     echo "image: copying files to part1..."
     cp $TARGET_IMG/$IMAGE_NAME.kernel "$OE_TMP/$KERNEL_NAME"
     cp $TARGET_IMG/$IMAGE_NAME.system "$OE_TMP/SYSTEM"
-    cp $RELEASE_DIR/splash.png "$OE_TMP"
-    cp $ROOT/$TOOLCHAIN/share/syslinux/vesamenu.c32 "$OE_TMP"
-    cp $ROOT/$TOOLCHAIN/share/syslinux/libcom32.c32 "$OE_TMP"
-    cp $ROOT/$TOOLCHAIN/share/syslinux/libutil.c32 "$OE_TMP"
     mkdir -p "$OE_TMP/EFI/BOOT"
     cp $ROOT/$TOOLCHAIN/share/syslinux/bootx64.efi "$OE_TMP/EFI/BOOT"
     cp $ROOT/$TOOLCHAIN/share/syslinux/ldlinux.e64 "$OE_TMP/EFI/BOOT"
-    cat << EOF > "$OE_TMP"/EFI/BOOT/syslinux.cfg
-DEFAULT installer
-
-LABEL installer
-  KERNEL /$KERNEL_NAME
-  APPEND boot=UUID=$UUID_SYSTEM installer quiet tty vga=current
-EOF
+    cp "$OE_TMP"/syslinux.cfg "$OE_TMP"/EFI/BOOT/syslinux.cfg
 elif [ "$BOOTLOADER" = "bcm2835-bootloader" ]; then
   # create bootloader configuration
     echo "image: creating bootloader configuration..."