Skip to content

Commit

Permalink
Revert "build and provide bl2-for-mtk_uartboot.bin"
Browse files Browse the repository at this point in the history
We no longer need to build bl2 as OKD issue has been resolved.
  • Loading branch information
dangowrt committed Aug 13, 2024
1 parent 75c0991 commit 5e139ec
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 28 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/blank.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,8 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Update package lists
run: sudo apt update

- name: Install libfdt-dev, cmake and cross toolchain
run: sudo apt install libfdt-dev cmake squashfs-tools gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
- name: Install libfdt-dev and cmake
run: sudo apt install libfdt-dev cmake squashfs-tools

- name: Run builder script
run: |
Expand All @@ -38,7 +35,7 @@ jobs:
uses: actions/upload-artifact@v4
with:
name: images
path: "*.*i*"
path: "*.itb"

release:
if: inputs.no_release == '0'
Expand Down
24 changes: 2 additions & 22 deletions build_installer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ DTC=
FILEBASE=
WORKDIR=
ITSFILE=
TFA_PLAT=
TFA_MAKEARGS=


prepare_openwrt_ib() {
GNUPGHOME="$(mktemp -d)"
Expand Down Expand Up @@ -253,23 +252,7 @@ bundle_initrd() {
esac
}


build_bl2_for_uartboot()
{
git clone https://github.com/mtk-openwrt/arm-trusted-firmware.git "${WORKDIR}/arm-trusted-firmware"
make -C "${WORKDIR}/arm-trusted-firmware" CROSS_COMPILE=aarch64-linux-gnu- PLAT=$TFA_PLAT RAM_BOOT_UART_DL=1 BOOT_DEVICE=ram $TFA_MAKEARGS bl2
cp "${WORKDIR}/arm-trusted-firmware/build/mt7622/release/bl2.bin" "${DESTDIR}/bl2-for-mtk_uartboot.bin"
}

build_bl2_for_snfi_debug()
{
git clone https://github.com/mtk-openwrt/arm-trusted-firmware.git "${WORKDIR}/arm-trusted-firmware-debug"
make -C "${WORKDIR}/arm-trusted-firmware-debug" CROSS_COMPILE=aarch64-linux-gnu- PLAT=$TFA_PLAT UBI=1 OVERRIDE_UBI_START_ADDR=0x80000 LOG_LEVEL=50 BOOT_DEVICE=snand $TFA_MAKEARGS bl2
cp "${WORKDIR}/arm-trusted-firmware-debug/build/mt7622/release/bl2.bin" "${DESTDIR}/bl2-for-debug-snand-issue.bin"
}

linksys_e8450_installer() {
TFA_PLAT=mt7622
# OPENWRT_RELEASE="23.05.0"
OPENWRT_TARGET="https://downloads.openwrt.org/snapshots/targets/mediatek/mt7622"
# OPENWRT_TARGET="https://downloads.openwrt.org/releases/${OPENWRT_RELEASE}/targets/mediatek/mt7622"
Expand Down Expand Up @@ -316,11 +299,8 @@ linksys_e8450_installer() {
rm "${INSTALLERDIR}/dl/vendor.bin"
fi

build_bl2_for_uartboot
build_bl2_for_snfi_debug

mv "${WORKDIR}/${FILEBASE}-installer"* "${DESTDIR}"
rm -rf "${WORKDIR}"
rm -r "${WORKDIR}"
}

linksys_e8450_installer

0 comments on commit 5e139ec

Please sign in to comment.