bump ifxmips to 2.6.26.2
SVN-Revision: 12557
This commit is contained in:
parent
480864baef
commit
8dc12e9096
3 changed files with 93 additions and 70 deletions
|
@ -10,7 +10,7 @@ ARCH:=mips
|
|||
BOARD:=ifxmips
|
||||
BOARDNAME:=Infineon Mips
|
||||
FEATURES:=squashfs jffs2
|
||||
LINUX_VERSION:=2.6.25.16
|
||||
LINUX_VERSION:=2.6.26.2
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
DEFAULT_PACKAGES+=uboot-ifxmips
|
||||
|
|
|
@ -44,8 +44,6 @@ CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
|||
# CONFIG_CPU_TX39XX is not set
|
||||
# CONFIG_CPU_TX49XX is not set
|
||||
# CONFIG_CPU_VR41XX is not set
|
||||
CONFIG_CRYPTO_AEAD=m
|
||||
CONFIG_CRYPTO_AUTHENC=m
|
||||
CONFIG_CRYPTO_GF128MUL=m
|
||||
CONFIG_CSRC_R4K=y
|
||||
CONFIG_DEVPORT=y
|
||||
|
@ -58,6 +56,7 @@ CONFIG_FS_POSIX_ACL=y
|
|||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
||||
# CONFIG_GENERIC_FIND_FIRST_BIT is not set
|
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||
CONFIG_GENERIC_GPIO=y
|
||||
# CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ is not set
|
||||
|
@ -65,6 +64,7 @@ CONFIG_GPIO_DEVICE=y
|
|||
CONFIG_HAS_DMA=y
|
||||
CONFIG_HAS_IOMEM=y
|
||||
CONFIG_HAS_IOPORT=y
|
||||
# CONFIG_HAVE_DMA_ATTRS is not set
|
||||
CONFIG_HAVE_IDE=y
|
||||
# CONFIG_HAVE_KPROBES is not set
|
||||
# CONFIG_HAVE_KRETPROBES is not set
|
||||
|
@ -83,26 +83,26 @@ CONFIG_HW_RANDOM=y
|
|||
CONFIG_IFXMIPS=y
|
||||
CONFIG_IFXMIPS_EEPROM=y
|
||||
CONFIG_IFXMIPS_GPIO_RST_BTN=y
|
||||
CONFIG_IFXMIPS_MEI=y
|
||||
# CONFIG_IFXMIPS_MEI is not set
|
||||
CONFIG_IFXMIPS_MII0=y
|
||||
# CONFIG_IFXMIPS_PROM_ASC0 is not set
|
||||
CONFIG_IFXMIPS_PROM_ASC1=y
|
||||
CONFIG_IFXMIPS_SSC=y
|
||||
CONFIG_IFXMIPS_WDT=y
|
||||
CONFIG_INITRAMFS_SOURCE=""
|
||||
CONFIG_IPV6_NDISC_NODETYPE=y
|
||||
CONFIG_IRQ_CPU=y
|
||||
# CONFIG_IWLWIFI_LEDS is not set
|
||||
CONFIG_KALLSYMS=y
|
||||
# CONFIG_LEDS_ALIX is not set
|
||||
CONFIG_LEDS_GPIO=y
|
||||
CONFIG_LEDS_IFXMIPS=y
|
||||
# CONFIG_LEMOTE_FULONG is not set
|
||||
CONFIG_LZO_COMPRESS=m
|
||||
CONFIG_LZO_DECOMPRESS=m
|
||||
# CONFIG_MACH_ALCHEMY is not set
|
||||
# CONFIG_MACH_DECSTATION is not set
|
||||
# CONFIG_MACH_JAZZ is not set
|
||||
# CONFIG_MACH_VR41XX is not set
|
||||
# CONFIG_MEMSTICK is not set
|
||||
# CONFIG_MEDIA_ATTACH is not set
|
||||
CONFIG_MIPS=y
|
||||
# CONFIG_MIPS_ATLAS is not set
|
||||
# CONFIG_MIPS_COBALT is not set
|
||||
|
@ -169,6 +169,8 @@ CONFIG_MTD_PHYSMAP_START=0x0
|
|||
# CONFIG_NE2K_PCI is not set
|
||||
# CONFIG_NET_VENDOR_3COM is not set
|
||||
# CONFIG_NO_IOPORT is not set
|
||||
# CONFIG_OCF_OCF is not set
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
# CONFIG_PAGE_SIZE_16KB is not set
|
||||
CONFIG_PAGE_SIZE_4KB=y
|
||||
# CONFIG_PAGE_SIZE_64KB is not set
|
||||
|
@ -176,12 +178,13 @@ CONFIG_PAGE_SIZE_4KB=y
|
|||
CONFIG_PCI=y
|
||||
# CONFIG_PCIPCWATCHDOG is not set
|
||||
CONFIG_PCI_DOMAINS=y
|
||||
CONFIG_PCSPKR_PLATFORM=y
|
||||
# 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_R6040 is not set
|
||||
# CONFIG_RTC is not set
|
||||
CONFIG_RFKILL_LEDS=y
|
||||
CONFIG_RTC_LIB=y
|
||||
CONFIG_RWSEM_GENERIC_SPINLOCK=y
|
||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||
|
@ -200,7 +203,6 @@ CONFIG_SERIAL_IFXMIPS=y
|
|||
# CONFIG_SIBYTE_RHONE is not set
|
||||
# CONFIG_SIBYTE_SENTOSA is not set
|
||||
# CONFIG_SIBYTE_SWARM is not set
|
||||
CONFIG_SLABINFO=y
|
||||
# CONFIG_SOFT_WATCHDOG is not set
|
||||
# CONFIG_SPARSEMEM_STATIC is not set
|
||||
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
|
||||
|
@ -214,18 +216,22 @@ CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
|
|||
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
||||
# CONFIG_TC35815 is not set
|
||||
# CONFIG_THERMAL is not set
|
||||
# CONFIG_THERMAL_HWMON is not set
|
||||
# CONFIG_TICK_ONESHOT is not set
|
||||
# CONFIG_TOSHIBA_JMR3927 is not set
|
||||
# CONFIG_TOSHIBA_RBTX4927 is not set
|
||||
# CONFIG_TOSHIBA_RBTX4938 is not set
|
||||
CONFIG_TRAD_SIGNALS=y
|
||||
CONFIG_USB=m
|
||||
# CONFIG_USBPCWATCHDOG is not set
|
||||
# CONFIG_USB_DWC_HCD is not set
|
||||
# CONFIG_USB_EHCI_HCD is not set
|
||||
# CONFIG_USB_R8A66597_HCD is not set
|
||||
# CONFIG_USB_ISIGHTFW is not set
|
||||
# CONFIG_USB_UHCI_HCD is not set
|
||||
# CONFIG_VGASTATE is not set
|
||||
# CONFIG_VIA_RHINE is not set
|
||||
CONFIG_VIDEO_ALLOW_V4L1=y
|
||||
CONFIG_VIDEO_MEDIA=m
|
||||
CONFIG_VIDEO_V4L1=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
CONFIG_VIDEO_V4L2_COMMON=m
|
||||
CONFIG_ZONE_DMA_FLAG=0
|
|
@ -1,6 +1,8 @@
|
|||
--- a/drivers/char/Makefile
|
||||
+++ b/drivers/char/Makefile
|
||||
@@ -113,6 +113,10 @@
|
||||
Index: linux-2.6.26.2/drivers/char/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/char/Makefile 2008-09-09 01:44:53.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/char/Makefile 2008-09-09 01:45:41.000000000 +0200
|
||||
@@ -114,6 +114,10 @@
|
||||
obj-$(CONFIG_JS_RTC) += js-rtc.o
|
||||
js-rtc-y = rtc.o
|
||||
|
||||
|
@ -11,15 +13,19 @@
|
|||
# Files generated that shall be removed upon make clean
|
||||
clean-files := consolemap_deftbl.c defkeymap.c
|
||||
|
||||
--- a/drivers/mtd/maps/Makefile
|
||||
+++ b/drivers/mtd/maps/Makefile
|
||||
@@ -68,3 +68,4 @@
|
||||
Index: linux-2.6.26.2/drivers/mtd/maps/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/mtd/maps/Makefile 2008-09-09 01:44:51.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/mtd/maps/Makefile 2008-09-09 01:45:41.000000000 +0200
|
||||
@@ -67,3 +67,4 @@
|
||||
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
|
||||
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
|
||||
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
|
||||
+obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o
|
||||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
Index: linux-2.6.26.2/drivers/net/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/net/Kconfig 2008-09-09 01:44:53.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/net/Kconfig 2008-09-09 01:45:41.000000000 +0200
|
||||
@@ -351,6 +351,12 @@
|
||||
|
||||
source "drivers/net/arm/Kconfig"
|
||||
|
@ -33,9 +39,11 @@
|
|||
config AX88796
|
||||
tristate "ASIX AX88796 NE2000 clone support"
|
||||
depends on ARM || MIPS || SUPERH
|
||||
--- a/drivers/serial/Kconfig
|
||||
+++ b/drivers/serial/Kconfig
|
||||
@@ -1327,6 +1327,14 @@
|
||||
Index: linux-2.6.26.2/drivers/serial/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/serial/Kconfig 2008-09-09 01:44:51.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/serial/Kconfig 2008-09-09 01:45:41.000000000 +0200
|
||||
@@ -1334,6 +1334,14 @@
|
||||
Currently, only 8250 compatible ports are supported, but
|
||||
others can easily be added.
|
||||
|
||||
|
@ -50,17 +58,20 @@
|
|||
config SERIAL_QE
|
||||
tristate "Freescale QUICC Engine serial port support"
|
||||
depends on QUICC_ENGINE
|
||||
--- a/drivers/serial/Makefile
|
||||
+++ b/drivers/serial/Makefile
|
||||
@@ -66,4 +66,5 @@
|
||||
obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
|
||||
obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
|
||||
Index: linux-2.6.26.2/drivers/serial/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/serial/Makefile 2008-09-09 01:44:51.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/serial/Makefile 2008-09-09 01:46:23.000000000 +0200
|
||||
@@ -68,3 +68,4 @@
|
||||
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
|
||||
+obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
|
||||
obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
|
||||
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
|
||||
--- a/drivers/watchdog/Makefile
|
||||
+++ b/drivers/watchdog/Makefile
|
||||
@@ -96,6 +96,7 @@
|
||||
+obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
|
||||
Index: linux-2.6.26.2/drivers/watchdog/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/watchdog/Makefile 2008-09-09 01:44:51.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/watchdog/Makefile 2008-09-09 01:45:41.000000000 +0200
|
||||
@@ -97,6 +97,7 @@
|
||||
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
|
||||
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
|
||||
obj-$(CONFIG_TXX9_WDT) += txx9wdt.o
|
||||
|
@ -68,15 +79,20 @@
|
|||
|
||||
# PARISC Architecture
|
||||
|
||||
--- a/drivers/net/Makefile
|
||||
+++ b/drivers/net/Makefile
|
||||
@@ -254,3 +254,4 @@
|
||||
obj-$(CONFIG_NETXEN_NIC) += netxen/
|
||||
Index: linux-2.6.26.2/drivers/net/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/net/Makefile 2008-09-09 01:44:53.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/net/Makefile 2008-09-09 01:47:02.000000000 +0200
|
||||
@@ -256,4 +256,4 @@
|
||||
obj-$(CONFIG_NIU) += niu.o
|
||||
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
|
||||
obj-$(CONFIG_SFC) += sfc/
|
||||
-
|
||||
+obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o
|
||||
--- a/drivers/crypto/Kconfig
|
||||
+++ b/drivers/crypto/Kconfig
|
||||
Index: linux-2.6.26.2/drivers/crypto/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/crypto/Kconfig 2008-09-09 01:44:53.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/crypto/Kconfig 2008-09-09 01:45:41.000000000 +0200
|
||||
@@ -9,6 +9,9 @@
|
||||
If you say N, all options in this submenu will be skipped and disabled.
|
||||
|
||||
|
@ -87,38 +103,35 @@
|
|||
|
||||
config CRYPTO_DEV_PADLOCK
|
||||
tristate "Support for VIA PadLock ACE"
|
||||
--- a/drivers/crypto/Makefile
|
||||
+++ b/drivers/crypto/Makefile
|
||||
@@ -2,3 +2,4 @@
|
||||
obj-$(CONFIG_CRYPTO_DEV_PADLOCK_SHA) += padlock-sha.o
|
||||
obj-$(CONFIG_CRYPTO_DEV_GEODE) += geode-aes.o
|
||||
Index: linux-2.6.26.2/drivers/crypto/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/crypto/Makefile 2008-09-09 01:44:53.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/crypto/Makefile 2008-09-09 01:47:30.000000000 +0200
|
||||
@@ -4,3 +4,4 @@
|
||||
obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
|
||||
obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
|
||||
obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o
|
||||
+obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o
|
||||
--- a/drivers/usb/host/Kconfig
|
||||
+++ b/drivers/usb/host/Kconfig
|
||||
@@ -260,3 +260,9 @@
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called r8a66597-hcd.
|
||||
|
||||
Index: linux-2.6.26.2/drivers/usb/host/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/usb/host/Kconfig 2008-09-09 01:44:51.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/usb/host/Kconfig 2008-09-09 01:48:14.000000000 +0200
|
||||
@@ -305,3 +305,10 @@
|
||||
help
|
||||
This driver enables support for the on-chip R8A66597 in the
|
||||
SH7366 and SH7723 processors.
|
||||
+
|
||||
+config USB_DWC_HCD
|
||||
+ tristate "IFXMIPS USB Host Controller Driver"
|
||||
+ depends on USB && IFXMIPS
|
||||
+ depends on USB && IFXMIPS
|
||||
+ default y
|
||||
+ help
|
||||
+ Danube USB Host Controller
|
||||
--- a/drivers/usb/host/Makefile
|
||||
+++ b/drivers/usb/host/Makefile
|
||||
@@ -16,4 +16,6 @@
|
||||
obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o
|
||||
obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o
|
||||
obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o
|
||||
-
|
||||
+obj-$(CONFIG_USB_DWC_HCD) += dwc_otg_hcd.o dwc_otg_hcd_intr.o dwc_otg_hcd_queue.o \
|
||||
+ dwc_otg_attr.o dwc_otg_driver.o dwc_otg_cil.o \
|
||||
+ dwc_otg_cil_intr.o dwc_otg_proc.o dwc_otg_ifx.o
|
||||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -151,6 +151,12 @@
|
||||
+ Danube USB Host Controller
|
||||
Index: linux-2.6.26.2/drivers/leds/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/leds/Kconfig 2008-09-09 01:44:53.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/leds/Kconfig 2008-09-09 01:45:41.000000000 +0200
|
||||
@@ -153,6 +153,12 @@
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called leds-clevo-mail.
|
||||
|
||||
|
@ -131,19 +144,23 @@
|
|||
comment "LED Triggers"
|
||||
|
||||
config LEDS_TRIGGERS
|
||||
--- a/drivers/leds/Makefile
|
||||
+++ b/drivers/leds/Makefile
|
||||
Index: linux-2.6.26.2/drivers/leds/Makefile
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/leds/Makefile 2008-09-09 01:44:53.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/leds/Makefile 2008-09-09 01:49:25.000000000 +0200
|
||||
@@ -22,6 +22,7 @@
|
||||
obj-$(CONFIG_LEDS_CM_X270) += leds-cm-x270.o
|
||||
obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
|
||||
obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o
|
||||
+obj-$(CONFIG_LEDS_IFXMIPS) += leds-ifxmips.o
|
||||
obj-$(CONFIG_LEDS_FSG) += leds-fsg.o
|
||||
+obj-$(CONFIG_LEDS_IFXMIPS) += leds-ifxmips.o
|
||||
|
||||
# LED Triggers
|
||||
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
|
||||
--- a/drivers/watchdog/Kconfig
|
||||
+++ b/drivers/watchdog/Kconfig
|
||||
@@ -670,6 +670,12 @@
|
||||
Index: linux-2.6.26.2/drivers/watchdog/Kconfig
|
||||
===================================================================
|
||||
--- linux-2.6.26.2.orig/drivers/watchdog/Kconfig 2008-09-09 01:44:51.000000000 +0200
|
||||
+++ linux-2.6.26.2/drivers/watchdog/Kconfig 2008-09-09 01:45:41.000000000 +0200
|
||||
@@ -683,6 +683,12 @@
|
||||
help
|
||||
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
|
||||
|
||||
|
|
Loading…
Reference in a new issue