[x86] merge the RDC R-321x target as a subtarget of x86

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33779 3c298f89-4303-0410-b956-a3cf2f4a3e73

27 files changed, 53 insertions, 89 deletions

diff --git a/target/linux/rdc/image/Makefile b/target/linux/rdc/image/Makefile
deleted file mode 100644
index 7086b998cd..0000000000
--- a/target/linux/rdc/image/Makefile
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/image.mk
-
-define Image/Prepare
-	$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
-endef
-
-define Image/Build/ar525w
-	cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
-	$(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32
-	$(STAGING_DIR_HOST)/bin/airlink -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2).img
-	$(STAGING_DIR_HOST)/bin/airlink -e -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2)-web.img
-endef
-
-define Image/Build/sitecom
-	cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
-	#32k config data + 20 bytes header + 2 bytes checksum after kernel image
-	$(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32790
-	$(TOPDIR)/target/linux/rdc/image/mkimg_sitecom.pl $(KDIR)/bzImage.tmp > $(KDIR)/tmp.img
-	cat $(KDIR)/root.$(1) >> $(KDIR)/tmp.img
-	cp $(KDIR)/tmp.img $(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2).img
-	rm $(KDIR)/tmp.img $(KDIR)/bzImage.tmp
-endef
-
-define Image/Build/bifferboard
-	$(TOPDIR)/target/linux/rdc/image/mkimg_bifferboard.py $(KDIR)/bzImage $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-$(2).img
-endef
-
-define Image/Build/Initramfs
-	$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-ramfs.bzImage
-endef
-
-define Image/Build
-	$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX).bzImage
-	$(call Image/Build/$(PROFILE),$(1),$(PROFILE),$(patsubst jffs2-%k,%,$(1)))
-ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-	$(call Image/Build/Initramfs)
-endif
-endef
-
-$(eval $(call BuildImage))
diff --git a/target/linux/rdc/modules.mk b/target/linux/rdc/modules.mk
deleted file mode 100644
index ce7cbdf6e3..0000000000
--- a/target/linux/rdc/modules.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define KernelPackage/rdc321x-wdt
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=RDC321x watchdog
-  DEPENDS:=@TARGET_rdc
-  KCONFIG:=CONFIG_RDC321X_WDT
-  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/rdc321x_wdt.ko
-  AUTOLOAD:=$(call AutoLoad,50,rdc321x_wdt)
-endef
-
-define KernelPackage/rdc321x-wdt/description
-  RDC-321x watchdog driver
-endef
-
-$(eval $(call KernelPackage,rdc321x-wdt))
-
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 422e828d4d..a64fbc38c9 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -10,7 +10,8 @@ ARCH:=i386
 BOARD:=x86
 BOARDNAME:=x86
 FEATURES:=squashfs jffs2 ext4 vdi vmdk pcmcia targz
-SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan
+SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan \
+	   rdc
 
 LINUX_VERSION:=3.3.8
 
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 653aa61eff..9ced34c93e 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -15,7 +15,7 @@ config X86_ETHERBOOT_BOOTOPTS
 
 config X86_GRUB_IMAGES
 	bool "Build GRUB images (Linux x86 or x86_64 host only)"
-	depends TARGET_x86 && !TARGET_x86_olpc
+	depends TARGET_x86 && !(TARGET_x86_olpc || TARGET_x86_rdc)
 	depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
 	select PACKAGE_grub2
 	default y
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index 3552748e60..399ce3c7d3 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -206,12 +206,40 @@ define Image/BuildKernel
   endif
 endef
 
+define Image/Build/Profile/ar525w
+	cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
+	$(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32
+	$(STAGING_DIR_HOST)/bin/airlink -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) \
+		$(BIN_DIR)/$(IMG_PREFIX)-$(1)-ar525w.img
+	$(STAGING_DIR_HOST)/bin/airlink -e -b 1 $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) \
+		$(BIN_DIR)/$(IMG_PREFIX)-$(1)-ar525w-web.img
+endef
+
+define Image/Build/Profile/sitecom
+	cp $(KDIR)/bzImage $(KDIR)/bzImage.tmp
+	#32k config data + 20 bytes header + 2 bytes checksum after kernel image
+	$(SCRIPT_DIR)/pad_image $(1) $(KDIR)/bzImage.tmp $(KDIR)/root.$(1) 32790
+	$(TOPDIR)/target/linux/rdc/image/mkimg_sitecom.pl $(KDIR)/bzImage.tmp > $(KDIR)/tmp.img
+	cat $(KDIR)/root.$(1) >> $(KDIR)/tmp.img
+	cp $(KDIR)/tmp.img $(BIN_DIR)/$(IMG_PREFIX)-$(1)-sitecom.img
+	rm $(KDIR)/tmp.img $(KDIR)/bzImage.tmp
+endef
+
+define Image/Build/Profile/bifferboard
+	$(TOPDIR)/target/linux/rdc/image/mkimg_bifferboard.py $(KDIR)/bzImage $(KDIR)/root.$(1) \
+		$(BIN_DIR)/$(IMG_PREFIX)-$(1)-bifferboard.img
+endef
+
 define Image/Prepare
 	$(CP) $(LINUX_DIR)/arch/x86/boot/bzImage $(KDIR)/bzImage
 	$(call Image/Prepare/bootscript)
 	$(call Image/Prepare/grub2)
 endef
 
+define Image/Build/Initramfs
+	$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-ramfs.bzImage
+endef
+
 define Image/Build
 	$(call Image/Build/$(1))
 	$(call Image/Build/bootscript,$(1))
@@ -225,6 +253,10 @@ define Image/Build
   endif
 	$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
 	$(call Image/Build/gzip/$(1))
+	$(call Image/Build/Profile/$(PROFILE),$(1))
+ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+	$(call Image/Build/Initramfs)
+endif
 endef
 
 $(eval $(call BuildImage))
diff --git a/target/linux/rdc/image/mkimg_bifferboard.py b/target/linux/x86/image/mkimg_bifferboard.py
index 5444abebd1..5444abebd1 100755
--- a/target/linux/rdc/image/mkimg_bifferboard.py
+++ b/target/linux/x86/image/mkimg_bifferboard.py
diff --git a/target/linux/rdc/image/mkimg_sitecom.pl b/target/linux/x86/image/mkimg_sitecom.pl
index cfd5e652f0..cfd5e652f0 100755
--- a/target/linux/rdc/image/mkimg_sitecom.pl
+++ b/target/linux/x86/image/mkimg_sitecom.pl
diff --git a/target/linux/x86/modules.mk b/target/linux/x86/modules.mk
index 70a64ffdb4..f0d436c1e9 100644
--- a/target/linux/x86/modules.mk
+++ b/target/linux/x86/modules.mk
@@ -312,3 +312,19 @@ define KernelPackage/leds-net48xx/description
 endef
 
 $(eval $(call KernelPackage,leds-net48xx))
