--- bin/setup.d/04-setup	2021-06-19 00:49:32.544626976 +0200
+++ bin/setup.d/04-setup	2021-06-19 01:00:36.513714707 +0200
@@ -38,6 +38,7 @@
            CONF_DO_AMD64 \
            CONF_DO_ARM \
            CONF_DO_ARM_VIRT_PL2 \
+           CONF_DO_ARM_RPIZ \
            CONF_DO_ARM_RPI3 \
            CONF_DO_ARM_RPI4 \
            CONF_DO_ARM_IMX6UL_PL1 \
@@ -91,6 +92,7 @@
     CONF_DO_ARM64=1
 
     CONF_DO_ARM_VIRT_PL2=1
+    CONF_DO_ARM_RPIZ=1
     CONF_DO_ARM_RPI3=1
     CONF_DO_ARM_RPI4=1
     CONF_DO_ARM_IMX6UL_PL1=1
@@ -175,6 +177,7 @@
 	--and-widget --begin 9 10 \
 	  --checklist "Select ARM Targets to build:" 12 60 5 \
 	   arm-virt-pl2    "QEMU Virt Platform"  on \
+	   arm-rpiz        "Raspberry Pi Zero"   off \
 	   arm-rpi3        "Raspberry Pi 3"      off \
 	   arm-rpi4        "Raspberry Pi 4"      off \
 	   arm-imx6ul-pl1  "NXP i.MX6UL/ULL"     off \
@@ -188,6 +191,7 @@
 	[ "${e#\"}" = "$e" ] && e="\"$e\""
 	case "$e" in
 	  \"arm-virt-pl2\")   CONF_DO_ARM_VIRT_PL2=1 ;;
+	  \"arm-rpiz\")       CONF_DO_ARM_RPIZ=1 ;;
 	  \"arm-rpi3\")       CONF_DO_ARM_RPI3=1 ;;
 	  \"arm-rpi4\")       CONF_DO_ARM_RPI4=1 ;;
 	  \"arm-imx6ul-pl1\") CONF_DO_ARM_IMX6UL_PL1=1 ;;
@@ -337,6 +341,7 @@
     unset CONF_DO_ARM
     add_to_config "unset CONF_DO_ARM"
     unset CONF_DO_ARM_VIRT_PL2
+    unset CONF_DO_ARM_RPIZ
     unset CONF_DO_ARM_RPI3
     unset CONF_DO_ARM_RPI4
     unset CONF_DO_ARM_IMX6UL_PL1
@@ -588,6 +593,7 @@
   [ "$CONF_DO_AMD64" ] && fiasco_configs="$fiasco_configs amd64-4"
 
   [ "$CONF_DO_ARM_VIRT_PL2" ] && fiasco_configs="$fiasco_configs arm-virt-pl2"
+  [ "$CONF_DO_ARM_RPIZ" ] && fiasco_configs="$fiasco_configs arm-rpiz"
   [ "$CONF_DO_ARM_RPI3" ] && fiasco_configs="$fiasco_configs arm-rpi3"
   [ "$CONF_DO_ARM_RPI4" ] && fiasco_configs="$fiasco_configs arm-rpi4"
   [ "$CONF_DO_ARM_IMX6UL_PL1" ] && fiasco_configs="$fiasco_configs arm-imx6ul"
@@ -616,6 +622,7 @@
   fiascodirs[arm64-s32]="arm64-s32"
   fiascodirs[arm64-zynqmp]="arm64-zynqmp"
   fiascodirs[arm-virt-pl2]="arm-virt-pl2"
+  fiascodirs[arm-rpiz]="arm-rpiz"
   fiascodirs[arm-rpi3]="arm-rpi3"
   fiascodirs[arm-rpi4]="arm-rpi4"
   fiascodirs[arm-imx6ul]="arm-imx6ul-pl1"
@@ -638,6 +645,7 @@
   fiascocrosscomp[arm64-s32]=$CROSS_COMPILE_ARM64
   fiascocrosscomp[arm64-zynqmp]=$CROSS_COMPILE_ARM64
   fiascocrosscomp[arm-virt-pl2]=$CROSS_COMPILE_ARM
+  fiascocrosscomp[arm-rpiz]=$CROSS_COMPILE_ARM
   fiascocrosscomp[arm-rpi3]=$CROSS_COMPILE_ARM
   fiascocrosscomp[arm-rpi4]=$CROSS_COMPILE_ARM
   fiascocrosscomp[arm-imx6ul]=$CROSS_COMPILE_ARM
@@ -655,7 +663,7 @@
   mkdir -p obj/l4
   mkdir -p obj/l4linux
 
-  [ -e src/l4linux ] && l4lx_avail=1
+  #[ -e src/l4linux ] && l4lx_avail=1
 
   # Fiasco build dirs
   for b in $fiasco_configs; do
@@ -687,7 +695,13 @@
   [ "$CONF_DO_AMD64" ] \
     && make -C src/l4 DROPSCONF_DEFCONFIG=mk/defconfig/config.amd64 B=../../obj/l4/amd64
 
-  if [ "$CONF_DO_ARM" ]; then
+  if [ "$CONF_DO_ARM_RPIZ" ]; then
+    make -C src/l4 CROSS_COMPILE=$CROSS_COMPILE_ARM \
+      DROPSCONF_DEFCONFIG=mk/defconfig/config.arm-rpiz B=../../obj/l4/arm-v7
+    make -C obj/l4/arm-v7 CROSS_COMPILE=$CROSS_COMPILE_ARM oldconfig
+    ARM_L4_DIR_FOR_LX_MP=obj/l4/arm-v7
+    echo CROSS_COMPILE=$CROSS_COMPILE_ARM >> obj/l4/arm-v7/Makeconf.local
+  elif [ "$CONF_DO_ARM" ]; then
     make -C src/l4 CROSS_COMPILE=$CROSS_COMPILE_ARM \
       DROPSCONF_DEFCONFIG=mk/defconfig/config.arm-rv-v7a B=../../obj/l4/arm-v7
     make -C obj/l4/arm-v7 CROSS_COMPILE=$CROSS_COMPILE_ARM oldconfig
@@ -824,6 +838,11 @@
       echo "ENTRY=vm-multi     BOOTSTRAP_IMAGE_SUFFIX=arm_virt PT=arm_virt PATH_FIASCO=$(pwd)/obj/fiasco/arm-virt-pl2" >> $odir/.imagebuilds
     fi
 
+    if [ "$CONF_DO_ARM_RPIZ" ]; then
+      echo "ENTRY=hello        BOOTSTRAP_IMAGE_SUFFIX=rpiz PT=rpi PATH_FIASCO=$(pwd)/obj/fiasco/arm-rpiz" >> $odir/.imagebuilds
+      echo "ENTRY=hello-shared BOOTSTRAP_IMAGE_SUFFIX=rpiz PT=rpi PATH_FIASCO=$(pwd)/obj/fiasco/arm-rpiz" >> $odir/.imagebuilds
+    fi
+
     if [ "$CONF_DO_ARM_RPI3" ]; then
       echo "ENTRY=hello        BOOTSTRAP_IMAGE_SUFFIX=rpi3 PT=rpi PATH_FIASCO=$(pwd)/obj/fiasco/arm-rpi3" >> $odir/.imagebuilds
       echo "ENTRY=hello-shared BOOTSTRAP_IMAGE_SUFFIX=rpi3 PT=rpi PATH_FIASCO=$(pwd)/obj/fiasco/arm-rpi3" >> $odir/.imagebuilds