From 4e6c8d29289498615d76b98416dffbed17dc1c46 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sun, 23 Oct 2005 18:47:07 +0000 Subject: [PATCH] rename soekris port to x86 git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2285 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/Config.in | 12 ++++++------ target/linux/Makefile | 2 +- target/linux/image/tgz.mk | 2 +- target/linux/image/{soekris => x86}/Makefile | 0 .../lists/{default.soekris-2.4 => default.x86-2.4} | 2 +- .../lists/{micro.soekris-2.4 => micro.x86-2.4} | 2 +- .../lists/{pptp.soekris-2.4 => pptp.x86-2.4} | 2 +- target/linux/linux-2.4/Makefile | 4 ++-- target/linux/linux-2.4/config/{soekris => x86} | 0 .../config/{soekris.modules => x86.modules} | 0 .../patches/{soekris => x86}/001-mgeode-cpu.patch | 0 .../patches/{soekris => x86}/002-wd1100.patch | 0 .../patches/{soekris => x86}/003-mgeode-pci.patch | 0 target/linux/linux-2.4/{soekris.mk => x86.mk} | 0 .../{soekris-2.4 => x86-2.4}/etc/config/network | 0 .../{soekris-2.4 => x86-2.4}/etc/network.overrides | 0 16 files changed, 13 insertions(+), 13 deletions(-) rename target/linux/image/{soekris => x86}/Makefile (100%) rename target/linux/imagebuilder/lists/{default.soekris-2.4 => default.x86-2.4} (85%) rename target/linux/imagebuilder/lists/{micro.soekris-2.4 => micro.x86-2.4} (82%) rename target/linux/imagebuilder/lists/{pptp.soekris-2.4 => pptp.x86-2.4} (85%) rename target/linux/linux-2.4/config/{soekris => x86} (100%) rename target/linux/linux-2.4/config/{soekris.modules => x86.modules} (100%) rename target/linux/linux-2.4/patches/{soekris => x86}/001-mgeode-cpu.patch (100%) rename target/linux/linux-2.4/patches/{soekris => x86}/002-wd1100.patch (100%) rename target/linux/linux-2.4/patches/{soekris => x86}/003-mgeode-pci.patch (100%) rename target/linux/linux-2.4/{soekris.mk => x86.mk} (100%) rename target/linux/package/base-files/files/{soekris-2.4 => x86-2.4}/etc/config/network (100%) rename target/linux/package/base-files/files/{soekris-2.4 => x86-2.4}/etc/network.overrides (100%) 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 similarity index 100% rename from target/linux/image/soekris/Makefile rename to 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 similarity index 85% rename from target/linux/imagebuilder/lists/default.soekris-2.4 rename to 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 similarity index 82% rename from target/linux/imagebuilder/lists/micro.soekris-2.4 rename to 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 similarity index 85% rename from target/linux/imagebuilder/lists/pptp.soekris-2.4 rename to 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 similarity index 100% rename from target/linux/linux-2.4/config/soekris rename to 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 similarity index 100% rename from target/linux/linux-2.4/config/soekris.modules rename to 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 similarity index 100% rename from target/linux/linux-2.4/patches/soekris/001-mgeode-cpu.patch rename to 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 similarity index 100% rename from target/linux/linux-2.4/patches/soekris/002-wd1100.patch rename to 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 similarity index 100% rename from target/linux/linux-2.4/patches/soekris/003-mgeode-pci.patch rename to 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 similarity index 100% rename from target/linux/linux-2.4/soekris.mk rename to 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 similarity index 100% rename from target/linux/package/base-files/files/soekris-2.4/etc/config/network rename to 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 similarity index 100% rename from target/linux/package/base-files/files/soekris-2.4/etc/network.overrides rename to target/linux/package/base-files/files/x86-2.4/etc/network.overrides