DO NOT SUBMIT: Fix rpi4
Change-Id: Ifba41a88995dee8d521bd000db7383f4957c351c
diff --git a/boards/rpi4.gni b/boards/rpi4.gni
index 05377ec..f17517b 100644
--- a/boards/rpi4.gni
+++ b/boards/rpi4.gni
@@ -9,9 +9,11 @@
custom_signing_script =
"//zircon/kernel/target/arm64/board/rpi4/package-image.sh"
+custom_signing_script_deps = [ "//zircon/kernel/target/arm64/boot-shim:rpi4" ]
+
# partitions for fx flash to flash
zircon_a_partition = "boot"
# The rpi4 image is not actually signed, but defining custom_signing_script
# means we use zedboot.zbi.signed.
-signed_image = true
+# signed_image = true
diff --git a/zircon/kernel/target/arm64/board/rpi4/boot-shim-config.h b/zircon/kernel/target/arm64/board/rpi4/boot-shim-config.h
index 7ef4a3a..294a54b 100644
--- a/zircon/kernel/target/arm64/board/rpi4/boot-shim-config.h
+++ b/zircon/kernel/target/arm64/board/rpi4/boot-shim-config.h
@@ -7,6 +7,7 @@
#define HAS_DEVICE_TREE 0
#define PRINT_DEVICE_TREE 0
#define PRINT_ZBI 1
+#define DEBUG_UART 1
static const zbi_cpu_config_t cpu_config = {
.cluster_count = 1,
diff --git a/zircon/kernel/target/arm64/board/rpi4/package-image.sh b/zircon/kernel/target/arm64/board/rpi4/package-image.sh
index 7d7d337..6740409 100755
--- a/zircon/kernel/target/arm64/board/rpi4/package-image.sh
+++ b/zircon/kernel/target/arm64/board/rpi4/package-image.sh
@@ -12,4 +12,14 @@
ZIRCON_DIR="${DIR}/../../../../.."
SCRIPTS_DIR="${ZIRCON_DIR}/scripts"
-"${SCRIPTS_DIR}/package-image.sh" -r zbi -b rpi4 $@
+ROOT_BUILD_DIR="$(pwd)"
+BOARD=rpi4
+
+"${SCRIPTS_DIR}/package-image.sh" -r zbi -b "${BOARD}" -B "${ROOT_BUILD_DIR}" $@
+
+# hack
+BOOT_SHIM="${ROOT_BUILD_DIR}/${BOARD}-boot-shim.bin"
+ZIRCON_BOOTIMAGE="${ROOT_BUILD_DIR}/zedboot.zbi"
+SHIMMED_ZIRCON_BOOTIMAGE="${ZIRCON_BOOTIMAGE}.shim"
+
+cat "${BOOT_SHIM}" "${ZIRCON_BOOTIMAGE}" > "${SHIMMED_ZIRCON_BOOTIMAGE}"
