mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-05 21:54:37 +03:00
ar71xx: remove support for 2.6.36
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25716 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
0c62a2add1
commit
9a4c96e6e9
@ -1,173 +0,0 @@
|
|||||||
CONFIG_AG71XX=y
|
|
||||||
CONFIG_AG71XX_AR8216_SUPPORT=y
|
|
||||||
# CONFIG_AG71XX_DEBUG is not set
|
|
||||||
# CONFIG_AG71XX_DEBUG_FS is not set
|
|
||||||
CONFIG_AR71XX_DEV_AP91_PCI=y
|
|
||||||
CONFIG_AR71XX_DEV_AP94_PCI=y
|
|
||||||
CONFIG_AR71XX_DEV_AR913X_WMAC=y
|
|
||||||
CONFIG_AR71XX_DEV_DSA=y
|
|
||||||
CONFIG_AR71XX_DEV_GPIO_BUTTONS=y
|
|
||||||
CONFIG_AR71XX_DEV_LEDS_GPIO=y
|
|
||||||
CONFIG_AR71XX_DEV_M25P80=y
|
|
||||||
CONFIG_AR71XX_DEV_PB42_PCI=y
|
|
||||||
CONFIG_AR71XX_DEV_PB9X_PCI=y
|
|
||||||
CONFIG_AR71XX_DEV_USB=y
|
|
||||||
CONFIG_AR71XX_MACH_AP81=y
|
|
||||||
CONFIG_AR71XX_MACH_AP83=y
|
|
||||||
CONFIG_AR71XX_MACH_AP96=y
|
|
||||||
CONFIG_AR71XX_MACH_AW_NR580=y
|
|
||||||
CONFIG_AR71XX_MACH_DIR_600_A1=y
|
|
||||||
CONFIG_AR71XX_MACH_DIR_615_C1=y
|
|
||||||
CONFIG_AR71XX_MACH_DIR_825_B1=y
|
|
||||||
CONFIG_AR71XX_MACH_EAP7660D=y
|
|
||||||
CONFIG_AR71XX_MACH_JA76PF=y
|
|
||||||
CONFIG_AR71XX_MACH_JWAP003=y
|
|
||||||
CONFIG_AR71XX_MACH_MZK_W04NU=y
|
|
||||||
CONFIG_AR71XX_MACH_MZK_W300NH=y
|
|
||||||
CONFIG_AR71XX_MACH_NBG460N=y
|
|
||||||
CONFIG_AR71XX_MACH_PB42=y
|
|
||||||
CONFIG_AR71XX_MACH_PB44=y
|
|
||||||
CONFIG_AR71XX_MACH_PB92=y
|
|
||||||
CONFIG_AR71XX_MACH_RB4XX=y
|
|
||||||
CONFIG_AR71XX_MACH_RB750=y
|
|
||||||
CONFIG_AR71XX_MACH_TEW_632BRP=y
|
|
||||||
CONFIG_AR71XX_MACH_TL_MR3X20=y
|
|
||||||
CONFIG_AR71XX_MACH_TL_WA901ND=y
|
|
||||||
CONFIG_AR71XX_MACH_TL_WR1043ND=y
|
|
||||||
CONFIG_AR71XX_MACH_TL_WR741ND=y
|
|
||||||
CONFIG_AR71XX_MACH_TL_WR841N_V1=y
|
|
||||||
CONFIG_AR71XX_MACH_TL_WR941ND=y
|
|
||||||
CONFIG_AR71XX_MACH_UBNT=y
|
|
||||||
CONFIG_AR71XX_MACH_WNDR3700=y
|
|
||||||
CONFIG_AR71XX_MACH_WNR2000=y
|
|
||||||
CONFIG_AR71XX_MACH_WP543=y
|
|
||||||
CONFIG_AR71XX_MACH_WRT160NL=y
|
|
||||||
CONFIG_AR71XX_MACH_WRT400N=y
|
|
||||||
CONFIG_AR71XX_MACH_WZR_HP_G300NH=y
|
|
||||||
CONFIG_AR71XX_MACH_ZCN_1523H=y
|
|
||||||
CONFIG_AR71XX_NVRAM=y
|
|
||||||
CONFIG_AR71XX_PCI_ATH9K_FIXUP=y
|
|
||||||
CONFIG_AR71XX_WDT=y
|
|
||||||
CONFIG_AR8216_PHY=y
|
|
||||||
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
|
|
||||||
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
|
|
||||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y
|
|
||||||
# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
|
|
||||||
CONFIG_ARCH_POPULATES_NODE_MAP=y
|
|
||||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y
|
|
||||||
# CONFIG_ARCH_SUPPORTS_MSI is not set
|
|
||||||
CONFIG_ARCH_SUPPORTS_OPROFILE=y
|
|
||||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
|
||||||
CONFIG_ATHEROS_AR71XX=y
|
|
||||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
|
|
||||||
CONFIG_CEVT_R4K=y
|
|
||||||
CONFIG_CEVT_R4K_LIB=y
|
|
||||||
CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd console=ttyS0,115200"
|
|
||||||
CONFIG_CMDLINE_BOOL=y
|
|
||||||
# CONFIG_CMDLINE_OVERRIDE is not set
|
|
||||||
CONFIG_CPU_BIG_ENDIAN=y
|
|
||||||
CONFIG_CPU_HAS_PREFETCH=y
|
|
||||||
CONFIG_CPU_HAS_SYNC=y
|
|
||||||
CONFIG_CPU_MIPS32=y
|
|
||||||
# CONFIG_CPU_MIPS32_R1 is not set
|
|
||||||
CONFIG_CPU_MIPS32_R2=y
|
|
||||||
CONFIG_CPU_MIPSR2=y
|
|
||||||
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
|
|
||||||
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
|
||||||
CONFIG_CSRC_R4K=y
|
|
||||||
CONFIG_CSRC_R4K_LIB=y
|
|
||||||
CONFIG_DECOMPRESS_LZMA=y
|
|
||||||
CONFIG_DMA_NONCOHERENT=y
|
|
||||||
CONFIG_EARLY_PRINTK=y
|
|
||||||
# CONFIG_FSNOTIFY is not set
|
|
||||||
CONFIG_GENERIC_ATOMIC64=y
|
|
||||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
|
||||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
|
||||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
|
||||||
CONFIG_GENERIC_FIND_LAST_BIT=y
|
|
||||||
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
|
||||||
CONFIG_GENERIC_GPIO=y
|
|
||||||
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
|
|
||||||
CONFIG_GPIOLIB=y
|
|
||||||
CONFIG_GPIO_NXP_74HC153=y
|
|
||||||
CONFIG_GPIO_PCF857X=y
|
|
||||||
CONFIG_GPIO_SYSFS=y
|
|
||||||
CONFIG_HARDWARE_WATCHPOINTS=y
|
|
||||||
CONFIG_HAS_DMA=y
|
|
||||||
CONFIG_HAS_IOMEM=y
|
|
||||||
CONFIG_HAS_IOPORT=y
|
|
||||||
CONFIG_HAVE_ARCH_KGDB=y
|
|
||||||
CONFIG_HAVE_DYNAMIC_FTRACE=y
|
|
||||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
|
|
||||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
|
|
||||||
CONFIG_HAVE_FUNCTION_TRACER=y
|
|
||||||
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
|
|
||||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
|
|
||||||
CONFIG_HAVE_IDE=y
|
|
||||||
CONFIG_HAVE_OPROFILE=y
|
|
||||||
CONFIG_HW_HAS_PCI=y
|
|
||||||
CONFIG_I2C=y
|
|
||||||
CONFIG_I2C_ALGOBIT=y
|
|
||||||
CONFIG_I2C_BOARDINFO=y
|
|
||||||
CONFIG_I2C_GPIO=y
|
|
||||||
CONFIG_IMAGE_CMDLINE_HACK=y
|
|
||||||
CONFIG_INITRAMFS_ROOT_GID=0
|
|
||||||
CONFIG_INITRAMFS_ROOT_UID=0
|
|
||||||
CONFIG_INITRAMFS_SOURCE="../../root"
|
|
||||||
CONFIG_IRQ_CPU=y
|
|
||||||
# CONFIG_LEDS_GPIO is not set
|
|
||||||
# CONFIG_LEDS_RB750 is not set
|
|
||||||
# CONFIG_LEDS_WNDR3700_USB is not set
|
|
||||||
CONFIG_LOONGSON_UART_BASE=y
|
|
||||||
# CONFIG_M25PXX_USE_FAST_READ is not set
|
|
||||||
CONFIG_MARVELL_PHY=y
|
|
||||||
CONFIG_MICREL_PHY=y
|
|
||||||
CONFIG_MIPS=y
|
|
||||||
CONFIG_MIPS_L1_CACHE_SHIFT=5
|
|
||||||
CONFIG_MIPS_MACHINE=y
|
|
||||||
CONFIG_MIPS_MT_DISABLED=y
|
|
||||||
CONFIG_MTD_AR91XX_FLASH=y
|
|
||||||
# CONFIG_MTD_CFI_INTELEXT is not set
|
|
||||||
CONFIG_MTD_CMDLINE_PARTS=y
|
|
||||||
CONFIG_MTD_JEDECPROBE=y
|
|
||||||
CONFIG_MTD_M25P80=y
|
|
||||||
CONFIG_MTD_MYLOADER_PARTS=y
|
|
||||||
CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-2
|
|
||||||
CONFIG_MTD_REDBOOT_PARTS=y
|
|
||||||
CONFIG_MTD_WRT160NL_PARTS=y
|
|
||||||
CONFIG_MYLOADER=y
|
|
||||||
CONFIG_NEED_DMA_MAP_STATE=y
|
|
||||||
CONFIG_NET_DSA=y
|
|
||||||
CONFIG_NET_DSA_MV88E6060=y
|
|
||||||
CONFIG_NET_DSA_MV88E6063=y
|
|
||||||
CONFIG_NET_DSA_TAG_TRAILER=y
|
|
||||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
|
||||||
CONFIG_PCI=y
|
|
||||||
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y
|
|
||||||
CONFIG_PCI_DOMAINS=y
|
|
||||||
CONFIG_PHYLIB=y
|
|
||||||
CONFIG_RTL8306_PHY=y
|
|
||||||
CONFIG_RTL8366RB_PHY=y
|
|
||||||
CONFIG_RTL8366S_PHY=y
|
|
||||||
CONFIG_RTL8366_SMI=y
|
|
||||||
# CONFIG_SCSI_DMA is not set
|
|
||||||
CONFIG_SERIAL_8250_NR_UARTS=1
|
|
||||||
CONFIG_SERIAL_8250_RUNTIME_UARTS=1
|
|
||||||
# CONFIG_SLAB is not set
|
|
||||||
CONFIG_SLUB=y
|
|
||||||
CONFIG_SPI=y
|
|
||||||
CONFIG_SPI_AP83=y
|
|
||||||
CONFIG_SPI_AR71XX=y
|
|
||||||
CONFIG_SPI_BITBANG=y
|
|
||||||
CONFIG_SPI_GPIO=y
|
|
||||||
CONFIG_SPI_MASTER=y
|
|
||||||
CONFIG_SPI_PB44=y
|
|
||||||
CONFIG_SWCONFIG=y
|
|
||||||
CONFIG_SYS_HAS_CPU_MIPS32_R1=y
|
|
||||||
CONFIG_SYS_HAS_CPU_MIPS32_R2=y
|
|
||||||
CONFIG_SYS_HAS_EARLY_PRINTK=y
|
|
||||||
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
|
|
||||||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
|
|
||||||
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
|
||||||
CONFIG_USB_SUPPORT=y
|
|
||||||
CONFIG_ZONE_DMA_FLAG=0
|
|
@ -1,50 +0,0 @@
|
|||||||
--- a/arch/mips/Makefile
|
|
||||||
+++ b/arch/mips/Makefile
|
|
||||||
@@ -162,6 +162,13 @@ ifeq (,$(findstring march=octeon, $(cfla
|
|
||||||
cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon
|
|
||||||
endif
|
|
||||||
|
|
||||||
+#
|
|
||||||
+# Atheros AR71xx
|
|
||||||
+#
|
|
||||||
+core-$(CONFIG_ATHEROS_AR71XX) += arch/mips/ar71xx/
|
|
||||||
+cflags-$(CONFIG_ATHEROS_AR71XX) += -I$(srctree)/arch/mips/include/asm/mach-ar71xx
|
|
||||||
+load-$(CONFIG_ATHEROS_AR71XX) += 0xffffffff80060000
|
|
||||||
+
|
|
||||||
cflags-$(CONFIG_CPU_R4000_WORKAROUNDS) += $(call cc-option,-mfix-r4000,)
|
|
||||||
cflags-$(CONFIG_CPU_R4400_WORKAROUNDS) += $(call cc-option,-mfix-r4400,)
|
|
||||||
cflags-$(CONFIG_CPU_DADDI_WORKAROUNDS) += $(call cc-option,-mno-daddi,)
|
|
||||||
--- a/arch/mips/Kconfig
|
|
||||||
+++ b/arch/mips/Kconfig
|
|
||||||
@@ -60,6 +60,23 @@ config AR7
|
|
||||||
Support for the Texas Instruments AR7 System-on-a-Chip
|
|
||||||
family: TNETD7100, 7200 and 7300.
|
|
||||||
|
|
||||||
+config ATHEROS_AR71XX
|
|
||||||
+ bool "Atheros AR71xx based boards"
|
|
||||||
+ select CEVT_R4K
|
|
||||||
+ select CSRC_R4K
|
|
||||||
+ select DMA_NONCOHERENT
|
|
||||||
+ select HW_HAS_PCI
|
|
||||||
+ select IRQ_CPU
|
|
||||||
+ select ARCH_REQUIRE_GPIOLIB
|
|
||||||
+ select SYS_HAS_CPU_MIPS32_R1
|
|
||||||
+ select SYS_HAS_CPU_MIPS32_R2
|
|
||||||
+ select SYS_SUPPORTS_32BIT_KERNEL
|
|
||||||
+ select SYS_SUPPORTS_BIG_ENDIAN
|
|
||||||
+ select SYS_HAS_EARLY_PRINTK
|
|
||||||
+ select MIPS_MACHINE
|
|
||||||
+ help
|
|
||||||
+ Support for Atheros AR71xx based boards.
|
|
||||||
+
|
|
||||||
config BCM47XX
|
|
||||||
bool "Broadcom BCM47XX based boards"
|
|
||||||
select CEVT_R4K
|
|
||||||
@@ -709,6 +726,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
|
|
||||||
endchoice
|
|
||||||
|
|
||||||
source "arch/mips/alchemy/Kconfig"
|
|
||||||
+source "arch/mips/ar71xx/Kconfig"
|
|
||||||
source "arch/mips/bcm63xx/Kconfig"
|
|
||||||
source "arch/mips/jazz/Kconfig"
|
|
||||||
source "arch/mips/jz4740/Kconfig"
|
|
@ -1,10 +0,0 @@
|
|||||||
--- a/arch/mips/pci/Makefile
|
|
||||||
+++ b/arch/mips/pci/Makefile
|
|
||||||
@@ -18,6 +18,7 @@ obj-$(CONFIG_PCI_TX4927) += ops-tx4927.o
|
|
||||||
obj-$(CONFIG_BCM47XX) += pci-bcm47xx.o
|
|
||||||
obj-$(CONFIG_BCM63XX) += pci-bcm63xx.o fixup-bcm63xx.o \
|
|
||||||
ops-bcm63xx.o
|
|
||||||
+obj-$(CONFIG_ATHEROS_AR71XX) += pci-ar71xx.o pci-ar724x.o
|
|
||||||
|
|
||||||
#
|
|
||||||
# These are still pretty much in the old state, watch, go blind.
|
|
@ -1,58 +0,0 @@
|
|||||||
--- a/drivers/usb/host/Kconfig
|
|
||||||
+++ b/drivers/usb/host/Kconfig
|
|
||||||
@@ -112,6 +112,13 @@ config XPS_USB_HCD_XILINX
|
|
||||||
support both high speed and full speed devices, or high speed
|
|
||||||
devices only.
|
|
||||||
|
|
||||||
+config USB_EHCI_AR71XX
|
|
||||||
+ bool "USB EHCI support for AR71xx"
|
|
||||||
+ depends on USB_EHCI_HCD && ATHEROS_AR71XX
|
|
||||||
+ default y
|
|
||||||
+ help
|
|
||||||
+ Support for Atheros AR71xx built-in EHCI controller
|
|
||||||
+
|
|
||||||
config USB_EHCI_FSL
|
|
||||||
bool "Support for Freescale on-chip EHCI USB controller"
|
|
||||||
depends on USB_EHCI_HCD && FSL_SOC
|
|
||||||
@@ -225,6 +232,13 @@ config USB_OHCI_HCD_OMAP3
|
|
||||||
Enables support for the on-chip OHCI controller on
|
|
||||||
OMAP3 and later chips.
|
|
||||||
|
|
||||||
+config USB_OHCI_AR71XX
|
|
||||||
+ bool "USB OHCI support for Atheros AR71xx"
|
|
||||||
+ depends on USB_OHCI_HCD && ATHEROS_AR71XX
|
|
||||||
+ default y
|
|
||||||
+ help
|
|
||||||
+ Support for Atheros AR71xx built-in OHCI controller
|
|
||||||
+
|
|
||||||
config USB_OHCI_HCD_PPC_SOC
|
|
||||||
bool "OHCI support for on-chip PPC USB controller"
|
|
||||||
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
|
|
||||||
--- a/drivers/usb/host/ehci-hcd.c
|
|
||||||
+++ b/drivers/usb/host/ehci-hcd.c
|
|
||||||
@@ -1210,6 +1210,11 @@ MODULE_LICENSE ("GPL");
|
|
||||||
#define PLATFORM_DRIVER ehci_atmel_driver
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifdef CONFIG_USB_EHCI_AR71XX
|
|
||||||
+#include "ehci-ar71xx.c"
|
|
||||||
+#define PLATFORM_DRIVER ehci_ar71xx_driver
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if !defined(PCI_DRIVER) && !defined(PLATFORM_DRIVER) && \
|
|
||||||
!defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) && \
|
|
||||||
!defined(XILINX_OF_PLATFORM_DRIVER)
|
|
||||||
--- a/drivers/usb/host/ohci-hcd.c
|
|
||||||
+++ b/drivers/usb/host/ohci-hcd.c
|
|
||||||
@@ -1100,6 +1100,11 @@ MODULE_LICENSE ("GPL");
|
|
||||||
#define PLATFORM_DRIVER ohci_hcd_jz4740_driver
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifdef CONFIG_USB_OHCI_AR71XX
|
|
||||||
+#include "ohci-ar71xx.c"
|
|
||||||
+#define PLATFORM_DRIVER ohci_hcd_ar71xx_driver
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
#if !defined(PCI_DRIVER) && \
|
|
||||||
!defined(PLATFORM_DRIVER) && \
|
|
||||||
!defined(OMAP1_PLATFORM_DRIVER) && \
|
|
@ -1,26 +0,0 @@
|
|||||||
--- a/drivers/spi/Kconfig
|
|
||||||
+++ b/drivers/spi/Kconfig
|
|
||||||
@@ -53,6 +53,13 @@ if SPI_MASTER
|
|
||||||
|
|
||||||
comment "SPI Master Controller Drivers"
|
|
||||||
|
|
||||||
+config SPI_AR71XX
|
|
||||||
+ tristate "Atheros AR71xx SPI Controller"
|
|
||||||
+ depends on SPI_MASTER && ATHEROS_AR71XX
|
|
||||||
+ select SPI_BITBANG
|
|
||||||
+ help
|
|
||||||
+ This is the SPI contoller driver for Atheros AR71xx.
|
|
||||||
+
|
|
||||||
config SPI_ATMEL
|
|
||||||
tristate "Atmel SPI Controller"
|
|
||||||
depends on (ARCH_AT91 || AVR32)
|
|
||||||
--- a/drivers/spi/Makefile
|
|
||||||
+++ b/drivers/spi/Makefile
|
|
||||||
@@ -11,6 +11,7 @@ endif
|
|
||||||
obj-$(CONFIG_SPI_MASTER) += spi.o
|
|
||||||
|
|
||||||
# SPI master controller drivers (bus)
|
|
||||||
+obj-$(CONFIG_SPI_AR71XX) += ar71xx_spi.o
|
|
||||||
obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
|
|
||||||
obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
|
|
||||||
obj-$(CONFIG_SPI_BITBANG) += spi_bitbang.o
|
|
@ -1,21 +0,0 @@
|
|||||||
--- a/drivers/net/Kconfig
|
|
||||||
+++ b/drivers/net/Kconfig
|
|
||||||
@@ -2045,6 +2045,8 @@ config ACENIC_OMIT_TIGON_I
|
|
||||||
|
|
||||||
The safe and default value for this is N.
|
|
||||||
|
|
||||||
+source drivers/net/ag71xx/Kconfig
|
|
||||||
+
|
|
||||||
config DL2K
|
|
||||||
tristate "DL2000/TC902x-based Gigabit Ethernet support"
|
|
||||||
depends on PCI
|
|
||||||
--- a/drivers/net/Makefile
|
|
||||||
+++ b/drivers/net/Makefile
|
|
||||||
@@ -109,6 +109,7 @@ obj-$(CONFIG_STMMAC_ETH) += stmmac/
|
|
||||||
# end link order section
|
|
||||||
#
|
|
||||||
|
|
||||||
+obj-$(CONFIG_AG71XX) += ag71xx/
|
|
||||||
obj-$(CONFIG_SUNDANCE) += sundance.o
|
|
||||||
obj-$(CONFIG_HAMACHI) += hamachi.o
|
|
||||||
obj-$(CONFIG_NET) += Space.o loopback.o
|
|
@ -1,26 +0,0 @@
|
|||||||
--- a/drivers/watchdog/Kconfig
|
|
||||||
+++ b/drivers/watchdog/Kconfig
|
|
||||||
@@ -916,6 +916,13 @@ config OCTEON_WDT
|
|
||||||
from the first interrupt, it is then only poked when the
|
|
||||||
device is written.
|
|
||||||
|
|
||||||
+config AR71XX_WDT
|
|
||||||
+ tristate "Atheros AR71xx Watchdog Timer"
|
|
||||||
+ depends on ATHEROS_AR71XX
|
|
||||||
+ help
|
|
||||||
+ Hardware driver for the built-in watchdog timer on the Atheros
|
|
||||||
+ AR71xx SoCs.
|
|
||||||
+
|
|
||||||
# PARISC Architecture
|
|
||||||
|
|
||||||
# POWERPC Architecture
|
|
||||||
--- a/drivers/watchdog/Makefile
|
|
||||||
+++ b/drivers/watchdog/Makefile
|
|
||||||
@@ -114,6 +114,7 @@ obj-$(CONFIG_INDYDOG) += indydog.o
|
|
||||||
obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o
|
|
||||||
obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o
|
|
||||||
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
|
|
||||||
+obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o
|
|
||||||
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
|
|
||||||
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
|
|
||||||
obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o
|
|
@ -1,26 +0,0 @@
|
|||||||
--- a/drivers/mtd/maps/Kconfig
|
|
||||||
+++ b/drivers/mtd/maps/Kconfig
|
|
||||||
@@ -251,6 +251,13 @@ config MTD_NETtel
|
|
||||||
help
|
|
||||||
Support for flash chips on NETtel/SecureEdge/SnapGear boards.
|
|
||||||
|
|
||||||
+config MTD_AR91XX_FLASH
|
|
||||||
+ tristate "Atheros AR91xx parallel flash support"
|
|
||||||
+ depends on ATHEROS_AR71XX
|
|
||||||
+ select MTD_COMPLEX_MAPPINGS
|
|
||||||
+ help
|
|
||||||
+ Parallel flash driver for the Atheros AR91xx based boards.
|
|
||||||
+
|
|
||||||
config MTD_DILNETPC
|
|
||||||
tristate "CFI Flash device mapped on DIL/Net PC"
|
|
||||||
depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
|
|
||||||
--- a/drivers/mtd/maps/Makefile
|
|
||||||
+++ b/drivers/mtd/maps/Makefile
|
|
||||||
@@ -40,6 +40,7 @@ obj-$(CONFIG_MTD_SCx200_DOCFLASH)+= scx2
|
|
||||||
obj-$(CONFIG_MTD_DBOX2) += dbox2-flash.o
|
|
||||||
obj-$(CONFIG_MTD_SOLUTIONENGINE)+= solutionengine.o
|
|
||||||
obj-$(CONFIG_MTD_PCI) += pci.o
|
|
||||||
+obj-$(CONFIG_MTD_AR91XX_FLASH) += ar91xx_flash.o
|
|
||||||
obj-$(CONFIG_MTD_AUTCPU12) += autcpu12-nvram.o
|
|
||||||
obj-$(CONFIG_MTD_EDB7312) += edb7312.o
|
|
||||||
obj-$(CONFIG_MTD_IMPA7) += impa7.o
|
|
@ -1,24 +0,0 @@
|
|||||||
--- a/drivers/net/phy/Kconfig
|
|
||||||
+++ b/drivers/net/phy/Kconfig
|
|
||||||
@@ -119,6 +119,11 @@ config RTL8306_PHY
|
|
||||||
tristate "Driver for Realtek RTL8306S switches"
|
|
||||||
select SWCONFIG
|
|
||||||
|
|
||||||
+config MICREL_PHY
|
|
||||||
+ tristate "Drivers for Micrel/Kendin PHYs"
|
|
||||||
+ ---help---
|
|
||||||
+ Currently has a driver for the KSZ8041
|
|
||||||
+
|
|
||||||
config FIXED_PHY
|
|
||||||
bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
|
|
||||||
depends on PHYLIB=y
|
|
||||||
--- a/drivers/net/phy/Makefile
|
|
||||||
+++ b/drivers/net/phy/Makefile
|
|
||||||
@@ -24,6 +24,7 @@ obj-$(CONFIG_RTL8366_SMI) += rtl8366_smi
|
|
||||||
obj-$(CONFIG_RTL8366S_PHY) += rtl8366s.o
|
|
||||||
obj-$(CONFIG_RTL8366RB_PHY) += rtl8366rb.o
|
|
||||||
obj-$(CONFIG_LSI_ET1011C_PHY) += et1011c.o
|
|
||||||
+obj-$(CONFIG_MICREL_PHY) += micrel.o
|
|
||||||
obj-$(CONFIG_FIXED_PHY) += fixed.o
|
|
||||||
obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
|
|
||||||
obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o
|
|
@ -1,19 +0,0 @@
|
|||||||
--- a/drivers/mtd/devices/m25p80.c
|
|
||||||
+++ b/drivers/mtd/devices/m25p80.c
|
|
||||||
@@ -929,6 +929,16 @@ static int __devinit m25p_probe(struct s
|
|
||||||
part_probes, &parts, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
+#ifdef CONFIG_MTD_MYLOADER_PARTS
|
|
||||||
+ if (nr_parts <= 0) {
|
|
||||||
+ static const char *part_probes[]
|
|
||||||
+ = { "MyLoader", NULL, };
|
|
||||||
+
|
|
||||||
+ nr_parts = parse_mtd_partitions(&flash->mtd,
|
|
||||||
+ part_probes, &parts, 0);
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
if (nr_parts <= 0 && data && data->parts) {
|
|
||||||
parts = data->parts;
|
|
||||||
nr_parts = data->nr_parts;
|
|
@ -1,18 +0,0 @@
|
|||||||
--- a/drivers/mtd/devices/m25p80.c
|
|
||||||
+++ b/drivers/mtd/devices/m25p80.c
|
|
||||||
@@ -939,6 +939,15 @@ static int __devinit m25p_probe(struct s
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#ifdef CONFIG_MTD_REDBOOT_PARTS
|
|
||||||
+ if (nr_parts <= 0) {
|
|
||||||
+ static const char *part_probes[]
|
|
||||||
+ = { "RedBoot", NULL, };
|
|
||||||
+
|
|
||||||
+ nr_parts = parse_mtd_partitions(&flash->mtd,
|
|
||||||
+ part_probes, &parts, 0);
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
if (nr_parts <= 0 && data && data->parts) {
|
|
||||||
parts = data->parts;
|
|
||||||
nr_parts = data->nr_parts;
|
|
@ -1,29 +0,0 @@
|
|||||||
--- a/drivers/mtd/chips/jedec_probe.c
|
|
||||||
+++ b/drivers/mtd/chips/jedec_probe.c
|
|
||||||
@@ -149,6 +149,7 @@
|
|
||||||
#define SST39LF160 0x2782
|
|
||||||
#define SST39VF1601 0x234b
|
|
||||||
#define SST39VF3201 0x235b
|
|
||||||
+#define SST39VF6401B 0x236d
|
|
||||||
#define SST39WF1601 0x274b
|
|
||||||
#define SST39WF1602 0x274a
|
|
||||||
#define SST39LF512 0x00D4
|
|
||||||
@@ -1582,6 +1583,18 @@ static const struct amd_flash_info jedec
|
|
||||||
ERASEINFO(0x10000,64),
|
|
||||||
}
|
|
||||||
}, {
|
|
||||||
+ .mfr_id = CFI_MFR_SST,
|
|
||||||
+ .dev_id = SST39VF6401B,
|
|
||||||
+ .name = "SST 39VF6401B",
|
|
||||||
+ .devtypes = CFI_DEVICETYPE_X16,
|
|
||||||
+ .uaddr = MTD_UADDR_0xAAAA_0x5555,
|
|
||||||
+ .dev_size = SIZE_8MiB,
|
|
||||||
+ .cmd_set = P_ID_AMD_STD,
|
|
||||||
+ .nr_regions = 1,
|
|
||||||
+ .regions = {
|
|
||||||
+ ERASEINFO(0x10000,128)
|
|
||||||
+ }
|
|
||||||
+ }, {
|
|
||||||
.mfr_id = CFI_MFR_ST,
|
|
||||||
.dev_id = M29F800AB,
|
|
||||||
.name = "ST M29F800AB",
|
|
@ -1,69 +0,0 @@
|
|||||||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
||||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
||||||
@@ -1215,8 +1215,8 @@ static int __xipram do_write_oneword(str
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (chip_ready(map, adr))
|
|
||||||
- break;
|
|
||||||
+ if (chip_good(map, adr, datum))
|
|
||||||
+ goto enable_xip;
|
|
||||||
|
|
||||||
/* Latency issues. Drop the lock, wait a while and retry */
|
|
||||||
UDELAY(map, chip, adr, 1);
|
|
||||||
@@ -1232,6 +1232,8 @@ static int __xipram do_write_oneword(str
|
|
||||||
|
|
||||||
ret = -EIO;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ enable_xip:
|
|
||||||
xip_enable(map, chip, adr);
|
|
||||||
op_done:
|
|
||||||
chip->state = FL_READY;
|
|
||||||
@@ -1578,7 +1580,6 @@ static int cfi_amdstd_write_buffers(stru
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
-
|
|
||||||
/*
|
|
||||||
* Handle devices with one erase region, that only implement
|
|
||||||
* the chip erase command.
|
|
||||||
@@ -1642,8 +1643,8 @@ static int __xipram do_erase_chip(struct
|
|
||||||
chip->erase_suspended = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (chip_ready(map, adr))
|
|
||||||
- break;
|
|
||||||
+ if (chip_good(map, adr, map_word_ff(map)))
|
|
||||||
+ goto op_done;
|
|
||||||
|
|
||||||
if (time_after(jiffies, timeo)) {
|
|
||||||
printk(KERN_WARNING "MTD %s(): software timeout\n",
|
|
||||||
@@ -1663,6 +1664,7 @@ static int __xipram do_erase_chip(struct
|
|
||||||
ret = -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ op_done:
|
|
||||||
chip->state = FL_READY;
|
|
||||||
xip_enable(map, chip, adr);
|
|
||||||
put_chip(map, chip, adr);
|
|
||||||
@@ -1730,9 +1732,9 @@ static int __xipram do_erase_oneblock(st
|
|
||||||
chip->erase_suspended = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
- if (chip_ready(map, adr)) {
|
|
||||||
+ if (chip_good(map, adr, map_word_ff(map))) {
|
|
||||||
xip_enable(map, chip, adr);
|
|
||||||
- break;
|
|
||||||
+ goto op_done;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (time_after(jiffies, timeo)) {
|
|
||||||
@@ -1754,6 +1756,7 @@ static int __xipram do_erase_oneblock(st
|
|
||||||
ret = -EIO;
|
|
||||||
}
|
|
||||||
|
|
||||||
+ op_done:
|
|
||||||
chip->state = FL_READY;
|
|
||||||
put_chip(map, chip, adr);
|
|
||||||
mutex_unlock(&chip->mutex);
|
|
@ -1,44 +0,0 @@
|
|||||||
--- a/drivers/mtd/devices/m25p80.c
|
|
||||||
+++ b/drivers/mtd/devices/m25p80.c
|
|
||||||
@@ -948,6 +948,16 @@ static int __devinit m25p_probe(struct s
|
|
||||||
part_probes, &parts, 0);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
+
|
|
||||||
+#ifdef CONFIG_MTD_WRT160NL_PARTS
|
|
||||||
+ if (nr_parts <= 0) {
|
|
||||||
+ static const char *part_probes[]
|
|
||||||
+ = { "wrt160nl", NULL, };
|
|
||||||
+
|
|
||||||
+ nr_parts = parse_mtd_partitions(&flash->mtd,
|
|
||||||
+ part_probes, &parts, 0);
|
|
||||||
+ }
|
|
||||||
+#endif
|
|
||||||
if (nr_parts <= 0 && data && data->parts) {
|
|
||||||
parts = data->parts;
|
|
||||||
nr_parts = data->nr_parts;
|
|
||||||
--- a/drivers/mtd/Kconfig
|
|
||||||
+++ b/drivers/mtd/Kconfig
|
|
||||||
@@ -181,6 +181,12 @@ config MTD_AR7_PARTS
|
|
||||||
---help---
|
|
||||||
TI AR7 partitioning support
|
|
||||||
|
|
||||||
+config MTD_WRT160NL_PARTS
|
|
||||||
+ tristate "Linksys WRT160NL partitioning support"
|
|
||||||
+ depends on MTD_PARTITIONS && AR71XX_MACH_WRT160NL
|
|
||||||
+ ---help---
|
|
||||||
+ Linksys WRT160NL partitioning support
|
|
||||||
+
|
|
||||||
config MTD_MYLOADER_PARTS
|
|
||||||
tristate "MyLoader partition parsing"
|
|
||||||
depends on MTD_PARTITIONS && (ADM5120 || ATHEROS_AR231X || ATHEROS_AR71XX)
|
|
||||||
--- a/drivers/mtd/Makefile
|
|
||||||
+++ b/drivers/mtd/Makefile
|
|
||||||
@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
|
|
||||||
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
|
|
||||||
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
|
|
||||||
obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
|
|
||||||
+obj-$(CONFIG_MTD_WRT160NL_PARTS) += wrt160nl_part.o
|
|
||||||
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
|
|
||||||
obj-$(CONFIG_MTD_MYLOADER_PARTS) += myloader.o
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
|||||||
--- a/drivers/usb/host/ehci-q.c
|
|
||||||
+++ b/drivers/usb/host/ehci-q.c
|
|
||||||
@@ -1193,6 +1193,9 @@ static void end_unlink_async (struct ehc
|
|
||||||
ehci->reclaim = NULL;
|
|
||||||
start_unlink_async (ehci, next);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ if (ehci->has_synopsys_hc_bug)
|
|
||||||
+ writel((u32)ehci->async->qh_dma, &ehci->regs->async_next);
|
|
||||||
}
|
|
||||||
|
|
||||||
/* makes sure the async qh will become idle */
|
|
||||||
--- a/drivers/usb/host/ehci.h
|
|
||||||
+++ b/drivers/usb/host/ehci.h
|
|
||||||
@@ -132,6 +132,7 @@ struct ehci_hcd { /* one per controlle
|
|
||||||
unsigned broken_periodic:1;
|
|
||||||
unsigned amd_l1_fix:1;
|
|
||||||
unsigned fs_i_thresh:1; /* Intel iso scheduling */
|
|
||||||
+ unsigned has_synopsys_hc_bug:1; /* Synopsys HC */
|
|
||||||
|
|
||||||
/* required for usb32 quirk */
|
|
||||||
#define OHCI_CTRL_HCFS (3 << 6)
|
|
@ -1,61 +0,0 @@
|
|||||||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
||||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
|
||||||
@@ -39,7 +39,7 @@
|
|
||||||
#include <linux/mtd/xip.h>
|
|
||||||
|
|
||||||
#define AMD_BOOTLOC_BUG
|
|
||||||
-#define FORCE_WORD_WRITE 0
|
|
||||||
+#define FORCE_WORD_WRITE 1
|
|
||||||
|
|
||||||
#define MAX_WORD_RETRIES 3
|
|
||||||
|
|
||||||
@@ -50,7 +50,9 @@
|
|
||||||
|
|
||||||
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
|
|
||||||
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
|
||||||
+#if !FORCE_WORD_WRITE
|
|
||||||
static int cfi_amdstd_write_buffers(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
|
|
||||||
+#endif
|
|
||||||
static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
|
|
||||||
static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
|
|
||||||
static void cfi_amdstd_sync (struct mtd_info *);
|
|
||||||
@@ -186,6 +188,7 @@ static void fixup_amd_bootblock(struct m
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#if !FORCE_WORD_WRITE
|
|
||||||
static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
|
|
||||||
{
|
|
||||||
struct map_info *map = mtd->priv;
|
|
||||||
@@ -195,6 +198,7 @@ static void fixup_use_write_buffers(stru
|
|
||||||
mtd->write = cfi_amdstd_write_buffers;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+#endif /* !FORCE_WORD_WRITE */
|
|
||||||
|
|
||||||
/* Atmel chips don't use the same PRI format as AMD chips */
|
|
||||||
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
|
|
||||||
@@ -1389,6 +1393,7 @@ static int cfi_amdstd_write_words(struct
|
|
||||||
/*
|
|
||||||
* FIXME: interleaved mode not tested, and probably not supported!
|
|
||||||
*/
|
|
||||||
+#if !FORCE_WORD_WRITE
|
|
||||||
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
|
|
||||||
unsigned long adr, const u_char *buf,
|
|
||||||
int len)
|
|
||||||
@@ -1500,7 +1505,6 @@ static int __xipram do_write_buffer(stru
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
-
|
|
||||||
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
|
|
||||||
size_t *retlen, const u_char *buf)
|
|
||||||
{
|
|
||||||
@@ -1579,6 +1583,7 @@ static int cfi_amdstd_write_buffers(stru
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
+#endif /* !FORCE_WORD_WRITE */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Handle devices with one erase region, that only implement
|
|
@ -1,11 +0,0 @@
|
|||||||
--- a/net/dsa/tag_trailer.c
|
|
||||||
+++ b/net/dsa/tag_trailer.c
|
|
||||||
@@ -87,7 +87,7 @@ static int trailer_rcv(struct sk_buff *s
|
|
||||||
|
|
||||||
trailer = skb_tail_pointer(skb) - 4;
|
|
||||||
if (trailer[0] != 0x80 || (trailer[1] & 0xf8) != 0x00 ||
|
|
||||||
- (trailer[3] & 0xef) != 0x00 || trailer[3] != 0x00)
|
|
||||||
+ (trailer[2] & 0xef) != 0x00 || (trailer[3] & 0xfe) != 0x00)
|
|
||||||
goto out_drop;
|
|
||||||
|
|
||||||
source_port = trailer[1] & 7;
|
|
@ -1,26 +0,0 @@
|
|||||||
--- a/net/dsa/Kconfig
|
|
||||||
+++ b/net/dsa/Kconfig
|
|
||||||
@@ -36,6 +36,13 @@ config NET_DSA_MV88E6060
|
|
||||||
This enables support for the Marvell 88E6060 ethernet switch
|
|
||||||
chip.
|
|
||||||
|
|
||||||
+config NET_DSA_MV88E6063
|
|
||||||
+ bool "Marvell 88E6063 ethernet switch chip support"
|
|
||||||
+ select NET_DSA_TAG_TRAILER
|
|
||||||
+ ---help---
|
|
||||||
+ This enables support for the Marvell 88E6063 ethernet switch
|
|
||||||
+ chip
|
|
||||||
+
|
|
||||||
config NET_DSA_MV88E6XXX_NEED_PPU
|
|
||||||
bool
|
|
||||||
default n
|
|
||||||
--- a/net/dsa/Makefile
|
|
||||||
+++ b/net/dsa/Makefile
|
|
||||||
@@ -6,6 +6,7 @@ obj-$(CONFIG_NET_DSA_TAG_TRAILER) += tag
|
|
||||||
# switch drivers
|
|
||||||
obj-$(CONFIG_NET_DSA_MV88E6XXX) += mv88e6xxx.o
|
|
||||||
obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
|
|
||||||
+obj-$(CONFIG_NET_DSA_MV88E6063) += mv88e6063.o
|
|
||||||
obj-$(CONFIG_NET_DSA_MV88E6123_61_65) += mv88e6123_61_65.o
|
|
||||||
obj-$(CONFIG_NET_DSA_MV88E6131) += mv88e6131.o
|
|
||||||
|
|
@ -1,54 +0,0 @@
|
|||||||
--- a/drivers/mtd/redboot.c
|
|
||||||
+++ b/drivers/mtd/redboot.c
|
|
||||||
@@ -78,31 +78,32 @@ static int parse_redboot_partitions(stru
|
|
||||||
static char nullstring[] = "unallocated";
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+ buf = vmalloc(master->erasesize);
|
|
||||||
+ if (!buf)
|
|
||||||
+ return -ENOMEM;
|
|
||||||
+
|
|
||||||
+ restart:
|
|
||||||
if ( directory < 0 ) {
|
|
||||||
offset = master->size + directory * master->erasesize;
|
|
||||||
- while (master->block_isbad &&
|
|
||||||
+ while (master->block_isbad &&
|
|
||||||
master->block_isbad(master, offset)) {
|
|
||||||
if (!offset) {
|
|
||||||
nogood:
|
|
||||||
printk(KERN_NOTICE "Failed to find a non-bad block to check for RedBoot partition table\n");
|
|
||||||
+ vfree(buf);
|
|
||||||
return -EIO;
|
|
||||||
}
|
|
||||||
offset -= master->erasesize;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
offset = directory * master->erasesize;
|
|
||||||
- while (master->block_isbad &&
|
|
||||||
+ while (master->block_isbad &&
|
|
||||||
master->block_isbad(master, offset)) {
|
|
||||||
offset += master->erasesize;
|
|
||||||
if (offset == master->size)
|
|
||||||
goto nogood;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
- buf = vmalloc(master->erasesize);
|
|
||||||
-
|
|
||||||
- if (!buf)
|
|
||||||
- return -ENOMEM;
|
|
||||||
-
|
|
||||||
printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
|
|
||||||
master->name, offset);
|
|
||||||
|
|
||||||
@@ -174,6 +175,11 @@ static int parse_redboot_partitions(stru
|
|
||||||
}
|
|
||||||
if (i == numslots) {
|
|
||||||
/* Didn't find it */
|
|
||||||
+ if (offset + master->erasesize < master->size) {
|
|
||||||
+ /* not at the end of the flash yet, maybe next block :) */
|
|
||||||
+ directory++;
|
|
||||||
+ goto restart;
|
|
||||||
+ }
|
|
||||||
printk(KERN_NOTICE "No RedBoot partition table detected in %s\n",
|
|
||||||
master->name);
|
|
||||||
ret = 0;
|
|
@ -1,12 +0,0 @@
|
|||||||
--- a/drivers/Makefile
|
|
||||||
+++ b/drivers/Makefile
|
|
||||||
@@ -45,8 +45,8 @@ obj-y += macintosh/
|
|
||||||
obj-$(CONFIG_IDE) += ide/
|
|
||||||
obj-$(CONFIG_SCSI) += scsi/
|
|
||||||
obj-$(CONFIG_ATA) += ata/
|
|
||||||
-obj-$(CONFIG_MTD) += mtd/
|
|
||||||
obj-$(CONFIG_SPI) += spi/
|
|
||||||
+obj-$(CONFIG_MTD) += mtd/
|
|
||||||
obj-y += net/
|
|
||||||
obj-$(CONFIG_ATM) += atm/
|
|
||||||
obj-$(CONFIG_FUSION) += message/
|
|
@ -1,19 +0,0 @@
|
|||||||
--- a/include/linux/spi/spi.h
|
|
||||||
+++ b/include/linux/spi/spi.h
|
|
||||||
@@ -438,6 +438,8 @@ struct spi_transfer {
|
|
||||||
dma_addr_t rx_dma;
|
|
||||||
|
|
||||||
unsigned cs_change:1;
|
|
||||||
+ unsigned verify:1;
|
|
||||||
+ unsigned fast_write:1;
|
|
||||||
u8 bits_per_word;
|
|
||||||
u16 delay_usecs;
|
|
||||||
u32 speed_hz;
|
|
||||||
@@ -479,6 +481,7 @@ struct spi_message {
|
|
||||||
struct spi_device *spi;
|
|
||||||
|
|
||||||
unsigned is_dma_mapped:1;
|
|
||||||
+ unsigned fast_read:1;
|
|
||||||
|
|
||||||
/* REVISIT: we might want a flag affecting the behavior of the
|
|
||||||
* last transfer ... allowing things like "read 16 bit length L"
|
|
@ -1,25 +0,0 @@
|
|||||||
--- a/drivers/spi/Kconfig
|
|
||||||
+++ b/drivers/spi/Kconfig
|
|
||||||
@@ -259,6 +259,12 @@ config SPI_PXA2XX
|
|
||||||
The driver can be configured to use any SSP port and additional
|
|
||||||
documentation can be found a Documentation/spi/pxa2xx.
|
|
||||||
|
|
||||||
+config SPI_RB4XX
|
|
||||||
+ tristate "Mikrotik RB4XX SPI master"
|
|
||||||
+ depends on SPI_MASTER && AR71XX_MACH_RB4XX
|
|
||||||
+ help
|
|
||||||
+ SPI controller driver for the Mikrotik RB4xx series boards.
|
|
||||||
+
|
|
||||||
config SPI_S3C24XX
|
|
||||||
tristate "Samsung S3C24XX series SPI"
|
|
||||||
depends on ARCH_S3C2410 && EXPERIMENTAL
|
|
||||||
--- a/drivers/spi/Makefile
|
|
||||||
+++ b/drivers/spi/Makefile
|
|
||||||
@@ -49,6 +49,7 @@ obj-$(CONFIG_SPI_SH_SCI) += spi_sh_sci.
|
|
||||||
obj-$(CONFIG_SPI_SH_MSIOF) += spi_sh_msiof.o
|
|
||||||
obj-$(CONFIG_SPI_STMP3XXX) += spi_stmp.o
|
|
||||||
obj-$(CONFIG_SPI_NUC900) += spi_nuc900.o
|
|
||||||
+obj-$(CONFIG_SPI_RB4XX) += rb4xx_spi.o
|
|
||||||
|
|
||||||
# special build for s3c24xx spi driver with fiq support
|
|
||||||
spi_s3c24xx_hw-y := spi_s3c24xx.o
|
|
@ -1,26 +0,0 @@
|
|||||||
--- a/drivers/spi/Kconfig
|
|
||||||
+++ b/drivers/spi/Kconfig
|
|
||||||
@@ -401,6 +401,13 @@ config SPI_TLE62X0
|
|
||||||
sysfs interface, with each line presented as a kind of GPIO
|
|
||||||
exposing both switch control and diagnostic feedback.
|
|
||||||
|
|
||||||
+config SPI_RB4XX_CPLD
|
|
||||||
+ tristate "MikroTik RB4XX CPLD driver"
|
|
||||||
+ depends on AR71XX_MACH_RB4XX
|
|
||||||
+ help
|
|
||||||
+ SPI driver for the Xilinx CPLD chip present on the
|
|
||||||
+ MikroTik RB4xx boards.
|
|
||||||
+
|
|
||||||
#
|
|
||||||
# Add new SPI protocol masters in alphabetical order above this line
|
|
||||||
#
|
|
||||||
--- a/drivers/spi/Makefile
|
|
||||||
+++ b/drivers/spi/Makefile
|
|
||||||
@@ -58,6 +58,7 @@ spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ)
|
|
||||||
# ... add above this line ...
|
|
||||||
|
|
||||||
# SPI protocol drivers (device/link on bus)
|
|
||||||
+obj-$(CONFIG_SPI_RB4XX_CPLD) += spi_rb4xx_cpld.o
|
|
||||||
obj-$(CONFIG_SPI_SPIDEV) += spidev.o
|
|
||||||
obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
|
|
||||||
# ... add above this line ...
|
|
@ -1,21 +0,0 @@
|
|||||||
--- a/drivers/mtd/nand/Kconfig
|
|
||||||
+++ b/drivers/mtd/nand/Kconfig
|
|
||||||
@@ -531,4 +531,8 @@ config MTD_NAND_JZ4740
|
|
||||||
help
|
|
||||||
Enables support for NAND Flash on JZ4740 SoC based boards.
|
|
||||||
|
|
||||||
+config MTD_NAND_RB4XX
|
|
||||||
+ tristate "NAND flash driver for RouterBoard 4xx series"
|
|
||||||
+ depends on MTD_NAND && AR71XX_MACH_RB4XX
|
|
||||||
+
|
|
||||||
endif # MTD_NAND
|
|
||||||
--- a/drivers/mtd/nand/Makefile
|
|
||||||
+++ b/drivers/mtd/nand/Makefile
|
|
||||||
@@ -32,6 +32,7 @@ obj-$(CONFIG_MTD_NAND_CM_X270) += cmx27
|
|
||||||
obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx_nand.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
|
|
||||||
+obj-$(CONFIG_MTD_NAND_RB4XX) += rb4xx_nand.o
|
|
||||||
obj-$(CONFIG_MTD_ALAUDA) += alauda.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o
|
|
@ -1,27 +0,0 @@
|
|||||||
--- a/drivers/spi/Makefile
|
|
||||||
+++ b/drivers/spi/Makefile
|
|
||||||
@@ -11,6 +11,7 @@ endif
|
|
||||||
obj-$(CONFIG_SPI_MASTER) += spi.o
|
|
||||||
|
|
||||||
# SPI master controller drivers (bus)
|
|
||||||
+obj-$(CONFIG_SPI_AP83) += ap83_spi.o
|
|
||||||
obj-$(CONFIG_SPI_AR71XX) += ar71xx_spi.o
|
|
||||||
obj-$(CONFIG_SPI_ATMEL) += atmel_spi.o
|
|
||||||
obj-$(CONFIG_SPI_BFIN) += spi_bfin5xx.o
|
|
||||||
--- a/drivers/spi/Kconfig
|
|
||||||
+++ b/drivers/spi/Kconfig
|
|
||||||
@@ -53,6 +53,14 @@ if SPI_MASTER
|
|
||||||
|
|
||||||
comment "SPI Master Controller Drivers"
|
|
||||||
|
|
||||||
+config SPI_AP83
|
|
||||||
+ tristate "Atheros AP83 specific SPI Controller"
|
|
||||||
+ depends on SPI_MASTER && AR71XX_MACH_AP83
|
|
||||||
+ select SPI_BITBANG
|
|
||||||
+ help
|
|
||||||
+ This is a specific SPI controller driver for the Atheros AP83
|
|
||||||
+ reference board.
|
|
||||||
+
|
|
||||||
config SPI_AR71XX
|
|
||||||
tristate "Atheros AR71xx SPI Controller"
|
|
||||||
depends on SPI_MASTER && ATHEROS_AR71XX
|
|
@ -1,24 +0,0 @@
|
|||||||
--- a/drivers/spi/Kconfig
|
|
||||||
+++ b/drivers/spi/Kconfig
|
|
||||||
@@ -416,6 +416,11 @@ config SPI_RB4XX_CPLD
|
|
||||||
SPI driver for the Xilinx CPLD chip present on the
|
|
||||||
MikroTik RB4xx boards.
|
|
||||||
|
|
||||||
+config SPI_VSC7385
|
|
||||||
+ tristate "Vitesse VSC7385 ethernet switch driver"
|
|
||||||
+ help
|
|
||||||
+ SPI driver for the Vitesse VSC7385 ethernet switch.
|
|
||||||
+
|
|
||||||
#
|
|
||||||
# Add new SPI protocol masters in alphabetical order above this line
|
|
||||||
#
|
|
||||||
--- a/drivers/spi/Makefile
|
|
||||||
+++ b/drivers/spi/Makefile
|
|
||||||
@@ -61,6 +61,7 @@ spi_s3c24xx_hw-$(CONFIG_SPI_S3C24XX_FIQ)
|
|
||||||
# SPI protocol drivers (device/link on bus)
|
|
||||||
obj-$(CONFIG_SPI_RB4XX_CPLD) += spi_rb4xx_cpld.o
|
|
||||||
obj-$(CONFIG_SPI_SPIDEV) += spidev.o
|
|
||||||
+obj-$(CONFIG_SPI_VSC7385) += spi_vsc7385.o
|
|
||||||
obj-$(CONFIG_SPI_TLE62X0) += tle62x0.o
|
|
||||||
# ... add above this line ...
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
|||||||
--- a/drivers/spi/Kconfig
|
|
||||||
+++ b/drivers/spi/Kconfig
|
|
||||||
@@ -68,6 +68,14 @@ config SPI_AR71XX
|
|
||||||
help
|
|
||||||
This is the SPI contoller driver for Atheros AR71xx.
|
|
||||||
|
|
||||||
+config SPI_PB44
|
|
||||||
+ tristate "Atheros PB44 board specific SPI controller"
|
|
||||||
+ depends on SPI_MASTER && AR71XX_MACH_PB44
|
|
||||||
+ select SPI_BITBANG
|
|
||||||
+ help
|
|
||||||
+ This is a specific SPI controller driver for the Atheros PB44
|
|
||||||
+ reference board.
|
|
||||||
+
|
|
||||||
config SPI_ATMEL
|
|
||||||
tristate "Atmel SPI Controller"
|
|
||||||
depends on (ARCH_AT91 || AVR32)
|
|
||||||
--- a/drivers/spi/Makefile
|
|
||||||
+++ b/drivers/spi/Makefile
|
|
||||||
@@ -28,6 +28,7 @@ obj-$(CONFIG_SPI_GPIO) += spi_gpio.o
|
|
||||||
obj-$(CONFIG_SPI_GPIO_OLD) += spi_gpio_old.o
|
|
||||||
obj-$(CONFIG_SPI_IMX) += spi_imx.o
|
|
||||||
obj-$(CONFIG_SPI_LM70_LLP) += spi_lm70llp.o
|
|
||||||
+obj-$(CONFIG_SPI_PB44) += pb44_spi.o
|
|
||||||
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
|
|
||||||
obj-$(CONFIG_SPI_OMAP_UWIRE) += omap_uwire.o
|
|
||||||
obj-$(CONFIG_SPI_OMAP24XX) += omap2_mcspi.o
|
|
@ -1,26 +0,0 @@
|
|||||||
--- a/drivers/leds/Kconfig
|
|
||||||
+++ b/drivers/leds/Kconfig
|
|
||||||
@@ -320,6 +320,13 @@ config LEDS_TRIGGERS
|
|
||||||
|
|
||||||
if LEDS_TRIGGERS
|
|
||||||
|
|
||||||
+config LEDS_WNDR3700_USB
|
|
||||||
+ tristate "NETGEAR WNDR3700 USB LED driver"
|
|
||||||
+ depends on LEDS_CLASS && AR71XX_MACH_WNDR3700
|
|
||||||
+ help
|
|
||||||
+ This option enables support for the USB LED found on the
|
|
||||||
+ NETGEAR WNDR3700 board.
|
|
||||||
+
|
|
||||||
comment "LED Triggers"
|
|
||||||
|
|
||||||
config LEDS_TRIGGER_TIMER
|
|
||||||
--- a/drivers/leds/Makefile
|
|
||||||
+++ b/drivers/leds/Makefile
|
|
||||||
@@ -31,6 +31,7 @@ obj-$(CONFIG_LEDS_DA903X) += leds-da903
|
|
||||||
obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o
|
|
||||||
obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o
|
|
||||||
obj-$(CONFIG_LEDS_PWM) += leds-pwm.o
|
|
||||||
+obj-${CONFIG_LEDS_WNDR3700_USB} += leds-wndr3700-usb.o
|
|
||||||
obj-$(CONFIG_LEDS_REGULATOR) += leds-regulator.o
|
|
||||||
obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o
|
|
||||||
obj-$(CONFIG_LEDS_LT3593) += leds-lt3593.o
|
|
@ -1,25 +0,0 @@
|
|||||||
--- a/drivers/gpio/Kconfig
|
|
||||||
+++ b/drivers/gpio/Kconfig
|
|
||||||
@@ -361,4 +361,12 @@ config GPIO_JANZ_TTL
|
|
||||||
This driver provides support for driving the pins in output
|
|
||||||
mode only. Input mode is not supported.
|
|
||||||
|
|
||||||
+comment "Other GPIO expanders"
|
|
||||||
+
|
|
||||||
+config GPIO_NXP_74HC153
|
|
||||||
+ tristate "NXP 74HC153 Dual 4-input multiplexer"
|
|
||||||
+ help
|
|
||||||
+ Platform driver for NXP 74HC153 Dual 4-input Multiplexer. This
|
|
||||||
+ provides a GPIO interface supporting inputs.
|
|
||||||
+
|
|
||||||
endif
|
|
||||||
--- a/drivers/gpio/Makefile
|
|
||||||
+++ b/drivers/gpio/Makefile
|
|
||||||
@@ -17,6 +17,7 @@ obj-$(CONFIG_GPIO_MAX7301) += max7301.o
|
|
||||||
obj-$(CONFIG_GPIO_MAX732X) += max732x.o
|
|
||||||
obj-$(CONFIG_GPIO_MC33880) += mc33880.o
|
|
||||||
obj-$(CONFIG_GPIO_MCP23S08) += mcp23s08.o
|
|
||||||
+obj-$(CONFIG_GPIO_NXP_74HC153) += nxp_74hc153.o
|
|
||||||
obj-$(CONFIG_GPIO_PCA953X) += pca953x.o
|
|
||||||
obj-$(CONFIG_GPIO_PCF857X) += pcf857x.o
|
|
||||||
obj-$(CONFIG_GPIO_PL061) += pl061.o
|
|
@ -1,23 +0,0 @@
|
|||||||
--- a/drivers/leds/Kconfig
|
|
||||||
+++ b/drivers/leds/Kconfig
|
|
||||||
@@ -327,6 +327,10 @@ config LEDS_WNDR3700_USB
|
|
||||||
This option enables support for the USB LED found on the
|
|
||||||
NETGEAR WNDR3700 board.
|
|
||||||
|
|
||||||
+config LEDS_RB750
|
|
||||||
+ tristate "LED driver for the Mikrotik RouterBOARD 750"
|
|
||||||
+ depends on LEDS_CLASS && AR71XX_MACH_RB750
|
|
||||||
+
|
|
||||||
comment "LED Triggers"
|
|
||||||
|
|
||||||
config LEDS_TRIGGER_TIMER
|
|
||||||
--- a/drivers/leds/Makefile
|
|
||||||
+++ b/drivers/leds/Makefile
|
|
||||||
@@ -38,6 +38,7 @@ obj-$(CONFIG_LEDS_LT3593) += leds-lt359
|
|
||||||
obj-$(CONFIG_LEDS_ADP5520) += leds-adp5520.o
|
|
||||||
obj-$(CONFIG_LEDS_DELL_NETBOOKS) += dell-led.o
|
|
||||||
obj-$(CONFIG_LEDS_MC13783) += leds-mc13783.o
|
|
||||||
+obj-$(CONFIG_LEDS_RB750) += leds-rb750.o
|
|
||||||
obj-$(CONFIG_LEDS_NS2) += leds-ns2.o
|
|
||||||
|
|
||||||
# LED SPI Drivers
|
|
@ -1,21 +0,0 @@
|
|||||||
--- a/drivers/mtd/nand/Kconfig
|
|
||||||
+++ b/drivers/mtd/nand/Kconfig
|
|
||||||
@@ -535,4 +535,8 @@ config MTD_NAND_RB4XX
|
|
||||||
tristate "NAND flash driver for RouterBoard 4xx series"
|
|
||||||
depends on MTD_NAND && AR71XX_MACH_RB4XX
|
|
||||||
|
|
||||||
+config MTD_NAND_RB750
|
|
||||||
+ tristate "NAND flash driver for the RouterBoard 750"
|
|
||||||
+ depends on MTD_NAND && AR71XX_MACH_RB750
|
|
||||||
+
|
|
||||||
endif # MTD_NAND
|
|
||||||
--- a/drivers/mtd/nand/Makefile
|
|
||||||
+++ b/drivers/mtd/nand/Makefile
|
|
||||||
@@ -33,6 +33,7 @@ obj-$(CONFIG_MTD_NAND_PXA3xx) += pxa3xx
|
|
||||||
obj-$(CONFIG_MTD_NAND_TMIO) += tmio_nand.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_RB4XX) += rb4xx_nand.o
|
|
||||||
+obj-$(CONFIG_MTD_NAND_RB750) += rb750_nand.o
|
|
||||||
obj-$(CONFIG_MTD_ALAUDA) += alauda.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_PASEMI) += pasemi_nand.o
|
|
||||||
obj-$(CONFIG_MTD_NAND_ORION) += orion_nand.o
|
|
@ -1,22 +0,0 @@
|
|||||||
--- a/arch/mips/Makefile
|
|
||||||
+++ b/arch/mips/Makefile
|
|
||||||
@@ -185,6 +185,7 @@ endif
|
|
||||||
#
|
|
||||||
libs-$(CONFIG_ARC) += arch/mips/fw/arc/
|
|
||||||
libs-$(CONFIG_CFE) += arch/mips/fw/cfe/
|
|
||||||
+libs-$(CONFIG_MYLOADER) += arch/mips/fw/myloader/
|
|
||||||
libs-$(CONFIG_SNIPROM) += arch/mips/fw/sni/
|
|
||||||
libs-y += arch/mips/fw/lib/
|
|
||||||
|
|
||||||
--- a/arch/mips/Kconfig
|
|
||||||
+++ b/arch/mips/Kconfig
|
|
||||||
@@ -901,6 +901,9 @@ config MIPS_NILE4
|
|
||||||
config MIPS_DISABLE_OBSOLETE_IDE
|
|
||||||
bool
|
|
||||||
|
|
||||||
+config MYLOADER
|
|
||||||
+ bool
|
|
||||||
+
|
|
||||||
config SYNC_R4K
|
|
||||||
bool
|
|
||||||
|
|
@ -1,22 +0,0 @@
|
|||||||
--- a/drivers/mtd/nand/rb4xx_nand.c
|
|
||||||
+++ b/drivers/mtd/nand/rb4xx_nand.c
|
|
||||||
@@ -223,7 +223,7 @@ static int __init rb4xx_nand_probe(struc
|
|
||||||
|
|
||||||
platform_set_drvdata(pdev, info);
|
|
||||||
|
|
||||||
- ret = nand_scan_ident(&info->mtd, 1);
|
|
||||||
+ ret = nand_scan_ident(&info->mtd, 1, NULL);
|
|
||||||
if (ret) {
|
|
||||||
ret = -ENXIO;
|
|
||||||
goto err_free_info;
|
|
||||||
--- a/drivers/mtd/nand/rb750_nand.c
|
|
||||||
+++ b/drivers/mtd/nand/rb750_nand.c
|
|
||||||
@@ -287,7 +287,7 @@ static int __init rb750_nand_probe(struc
|
|
||||||
|
|
||||||
platform_set_drvdata(pdev, info);
|
|
||||||
|
|
||||||
- ret = nand_scan_ident(&info->mtd, 1);
|
|
||||||
+ ret = nand_scan_ident(&info->mtd, 1, NULL);
|
|
||||||
if (ret) {
|
|
||||||
ret = -ENXIO;
|
|
||||||
goto err_free_info;
|
|
@ -1,29 +0,0 @@
|
|||||||
--- a/arch/mips/kernel/traps.c
|
|
||||||
+++ b/arch/mips/kernel/traps.c
|
|
||||||
@@ -53,6 +53,7 @@
|
|
||||||
#include <asm/stacktrace.h>
|
|
||||||
#include <asm/irq.h>
|
|
||||||
#include <asm/uasm.h>
|
|
||||||
+#include <asm/time.h>
|
|
||||||
|
|
||||||
extern void check_wait(void);
|
|
||||||
extern asmlinkage void r4k_wait(void);
|
|
||||||
@@ -1539,6 +1540,8 @@ void __cpuinit per_cpu_trap_init(void)
|
|
||||||
if (cpu_has_mips_r2) {
|
|
||||||
cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP;
|
|
||||||
cp0_compare_irq = (read_c0_intctl() >> INTCTLB_IPTI) & 7;
|
|
||||||
+ if (get_c0_compare_irq)
|
|
||||||
+ cp0_compare_irq = get_c0_compare_irq();
|
|
||||||
cp0_perfcount_irq = (read_c0_intctl() >> INTCTLB_IPPCI) & 7;
|
|
||||||
if (cp0_perfcount_irq == cp0_compare_irq)
|
|
||||||
cp0_perfcount_irq = -1;
|
|
||||||
--- a/arch/mips/include/asm/time.h
|
|
||||||
+++ b/arch/mips/include/asm/time.h
|
|
||||||
@@ -52,6 +52,7 @@ extern int (*perf_irq)(void);
|
|
||||||
*/
|
|
||||||
#ifdef CONFIG_CEVT_R4K_LIB
|
|
||||||
extern unsigned int __weak get_c0_compare_int(void);
|
|
||||||
+extern unsigned int __weak get_c0_compare_irq(void);
|
|
||||||
extern int r4k_clockevent_init(void);
|
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user