qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:13:11 +02:00
Code

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33779 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-10-15 18:54:34 +00:00
parent 6c6c941068
commit f3263c9679
27 changed files with 53 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
target/linux/rdc/image/Makefile
View File

@ -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))

22
target/linux/rdc/modules.mk
View File

@ -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))

3
target/linux/x86/Makefile
View File

@ -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

2
target/linux/x86/image/Config.in
View File

@ -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

32
target/linux/x86/image/Makefile
View File

@ -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))

0
target/linux/rdc/image/mkimg_bifferboard.py → target/linux/x86/image/mkimg_bifferboard.py
View File

0
target/linux/rdc/image/mkimg_sitecom.pl → target/linux/x86/image/mkimg_sitecom.pl
View File

16
target/linux/x86/modules.mk
View File

@ -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))

0
target/linux/rdc/patches-3.3/006-yenta_mistery.patch → target/linux/x86/patches-3.3/006-yenta_mistery.patch
View File

0
target/linux/rdc/patches-3.3/009-rdc321x_select_embedded.patch → target/linux/x86/patches-3.3/009-rdc321x_select_embedded.patch
View File

0
target/linux/rdc/patches-3.3/010-rdc_cpu_ident.patch → target/linux/x86/patches-3.3/010-rdc_cpu_ident.patch
View File

0
target/linux/rdc/patches-3.3/011-tune_lzma_options.patch → target/linux/x86/patches-3.3/011-tune_lzma_options.patch
View File

0
target/linux/rdc/patches-3.3/012-export_erase_write.patch → target/linux/x86/patches-3.3/012-export_erase_write.patch
View File

0
target/linux/rdc/patches-3.3/100-rdc_boards.patch → target/linux/x86/patches-3.3/100-rdc_boards.patch
View File

0
target/linux/rdc/patches-3.3/120-panic_on_unrecovered_nmi.patch → target/linux/x86/patches-3.3/120-panic_on_unrecovered_nmi.patch
View File

0
target/linux/rdc/patches-3.3/150-pit-tick-rate.patch → target/linux/x86/patches-3.3/150-pit-tick-rate.patch
View File

0
target/linux/rdc/patches-3.3/160-kexec-fix.patch → target/linux/x86/patches-3.3/160-kexec-fix.patch
View File

0
target/linux/rdc/base-files/etc/config/network → target/linux/x86/rdc/base-files/etc/config/network
View File

0
target/linux/rdc/base-files/etc/diag.sh → target/linux/x86/rdc/base-files/etc/diag.sh
View File

0
target/linux/rdc/base-files/lib/preinit/05_set_ether_mac_rdc → target/linux/x86/rdc/base-files/lib/preinit/05_set_ether_mac_rdc
View File

0
target/linux/rdc/base-files/lib/upgrade/platform.sh → target/linux/x86/rdc/base-files/lib/upgrade/platform.sh
View File

0
target/linux/rdc/config-3.3 → target/linux/x86/rdc/config-3.3
View File

0
target/linux/rdc/profiles/ar525w.mk → target/linux/x86/rdc/profiles/ar525w.mk
View File

0
target/linux/rdc/profiles/bifferboard.mk → target/linux/x86/rdc/profiles/bifferboard.mk
View File

0
target/linux/rdc/profiles/r8610.mk → target/linux/x86/rdc/profiles/r8610.mk
View File

0
target/linux/rdc/profiles/sitecom.mk → target/linux/x86/rdc/profiles/sitecom.mk
View File

20
target/linux/rdc/Makefile → target/linux/x86/rdc/target.mk
View File

@ -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))