[PATCH 3/4] kernel/x86: rename "generic" to i686

[Elliott Mitchell]

There are few (if any) non-64-bit x86 processors currently in
production, therefore calling non-64-bit "generic" is a major
misnomer.

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

diff --git a/package/kernel/linux/modules/virt.mk b/package/kernel/linux/modules/virt.mk
index d572a873df..d0fd4d72cc 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 +kmod-irqbypass
+  DEPENDS:=@TARGET_x86_generic||TARGET_x86_64||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 5368a779e5..22bafb8d05 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:=generic legacy geode 64
+SUBTARGETS:=legacy geode 64 i686
 
 KERNEL_PATCHVER:=5.15
 
diff --git a/target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs b/target/linux/x86/i686/base-files/lib/preinit/45_mount_xenfs
similarity index 100%
rename from target/linux/x86/generic/base-files/lib/preinit/45_mount_xenfs
rename to target/linux/x86/i686/base-files/lib/preinit/45_mount_xenfs
diff --git a/target/linux/x86/generic/config-5.10 b/target/linux/x86/i686/config-5.10
similarity index 100%
rename from target/linux/x86/generic/config-5.10
rename to target/linux/x86/i686/config-5.10
diff --git a/target/linux/x86/generic/config-5.15 b/target/linux/x86/i686/config-5.15
similarity index 100%
rename from target/linux/x86/generic/config-5.15
rename to target/linux/x86/i686/config-5.15
diff --git a/target/linux/x86/generic/target.mk b/target/linux/x86/i686/target.mk
similarity index 92%
rename from target/linux/x86/generic/target.mk
rename to target/linux/x86/i686/target.mk
index 7e7f9f5a78..74cf434cb6 100644
--- a/target/linux/x86/generic/target.mk
+++ b/target/linux/x86/i686/target.mk
@@ -1,4 +1,4 @@
-BOARDNAME:=Generic
+BOARDNAME:=i686
 CPU_TYPE :=i686
 FEATURES += audio pci pcie usb
 
-- 
2.30.2