Revert "Add simple-init boot manager"

This reverts commit 81e96bf.

Author: mariobalanica

.gitmodules

@@ -27,7 +27,7 @@ sudo apt install git gcc g++ build-essential gcc-aarch64-linux-gnu iasl python3-
 
 Clone the repository:
 ```bash
-git clone https://github.com/edk2-porting/edk2-rk35xx.git --recursive
+git clone https://github.com/edk2-porting/edk2-rk35xx.git
 cd edk2-rk35xx
 ```
 
@@ -39,27 +39,3 @@ Build UEFI (ROCK 5B for example):
 ## TODO
  - Create gpt image in build process instead of using the prebuilt one
  - Fix resetting to maskrom
-
-## Notes
-
-### Flash layout
-
-| Address    | Size       | Desc                  | File                   |
-| ---------- | :--------- | --------------------- | ---------------------- |
-| 0x00000000 | 0x00004400 | GPT Table             | rk3588_spi_nor_gpt.img |
-| 0x00008000 |            | IDBlock               | idblock.bin            |
-| 0x00088000 |            | IDBlock               | idblock.bin            |
-| 0x00100000 | 0x00500000 | BL33_AP_UEFI FV       | ${DEVICE}_EFI.itb      |
-| 0x007C0000 | 0x00010000 | NV_VARIABLE_STORE     |                        |
-| 0x007D0000 | 0x00010000 | NV_FTW_WORKING header |                        |
-| 0x007E0000 | 0x00010000 | NV_FTW_WORKING data   | NV_DATA.img            |
-
-### Memory Map
-
-| Address    | Size | Desc          | File                |
-| ---------- | :--: | ------------- | ------------------- |
-| 0x00040000 |      | ATF           | bl31_0x00040000.bin |
-| 0x000f0000 |      | ATF           | bl31_0x000f0000.bin |
-| 0x00200000 |      | UEFI FV       | BL33_AP_UEFI.Fv     |
-| 0x08400000 |      | OP-TEE        | bl32.bin            |
-| 0xff100000 |      | ATF (PMU_MEM) | bl31_0xff100000.bin |

README.md

@@ -10,7 +10,7 @@ function _help(){
 	echo "	--all, -a:               build all devices."
 	echo "	--release MODE, -r MODE: Release mode for building, default is 'DEBUG', 'RELEASE' alternatively."
 	echo "	--toolchain TOOLCHAIN:   Set toolchain, default is 'GCC5'."
-	echo " 	--skip-rootfs-gen:       skip generating SimpleInit rootfs to speed up building."
+	# echo " 	--skip-rootfs-gen:       skip generating SimpleInit rootfs to speed up building."
 	echo "	--clean, -C:             clean workspace and output."
 	echo "	--distclean, -D:         clean up all files that are not in repo."
 	echo "	--outputdir, -O:         output folder."
@@ -161,44 +161,44 @@ then
 	set +e
 fi
 
-for i in "${SIMPLE_INIT}" ./simple-init ../simple-init
-do
-	if [ -n "${i}" ]&&[ -f "${i}/SimpleInit.inc" ]
-	then
-		_SIMPLE_INIT="$(realpath "${i}")"
-		break
-	fi
-done
+# for i in "${SIMPLE_INIT}" Platform/RenegadePkg/Library/SimpleInit ./simple-init ../simple-init
+# do
+# 	if [ -n "${i}" ]&&[ -f "${i}/SimpleInit.inc" ]
+# 	then
+# 		_SIMPLE_INIT="$(realpath "${i}")"
+# 		break
+# 	fi
+# done
 
-[ -n "${_SIMPLE_INIT}" ]||_error "SimpleInit not found, please see README.md"
+# [ -n "${_SIMPLE_INIT}" ]||_error "SimpleInit not found, please see README.md"
 [ -f "configs/${DEVICE}.conf" ]||_error "Device configuration not found"
 
 export CROSS_COMPILE="${CROSS_COMPILE:-aarch64-linux-gnu-}"
 export GCC5_AARCH64_PREFIX="${CROSS_COMPILE}"
 export CLANG38_AARCH64_PREFIX="${CROSS_COMPILE}"
 # export PACKAGES_PATH="$_EDK2:$_EDK2_PLATFORMS:$_SIMPLE_INIT:$PWD"
-export PACKAGES_PATH="${ROOTDIR}/edk2:${ROOTDIR}/edk2-platforms:${ROOTDIR}/edk2-non-osi:${ROOTDIR}:${_SIMPLE_INIT}"
+export PACKAGES_PATH="${ROOTDIR}/edk2:${ROOTDIR}/edk2-platforms:${ROOTDIR}/edk2-non-osi:${ROOTDIR}"
 export WORKSPACE="${OUTDIR}/workspace"
 GITCOMMIT="$(git describe --tags --always)"||GITCOMMIT="unknown"
 export GITCOMMIT
 set -e
 
-mkdir -p "${_SIMPLE_INIT}/build" "${_SIMPLE_INIT}/root/usr/share/locale"
-for i in "${_SIMPLE_INIT}/po/"*.po
-do
-	[ -f "${i}" ]||continue
-	_name="$(basename "$i" .po)"
-	_path="${_SIMPLE_INIT}/root/usr/share/locale/${_name}/LC_MESSAGES"
-	mkdir -p "${_path}"
-	msgfmt -o "${_path}/simple-init.mo" "${i}"
-done
-
-if "${GEN_ROOTFS}"
-then
-	 bash "${_SIMPLE_INIT}/scripts/gen-rootfs-source.sh" \
-		"${_SIMPLE_INIT}" \
-		"${_SIMPLE_INIT}/build"
-fi
+# mkdir -p "${_SIMPLE_INIT}/build" "${_SIMPLE_INIT}/root/usr/share/locale"
+# for i in "${_SIMPLE_INIT}/po/"*.po
+# do
+# 	[ -f "${i}" ]||continue
+# 	_name="$(basename "$i" .po)"
+# 	_path="${_SIMPLE_INIT}/root/usr/share/locale/${_name}/LC_MESSAGES"
+# 	mkdir -p "${_path}"
+# 	msgfmt -o "${_path}/simple-init.mo" "${i}"
+# done
+
+# if "${GEN_ROOTFS}"
+# then
+# 	 bash "${_SIMPLE_INIT}/scripts/gen-rootfs-source.sh" \
+# 		"${_SIMPLE_INIT}" \
+# 		"${_SIMPLE_INIT}/build"
+# fi
 
 if [ "${DEVICE}" == "all" ]
 then

build.sh

@@ -640,7 +640,7 @@ PlatformRegisterOptionsAndKeys (
   F3.ScanCode     = SCAN_F3;
   F3.UnicodeChar  = CHAR_NULL;
 
-  PlatformRegisterFvBootOption (&gSimpleInitFileGuid, L"Simple Init", LOAD_OPTION_ACTIVE, &F3);
+  // PlatformRegisterFvBootOption (&gSimpleInitFileGuid, L"Simple Init", LOAD_OPTION_ACTIVE, &F3);
 }
 
 //
@@ -967,7 +967,8 @@ PlatformBootManagerAfterConsole (
         );
     }
 
