extensions: add gxlimg and amlogic-fip-blobs

config/boards/cainiao-cniot-core.csc

@@ -20,50 +20,26 @@ function post_family_config__use_repacked_fip() {
 	unset write_uboot_platform
 
 	function write_uboot_platform() {
-		dd if="$1/u-boot.bin" of="$2" bs=512 seek=1 conv=fsync 2>&1
+		dd if="$1/u-boot.bin" of="$2" bs=512 seek=1 conv=fsync,notrunc 2>&1
 	}
 }
 
-function fetch_sources_tools__get_vendor_fip_and_gxlimg_source() {
-	fetch_from_repo "https://github.com/retro98boy/cainiao-cniot-core-linux.git" "cainiao-cniot-core-linux" "commit:30273c25aeabf75f609cff2c4fa7264335c295a8"
-	fetch_from_repo "https://github.com/repk/gxlimg.git" "gxlimg" "commit:0d0e5ba9cf396d1338067e8dc37a8bcd2e6874f1"
-}
-
-function build_host_tools__install_gxlimg() {
-	# Compile and install only if git commit hash changed
-	cd "${SRC}/cache/sources/gxlimg" || exit
-	# need to check if /usr/local/bin/gxlimg to detect new Docker containers with old cached sources
-	if [[ ! -f .commit_id || $(git rev-parse @ 2> /dev/null) != $(< .commit_id) || ! -f /usr/local/bin/gxlimg ]]; then
-		display_alert "Compiling" "gxlimg" "info"
-		run_host_command_logged make distclean
-		run_host_command_logged make
-		install -Dm0755 gxlimg /usr/local/bin/gxlimg
-		git rev-parse @ 2> /dev/null > .commit_id
-	fi
-}
-
 function post_uboot_custom_postprocess__repack_vendor_fip_with_mainline_uboot() {
 	display_alert "${BOARD}" "Repacking vendor FIP with mainline u-boot.bin" "info"
 
-	BLOBS_DIR="${SRC}/cache/sources/cainiao-cniot-core-linux"
+	BLOBS_DIR="${SRC}/cache/sources/amlogic-fip-blobs/cainiao-cniot-core"
 	EXTRACT_DIR="${BLOBS_DIR}/extract"
-	AML_ENCRYPT="${SRC}/cache/sources/amlogic-boot-fip/khadas-vim3/aml_encrypt_g12b"
 
-	if [ ! -f "$AML_ENCRYPT" ]; then
+	rm -rf "$EXTRACT_DIR"
-		display_alert "${BOARD}" "amlogic-boot-fip/khadas-vim3/aml_encrypt_g12b not exist" "err"
+	mkdir "$EXTRACT_DIR"
-		exit 1
+	run_host_command_logged gxlimg -e "${BLOBS_DIR}/DDR.USB" "$EXTRACT_DIR"
-	fi
 
 	mv u-boot.bin raw-u-boot.bin
 	rm -f "${EXTRACT_DIR}/bl33.enc"
-	# The current version of gxlimg has a problem with the handling of bl3x,
+	run_host_command_logged gxlimg \
-	# which may cause the produced fip to fail to boot.
+		-t bl3x \
-	# see https://github.com/repk/gxlimg/issues/19
+		-s raw-u-boot.bin \
-	# run_host_command_logged gxlimg -t bl3x -s raw-u-boot.bin "${EXTRACT_DIR}/bl33.enc"
+		"${EXTRACT_DIR}/bl33.enc"
-	run_host_x86_binary_logged "$AML_ENCRYPT" --bl3sig \
-		--input raw-u-boot.bin \
-		--output "${EXTRACT_DIR}/bl33.enc" \
-		--level v3 --type bl33
 	run_host_command_logged gxlimg \
 		-t fip \
 		--bl2 "${EXTRACT_DIR}/bl2.sign" \

config/sources/families/include/meson64_common.inc

@@ -6,6 +6,8 @@
 # This file is a part of the Armbian Build Framework
 # https://github.com/armbian/build/
 #
+enable_extension "gxlimg"
+enable_extension "amlogic-fip-blobs"
 UBOOT_TARGET_MAP="${UBOOT_TARGET_MAP:-u-boot-dtb.img;;u-boot.bin.sd.bin:u-boot.bin u-boot-dtb.img}"
 BOOTSCRIPT="boot-meson64.cmd:boot.cmd"
 BOOTENV_FILE='meson.txt'

extensions/amlogic-fip-blobs.sh

@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+function fetch_sources_tools__amlogic-fip-blobs() {
+	fetch_from_repo "https://github.com/retro98boy/amlogic-fip-blobs" "amlogic-fip-blobs" "commit:f090bd4a5420c12f8ef5932c472afee9fb590787"
+}

extensions/gxlimg.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+function fetch_sources_tools__gxlimg() {
+	fetch_from_repo "https://github.com/retro98boy/gxlimg" "gxlimg" "commit:fde6a3dd0e13875a5b219389c0a6137616eaebdb"
+}
+
+function build_host_tools__compile_gxlimg() {
+	# Compile and install only if git commit hash changed
+	cd "${SRC}/cache/sources/gxlimg" || exit
+	# need to check if /usr/local/bin/gxlimg to detect new Docker containers with old cached sources
+	if [[ ! -f .commit_id || $(git rev-parse @ 2> /dev/null) != $(< .commit_id) || ! -f /usr/local/bin/gxlimg ]]; then
+		display_alert "Compiling" "gxlimg" "info"
+		run_host_command_logged make distclean
+		run_host_command_logged make
+		run_host_command_logged install -Dm0755 gxlimg /usr/local/bin/gxlimg
+		git rev-parse @ 2> /dev/null > .commit_id
+	fi
+}