[PATCH 4/4] kernel/x86: move "64" to "generic"

[Elliott Mitchell]

Point "generic" at amd64 which is far more important to nearly
everyone.

Signed-off-by: Elliott Mitchell <ehem+openwrt at m5p.com>
---
 package/kernel/linux/modules/virt.mk                            | 2 +-
 target/linux/x86/Makefile                                       | 2 +-
 .../x86/{64 => generic}/base-files/lib/preinit/45_mount_xenfs   | 0
 target/linux/x86/{64 => generic}/config-5.10                    | 0
 target/linux/x86/{64 => generic}/config-5.15                    | 0
 target/linux/x86/{64 => generic}/target.mk                      | 2 +-
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename target/linux/x86/{64 => generic}/base-files/lib/preinit/45_mount_xenfs (100%)
 rename target/linux/x86/{64 => generic}/config-5.10 (100%)
 rename target/linux/x86/{64 => generic}/config-5.15 (100%)
 rename target/linux/x86/{64 => generic}/target.mk (85%)

diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk
index d0fd4d72cc..fb2e7ccb24 100644
--- a/package/kernel/linux/modules/virt.mk
+++ b/package/kernel/linux/modules/virt.mk
@@ -18,7 +18,7 @@ $(eval $(call KernelPackage,irqbypass))
 define KernelPackage/kvm-x86
   SUBMENU:=Virtualization
   TITLE:=Kernel-based Virtual Machine (KVM) support
-  DEPENDS:=@TARGET_x86_generic||TARGET_x86_64||TARGET_x86_i686 +kmod-irqbypass
+  DEPENDS:=@TARGET_x86_generic||TARGET_x86_i686 +kmod-irqbypass
   KCONFIG:=\
 	  CONFIG_KVM \
 	  CONFIG_KVM_MMU_AUDIT=n \
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 22bafb8d05..f2e9681621 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -8,7 +8,7 @@ ARCH:=i386
 BOARD:=x86
 BOARDNAME:=x86
 FEATURES:=squashfs ext4 vdi vmdk vhdx pcmcia targz fpu boot-part rootfs-part
-SUBTARGETS:=legacy geode 64 i686
+SUBTARGETS:=generic legacy geode i686
 
 KERNEL_PATCHVER:=5.15
 
diff --git a/target/linux/x86/64/base-files/lib/preinit/45_mount_xenfs b/target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs
similarity index 100%
rename from target/linux/x86/64/base-files/lib/preinit/45_mount_xenfs
rename to target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs
diff --git a/target/linux/x86/64/config-5.10 b/target/linux/x86/generic/config-5.10
similarity index 100%
rename from target/linux/x86/64/config-5.10
rename to target/linux/x86/generic/config-5.10
diff --git a/target/linux/x86/64/config-5.15 b/target/linux/x86/generic/config-5.15
similarity index 100%
rename from target/linux/x86/64/config-5.15
rename to target/linux/x86/generic/config-5.15
diff --git a/target/linux/x86/64/target.mk b/target/linux/x86/generic/target.mk
similarity index 85%
rename from target/linux/x86/64/target.mk
rename to target/linux/x86/generic/target.mk
index ece3d1bc9a..d0c4a69f58 100644
--- a/target/linux/x86/64/target.mk
+++ b/target/linux/x86/generic/target.mk
@@ -1,5 +1,5 @@
 ARCH:=x86_64
-BOARDNAME:=x86_64
+BOARDNAME:=Generic
 
 define Target/Description
         Build images for 64 bit systems including virtualized guests.
-- 
2.30.2