Merge upstream Horizon-OC main into Horizon-OC-pro.

build.sh

@@ -2,7 +2,10 @@
 
 EXT=0
 LDR_MAKE="nx_release"
+LDR_SET=0
 NO_EXO=0
+JOBS=""
+UART_LOGGING=0
 
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIST_DIR="$ROOT_DIR/dist"
@@ -14,10 +17,21 @@ while [ $# -gt 0 ]; do
             ;;
         --ldr=*)
             LDR_MAKE="${1#*=}"
+            LDR_SET=1
+            ;;
+        -u|--uart)
+            UART_LOGGING=1
             ;;
         --no-exo)
             NO_EXO=1
             ;;
+        -j)
+            shift
+            JOBS="$1"
+            ;;
+        -j*)
+            JOBS="${1#-j}"
+            ;;
         *)
             echo "Unknown option: $1"
             exit 1
@@ -26,6 +40,10 @@ while [ $# -gt 0 ]; do
     shift
 done
 
+if [ "$UART_LOGGING" -eq 1 ] && [ "$LDR_SET" -eq 0 ]; then
+    LDR_MAKE="nx_audit"
+fi
+
 LDR_BUILD_PATH="${LDR_MAKE#nx_}"
 
 echo
@@ -37,8 +55,24 @@ if [ "$NO_EXO" -eq 1 ]; then
     echo "NO_EXO = 1"
 fi
 
+if [ "$UART_LOGGING" -eq 1 ]; then
+    echo "UART_LOGGING = 1 (loader build: $LDR_MAKE, UART logging enabled)"
+fi
+
 CORES="$(nproc --all)"
 echo "CORES: $CORES"
+JOBS="${JOBS:-$CORES}"
+echo "JOBS: $JOBS"
+
+if command -v ccache >/dev/null 2>&1; then
+    export ATMOSPHERE_CCACHE="ccache"
+    export CCACHE_BASEDIR="$ROOT_DIR"
+    export CCACHE_SLOPPINESS="time_macros,include_file_mtime,include_file_ctime,pch_defines,locale"
+    export CCACHE_MAXSIZE="10G"
+    echo "CCACHE: enabled ($(ccache --version | head -n1))"
+else
+    echo "CCACHE: not found, building without it"
+fi
 
 SRC="Source/Atmosphere/stratosphere/loader/"
 
@@ -61,9 +95,9 @@ mkdir -p "$DEST"
 echo
 echo "*** Patching loader ***"
 cp -vr "$SRC"/. "$DEST"/
-echo
 
 if [ "$NO_EXO" -eq 0 ]; then
+    echo
     echo "*** Patching exosphere ***"
     EXO_SRC="Source/Atmosphere-Patches"
     EXO_DEST="build/atmosphere/exosphere/program/source/smc"
@@ -78,10 +112,32 @@ if [ "$NO_EXO" -eq 0 ]; then
     cp -v "$EXO_SRC/secmon_memory_layout.hpp"               "$LIBEXO_DEST/"
 fi
 
+CCACHE_MKS="build/atmosphere/libraries/config/common.mk
+build/atmosphere/libraries/config/templates/stratosphere.mk
+build/atmosphere/libraries/libstratosphere/libstratosphere.mk"
+
+for CCACHE_MK in $CCACHE_MKS; do
+    if ! grep -q "ATMOSPHERE_CCACHE" "$CCACHE_MK"; then
+        echo
+        echo "*** Patching $CCACHE_MK for ccache ***"
+        cat >> "$CCACHE_MK" <<'EOF'
+
+ifneq ($(strip $(ATMOSPHERE_CCACHE)),)
+ifneq ($(firstword $(CC)),$(ATMOSPHERE_CCACHE))
+export CC  := $(ATMOSPHERE_CCACHE) $(CC)
+endif
+ifneq ($(firstword $(CXX)),$(ATMOSPHERE_CCACHE))
+export CXX := $(ATMOSPHERE_CCACHE) $(CXX)
+endif
+endif
+EOF
+    fi
+done
+
 echo
 echo "*** Compiling loader ***"
 cd build/atmosphere/stratosphere/loader || exit 1
-make -j$CORES "$LDR_MAKE"
+make -j$JOBS HOC_UART_LOG=$UART_LOGGING "$LDR_MAKE"
 hactool -t kip1 "out/nintendo_nx_arm64_armv8a/$LDR_BUILD_PATH/loader.kip" --uncompress=hoc.kip
 cd "$ROOT_DIR" # exit
 cp -v build/atmosphere/stratosphere/loader/hoc.kip dist/atmosphere/kips/hoc.kip
@@ -90,24 +146,31 @@ if [ "$NO_EXO" -eq 0 ]; then
     echo
     echo "*** Compiling exosphere ***"
     cd build/atmosphere/exosphere
-    make -j$CORES
+    make -j$JOBS
     cd "$ROOT_DIR"
     cp -v build/atmosphere/exosphere/out/nintendo_nx_arm64_armv8a/release/exosphere.bin dist/atmosphere/exosphere.bin
 fi
 
+if [ -n "$ATMOSPHERE_CCACHE" ]; then
+    echo
+    echo "*** ccache stats ***"
+    ccache --show-stats
+fi
+
 cd Source/hoc-clk/
 ./build.sh
 cp -r dist/ ../../
 
 cd "$ROOT_DIR"
 
-echo "*** Compiling horizon-oc-monitor ***"
-cd Source/Horizon-OC-Monitor/
-make -j$CORES
-cp -v Horizon-OC-Monitor.ovl ../../dist/switch/.overlays/Horizon-OC-Monitor.ovl
+echo "*** Downloading Status-Monitor ***"
+wget "https://github.com/ppkantorski/Status-monitor-overlay/releases/latest/download/Status-Monitor-Overlay.ovl"
+mv -v Status-Monitor-Overlay.ovl "$DIST_DIR"/switch/.overlays/Status-Monitor-Overlay.ovl
+
 
 if [ "$EXT" -eq 1 ]; then
-    cd ../
+    cd Source/
+
     echo
     echo "*** Compiling extensions ***"
 
@@ -123,16 +186,18 @@ if [ "$EXT" -eq 1 ]; then
     cd hekate/
     echo
     echo "*** Compiling custom Hekate ***"
-    make -j$CORES
+    make -j$JOBS
     echo
 
     mkdir -p "$DIST_DIR/bootloader/sys/"
     cp -v output/nyx.bin "$ROOT_DIR"/dist/bootloader/sys/nyx.bin
+    cp -v output/hekate.bin "$ROOT_DIR"/dist/bootloader/update.bin
+    cp -v output/hekate.bin "$ROOT_DIR"/dist/payload.bin
 
     cd "$ROOT_DIR"/Source/Benchmark-Toolbox
     echo
     echo "*** Compiling Benchmark-Toolbox ***"
-    make -j$CORES
+    make -j$JOBS
     cp -v Benchmark-Toolbox.nro "$DIST_DIR"/switch/Benchmark-Toolbox.nro
 fi