From: BigfootACA <bigfoot@classfun.cn>
Date: 星期五, 27 Aug 2021 05:54:04 +0000 (+0800)
Subject: sdm845Pkg: Library: add simple-init
X-Git-Tag: v1.0.4~15^2~3
X-Git-Url: https://git.renegade-project.org/?a=commitdiff_plain;h=92cd6a0f87da292041d8c11ccad08566726156ac;p=edk2-sdm845.git

sdm845Pkg: Library: add simple-init

Signed-off-by: BigfootACA <bigfoot@classfun.cn>
---

diff --git a/.gitmodules b/.gitmodules
index 131afff..51362ee 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,3 +13,6 @@
 [submodule "sdm845Pkg/Library/StdLib"]
 	path = sdm845Pkg/Library/StdLib
 	url = https://github.com/tianocore/edk2-libc.git
+[submodule "sdm845Pkg/Library/SimpleInit"]
+	path = sdm845Pkg/Library/SimpleInit
+	url = https://github.com/BigfootACA/simple-init.git
diff --git a/build.sh b/build.sh
index 21a35d7..676a6b0 100755
--- a/build.sh
+++ b/build.sh
@@ -134,11 +134,20 @@ then	set -e
 		git submodule init;git submodule update
 		git checkout .gitmodules
 		popd
+		pushd sdm845Pkg/Library/SimpleInit
+		git submodule set-url libs/lvgl     https://hub.fastgit.org/lvgl/lvgl.git
+		git submodule set-url libs/lodepng  https://hub.fastgit.org/lvandeve/lodepng.git
+		git submodule set-url libs/freetype https://hub.fastgit.org/freetype/freetype.git
+		git submodule init;git submodule update
+		popd
 		git checkout .gitmodules
 	else	git submodule init;git submodule update --depth 1
 		pushd edk2
 		git submodule init;git submodule update
 		popd
+		pushd sdm845Pkg/Library/SimpleInit
+		git submodule init;git submodule update
+		popd
 	fi
 	set +e
 fi
@@ -160,19 +169,30 @@ do	if [ -n "${i}" ]&&[ -d "${i}/Platform" ]
 		break
 	fi
 done
+for i in "${SIMPLE_INIT}" sdm845Pkg/Library/SimpleInit ./simple-init ../simple-init
+do	if [ -n "${i}" ]&&[ -f "${i}/SimpleInit.inc" ]
+	then	_SIMPLE_INIT="$(realpath "${i}")"
+		break
+	fi
+done
 [ -n "${_EDK2}" ]||_error "EDK2 not found, please see README.md"
 [ -n "${_EDK2_LIBC}" ]||_error "EDK2-LibC not found, please see README.md"
 [ -n "${_EDK2_PLATFORMS}" ]||_error "EDK2 Platforms not found, please see README.md"
+[ -n "${_SIMPLE_INIT}" ]||_error "SimpleInit not found, please see README.md"
 echo "EDK2 Path: ${_EDK2}"
 echo "EDK2_PLATFORMS Path: ${_EDK2_PLATFORMS}"
 export GCC5_AARCH64_PREFIX="${CROSS_COMPILE:-aarch64-linux-gnu-}"
-export PACKAGES_PATH="$_EDK2:$_EDK2_PLATFORMS:$_EDK2_LIBC:$PWD"
+export PACKAGES_PATH="$_EDK2:$_EDK2_PLATFORMS:$_EDK2_LIBC:$_SIMPLE_INIT:$PWD"
 export WORKSPACE="${PWD}/workspace"
 GITCOMMIT="$(git describe --tags --always)"||GITCOMMIT="unknown"
 export GITCOMMIT
 echo > ramdisk
 set -e
 python3 assets/generate-logo.py "${GITCOMMIT}"
+mkdir -p "${_SIMPLE_INIT}/build"
+bash "${_SIMPLE_INIT}/scripts/gen-rootfs-source.sh" \
+	"${_SIMPLE_INIT}" \
+	"${_SIMPLE_INIT}/build"
 if [ "${DEVICE}" == "all" ]
 then	E=0
 	for i in "${DEVICES[@]}"
diff --git a/sdm845Pkg/CommonDsc.dsc.inc b/sdm845Pkg/CommonDsc.dsc.inc
index da55e3e..ea44142 100644
--- a/sdm845Pkg/CommonDsc.dsc.inc
+++ b/sdm845Pkg/CommonDsc.dsc.inc
@@ -14,6 +14,7 @@
 #
 
 !include MdePkg/MdeLibs.dsc.inc
+!include sdm845Pkg/Library/SimpleInit/SimpleInit.inc
 
 [LibraryClasses.common]
 !if $(TARGET) == RELEASE
diff --git a/sdm845Pkg/Devices/845.fdf b/sdm845Pkg/Devices/845.fdf
index 3adc761..1f7d4f7 100644
--- a/sdm845Pkg/Devices/845.fdf
+++ b/sdm845Pkg/Devices/845.fdf
@@ -572,6 +572,10 @@ APRIORI DXE {
   INF MdeModulePkg/Application/UiApp/UiApp.inf
   INF sdm845Pkg/Drivers/LogoDxe/LogoDxe.inf
 
+  #
+  # Simple Init GUI
+  #
+  INF src/main/SimpleInitMain.inf
 
 [FV.FVMAIN_COMPACT]
 FvAlignment        = 8
diff --git a/sdm845Pkg/Library/SimpleInit b/sdm845Pkg/Library/SimpleInit
new file mode 160000
index 0000000..02b63b6
--- /dev/null
+++ b/sdm845Pkg/Library/SimpleInit
@@ -0,0 +1 @@
+Subproject commit 02b63b617ba4490ade4dcbfad30f4b0369394a46