[openwrt/openwrt] config: change references from armvirt to armsr

LEDE Commits lede-commits at lists.infradead.org
Tue Jun 13 07:50:24 PDT 2023


ynezz pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/a6afb3a7bcab650f4a005b254af59aceeaef84ff

commit a6afb3a7bcab650f4a005b254af59aceeaef84ff
Author: Mathew McBride <matt at traverse.com.au>
AuthorDate: Tue Jun 6 23:22:01 2023 +0000

    config: change references from armvirt to armsr
    
    armvirt target has been renamed to armsr (Arm SystemReady),
    so the config defaults need to be changed as well.
    
    Signed-off-by: Mathew McBride <matt at traverse.com.au>
    (cherry picked from commit 40ce6a7920a8f56d07228795a526576a8762aead)
---
 config/Config-images.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/Config-images.in b/config/Config-images.in
index d92c31ec5f..ea7b3d37c3 100644
--- a/config/Config-images.in
+++ b/config/Config-images.in
@@ -204,12 +204,12 @@ menu "Target Images"
 
 	config GRUB_EFI_IMAGES
 		bool "Build GRUB EFI images (Linux x86 or x86_64 host only)"
-		depends on TARGET_x86 || TARGET_armvirt
+		depends on TARGET_x86 || TARGET_armsr
 		depends on TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
 		select PACKAGE_grub2 if TARGET_x86
 		select PACKAGE_grub2-efi if TARGET_x86
 		select PACKAGE_grub2-bios-setup if TARGET_x86
-		select PACKAGE_grub2-efi-arm if TARGET_armvirt
+		select PACKAGE_grub2-efi-arm if TARGET_armsr
 		select PACKAGE_kmod-fs-vfat
 		default y
 
@@ -267,7 +267,7 @@ menu "Target Images"
 
 	config VMDK_IMAGES
 		bool "Build VMware image files (VMDK)"
-		depends on TARGET_x86 || TARGET_armvirt
+		depends on TARGET_x86 || TARGET_armsr
 		depends on GRUB_IMAGES || GRUB_EFI_IMAGES
 		select PACKAGE_kmod-e1000
 
@@ -279,7 +279,7 @@ menu "Target Images"
 
 	config TARGET_IMAGES_GZIP
 		bool "GZip images"
-		depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armvirt || TARGET_malta
+		depends on TARGET_ROOTFS_EXT4FS || TARGET_x86 || TARGET_armsr || TARGET_malta
 		default y
 
 	comment "Image Options"
@@ -292,7 +292,7 @@ menu "Target Images"
 		depends on USES_BOOT_PART
 		default 8 if TARGET_apm821xx_sata
 		default 64 if TARGET_bcm27xx
-		default 128 if TARGET_armvirt
+		default 128 if TARGET_armsr
 		default 16
 
 	config TARGET_ROOTFS_PARTSIZE




More information about the lede-commits mailing list