16 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/Config.in b/target/linux/Config.in
index 4c1b5ee1bb..8a2799f32c 100644
--- a/target/linux/Config.in
+++ b/target/linux/Config.in
@@ -20,13 +20,13 @@ config BR2_LINUX_2_4_AR7
 	help
 	  Build firmware images for TI AR7 based routers (w.g. Linksys WAG54G v2)
 
-config BR2_LINUX_2_4_SOEKRIS
-	bool "Support for Soekris boards [2.4]"
+config BR2_LINUX_2_4_X86
+	bool "Support for x86 boards [2.4]"
 	default n
 	depends BR2_i386
 	help
-	  Build firmware images for Soekris based boards
-	  (e.g. net4521, net4801)
+	  Build firmware images for x86 based boards
+	  (e.g. Soekris net4521 and net4801, PC Engines WRAP...)
 	 
 config BR2_LINUX_2_6_BRCM
 	bool "Support for Broadcom based routers [2.6]"
@@ -390,7 +390,7 @@ config BR2_PACKAGE_KMOD_PWC
 config BR2_PACKAGE_KMOD_NATSEMI
 	tristate "Soekris net4801 ethernet driver"
 	default y
-	depends BR2_LINUX_2_4_SOEKRIS
+	depends BR2_LINUX_2_4_X86
 	help
 	  Driver for the National Semiconductor DP8381x series PCI Ethernet 
 	  found on Soekris net4801 boards
@@ -398,7 +398,7 @@ config BR2_PACKAGE_KMOD_NATSEMI
 config BR2_PACKAGE_KMOD_WD1100
 	tristate "Soekris net4801 watchdog"
 	default y
-	depends BR2_LINUX_2_4_SOEKRIS
+	depends BR2_LINUX_2_4_X86
 	help
 	  Driver for the NatSemi SC1x00 series Watchdog 
 	  found on Soekris net4801 boards
diff --git a/target/linux/Makefile b/target/linux/Makefile
index fe3c6ca9f8..01044d2b2d 100644
--- a/target/linux/Makefile
+++ b/target/linux/Makefile
@@ -85,5 +85,5 @@ clean:
 
 $(eval $(call kernel_template,2.4,brcm,2_4_BRCM))
 $(eval $(call kernel_template,2.4,ar7,2_4_AR7))
-$(eval $(call kernel_template,2.4,soekris,2_4_SOEKRIS))
+$(eval $(call kernel_template,2.4,x86,2_4_X86))
 $(eval $(call kernel_template,2.6,brcm,2_6_BRCM))
diff --git a/target/linux/image/tgz.mk b/target/linux/image/tgz.mk
index 756d28b6aa..f927ef99e8 100644
--- a/target/linux/image/tgz.mk
+++ b/target/linux/image/tgz.mk
@@ -1,7 +1,7 @@
 $(KDIR)/root.tar.gz:
 	tar -zcf $@ --owner=root --group=root -C $(KDIR)/root/ .
 
-ifeq ($(BOARD),soekris)
+ifeq ($(BOARD),x86)
 install: tgz-install
 
 tgz-install: $(KDIR)/root.tar.gz
diff --git a/target/linux/image/soekris/Makefile b/target/linux/image/x86/Makefile
index 37600c91db..37600c91db 100644
--- a/target/linux/image/soekris/Makefile
+++ b/target/linux/image/x86/Makefile
diff --git a/target/linux/imagebuilder/lists/default.soekris-2.4 b/target/linux/imagebuilder/lists/default.x86-2.4
index fcdf15bff4..8ad11d0be3 100644
--- a/target/linux/imagebuilder/lists/default.soekris-2.4
+++ b/target/linux/imagebuilder/lists/default.x86-2.4
@@ -1,5 +1,5 @@
 base-files
-base-files-soekris-2.4
+base-files-x86-2.4
 bridge
 busybox
 dnsmasq
diff --git a/target/linux/imagebuilder/lists/micro.soekris-2.4 b/target/linux/imagebuilder/lists/micro.x86-2.4
index cf54e04d17..2b03720d14 100644
--- a/target/linux/imagebuilder/lists/micro.soekris-2.4
+++ b/target/linux/imagebuilder/lists/micro.x86-2.4
@@ -1,5 +1,5 @@
 base-files
