Rename aarch64-rpi4 feature to arm-rpi4

The feature фкь-кзш4 is available for armh now.

features.in/arm-rpi4/config.mk

@@ -1,6 +1,5 @@
-
-ifeq (,$(filter-out aarch64,$(ARCH)))
-use/aarch64-rpi4: use/bootloader/uboot
+ifeq (,$(filter-out aarch64 armh,$(ARCH)))
+use/arm-rpi4: use/bootloader/uboot
 	@$(call add_feature)
 	@$(call set,KFLAVOURS,rpi-def rpi-un)
 	@$(call add,THE_PACKAGES,u-boot-tools)

features.in/arm-rpi4/image-scripts.d/97-gen-uboot-env

@@ -1,5 +1,9 @@
 #!/bin/sh -efu
 
+[ -d /usr/share/u-boot/rpi_4 ] &&
+  target_dir='/usr/share/u-boot/rpi_4' ||
+  target_dir='/usr/share/u-boot/rpi_4_32b'
+
 (
 cat << 'EOF'
 arch=arm
@@ -53,4 +57,4 @@ stdout=serial,vidconsole
 vendor=raspberrypi
 
 EOF
-) | mkenvimage -s 16384 -o /usr/share/u-boot/rpi_4/uboot.env -
+) | mkenvimage -s 16384 -o "$target_dir/uboot.env" -