-    Print (L"Press ESCAPE for boot options, or F3 for SimpleInit GUI");
+    // Print (L"Press ESCAPE for boot options, or F3 for SimpleInit (UNSTABLE) ");
+    Print (L"Press ESCAPE for boot options");
   } else if (FirmwareVerLength > 0) {
     Status = gBS->HandleProtocol (
                     gST->ConsoleOutHandle,
@@ -1045,7 +1046,7 @@ PlatformBootManagerWaitCallback (
   Status = BootLogoUpdateProgress (
              White.Pixel,
              Black.Pixel,
-             L"Press ESCAPE for boot options, or F3 for SimpleInit GUI",
+             L"Press ESCAPE for boot options",
              White.Pixel,
              (Timeout - TimeoutRemain) * 100 / Timeout,
              0

edk2-platforms/Platform/Radxa/ROCK5B/Library/PlatformBootManagerLib/PlatformBm.c

@@ -34,7 +34,7 @@
   MdePkg/MdePkg.dec
   ShellPkg/ShellPkg.dec
   Platform/Radxa/ROCK5B/ROCK5B.dec
-  SimpleInit.dec
+  # SimpleInit.dec
 
 [LibraryClasses]
   BaseLib
@@ -82,7 +82,7 @@
   gEfiEndOfDxeEventGroupGuid
   gEfiTtyTermGuid
   gUefiShellFileGuid
-  gSimpleInitFileGuid
+  # gSimpleInitFileGuid
   gMaskromFileGuid
 
 [Protocols]

edk2-platforms/Platform/Radxa/ROCK5B/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf

@@ -39,7 +39,6 @@
   DEFINE NETWORK_VLAN_ENABLE            = FALSE
 !include Silicon/Rockchip/Rockchip.dsc.inc
 !include MdePkg/MdeLibs.dsc.inc
-!include SimpleInit.inc
 
 [LibraryClasses.common]
   ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf

edk2-platforms/Platform/Radxa/ROCK5B/ROCK5B.dsc

@@ -43,7 +43,7 @@ NumBlocks     = 0x800
 # RegionType <FV, DATA, or FILE>
 #
 ################################################################################
-0x00200000|0x00500000
+0x00200000|0x00100000
 gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.PcdFvSize
 FV = BL33_AP_UEFI
 
@@ -327,11 +327,6 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf
   INF MdeModulePkg/Application/UiApp/UiApp.inf
 
-  #
-  # Simple Init GUI
-  #
-  INF src/main/SimpleInitMain.inf
-
 [FV.BL33_AP_UEFI]
 FvAlignment        = 8
 ERASE_POLARITY     = 1

edk2-platforms/Platform/Radxa/ROCK5B/ROCK5B.fdf

@@ -227,7 +227,6 @@ FspiLib|Silicon/Rockchip/Library/FspiLib/FspiLib.inf
 
 [BuildOptions]
 #  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG
-  *_*_*_CC_FLAGS = -DDEFAULT_DARK
   *_GCC5_AARCH64_CC_FLAGS  = -Wno-error=uninitialized -Wno-error=stringop-overflow -Wno-error=unused-function -Wno-error=unused-variable
 
 [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER]