Index: target/linux/adm5120/router_le/base-files/sbin/wget2nand
===================================================================
--- target/linux/adm5120/router_le/base-files/sbin/wget2nand	(revision 9342)
+++ target/linux/adm5120/router_le/base-files/sbin/wget2nand	(working copy)
@@ -1,64 +0,0 @@
-#!/bin/sh
-# wget2nand
-# This script can be used to download a TGZ file from your build system which
-# contains the files to be installed on the NAND flash on your RB1xx card.
-# The one parameter is the URL of the TGZ file to be downloaded.
-# Licence GPL V2
-# Author david.goodenough@linkchoose.co.uk
-# Based on cf2nand from RB532 support
-. /etc/functions.sh
-
-[ -d /tmp/wget2nand ] && {
-	echo "/tmp/wget2nand already exists"
-	exit 1
-}
-
-# first get an address for br-lan using udhcpc
-killall udhcpc
-/sbin/udhcpc -i br-lan
-
-# need to find the wget server from the command line
-url=$1
-[ -z "$url" ] && {
-	echo "No URL specified for image TGZ"
-	echo "Usage : $0 URL"
-	exit 1
-} 
-
-boot="$(find_mtd_part 'RouterBoard NAND Boot')"
-main="$(find_mtd_part 'rootfs')"
-[ -z "$boot" -o -z "$main" ] && {
-	echo "Cannot find NAND Flash partitions"
-	exit 1
-}
-
-echo "Erasing filesystem."
-mtd erase Boot 2>/dev/null >/dev/null
-mtd erase Main 2>/dev/null >/dev/null
-
-echo "Mounting $main as new root and $boot as boot partition"
-
-mkdir /tmp/wget2nand/
-mkdir /tmp/wget2nand-boot
-mount -t yaffs2 "$main" /tmp/wget2nand/
-mount -t yaffs2 "$boot" /tmp/wget2nand-boot
-
-echo "Copying filesystem..."
-( wget -O - $url/openwrt-adm5120-2.6-rootfs.tgz) | ( cd /tmp/wget2nand/; tar xvz )
-wget -O /tmp/wget2nand-boot/kernel $url/openwrt-adm5120-2.6-rb1xx-vmlinux
-
-chmod +x /tmp/wget2nand-boot/kernel
-
-# make sure everything is written before we unmount the partitions
-echo "chmod ugo+x /" > /tmp/wget2nand/etc/uci-defaults/set_root_permission
-sync
-ls /tmp/wget2nand-boot/
-ls /tmp/wget2nand/
-# unmount the partitions and remove the directories into which they were mounted
-umount /tmp/wget2nand-boot
-umount /tmp/wget2nand
-rmdir /tmp/wget2nand-boot
-rmdir /tmp/wget2nand
-
-# all done
-echo "Image written, you can now reboot.  Remember to change the boot source to Boot from Nand"
Index: target/linux/adm5120/router_le/config-2.6.23
===================================================================
--- target/linux/adm5120/router_le/config-2.6.23	(revision 9342)
+++ target/linux/adm5120/router_le/config-2.6.23	(working copy)
@@ -8,6 +8,7 @@
 CONFIG_BASE_SMALL=0
 CONFIG_BAYCOM_SER_FDX=m
 CONFIG_BAYCOM_SER_HDX=m
+# CONFIG_BCM43XX_DMA_AND_PIO_MODE is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_BITREVERSE=y
 CONFIG_CIFS_DEBUG2=y
@@ -15,7 +16,7 @@
 CONFIG_CIFS_STATS2=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2 init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,jffs2 init=/etc/preinit"
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
@@ -46,7 +47,6 @@
 # CONFIG_CPU_TX49XX is not set
 # CONFIG_CPU_VR41XX is not set
 # CONFIG_CRYPTO_HW is not set
-CONFIG_DEVPORT=y
 # CONFIG_DM9000 is not set
 CONFIG_DMA_NEED_PCI_MAP_STATE=y
 CONFIG_DMA_NONCOHERENT=y
@@ -66,7 +66,7 @@
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
-CONFIG_HWMON=y
+CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
@@ -140,7 +140,7 @@
 # CONFIG_MTD_DOC2001 is not set
 # CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_GEN_PROBE=y
-CONFIG_MTD_JEDECPROBE=y
+# CONFIG_MTD_JEDECPROBE is not set
 CONFIG_MTD_MAP_BANK_WIDTH_1=y
 # CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
 CONFIG_MTD_MAP_BANK_WIDTH_2=y
@@ -149,56 +149,35 @@
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
 CONFIG_MTD_MYLOADER_PARTS=y
