From fd385808dc686b47d4a5edf52aa6a91f2bdc8815 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Sun, 28 Jul 2024 13:29:13 -0700
Subject: [PATCH] cleanup ABL building (#270)

---
 build_bootloader.sh | 21 ---------------------
 edk2_tici           |  2 +-
 flash_all.sh        |  3 +--
 flash_bootloader.sh | 13 -------------
 4 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100755 build_bootloader.sh
 delete mode 100755 flash_bootloader.sh

diff --git a/build_bootloader.sh b/build_bootloader.sh
deleted file mode 100755
index 542f11f7..00000000
--- a/build_bootloader.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash -e
-
-# Get directories and make sure we're in the correct spot to start the build
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
-OUTPUT_DIR=$DIR/output
-cd $DIR
-
-# Clone bootloader if not done already
-if [ ! -d edk2_tici ]; then
-  git submodule init edk2_tici
-fi
-cd edk2_tici
-
-# Create output directory
-mkdir -p $OUTPUT_DIR
-
-# Run build
-./build.sh
-
-# Copy output
-cp out/* $OUTPUT_DIR/
diff --git a/edk2_tici b/edk2_tici
index 67600416..aa3737ce 160000
--- a/edk2_tici
+++ b/edk2_tici
@@ -1 +1 @@
-Subproject commit 67600416eec240ad754a22707180628b562565d8
+Subproject commit aa3737ce9bb6d215b56ba4238d777042143dbb96
diff --git a/flash_all.sh b/flash_all.sh
index cd3e53e9..314ba813 100755
--- a/flash_all.sh
+++ b/flash_all.sh
@@ -4,11 +4,10 @@ set -e
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 cd $DIR
 
-for part in aop xbl xbl_config devcfg; do
+for part in aop abl xbl xbl_config devcfg; do
   tools/edl w ${part}_a $DIR/agnos-firmware/$part.bin
   tools/edl w ${part}_b $DIR/agnos-firmware/$part.bin
 done
 
-./flash_bootloader.sh
 ./flash_kernel.sh
 ./flash_system.sh
diff --git a/flash_bootloader.sh b/flash_bootloader.sh
deleted file mode 100755
index 45eb2d2e..00000000
--- a/flash_bootloader.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash -e
-
-GREEN="\033[0;32m"
-NO_COLOR='\033[0m'
-
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
-cd $DIR
-
-echo "Flashing bootloader..."
-tools/edl w abl_a output/abl.elf
-tools/edl w abl_b output/abl.elf
-
-echo -e "${GREEN}Flashed abl_a and abl_b!${NO_COLOR}"