From 5137e5ad9c908ece07175074dbb5e3b7205b9f90 Mon Sep 17 00:00:00 2001 From: Anton Midyukov Date: Fri, 22 May 2020 18:24:34 +0700 Subject: [PATCH] Rename aarch64-rpi4 feature to arm-rpi4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The feature фкь-кзш4 is available for armh now. --- features.in/{aarch64-rpi4 => arm-rpi4}/README | 0 features.in/{aarch64-rpi4 => arm-rpi4}/config.mk | 5 ++--- .../image-scripts.d/93-default-gouvernor-conservative | 0 .../image-scripts.d/96-gen-brcmfmac43455 | 0 .../image-scripts.d/97-gen-uboot-env | 6 +++++- .../image-scripts.d/98-bootstrap-boot-by-firmware | 0 6 files changed, 7 insertions(+), 4 deletions(-) rename features.in/{aarch64-rpi4 => arm-rpi4}/README (100%) rename features.in/{aarch64-rpi4 => arm-rpi4}/config.mk (85%) rename features.in/{aarch64-rpi4 => arm-rpi4}/image-scripts.d/93-default-gouvernor-conservative (100%) rename features.in/{aarch64-rpi4 => arm-rpi4}/image-scripts.d/96-gen-brcmfmac43455 (100%) rename features.in/{aarch64-rpi4 => arm-rpi4}/image-scripts.d/97-gen-uboot-env (95%) rename features.in/{aarch64-rpi4 => arm-rpi4}/image-scripts.d/98-bootstrap-boot-by-firmware (100%) diff --git a/features.in/aarch64-rpi4/README b/features.in/arm-rpi4/README similarity index 100% rename from features.in/aarch64-rpi4/README rename to features.in/arm-rpi4/README diff --git a/features.in/aarch64-rpi4/config.mk b/features.in/arm-rpi4/config.mk similarity index 85% rename from features.in/aarch64-rpi4/config.mk rename to features.in/arm-rpi4/config.mk index 9d462d69..19e29557 100644 --- a/features.in/aarch64-rpi4/config.mk +++ b/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) diff --git a/features.in/aarch64-rpi4/image-scripts.d/93-default-gouvernor-conservative b/features.in/arm-rpi4/image-scripts.d/93-default-gouvernor-conservative similarity index 100% rename from features.in/aarch64-rpi4/image-scripts.d/93-default-gouvernor-conservative rename to features.in/arm-rpi4/image-scripts.d/93-default-gouvernor-conservative diff --git a/features.in/aarch64-rpi4/image-scripts.d/96-gen-brcmfmac43455 b/features.in/arm-rpi4/image-scripts.d/96-gen-brcmfmac43455 similarity index 100% rename from features.in/aarch64-rpi4/image-scripts.d/96-gen-brcmfmac43455 rename to features.in/arm-rpi4/image-scripts.d/96-gen-brcmfmac43455 diff --git a/features.in/aarch64-rpi4/image-scripts.d/97-gen-uboot-env b/features.in/arm-rpi4/image-scripts.d/97-gen-uboot-env similarity index 95% rename from features.in/aarch64-rpi4/image-scripts.d/97-gen-uboot-env rename to features.in/arm-rpi4/image-scripts.d/97-gen-uboot-env index 29502fe2..5a56c930 100755 --- a/features.in/aarch64-rpi4/image-scripts.d/97-gen-uboot-env +++ b/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" - diff --git a/features.in/aarch64-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware b/features.in/arm-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware similarity index 100% rename from features.in/aarch64-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware rename to features.in/arm-rpi4/image-scripts.d/98-bootstrap-boot-by-firmware