-CONFIG_MTD_NAND=y
-# CONFIG_MTD_NAND_ADM5120 is not set
-# CONFIG_MTD_NAND_CAFE is not set
-# CONFIG_MTD_NAND_DISKONCHIP is not set
-# CONFIG_MTD_NAND_ECC_SMC is not set
-CONFIG_MTD_NAND_IDS=y
-# CONFIG_MTD_NAND_MUSEUM_IDS is not set
-# CONFIG_MTD_NAND_NANDSIM is not set
-CONFIG_MTD_NAND_PLATFORM=y
-# CONFIG_MTD_NAND_VERIFY_WRITE is not set
 # CONFIG_MTD_ONENAND is not set
 CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_PCI is not set
 # CONFIG_MTD_PHRAM is not set
 # CONFIG_MTD_PHYSMAP is not set
 # CONFIG_MTD_PLATRAM is not set
-# CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_TRXSPLIT=y
-# CONFIG_NETDEV_1000 is not set
 # CONFIG_NETFILTER_XT_TARGET_TARPIT is not set
-CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_KEY=y
-# CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_GRE=m
 # CONFIG_NO_IOPORT is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
 # CONFIG_PAGE_SIZE_64KB is not set
 # CONFIG_PAGE_SIZE_8KB is not set
 # CONFIG_PARTITION_ADVANCED is not set
-# CONFIG_PCIPCWATCHDOG is not set
-CONFIG_PCI_ADM5120=y
+# CONFIG_PCI is not set
+# CONFIG_PCI_ADM5120 is not set
 # CONFIG_PMC_MSP is not set
 # CONFIG_PMC_YOSEMITE is not set
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_RTC is not set
-# CONFIG_RTL8187 is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCSI_WAIT_SCAN=m
-# CONFIG_SENSORS_ABITUGURU3 is not set
 # CONFIG_SENSORS_PC87360 is not set
 # CONFIG_SERIAL_8250 is not set
 # CONFIG_SERIAL_ADM5120 is not set
@@ -211,7 +190,6 @@
 # CONFIG_SERIO_AMBAKMI is not set
 # CONFIG_SERIO_I8042 is not set
 # CONFIG_SERIO_LIBPS2 is not set
-# CONFIG_SERIO_PCIPS2 is not set
 # CONFIG_SERIO_RAW is not set
 CONFIG_SERIO_SERPORT=y
 # CONFIG_SGI_IP22 is not set
@@ -240,40 +218,11 @@
 # CONFIG_TOSHIBA_RBTX4927 is not set
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
-# CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_ACM is not set
-CONFIG_USB_ADM5120_HCD=m
-# CONFIG_USB_ALI_M5632 is not set
-# CONFIG_USB_AN2720 is not set
-# CONFIG_USB_CATC is not set
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_ARCH_HAS_EHCI is not set
+# CONFIG_USB_ARCH_HAS_HCD is not set
+# CONFIG_USB_ARCH_HAS_OHCI is not set
 # CONFIG_USER_NS is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_V4L1=y
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_YAFFS_9BYTE_TAGS=y
-# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set
-CONFIG_YAFFS_AUTO_YAFFS2=y
-CONFIG_YAFFS_CHECKPOINT_RESERVED_BLOCKS=0
-# CONFIG_YAFFS_DISABLE_LAZY_LOAD is not set
-# CONFIG_YAFFS_DISABLE_WIDE_TNODES is not set
-CONFIG_YAFFS_FS=y
-CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
-CONFIG_YAFFS_YAFFS1=y
-CONFIG_YAFFS_YAFFS2=y
-# CONFIG_ZD1211RW is not set
 CONFIG_ZONE_DMA_FLAG=0
Index: target/linux/adm5120/router_le/target.mk
===================================================================
--- target/linux/adm5120/router_le/target.mk	(revision 9342)
+++ target/linux/adm5120/router_le/target.mk	(working copy)
@@ -1,9 +1,17 @@
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 ARCH:=mipsel
 SUBTARGET:=router_le
 BOARDNAME:=ADM5120 Boards (Little Endian)
+FEATURES:=squashfs jffs2 broken
 
 define Target/Description
 	Build firmware images for Infineon/ADMtek ADM5120 based boards
-	(e.g : RouterBoard RB1xx, Compex WP54G-WRT ...)
+	(e.g : Compex WP54G-WRT ...)
 endef
 
Index: target/linux/adm5120/image/router_le.mk
===================================================================
--- target/linux/adm5120/image/router_le.mk	(revision 9342)
+++ target/linux/adm5120/image/router_le.mk	(working copy)
@@ -238,13 +238,6 @@
 endef
 
 #
