-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'ralf-3.7' of git://git.linux-mips.org/pub/scm/sjhill/li…
…nux-sjhill into mips-for-linux-next
- Loading branch information
Showing
44 changed files
with
2,874 additions
and
116 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| CONFIG_MIPS_SEAD3=y | ||
| CONFIG_CPU_LITTLE_ENDIAN=y | ||
| CONFIG_CPU_MIPS32_R2=y | ||
| CONFIG_HZ_100=y | ||
| CONFIG_EXPERIMENTAL=y | ||
| CONFIG_SYSVIPC=y | ||
| CONFIG_POSIX_MQUEUE=y | ||
| CONFIG_NO_HZ=y | ||
| CONFIG_HIGH_RES_TIMERS=y | ||
| CONFIG_IKCONFIG=y | ||
| CONFIG_IKCONFIG_PROC=y | ||
| CONFIG_LOG_BUF_SHIFT=15 | ||
| CONFIG_EMBEDDED=y | ||
| CONFIG_SLAB=y | ||
| CONFIG_PROFILING=y | ||
| CONFIG_OPROFILE=y | ||
| CONFIG_MODULES=y | ||
| # CONFIG_BLK_DEV_BSG is not set | ||
| # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| CONFIG_NET=y | ||
| CONFIG_PACKET=y | ||
| CONFIG_UNIX=y | ||
| CONFIG_INET=y | ||
| CONFIG_IP_PNP=y | ||
| CONFIG_IP_PNP_DHCP=y | ||
| CONFIG_IP_PNP_BOOTP=y | ||
| # CONFIG_INET_XFRM_MODE_TRANSPORT is not set | ||
| # CONFIG_INET_XFRM_MODE_TUNNEL is not set | ||
| # CONFIG_INET_XFRM_MODE_BEET is not set | ||
| # CONFIG_INET_LRO is not set | ||
| # CONFIG_INET_DIAG is not set | ||
| # CONFIG_IPV6 is not set | ||
| # CONFIG_WIRELESS is not set | ||
| CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" | ||
| CONFIG_MTD=y | ||
| CONFIG_MTD_CHAR=y | ||
| CONFIG_MTD_BLOCK=y | ||
| CONFIG_MTD_CFI=y | ||
| CONFIG_MTD_CFI_INTELEXT=y | ||
| CONFIG_MTD_PHYSMAP=y | ||
| CONFIG_MTD_UBI=y | ||
| CONFIG_MTD_UBI_GLUEBI=y | ||
| CONFIG_BLK_DEV_LOOP=y | ||
| CONFIG_BLK_DEV_CRYPTOLOOP=m | ||
| CONFIG_SCSI=y | ||
| # CONFIG_SCSI_PROC_FS is not set | ||
| CONFIG_BLK_DEV_SD=y | ||
| CONFIG_CHR_DEV_SG=y | ||
| # CONFIG_SCSI_LOWLEVEL is not set | ||
| CONFIG_NETDEVICES=y | ||
| CONFIG_SMSC911X=y | ||
| # CONFIG_NET_VENDOR_WIZNET is not set | ||
| CONFIG_MARVELL_PHY=y | ||
| CONFIG_DAVICOM_PHY=y | ||
| CONFIG_QSEMI_PHY=y | ||
| CONFIG_LXT_PHY=y | ||
| CONFIG_CICADA_PHY=y | ||
| CONFIG_VITESSE_PHY=y | ||
| CONFIG_SMSC_PHY=y | ||
| CONFIG_BROADCOM_PHY=y | ||
| CONFIG_ICPLUS_PHY=y | ||
| # CONFIG_WLAN is not set | ||
| # CONFIG_INPUT_MOUSEDEV is not set | ||
| # CONFIG_INPUT_KEYBOARD is not set | ||
| # CONFIG_INPUT_MOUSE is not set | ||
| # CONFIG_SERIO is not set | ||
| # CONFIG_CONSOLE_TRANSLATIONS is not set | ||
| CONFIG_VT_HW_CONSOLE_BINDING=y | ||
| CONFIG_LEGACY_PTY_COUNT=32 | ||
| CONFIG_SERIAL_8250=y | ||
| CONFIG_SERIAL_8250_CONSOLE=y | ||
| CONFIG_SERIAL_8250_NR_UARTS=2 | ||
| CONFIG_SERIAL_8250_RUNTIME_UARTS=2 | ||
| # CONFIG_HW_RANDOM is not set | ||
| CONFIG_I2C=y | ||
| # CONFIG_I2C_COMPAT is not set | ||
| CONFIG_I2C_CHARDEV=y | ||
| # CONFIG_I2C_HELPER_AUTO is not set | ||
| CONFIG_SPI=y | ||
| CONFIG_SENSORS_ADT7475=y | ||
| CONFIG_BACKLIGHT_LCD_SUPPORT=y | ||
| CONFIG_LCD_CLASS_DEVICE=y | ||
| CONFIG_BACKLIGHT_CLASS_DEVICE=y | ||
| # CONFIG_VGA_CONSOLE is not set | ||
| CONFIG_USB=y | ||
| CONFIG_USB_ANNOUNCE_NEW_DEVICES=y | ||
| CONFIG_USB_EHCI_HCD=y | ||
| CONFIG_USB_EHCI_ROOT_HUB_TT=y | ||
| CONFIG_USB_STORAGE=y | ||
| CONFIG_MMC=y | ||
| CONFIG_MMC_DEBUG=y | ||
| CONFIG_MMC_SPI=y | ||
| CONFIG_NEW_LEDS=y | ||
| CONFIG_LEDS_CLASS=y | ||
| CONFIG_LEDS_TRIGGERS=y | ||
| CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
| CONFIG_RTC_CLASS=y | ||
| CONFIG_RTC_DRV_M41T80=y | ||
| CONFIG_EXT3_FS=y | ||
| # CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set | ||
| CONFIG_XFS_FS=y | ||
| CONFIG_XFS_QUOTA=y | ||
| CONFIG_XFS_POSIX_ACL=y | ||
| CONFIG_QUOTA=y | ||
| # CONFIG_PRINT_QUOTA_WARNING is not set | ||
| CONFIG_MSDOS_FS=m | ||
| CONFIG_VFAT_FS=m | ||
| CONFIG_TMPFS=y | ||
| CONFIG_JFFS2_FS=y | ||
| CONFIG_NFS_FS=y | ||
| CONFIG_ROOT_NFS=y | ||
| CONFIG_NLS_CODEPAGE_437=y | ||
| CONFIG_NLS_ASCII=y | ||
| CONFIG_NLS_ISO8859_1=y | ||
| CONFIG_NLS_ISO8859_15=y | ||
| CONFIG_NLS_UTF8=y | ||
| # CONFIG_FTRACE is not set | ||
| CONFIG_CRYPTO=y | ||
| CONFIG_CRYPTO_CBC=y | ||
| CONFIG_CRYPTO_ECB=y | ||
| CONFIG_CRYPTO_AES=y | ||
| CONFIG_CRYPTO_ARC4=y | ||
| # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
| # CONFIG_CRYPTO_HW is not set |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * This file is subject to the terms and conditions of the GNU General Public | ||
| * License. See the file "COPYING" in the main directory of this archive | ||
| * for more details. | ||
| * | ||
| * Copyright (C) 2003, 2004 Chris Dearman | ||
| * Copyright (C) 2005 Ralf Baechle (ralf@linux-mips.org) | ||
| */ | ||
| #ifndef __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H | ||
| #define __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H | ||
|
|
||
|
|
||
| /* | ||
| * CPU feature overrides for MIPS boards | ||
| */ | ||
| #ifdef CONFIG_CPU_MIPS32 | ||
| #define cpu_has_tlb 1 | ||
| #define cpu_has_4kex 1 | ||
| #define cpu_has_4k_cache 1 | ||
| /* #define cpu_has_fpu ? */ | ||
| /* #define cpu_has_32fpr ? */ | ||
| #define cpu_has_counter 1 | ||
| /* #define cpu_has_watch ? */ | ||
| #define cpu_has_divec 1 | ||
| #define cpu_has_vce 0 | ||
| /* #define cpu_has_cache_cdex_p ? */ | ||
| /* #define cpu_has_cache_cdex_s ? */ | ||
| /* #define cpu_has_prefetch ? */ | ||
| #define cpu_has_mcheck 1 | ||
| /* #define cpu_has_ejtag ? */ | ||
| #ifdef CONFIG_CPU_HAS_LLSC | ||
| #define cpu_has_llsc 1 | ||
| #else | ||
| #define cpu_has_llsc 0 | ||
| #endif | ||
| /* #define cpu_has_vtag_icache ? */ | ||
| /* #define cpu_has_dc_aliases ? */ | ||
| /* #define cpu_has_ic_fills_f_dc ? */ | ||
| #define cpu_has_nofpuex 0 | ||
| /* #define cpu_has_64bits ? */ | ||
| /* #define cpu_has_64bit_zero_reg ? */ | ||
| /* #define cpu_has_inclusive_pcaches ? */ | ||
| #define cpu_icache_snoops_remote_store 1 | ||
| #endif | ||
|
|
||
| #ifdef CONFIG_CPU_MIPS64 | ||
| #define cpu_has_tlb 1 | ||
| #define cpu_has_4kex 1 | ||
| #define cpu_has_4k_cache 1 | ||
| /* #define cpu_has_fpu ? */ | ||
| /* #define cpu_has_32fpr ? */ | ||
| #define cpu_has_counter 1 | ||
| /* #define cpu_has_watch ? */ | ||
| #define cpu_has_divec 1 | ||
| #define cpu_has_vce 0 | ||
| /* #define cpu_has_cache_cdex_p ? */ | ||
| /* #define cpu_has_cache_cdex_s ? */ | ||
| /* #define cpu_has_prefetch ? */ | ||
| #define cpu_has_mcheck 1 | ||
| /* #define cpu_has_ejtag ? */ | ||
| #define cpu_has_llsc 1 | ||
| /* #define cpu_has_vtag_icache ? */ | ||
| /* #define cpu_has_dc_aliases ? */ | ||
| /* #define cpu_has_ic_fills_f_dc ? */ | ||
| #define cpu_has_nofpuex 0 | ||
| /* #define cpu_has_64bits ? */ | ||
| /* #define cpu_has_64bit_zero_reg ? */ | ||
| /* #define cpu_has_inclusive_pcaches ? */ | ||
| #define cpu_icache_snoops_remote_store 1 | ||
| #endif | ||
|
|
||
| #endif /* __ASM_MACH_MIPS_CPU_FEATURE_OVERRIDES_H */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #ifndef __ASM_MACH_MIPS_IRQ_H | ||
| #define __ASM_MACH_MIPS_IRQ_H | ||
|
|
||
| #define NR_IRQS 256 | ||
|
|
||
|
|
||
| #include_next <irq.h> | ||
|
|
||
| #endif /* __ASM_MACH_MIPS_IRQ_H */ |
Oops, something went wrong.