revert to MBR

Signed-off-by: Michel-FK <michel.stempin@funkey-project.com>

Recovery/board/funkey/linux.config

@@ -11,7 +11,6 @@ CONFIG_PERF_EVENTS=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_PARTITION_ADVANCED=y
-# CONFIG_MSDOS_PARTITION is not set
 CONFIG_ARCH_SUNXI=y
 # CONFIG_MACH_SUN4I is not set
 # CONFIG_MACH_SUN5I is not set

Recovery/board/funkey/rootfs-overlay/etc/issue

@@ -5,6 +5,6 @@
 |___|    |_____|__|__||__|\__||_____|___  |
          FUN ON A KEYCHAIN          |_____|
  -----------------------------------------------------
- Version 1.0.1 (Recovery)
+ Version 1.1.0 (Recovery)
  -----------------------------------------------------
 

Recovery/board/funkey/rootfs-overlay/etc/os-release

@@ -1,12 +1,12 @@
 NAME="FunKey-OS Recovery"
-VERSION="1.0.1 (Funky Fish)"
+VERSION="1.1.0 (Quacking Quagga)"
 ID=funkey-recovery
 ID_LIKE=buildroot
-PRETTY_NAME="FunKey-OS Recovery 1.0.1"
-VERSION_ID="1.0.1"
+PRETTY_NAME="FunKey-OS Recovery 1.1.0"
+VERSION_ID="1.1.0"
 HOME_URL="https://www.funkey-project.com/"
 SUPPORT_URL="https://www.funkey-project.com/"
 BUG_REPORT_URL="https://www.funkey-project.com/"
 PRIVACY_POLICY_URL="https://www.funkey-project.com"
-VERSION_CODENAME=Funky
-UBUNTU_CODENAME=Funky
+VERSION_CODENAME=Quacking
+UBUNTU_CODENAME=Quacking

Recovery/board/funkey/rootfs-overlay/etc/sw-versions

@@ -1 +1 @@
-Recovery	1.0.1
+Recovery	1.1.0

Recovery/board/funkey/rootfs-overlay/usr/local/sbin/normal_mode

@@ -1,9 +1,4 @@
 #!/bin/sh
-sgdisk -A 1:clear:2 -A 2:set:2 /dev/mmcblk0 >/dev/null 2>&1
-recovery=$(sgdisk -A 1:get:2 /dev/mmcblk0 | cut -d : -f3)
-if [ ${recovery} -eq 1 ]; then
-    echo "Next boot will be in recovery mode"
-else
-    echo "Next boot will be in normal mode"
-fi
+sfdisk -A /dev/mmcblk0 2 >/dev/null 2>&1
+echo "Next boot will be in normal mode"
 reboot