-# Mikrotik RB-1xx
-#
-define Image/Build/Board/RB1xx/Initramfs
-	$(CP) $(KDIR)/vmlinux.elf $(call imgname,netboot,rb1xx)
-endef
-
-#
 # Groups
 #
 define Image/Build/Group/Cellvision
@@ -327,27 +320,3 @@
 define Image/Build/Profile/BR6104KP
 	$(call Image/Build/Board/BR6104K/$(1))
 endef
-
-define Image/Build/Profile/RouterBoard
-	$(call Image/Build/Board/RB1xx/$(1))
-endef
-
-ifeq ($(PROFILE),RouterBoard)
-  define Image/cmdline/yaffs2
-	root=/dev/mtdblock3 rootfstype=yaffs2 init=/etc/preinit
-  endef
-
-  define Image/BuildKernel/RouterBoard
-	$(CP) $(KDIR)/vmlinux.elf $(call imgname,kernel,rb1xx)
-	$(STAGING_DIR_HOST)/bin/patch-cmdline $(call imgname,kernel,rb1xx) \
-		'$(strip $(call Image/cmdline/yaffs2))'
-  endef
-
-  ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
-    define Image/BuildKernel
-	$(call Image/BuildKernel/RouterBoard)
-    endef
-  endif
-
-endif
-
Index: target/linux/adm5120/image/rb1xx.mk
===================================================================
--- target/linux/adm5120/image/rb1xx.mk	(revision 0)
+++ target/linux/adm5120/image/rb1xx.mk	(revision 0)
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Image/cmdline/yaffs2
+	root=/dev/mtdblock3 rootfstype=yaffs2 init=/etc/preinit
+endef
+
+define Image/BuildKernel/RouterBoard
+	$(CP) $(KDIR)/vmlinux.elf $(call imgname,kernel,rb1xx)
+	$(STAGING_DIR_HOST)/bin/patch-cmdline $(call imgname,kernel,rb1xx) \
+		'$(strip $(call Image/cmdline/yaffs2))'
+endef
+
+ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+  define Image/BuildKernel
+	$(call Image/BuildKernel/RouterBoard)
+  endef
+endif
+
+define Image/Build/Netboot
+	$(CP) $(KDIR)/vmlinux.elf $(call imgname,netboot,$(1))
+endef
+
+#
+# Boards
+#
+define Image/Build/Board/RB11x/Initramfs
+	$(call Image/Build/Netboot,rb11x)
+endef
+
+define Image/Build/Board/RB133x/Initramfs
+	$(call Image/Build/Netboot,rb133x)
+endef
+
+define Image/Build/Board/RB150/Initramfs
+	$(call Image/Build/Netboot,rb150)
+endef
+
+define Image/Build/Board/RB153/Initramfs
+	$(call Image/Build/Netboot,rb153)
+endef
+
+#
+# Profiles
+#
+define Image/Build/Profile/Generic
+	$(call Image/Build/Board/RB11x/$(1))
+	$(call Image/Build/Board/RB133x/$(1))
+	$(call Image/Build/Board/RB150/$(1))
+	$(call Image/Build/Board/RB153/$(1))
+endef

Property changes on: target/linux/adm5120/image/rb1xx.mk
___________________________________________________________________
Name: svn:keywords
   - Id
   + Author Date Id Revision

Index: target/linux/adm5120/rb1xx/profiles/010-Generic.mk
===================================================================
--- target/linux/adm5120/rb1xx/profiles/010-Generic.mk	(revision 0)
+++ target/linux/adm5120/rb1xx/profiles/010-Generic.mk	(revision 0)
@@ -0,0 +1,17 @@
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+define Profile/Generic
+	NAME:=Generic (default)
+	PACKAGES:=
+endef
+
+define Profile/Generic/Description
+	Generic package set compatible with most boards.
+endef
+$(eval $(call Profile,Generic))
+

Property changes on: target/linux/adm5120/rb1xx/profiles/010-Generic.mk
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Index: target/linux/adm5120/rb1xx/config-2.6.23
===================================================================
--- target/linux/adm5120/rb1xx/config-2.6.23	(revision 0)
+++ target/linux/adm5120/rb1xx/config-2.6.23	(working copy)
@@ -15,7 +15,7 @@
 CONFIG_CIFS_STATS2=y
 CONFIG_CIFS_WEAK_PW_HASH=y
 CONFIG_CIFS_XATTR=y
-CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=squashfs,yaffs2,jffs2 init=/etc/preinit"
+CONFIG_CMDLINE="console=ttyS0,115200 rootfstype=yaffs2 init=/etc/preinit"
 # CONFIG_CPU_BIG_ENDIAN is not set
 CONFIG_CPU_HAS_LLSC=y
 CONFIG_CPU_HAS_PREFETCH=y
@@ -66,7 +66,7 @@
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
-CONFIG_HWMON=y
+CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
@@ -120,10 +120,10 @@
 CONFIG_MTD_BLKDEVS=y
 CONFIG_MTD_BLOCK=y
 # CONFIG_MTD_BLOCK2MTD is not set
-CONFIG_MTD_CFI=y
+# CONFIG_MTD_CFI is not set
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_CFI_AMDSTD=y
-CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC=y
+# CONFIG_MTD_CFI_FIXUP_MACRONIX_BOOTLOC is not set
 CONFIG_MTD_CFI_I1=y
 CONFIG_MTD_CFI_I2=y
 # CONFIG_MTD_CFI_I4 is not set
@@ -148,7 +148,7 @@
 CONFIG_MTD_MAP_BANK_WIDTH_4=y
 # CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
 # CONFIG_MTD_MTDRAM is not set
-CONFIG_MTD_MYLOADER_PARTS=y
+# CONFIG_MTD_MYLOADER_PARTS is not set
 CONFIG_MTD_NAND=y
 # CONFIG_MTD_NAND_ADM5120 is not set
 # CONFIG_MTD_NAND_CAFE is not set
@@ -169,18 +169,14 @@
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_REDBOOT_PARTS is not set
 # CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ROOTFS_SPLIT is not set
 # CONFIG_MTD_SLRAM is not set
-CONFIG_MTD_TRXSPLIT=y
-# CONFIG_NETDEV_1000 is not set
+# CONFIG_MTD_TRXSPLIT is not set
 # CONFIG_NETFILTER_XT_TARGET_TARPIT is not set
-CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
-CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_GRE=m
 # CONFIG_NO_IOPORT is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
@@ -194,7 +190,6 @@
 # CONFIG_PNX8550_JBS is not set
 # CONFIG_PNX8550_STB810 is not set
 # CONFIG_RTC is not set
-# CONFIG_RTL8187 is not set
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
 CONFIG_SCSI_WAIT_SCAN=m
@@ -241,26 +236,7 @@
 # CONFIG_TOSHIBA_RBTX4938 is not set
 CONFIG_TRAD_SIGNALS=y
 # CONFIG_UNUSED_SYMBOLS is not set
-# CONFIG_USBPCWATCHDOG is not set
-# CONFIG_USB_ACM is not set
-CONFIG_USB_ADM5120_HCD=m
-# CONFIG_USB_ALI_M5632 is not set
-# CONFIG_USB_AN2720 is not set
-# CONFIG_USB_CATC is not set
-CONFIG_USB_EHCI_HCD=m
-# CONFIG_USB_KAWETH is not set
-# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_GL620A is not set
-# CONFIG_USB_NET_MCS7830 is not set
-# CONFIG_USB_NET_PLUSB is not set
-# CONFIG_USB_NET_RNDIS_HOST is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_PEGASUS is not set
-# CONFIG_USB_R8A66597_HCD is not set
-# CONFIG_USB_SERIAL is not set
-# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SUPPORT is not set
 # CONFIG_USER_NS is not set
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_V4L1=y
@@ -275,5 +251,4 @@
 CONFIG_YAFFS_SHORT_NAMES_IN_RAM=y
 CONFIG_YAFFS_YAFFS1=y
 CONFIG_YAFFS_YAFFS2=y
-# CONFIG_ZD1211RW is not set
 CONFIG_ZONE_DMA_FLAG=0
Index: target/linux/adm5120/rb1xx/target.mk
===================================================================
--- target/linux/adm5120/rb1xx/target.mk	(revision 0)
+++ target/linux/adm5120/rb1xx/target.mk	(revision 0)
@@ -0,0 +1,15 @@
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ARCH:=mipsel
+SUBTARGET:=rb1xx
+BOARDNAME:=ADM5120 Boards (Mikrotik RouterBoard 1xx series)
+FEATURES:=tgz broken
+
+define Target/Description
+	Build firmware images for Mikrotik RouterBoard 1xx series.
+endef

