merge another batch of code from michael buesch's wireless-dev tree, fix up extpci support and remove scache probe like on brcm-2.6 - tested on the wgt634u with madwifi
SVN-Revision: 6213master
parent
048b3e684f
commit
87c22c5f13
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,336 @@ |
||||
CONFIG_32BIT=y |
||||
# CONFIG_64BIT is not set |
||||
# CONFIG_64BIT_PHYS_ADDR is not set |
||||
# CONFIG_8139TOO is not set |
||||
# CONFIG_ARPD is not set |
||||
# CONFIG_ATMEL is not set |
||||
CONFIG_B44=y |
||||
CONFIG_BASE_SMALL=0 |
||||
# CONFIG_BCM43XX is not set |
||||
CONFIG_BCM947XX=y |
||||
# CONFIG_BONDING is not set |
||||
# CONFIG_BRIDGE_NETFILTER is not set |
||||
# CONFIG_BSD_DISKLABEL is not set |
||||
# CONFIG_BSD_PROCESS_ACCT is not set |
||||
# CONFIG_BT_HCIBCM203X is not set |
||||
# CONFIG_BT_HCIBFUSB is not set |
||||
# CONFIG_BT_HCIBPA10X is not set |
||||
# CONFIG_BT_HCIVHCI is not set |
||||
CONFIG_CFE=y |
||||
# CONFIG_CIFS_STATS is not set |
||||
# CONFIG_CLS_U32_MARK is not set |
||||
# CONFIG_CLS_U32_PERF is not set |
||||
CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200" |
||||
# CONFIG_CONFIGFS_FS is not set |
||||
CONFIG_CONNECTOR=m |
||||
# CONFIG_CPU_BIG_ENDIAN is not set |
||||
CONFIG_CPU_HAS_LLSC=y |
||||
CONFIG_CPU_HAS_PREFETCH=y |
||||
CONFIG_CPU_HAS_SYNC=y |
||||
CONFIG_CPU_LITTLE_ENDIAN=y |
||||
CONFIG_CPU_MIPS32=y |
||||
CONFIG_CPU_MIPS32_R1=y |
||||
# CONFIG_CPU_MIPS32_R2 is not set |
||||
# CONFIG_CPU_MIPS64_R1 is not set |
||||
# CONFIG_CPU_MIPS64_R2 is not set |
||||
CONFIG_CPU_MIPSR1=y |
||||
# CONFIG_CPU_NEVADA is not set |
||||
# CONFIG_CPU_R10000 is not set |
||||
# CONFIG_CPU_R3000 is not set |
||||
# CONFIG_CPU_R4300 is not set |
||||
# CONFIG_CPU_R4X00 is not set |
||||
# CONFIG_CPU_R5000 is not set |
||||
# CONFIG_CPU_R5432 is not set |
||||
# CONFIG_CPU_R6000 is not set |
||||
# CONFIG_CPU_R8000 is not set |
||||
# CONFIG_CPU_RM7000 is not set |
||||
# CONFIG_CPU_RM9000 is not set |
||||
# CONFIG_CPU_SB1 is not set |
||||
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
||||
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_ANUBIS is not set |
||||
CONFIG_CRYPTO_BLKCIPHER=m |
||||
# CONFIG_CRYPTO_BLOWFISH is not set |
||||
# CONFIG_CRYPTO_CAST5 is not set |
||||
# CONFIG_CRYPTO_CAST6 is not set |
||||
CONFIG_CRYPTO_CBC=m |
||||
# CONFIG_CRYPTO_CRC32C is not set |
||||
CONFIG_CRYPTO_DES=m |
||||
CONFIG_CRYPTO_HASH=y |
||||
CONFIG_CRYPTO_HMAC=y |
||||
# CONFIG_CRYPTO_KHAZAD is not set |
||||
# CONFIG_CRYPTO_MD4 is not set |
||||
CONFIG_CRYPTO_MD5=m |
||||
# CONFIG_CRYPTO_NULL is not set |
||||
# CONFIG_CRYPTO_SERPENT is not set |
||||
# CONFIG_CRYPTO_SHA256 is not set |
||||
# CONFIG_CRYPTO_SHA512 is not set |
||||
# CONFIG_CRYPTO_TEA is not set |
||||
# CONFIG_CRYPTO_TEST is not set |
||||
# CONFIG_CRYPTO_TGR192 is not set |
||||
# CONFIG_CRYPTO_TWOFISH is not set |
||||
# CONFIG_CRYPTO_WP512 is not set |
||||
# CONFIG_DDB5477 is not set |
||||
# CONFIG_DM9000 is not set |
||||
CONFIG_DMA_NEED_PCI_MAP_STATE=y |
||||
CONFIG_DMA_NONCOHERENT=y |
||||
# CONFIG_E100 is not set |
||||
# CONFIG_FIRMWARE_EDID is not set |
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y |
||||
# CONFIG_GEN_RTC is not set |
||||
CONFIG_HW_HAS_PCI=y |
||||
CONFIG_HW_RANDOM=y |
||||
CONFIG_HZ=250 |
||||
# CONFIG_HZ_100 is not set |
||||
# CONFIG_HZ_1024 is not set |
||||
# CONFIG_HZ_128 is not set |
||||
CONFIG_HZ_250=y |
||||
# CONFIG_HZ_256 is not set |
||||
# CONFIG_HZ_48 is not set |
||||
# CONFIG_I2C is not set |
||||
# CONFIG_IDE is not set |
||||
# CONFIG_IKCONFIG is not set |
||||
CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m |
||||
CONFIG_INITRAMFS_SOURCE="" |
||||
CONFIG_INPUT=m |
||||
# CONFIG_IP6_NF_MATCH_FRAG is not set |
||||
# CONFIG_IP6_NF_MATCH_HL is not set |
||||
# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set |
||||
# CONFIG_IP6_NF_MATCH_OPTS is not set |
||||
# CONFIG_IP6_NF_MATCH_RT is not set |
||||
# CONFIG_IP6_NF_RAW is not set |
||||
# CONFIG_IP6_NF_TARGET_HL is not set |
||||
# CONFIG_IP6_NF_TARGET_LOG is not set |
||||
CONFIG_IPW2200_QOS=y |
||||
# CONFIG_IP_DCCP is not set |
||||
# CONFIG_IP_NF_ARPTABLES is not set |
||||
# CONFIG_IP_NF_CT_PROTO_SCTP is not set |
||||
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set |
||||
# CONFIG_IP_NF_MATCH_HASHLIMIT is not set |
||||
# CONFIG_IP_NF_TARGET_LOG is not set |
||||
# CONFIG_IP_NF_TARGET_NETMAP is not set |
||||
# CONFIG_IP_NF_TARGET_SAME is not set |
||||
# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set |
||||
# CONFIG_IP_ROUTE_VERBOSE is not set |
||||
CONFIG_IRQ_CPU=y |
||||
CONFIG_JFFS2_FS_DEBUG=0 |
||||
# CONFIG_LAN_SAA9730 is not set |
||||
# CONFIG_LIBCRC32C is not set |
||||
# CONFIG_LLC2 is not set |
||||
# CONFIG_MACH_DECSTATION is not set |
||||
# CONFIG_MACH_JAZZ is not set |
||||
# CONFIG_MACH_VR41XX is not set |
||||
CONFIG_MINI_FO=y |
||||
CONFIG_MIPS=y |
||||
# CONFIG_MIPS_ATLAS is not set |
||||
# CONFIG_MIPS_BOSPORUS is not set |
||||
# CONFIG_MIPS_COBALT is not set |
||||
# CONFIG_MIPS_DB1000 is not set |
||||
# CONFIG_MIPS_DB1100 is not set |
||||
# CONFIG_MIPS_DB1200 is not set |
||||
# CONFIG_MIPS_DB1500 is not set |
||||
# CONFIG_MIPS_DB1550 is not set |
||||
# CONFIG_MIPS_EV64120 is not set |
||||
CONFIG_MIPS_L1_CACHE_SHIFT=5 |
||||
# CONFIG_MIPS_MALTA is not set |
||||
# CONFIG_MIPS_MIRAGE is not set |
||||
# CONFIG_MIPS_MTX1 is not set |
||||
CONFIG_MIPS_MT_DISABLED=y |
||||
# CONFIG_MIPS_MT_SMP is not set |
||||
# CONFIG_MIPS_MT_SMTC is not set |
||||
# CONFIG_MIPS_PB1000 is not set |
||||
# CONFIG_MIPS_PB1100 is not set |
||||
# CONFIG_MIPS_PB1200 is not set |
||||
# CONFIG_MIPS_PB1500 is not set |
||||
# CONFIG_MIPS_PB1550 is not set |
||||
# CONFIG_MIPS_SEAD is not set |
||||
# CONFIG_MIPS_SIM is not set |
||||
# CONFIG_MIPS_VPE_LOADER is not set |
||||
# CONFIG_MIPS_XXS1500 is not set |
||||
# CONFIG_MOMENCO_JAGUAR_ATX is not set |
||||
# CONFIG_MOMENCO_OCELOT is not set |
||||
# CONFIG_MOMENCO_OCELOT_3 is not set |
||||
# CONFIG_MOMENCO_OCELOT_C is not set |
||||
# CONFIG_MOMENCO_OCELOT_G is not set |
||||
CONFIG_MTD=y |
||||
# CONFIG_MTD_ABSENT is not set |
||||
CONFIG_MTD_BCM47XX=y |
||||
CONFIG_MTD_BLOCK=y |
||||
# CONFIG_MTD_BLOCK2MTD is not set |
||||
CONFIG_MTD_CFI=y |
||||
# CONFIG_MTD_CFI_ADV_OPTIONS is not set |
||||
CONFIG_MTD_CFI_AMDSTD=y |
||||
CONFIG_MTD_CFI_I1=y |
||||
CONFIG_MTD_CFI_I2=y |
||||
# CONFIG_MTD_CFI_I4 is not set |
||||
# CONFIG_MTD_CFI_I8 is not set |
||||
CONFIG_MTD_CFI_INTELEXT=y |
||||
# CONFIG_MTD_CFI_STAA is not set |
||||
CONFIG_MTD_CFI_UTIL=y |
||||
CONFIG_MTD_CHAR=y |
||||
# CONFIG_MTD_CMDLINE_PARTS is not set |
||||
CONFIG_MTD_COMPLEX_MAPPINGS=y |
||||
# CONFIG_MTD_CONCAT is not set |
||||
# CONFIG_MTD_DEBUG is not set |
||||
# CONFIG_MTD_DOC2000 is not set |
||||
# CONFIG_MTD_DOC2001 is not set |
||||
# CONFIG_MTD_DOC2001PLUS is not set |
||||
CONFIG_MTD_GEN_PROBE=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 |
||||
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set |
||||
CONFIG_MTD_MAP_BANK_WIDTH_4=y |
||||
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set |
||||
# CONFIG_MTD_MTDRAM is not set |
||||
# CONFIG_MTD_NAND is not set |
||||
# CONFIG_MTD_OBSOLETE_CHIPS 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_NATSEMI is not set |
||||
# CONFIG_NE2K_PCI is not set |
||||
# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set |
||||
# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set |
||||
# CONFIG_NETFILTER_XT_MATCH_DCCP is not set |
||||
# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set |
||||
CONFIG_NETFILTER_XT_MATCH_PORTSCAN=m |
||||
# CONFIG_NETFILTER_XT_MATCH_REALM is not set |
||||
# CONFIG_NETFILTER_XT_MATCH_SCTP is not set |
||||
CONFIG_NETFILTER_XT_TARGET_CHAOS=m |
||||
CONFIG_NETFILTER_XT_TARGET_DELUDE=m |
||||
# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set |
||||
# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set |
||||
# CONFIG_NET_CLS_ACT is not set |
||||
# CONFIG_NET_CLS_IND is not set |
||||
# CONFIG_NET_EMATCH is not set |
||||
# CONFIG_NET_IPGRE_BROADCAST is not set |
||||
# CONFIG_NET_PKTGEN is not set |
||||
# CONFIG_NET_SCH_NETEM is not set |
||||
# CONFIG_NET_VENDOR_3COM is not set |
||||
# CONFIG_NFSD is not set |
||||
# CONFIG_NTFS_FS 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_PMC_YOSEMITE is not set |
||||
# CONFIG_PNX8550_JBS is not set |
||||
# CONFIG_PNX8550_V2PCI is not set |
||||
# CONFIG_PPP_MULTILINK is not set |
||||
# CONFIG_PPP_SYNC_TTY is not set |
||||
# CONFIG_PROC_KCORE is not set |
||||
# CONFIG_ROMFS_FS is not set |
||||
# CONFIG_RTC is not set |
||||
CONFIG_RWSEM_GENERIC_SPINLOCK=y |
||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
||||
# CONFIG_SCSI_MULTI_LUN is not set |
||||
# CONFIG_SERIAL_8250_DETECT_IRQ is not set |
||||
CONFIG_SERIAL_8250_EXTENDED=y |
||||
# CONFIG_SERIAL_8250_MANY_PORTS is not set |
||||
# CONFIG_SERIAL_8250_RSA is not set |
||||
CONFIG_SERIAL_8250_SHARE_IRQ=y |
||||
# CONFIG_SGI_IP22 is not set |
||||
# CONFIG_SGI_IP27 is not set |
||||
# CONFIG_SGI_IP32 is not set |
||||
# CONFIG_SIBYTE_BIGSUR is not set |
||||
# CONFIG_SIBYTE_CARMEL is not set |
||||
# CONFIG_SIBYTE_CRHINE is not set |
||||
# CONFIG_SIBYTE_CRHONE is not set |
||||
# CONFIG_SIBYTE_LITTLESUR is not set |
||||
# CONFIG_SIBYTE_PTSWARM is not set |
||||
# CONFIG_SIBYTE_RHONE is not set |
||||
# CONFIG_SIBYTE_SENTOSA is not set |
||||
# CONFIG_SIBYTE_SWARM is not set |
||||
# CONFIG_SND_MIXER_OSS is not set |
||||
# CONFIG_SND_PCM_OSS is not set |
||||
# CONFIG_SPARSEMEM_STATIC is not set |
||||
CONFIG_SSB=y |
||||
CONFIG_SSB_DEBUG=y |
||||
CONFIG_SSB_DRIVER_EXTIF=y |
||||
CONFIG_SSB_DRIVER_MIPS=y |
||||
CONFIG_SSB_DRIVER_PCICORE=y |
||||
CONFIG_SSB_PCICORE_HOSTMODE=y |
||||
CONFIG_SSB_PCIHOST=y |
||||
# CONFIG_SSB_PCMCIAHOST is not set |
||||
CONFIG_SSB_SERIAL=y |
||||
# CONFIG_SSB_SILENT is not set |
||||
CONFIG_SYS_HAS_CPU_MIPS32_R1=y |
||||
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
||||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
||||
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
||||
# CONFIG_TOSHIBA_JMR3927 is not set |
||||
# CONFIG_TOSHIBA_RBTX4927 is not set |
||||
# CONFIG_TOSHIBA_RBTX4938 is not set |
||||
CONFIG_TRAD_SIGNALS=y |
||||
# CONFIG_UNUSED_SYMBOLS is not set |
||||
# CONFIG_USB_CATC is not set |
||||
CONFIG_USB_EHCI_HCD=m |
||||
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
||||
CONFIG_USB_EHCI_SPLIT_ISO=y |
||||
# CONFIG_USB_EHCI_TT_NEWSCHED is not set |
||||
# CONFIG_USB_KAWETH is not set |
||||
CONFIG_USB_OHCI_HCD=m |
||||
# CONFIG_USB_PEGASUS is not set |
||||
# CONFIG_USB_RTL8150 is not set |
||||
# CONFIG_USB_SERIAL_AIRCABLE is not set |
||||
# CONFIG_USB_SERIAL_AIRPRIME is not set |
||||
# CONFIG_USB_SERIAL_ARK3116 is not set |
||||
# CONFIG_USB_SERIAL_CP2101 is not set |
||||
# CONFIG_USB_SERIAL_CYBERJACK is not set |
||||
# CONFIG_USB_SERIAL_CYPRESS_M8 is not set |
||||
# CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set |
||||
# CONFIG_USB_SERIAL_EDGEPORT is not set |
||||
# CONFIG_USB_SERIAL_EDGEPORT_TI is not set |
||||
# CONFIG_USB_SERIAL_EMPEG is not set |
||||
# CONFIG_USB_SERIAL_FUNSOFT is not set |
||||
# CONFIG_USB_SERIAL_GARMIN is not set |
||||
# CONFIG_USB_SERIAL_GENERIC is not set |
||||
# CONFIG_USB_SERIAL_HP4X is not set |
||||
# CONFIG_USB_SERIAL_IPAQ is not set |
||||
# CONFIG_USB_SERIAL_IPW is not set |
||||
# CONFIG_USB_SERIAL_IR is not set |
||||
# CONFIG_USB_SERIAL_KEYSPAN is not set |
||||
# CONFIG_USB_SERIAL_KEYSPAN_PDA is not set |
||||
# CONFIG_USB_SERIAL_KLSI is not set |
||||
# CONFIG_USB_SERIAL_KOBIL_SCT is not set |
||||
# CONFIG_USB_SERIAL_MCT_U232 is not set |
||||
# CONFIG_USB_SERIAL_MOS7720 is not set |
||||
# CONFIG_USB_SERIAL_MOS7840 is not set |
||||
# CONFIG_USB_SERIAL_NAVMAN is not set |
||||
# CONFIG_USB_SERIAL_OMNINET is not set |
||||
# CONFIG_USB_SERIAL_OPTION is not set |
||||
# CONFIG_USB_SERIAL_SAFE is not set |
||||
# CONFIG_USB_SERIAL_SIERRAWIRELESS is not set |
||||
# CONFIG_USB_SERIAL_TI is not set |
||||
# CONFIG_USB_SERIAL_WHITEHEAT is not set |
||||
# CONFIG_USB_SERIAL_XIRCOM is not set |
||||
# CONFIG_USB_STORAGE_ALAUDA is not set |
||||
# CONFIG_USB_STORAGE_DATAFAB is not set |
||||
# CONFIG_USB_STORAGE_DPCM is not set |
||||
# CONFIG_USB_STORAGE_FREECOM is not set |
||||
# CONFIG_USB_STORAGE_JUMPSHOT is not set |
||||
# CONFIG_USB_STORAGE_KARMA is not set |
||||
# CONFIG_USB_STORAGE_SDDR09 is not set |
||||
# CONFIG_USB_STORAGE_SDDR55 is not set |
||||
# CONFIG_USB_STORAGE_USBAT is not set |
||||
CONFIG_USB_UHCI_HCD=m |
||||
# CONFIG_USB_USBNET is not set |
||||
# CONFIG_USB_USBNET_MII is not set |
||||
# CONFIG_VIA_RHINE is not set |
||||
# CONFIG_VIDEO_CX2341X is not set |
||||
CONFIG_VIDEO_DEV=m |
||||
# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set |
||||
# CONFIG_WATCHDOG is not set |
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,94 @@ |
||||
diff -urN linux-2.6.19.ref/arch/mips/Kconfig linux-2.6.19/arch/mips/Kconfig
|
||||
--- linux-2.6.19.ref/arch/mips/Kconfig 2006-12-04 21:33:48.000000000 +0100
|
||||
+++ linux-2.6.19/arch/mips/Kconfig 2006-12-04 21:34:04.000000000 +0100
|
||||
@@ -283,7 +283,6 @@
|
||||
select I8259
|
||||
select MIPS_BOARDS_GEN
|
||||
select MIPS_BONITO64
|
||||
- select MIPS_CPU_SCACHE
|
||||
select MIPS_GT64120
|
||||
select MIPS_MSC
|
||||
select SWAP_IO_SPACE
|
||||
@@ -1434,13 +1433,6 @@
|
||||
bool
|
||||
select BOARD_SCACHE
|
||||
|
||||
-#
|
||||
-# Support for a MIPS32 / MIPS64 style S-caches
|
||||
-#
|
||||
-config MIPS_CPU_SCACHE
|
||||
- bool
|
||||
- select BOARD_SCACHE
|
||||
-
|
||||
config R5000_CPU_SCACHE
|
||||
bool
|
||||
select BOARD_SCACHE
|
||||
diff -urN linux-2.6.19.ref/arch/mips/kernel/cpu-probe.c linux-2.6.19/arch/mips/kernel/cpu-probe.c
|
||||
--- linux-2.6.19.ref/arch/mips/kernel/cpu-probe.c 2006-12-04 21:33:48.000000000 +0100
|
||||
+++ linux-2.6.19/arch/mips/kernel/cpu-probe.c 2006-12-04 21:34:04.000000000 +0100
|
||||
@@ -631,6 +631,8 @@
|
||||
break;
|
||||
case PRID_IMP_25KF:
|
||||
c->cputype = CPU_25KF;
|
||||
+ /* Probe for L2 cache */
|
||||
+ c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;
|
||||
break;
|
||||
case PRID_IMP_34K:
|
||||
c->cputype = CPU_34K;
|
||||
diff -urN linux-2.6.19.ref/arch/mips/mm/c-r4k.c linux-2.6.19/arch/mips/mm/c-r4k.c
|
||||
--- linux-2.6.19.ref/arch/mips/mm/c-r4k.c 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19/arch/mips/mm/c-r4k.c 2006-12-04 21:34:04.000000000 +0100
|
||||
@@ -1038,7 +1038,6 @@
|
||||
|
||||
extern int r5k_sc_init(void);
|
||||
extern int rm7k_sc_init(void);
|
||||
-extern int mips_sc_init(void);
|
||||
|
||||
static void __init setup_scache(void)
|
||||
{
|
||||
@@ -1086,29 +1085,17 @@
|
||||
return;
|
||||
|
||||
default:
|
||||
- if (c->isa_level == MIPS_CPU_ISA_M32R1 ||
|
||||
- c->isa_level == MIPS_CPU_ISA_M32R2 ||
|
||||
- c->isa_level == MIPS_CPU_ISA_M64R1 ||
|
||||
- c->isa_level == MIPS_CPU_ISA_M64R2) {
|
||||
-#ifdef CONFIG_MIPS_CPU_SCACHE
|
||||
- if (mips_sc_init ()) {
|
||||
- scache_size = c->scache.ways * c->scache.sets * c->scache.linesz;
|
||||
- printk("MIPS secondary cache %ldkB, %s, linesize %d bytes.\n",
|
||||
- scache_size >> 10,
|
||||
- way_string[c->scache.ways], c->scache.linesz);
|
||||
- }
|
||||
-#else
|
||||
- if (!(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
|
||||
- panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
|
||||
-#endif
|
||||
- return;
|
||||
- }
|
||||
sc_present = 0;
|
||||
}
|
||||
|
||||
if (!sc_present)
|
||||
return;
|
||||
|
||||
+ if ((c->isa_level == MIPS_CPU_ISA_M32R1 ||
|
||||
+ c->isa_level == MIPS_CPU_ISA_M64R1) &&
|
||||
+ !(c->scache.flags & MIPS_CACHE_NOT_PRESENT))
|
||||
+ panic("Dunno how to handle MIPS32 / MIPS64 second level cache");
|
||||
+
|
||||
/* compute a couple of other cache variables */
|
||||
c->scache.waysize = scache_size / c->scache.ways;
|
||||
|
||||
diff -urN linux-2.6.19.ref/arch/mips/mm/Makefile linux-2.6.19/arch/mips/mm/Makefile
|
||||
--- linux-2.6.19.ref/arch/mips/mm/Makefile 2006-11-29 22:57:37.000000000 +0100
|
||||
+++ linux-2.6.19/arch/mips/mm/Makefile 2006-12-04 21:34:04.000000000 +0100
|
||||
@@ -30,7 +30,6 @@
|
||||
obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
|
||||
obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
|
||||
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o
|
||||
-obj-$(CONFIG_MIPS_CPU_SCACHE) += sc-mips.o
|
||||
|
||||
#
|
||||
# Choose one DMA coherency model
|
Loading…
Reference in new issue