-base-files-soekris-2.4
+base-files-x86-2.4
 bridge
 busybox
 dnsmasq
diff --git a/target/linux/imagebuilder/lists/pptp.soekris-2.4 b/target/linux/imagebuilder/lists/pptp.x86-2.4
index 57ce95147c..de982576c9 100644
--- a/target/linux/imagebuilder/lists/pptp.soekris-2.4
+++ b/target/linux/imagebuilder/lists/pptp.x86-2.4
@@ -1,5 +1,5 @@
 base-files
-base-files-soekris-2.4
+base-files-x86-2.4
 bridge
 busybox
 dnsmasq
diff --git a/target/linux/linux-2.4/Makefile b/target/linux/linux-2.4/Makefile
index bd1dd6c5d3..2b8a186fc3 100644
--- a/target/linux/linux-2.4/Makefile
+++ b/target/linux/linux-2.4/Makefile
@@ -42,8 +42,8 @@ ifeq ($(BOARD),brcm)
 include ./broadcom.mk
 endif
 
-ifeq ($(BOARD),soekris)
-include ./soekris.mk
+ifeq ($(BOARD),x86)
+include ./x86.mk
 endif
 
 ifeq ($(BOARD),ar7)
diff --git a/target/linux/linux-2.4/config/soekris b/target/linux/linux-2.4/config/x86
index 92892b180e..92892b180e 100644
--- a/target/linux/linux-2.4/config/soekris
+++ b/target/linux/linux-2.4/config/x86
diff --git a/target/linux/linux-2.4/config/soekris.modules b/target/linux/linux-2.4/config/x86.modules
index 7fd95a5d38..7fd95a5d38 100644
--- a/target/linux/linux-2.4/config/soekris.modules
+++ b/target/linux/linux-2.4/config/x86.modules
diff --git a/target/linux/linux-2.4/patches/soekris/001-mgeode-cpu.patch b/target/linux/linux-2.4/patches/x86/001-mgeode-cpu.patch
index 662d4f263e..662d4f263e 100644
--- a/target/linux/linux-2.4/patches/soekris/001-mgeode-cpu.patch
+++ b/target/linux/linux-2.4/patches/x86/001-mgeode-cpu.patch
diff --git a/target/linux/linux-2.4/patches/soekris/002-wd1100.patch b/target/linux/linux-2.4/patches/x86/002-wd1100.patch
index 8cb2dbd04b..8cb2dbd04b 100644
--- a/target/linux/linux-2.4/patches/soekris/002-wd1100.patch
+++ b/target/linux/linux-2.4/patches/x86/002-wd1100.patch
diff --git a/target/linux/linux-2.4/patches/soekris/003-mgeode-pci.patch b/target/linux/linux-2.4/patches/x86/003-mgeode-pci.patch
index eb6594ec84..eb6594ec84 100644
--- a/target/linux/linux-2.4/patches/soekris/003-mgeode-pci.patch
+++ b/target/linux/linux-2.4/patches/x86/003-mgeode-pci.patch
diff --git a/target/linux/linux-2.4/soekris.mk b/target/linux/linux-2.4/x86.mk
index 8b308a0a52..8b308a0a52 100644
--- a/target/linux/linux-2.4/soekris.mk
+++ b/target/linux/linux-2.4/x86.mk
diff --git a/target/linux/package/base-files/files/soekris-2.4/etc/config/network b/target/linux/package/base-files/files/x86-2.4/etc/config/network
index fd0f557c04..fd0f557c04 100644
--- a/target/linux/package/base-files/files/soekris-2.4/etc/config/network
+++ b/target/linux/package/base-files/files/x86-2.4/etc/config/network
diff --git a/target/linux/package/base-files/files/soekris-2.4/etc/network.overrides b/target/linux/package/base-files/files/x86-2.4/etc/network.overrides
index e857d5b5f1..e857d5b5f1 100644
--- a/target/linux/package/base-files/files/soekris-2.4/etc/network.overrides
+++ b/target/linux/package/base-files/files/x86-2.4/etc/network.overrides