Property changes on: target/linux/adm5120/rb1xx/target.mk
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Index: target/linux/adm5120/router_be/config-2.6.23
===================================================================
--- target/linux/adm5120/router_be/config-2.6.23	(revision 9342)
+++ target/linux/adm5120/router_be/config-2.6.23	(working copy)
@@ -66,7 +66,7 @@
 CONFIG_HAS_IOPORT=y
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
-CONFIG_HWMON=y
+CONFIG_HWMON=m
 # CONFIG_HWMON_DEBUG_CHIP is not set
 CONFIG_HW_HAS_PCI=y
 CONFIG_HW_RANDOM=y
@@ -162,14 +162,10 @@
 # CONFIG_MTD_SLRAM is not set
 CONFIG_MTD_TRXSPLIT=y
 CONFIG_NETDEV_1000=y
-CONFIG_NET_ACT_POLICE=y
 CONFIG_NET_KEY=y
 # CONFIG_NET_PCI is not set
 # CONFIG_NET_PKTGEN is not set
-CONFIG_NET_SCH_FIFO=y
 # CONFIG_NET_VENDOR_3COM is not set
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_GRE=m
 # CONFIG_NO_IOPORT is not set
 # CONFIG_PAGE_SIZE_16KB is not set
 CONFIG_PAGE_SIZE_4KB=y
Index: target/linux/adm5120/router_be/target.mk
===================================================================
--- target/linux/adm5120/router_be/target.mk	(revision 9342)
+++ target/linux/adm5120/router_be/target.mk	(working copy)
@@ -1,6 +1,14 @@
+#
+# Copyright (C) 2007 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
 ARCH:=mips
 SUBTARGET:=router_be
 BOARDNAME:=ADM5120 Boards (Big Endian)
+FEATURES:=squashfs jffs2 broken
 
 define Target/Description
 	Build firmware images for Infineon/ADMTek ADM5120 based boards running in big-endian mode
Index: target/linux/adm5120/Makefile
===================================================================
--- target/linux/adm5120/Makefile	(revision 9342)
+++ target/linux/adm5120/Makefile	(working copy)
@@ -9,12 +9,12 @@
 
 BOARD:=adm5120
 LINUX_VERSION:=2.6.23
-FEATURES:=squashfs jffs2 tgz broken
 
 include $(INCLUDE_DIR)/target.mk
 
 DEFAULT_PACKAGES += admswconfig
 
+$(eval $(call Target,rb1xx))
 $(eval $(call Target,router_be))
 $(eval $(call Target,router_le))
 $(eval $(call BuildTarget))
Index: target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch
===================================================================
--- target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch	(revision 0)
+++ target/linux/adm5120/patches-2.6.23/202-pci_disable_common_quirks.patch	(revision 0)
@@ -0,0 +1,50 @@
+Index: linux-2.6.23/drivers/pci/Kconfig
+==================================================================
+--- linux-2.6.23.orig/drivers/pci/Kconfig	2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/drivers/pci/Kconfig	2007-10-13 14:21:03.000000000 +0200
+@@ -31,6 +31,12 @@
+ 
+ 	  When in doubt, say N.
+ 
++config PCI_DISABLE_COMMON_QUIRKS
++	bool "PCI disable common quirks"
++	depends on PCI
++	help
++	  If you don't know what to do here, say Y.
++
+ config HT_IRQ
+ 	bool "Interrupts on hypertransport devices"
+ 	default y
+Index: linux-2.6.23/drivers/pci/quirks.c
+==================================================================
+--- linux-2.6.23.orig/drivers/pci/quirks.c	2007-10-09 22:31:38.000000000 +0200
++++ linux-2.6.23/drivers/pci/quirks.c	2007-10-13 14:46:41.000000000 +0200
+@@ -23,6 +23,7 @@
+ #include <linux/acpi.h>
+ #include "pci.h"
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* The Mellanox Tavor device gives false positive parity errors
+  * Mark this device with a broken_parity_status, to allow
+  * PCI scanning code to "skip" this now blacklisted device.
+@@ -1510,6 +1511,7 @@
+ 	}
+ }
+ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */
+ 
+ static void pci_do_fixups(struct pci_dev *dev, struct pci_fixup *f, struct pci_fixup *end)
+ {
+@@ -1573,6 +1575,7 @@
+ }
+ EXPORT_SYMBOL(pci_fixup_device);
+ 
++#ifndef CONFIG_PCI_DISABLE_COMMON_QUIRKS
+ /* Enable 1k I/O space granularity on the Intel P64H2 */
+ static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
+ {
+@@ -1743,3 +1746,4 @@
+ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE,
+ 			quirk_nvidia_ck804_msi_ht_cap);
+ #endif /* CONFIG_PCI_MSI */
++#endif /* !CONFIG_PCI_DISABLE_COMMON_QUIRKS */