+
+define KernelPackage/rdc321x-wdt
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=RDC321x watchdog
+  DEPENDS:=@TARGET_x86_rdc
+  KCONFIG:=CONFIG_RDC321X_WDT
+  FILES:=$(LINUX_DIR)/drivers/$(WATCHDOG_DIR)/rdc321x_wdt.ko
+  AUTOLOAD:=$(call AutoLoad,50,rdc321x_wdt)
+endef
+
+define KernelPackage/rdc321x-wdt/description
+  RDC-321x watchdog driver
+endef
+
+$(eval $(call KernelPackage,rdc321x-wdt))
+
diff --git a/target/linux/rdc/patches-3.3/006-yenta_mistery.patch b/target/linux/x86/patches-3.3/006-yenta_mistery.patch
index 65893ea2b9..65893ea2b9 100644
--- a/target/linux/rdc/patches-3.3/006-yenta_mistery.patch
+++ b/target/linux/x86/patches-3.3/006-yenta_mistery.patch
diff --git a/target/linux/rdc/patches-3.3/009-rdc321x_select_embedded.patch b/target/linux/x86/patches-3.3/009-rdc321x_select_embedded.patch
index 2d094fc743..2d094fc743 100644
--- a/target/linux/rdc/patches-3.3/009-rdc321x_select_embedded.patch
+++ b/target/linux/x86/patches-3.3/009-rdc321x_select_embedded.patch
diff --git a/target/linux/rdc/patches-3.3/010-rdc_cpu_ident.patch b/target/linux/x86/patches-3.3/010-rdc_cpu_ident.patch
index 0f2314a3e2..0f2314a3e2 100644
--- a/target/linux/rdc/patches-3.3/010-rdc_cpu_ident.patch
+++ b/target/linux/x86/patches-3.3/010-rdc_cpu_ident.patch
diff --git a/target/linux/rdc/patches-3.3/011-tune_lzma_options.patch b/target/linux/x86/patches-3.3/011-tune_lzma_options.patch
index e6fd44d4e1..e6fd44d4e1 100644
--- a/target/linux/rdc/patches-3.3/011-tune_lzma_options.patch
+++ b/target/linux/x86/patches-3.3/011-tune_lzma_options.patch
diff --git a/target/linux/rdc/patches-3.3/012-export_erase_write.patch b/target/linux/x86/patches-3.3/012-export_erase_write.patch
index 893d4d8252..893d4d8252 100644
--- a/target/linux/rdc/patches-3.3/012-export_erase_write.patch
+++ b/target/linux/x86/patches-3.3/012-export_erase_write.patch
diff --git a/target/linux/rdc/patches-3.3/100-rdc_boards.patch b/target/linux/x86/patches-3.3/100-rdc_boards.patch
index 958bee0064..958bee0064 100644
--- a/target/linux/rdc/patches-3.3/100-rdc_boards.patch
+++ b/target/linux/x86/patches-3.3/100-rdc_boards.patch
diff --git a/target/linux/rdc/patches-3.3/120-panic_on_unrecovered_nmi.patch b/target/linux/x86/patches-3.3/120-panic_on_unrecovered_nmi.patch
index 6a1279ceac..6a1279ceac 100644
--- a/target/linux/rdc/patches-3.3/120-panic_on_unrecovered_nmi.patch
+++ b/target/linux/x86/patches-3.3/120-panic_on_unrecovered_nmi.patch
diff --git a/target/linux/rdc/patches-3.3/150-pit-tick-rate.patch b/target/linux/x86/patches-3.3/150-pit-tick-rate.patch
index 5af3cef2fa..5af3cef2fa 100644
--- a/target/linux/rdc/patches-3.3/150-pit-tick-rate.patch
+++ b/target/linux/x86/patches-3.3/150-pit-tick-rate.patch
diff --git a/target/linux/rdc/patches-3.3/160-kexec-fix.patch b/target/linux/x86/patches-3.3/160-kexec-fix.patch
index ea32494a09..ea32494a09 100644
--- a/target/linux/rdc/patches-3.3/160-kexec-fix.patch
+++ b/target/linux/x86/patches-3.3/160-kexec-fix.patch
diff --git a/target/linux/rdc/base-files/etc/config/network b/target/linux/x86/rdc/base-files/etc/config/network
index 44c57940e2..44c57940e2 100644
--- a/target/linux/rdc/base-files/etc/config/network
+++ b/target/linux/x86/rdc/base-files/etc/config/network
diff --git a/target/linux/rdc/base-files/etc/diag.sh b/target/linux/x86/rdc/base-files/etc/diag.sh
index 8d5c38262c..8d5c38262c 100644
--- a/target/linux/rdc/base-files/etc/diag.sh
+++ b/target/linux/x86/rdc/base-files/etc/diag.sh
diff --git a/target/linux/rdc/base-files/lib/preinit/05_set_ether_mac_rdc b/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc
index 4640e008fa..4640e008fa 100644
--- a/target/linux/rdc/base-files/lib/preinit/05_set_ether_mac_rdc
+++ b/target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc
diff --git a/target/linux/rdc/base-files/lib/upgrade/platform.sh b/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh
index 6348a6990b..6348a6990b 100644
--- a/target/linux/rdc/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/rdc/base-files/lib/upgrade/platform.sh
diff --git a/target/linux/rdc/config-3.3 b/target/linux/x86/rdc/config-3.3
index 33e27ebab4..33e27ebab4 100644
--- a/target/linux/rdc/config-3.3
+++ b/target/linux/x86/rdc/config-3.3
diff --git a/target/linux/rdc/profiles/ar525w.mk b/target/linux/x86/rdc/profiles/ar525w.mk
index d38cb1f232..d38cb1f232 100644
--- a/target/linux/rdc/profiles/ar525w.mk
+++ b/target/linux/x86/rdc/profiles/ar525w.mk
diff --git a/target/linux/rdc/profiles/bifferboard.mk b/target/linux/x86/rdc/profiles/bifferboard.mk
index 28e1d0e6d4..28e1d0e6d4 100644
--- a/target/linux/rdc/profiles/bifferboard.mk
+++ b/target/linux/x86/rdc/profiles/bifferboard.mk
diff --git a/target/linux/rdc/profiles/r8610.mk b/target/linux/x86/rdc/profiles/r8610.mk
index 67fef8a5ae..67fef8a5ae 100644
--- a/target/linux/rdc/profiles/r8610.mk
+++ b/target/linux/x86/rdc/profiles/r8610.mk
diff --git a/target/linux/rdc/profiles/sitecom.mk b/target/linux/x86/rdc/profiles/sitecom.mk
index e3b2981ed8..e3b2981ed8 100644
--- a/target/linux/rdc/profiles/sitecom.mk
+++ b/target/linux/x86/rdc/profiles/sitecom.mk
diff --git a/target/linux/rdc/Makefile b/target/linux/x86/rdc/target.mk
index db97a33377..32b300466a 100644
--- a/target/linux/rdc/Makefile
+++ b/target/linux/x86/rdc/target.mk
@@ -1,22 +1,8 @@
-#
-# Copyright (C) 2006-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-ARCH:=i386
-BOARD:=rdc
-BOARDNAME:=RDC 321x
-FEATURES:=squashfs jffs2 pci usb pcmcia
+BOARDNAME:=RDC R-321x
+FEATURES:=squashfs jffs2 pci usb gpio pcmcia
 CFLAGS:=-Os -pipe -march=i486 -mtune=i486 -fno-caller-saves
 MAINTAINER:=Florian Fainelli <florian@openwrt.org>
 
-LINUX_VERSION:=3.3.8
-
-include $(INCLUDE_DIR)/target.mk
-
 DEFAULT_PACKAGES += kmod-llc kmod-stp kmod-bridge kmod-8021q \
 		    wpad-mini kmod-libphy kmod-r6040 kmod-input-core \
 		    kmod-input-polldev kmod-input-gpio-buttons kmod-button-hotplug \
@@ -26,5 +12,3 @@ define Target/Description
         Build firmware images for RDC321x based routers
         (e.g. Airlink101 AR525W, Linksys WRT54GR, Sitecom WL-153)
 endef
-
-$(eval $(call BuildTarget))