Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1a8d700 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev 

* 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
  m32r: Rename STI/CLI macros
  m32r: build fix of entry.S
  m32r: Separate syscall table from entry.S
  m32r: Cosmetic updates of arch/m32r/kernel/entry.S
  m32r: Exit ei_handler directly for no IRQ case or IPI operations
  m32r: Simplify ei_handler code
  m32r: Define symbols to unify platform-dependent ICU checks
  m32r: Move dot.gdbinit files
  m32r: Rearrange platform-dependent codes
  m32r: Add defconfig file for the usrv platform.
  m32r: Update defconfig files for 2.6.23-rc1
  m32r: Move defconfig files to arch/m32r/configs/
parents 53f7b9bc 7071b291

arch/m32r/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -57,9 +57,13 @@ config PLAT_MAPPI 


config PLAT_USRV

	bool "uServer"

	select PLAT_HAS_INT1ICU



config PLAT_M32700UT

	bool "M32700UT"

	select PLAT_HAS_INT0ICU

	select PLAT_HAS_INT1ICU

	select PLAT_HAS_INT2ICU

	help

	  The M3T-M32700UT is an evaluation board based on uT-Engine

	  specification.  This board has an M32700 (Chaos) evaluation chip.
@@ -68,6 +72,9 @@ config PLAT_M32700UT 


config PLAT_OPSPUT

	bool "OPSPUT"

	select PLAT_HAS_INT0ICU

	select PLAT_HAS_INT1ICU

	select PLAT_HAS_INT2ICU

	help

	  The OPSPUT is an evaluation board based on uT-Engine

	  specification.  This board has a OPSP-REP chip.
@@ -89,6 +96,7 @@ config PLAT_MAPPI3 


config PLAT_M32104UT

	bool "M32104UT"

	select PLAT_HAS_INT1ICU

	help

	  The M3T-M32104UT is an reference board based on uT-Engine

	  specification.  This board has a M32104 chip.
@@ -149,6 +157,18 @@ config ISA_DUAL_ISSUE 
	depends on CHIP_M32700 || CHIP_OPSP

	default y



config PLAT_HAS_INT0ICU

	bool

	default n



config PLAT_HAS_INT1ICU

	bool

	default n



config PLAT_HAS_INT2ICU

	bool

	default n



config BUS_CLOCK

	int "Bus Clock [Hz] (integer)"

	default "70000000" if PLAT_MAPPI

arch/m32r/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ LIBGCC := $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) 
libs-y	+= arch/m32r/lib/ $(LIBGCC)

core-y	+= arch/m32r/kernel/	\

	   arch/m32r/mm/	\

	   arch/m32r/boot/

	   arch/m32r/boot/	\

	   arch/m32r/platforms/



drivers-$(CONFIG_OPROFILE)	+= arch/m32r/oprofile/

arch/m32r/m32104ut/defconfig.m32104ut→arch/m32r/configs/m32104ut_defconfig

+125 −238
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.19

# Wed Dec 13 17:22:20 2006

# Linux kernel version: 2.6.23-rc1

# Wed Aug  1 17:22:35 2007

#

CONFIG_M32R=y

CONFIG_GENERIC_ISA_DMA=y

CONFIG_ZONE_DMA=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_NO_IOPORT=y

CONFIG_NO_DMA=y

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"



#
@@ -23,17 +26,18 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

CONFIG_SYSVIPC=y

# CONFIG_IPC_NS is not set

CONFIG_SYSVIPC_SYSCTL=y

# CONFIG_POSIX_MQUEUE is not set

# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_UTS_NS is not set

# CONFIG_USER_NS is not set

# CONFIG_AUDIT is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14

CONFIG_SYSFS_DEPRECATED=y

# CONFIG_RELAY is not set

CONFIG_INITRAMFS_SOURCE=""

# CONFIG_BLK_DEV_INITRD is not set

CONFIG_CC_OPTIMIZE_FOR_SIZE=y

CONFIG_SYSCTL=y

# CONFIG_EMBEDDED is not set
@@ -46,29 +50,29 @@ CONFIG_BUG=y 
CONFIG_ELF_CORE=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

CONFIG_EPOLL=y

CONFIG_SLAB=y

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y

CONFIG_EVENTFD=y

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLAB=y

# CONFIG_SLUB is not set

# CONFIG_SLOB is not set

CONFIG_RT_MUTEXES=y

CONFIG_TINY_SHMEM=y

CONFIG_BASE_SMALL=0

# CONFIG_SLOB is not set



#

# Loadable module support

#

CONFIG_MODULES=y

CONFIG_MODULE_UNLOAD=y

CONFIG_MODULE_FORCE_UNLOAD=y

# CONFIG_MODVERSIONS is not set

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_KMOD=y



#

# Block layer

#

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_LSF is not set

# CONFIG_BLK_DEV_BSG is not set



#

# IO Schedulers
@@ -117,13 +121,18 @@ CONFIG_NEED_MULTIPLE_NODES=y 
# CONFIG_SPARSEMEM_STATIC is not set

CONFIG_SPLIT_PTLOCK_CPUS=4

# CONFIG_RESOURCES_64BIT is not set

CONFIG_ZONE_DMA_FLAG=1

CONFIG_VIRT_TO_BUS=y

CONFIG_IRAM_START=0x00700000

CONFIG_IRAM_SIZE=0x00010000

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_FIND_NEXT_BIT=y

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y

CONFIG_PREEMPT=y

# CONFIG_SMP is not set

CONFIG_NODES_SHIFT=1
@@ -131,6 +140,7 @@ CONFIG_NODES_SHIFT=1 
#

# Bus options (PCI, PCMCIA, EISA, MCA, ISA)

#

# CONFIG_ARCH_SUPPORTS_MSI is not set

CONFIG_ISA=y



#
@@ -138,10 +148,6 @@ CONFIG_ISA=y 
#

# CONFIG_PCCARD is not set



#

# PCI Hotplug Support

#



#

# Executable file formats

#
@@ -156,13 +162,13 @@ CONFIG_NET=y 
#

# Networking options

#

# CONFIG_NETDEBUG is not set

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y

CONFIG_XFRM=y

# CONFIG_XFRM_USER is not set

# CONFIG_XFRM_SUB_POLICY is not set

# CONFIG_XFRM_MIGRATE is not set

# CONFIG_NET_KEY is not set

CONFIG_INET=y

# CONFIG_IP_MULTICAST is not set
@@ -187,10 +193,6 @@ CONFIG_INET_TCP_DIAG=y 
CONFIG_TCP_CONG_CUBIC=y

CONFIG_DEFAULT_TCP_CONG="cubic"

# CONFIG_TCP_MD5SIG is not set



#

# IP: Virtual Server Configuration

#

# CONFIG_IP_VS is not set

# CONFIG_IPV6 is not set

# CONFIG_INET6_XFRM_TUNNEL is not set
@@ -206,12 +208,15 @@ CONFIG_NETFILTER_NETLINK=m 
CONFIG_NETFILTER_NETLINK_QUEUE=m

CONFIG_NETFILTER_NETLINK_LOG=m

# CONFIG_NF_CONNTRACK_ENABLED is not set

# CONFIG_NF_CONNTRACK is not set

CONFIG_NETFILTER_XTABLES=m

CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m

# CONFIG_NETFILTER_XT_TARGET_DSCP is not set

CONFIG_NETFILTER_XT_TARGET_MARK=m

CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m

# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set

# CONFIG_NETFILTER_XT_TARGET_TRACE is not set

# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set

CONFIG_NETFILTER_XT_MATCH_COMMENT=m

CONFIG_NETFILTER_XT_MATCH_DCCP=m

# CONFIG_NETFILTER_XT_MATCH_DSCP is not set
@@ -229,6 +234,7 @@ CONFIG_NETFILTER_XT_MATCH_SCTP=m 
# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set

CONFIG_NETFILTER_XT_MATCH_STRING=m

CONFIG_NETFILTER_XT_MATCH_TCPMSS=m

# CONFIG_NETFILTER_XT_MATCH_U32 is not set

# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set



#
@@ -248,7 +254,6 @@ CONFIG_IP_NF_FILTER=m 
CONFIG_IP_NF_TARGET_REJECT=m

CONFIG_IP_NF_TARGET_LOG=m

CONFIG_IP_NF_TARGET_ULOG=m

CONFIG_IP_NF_TARGET_TCPMSS=m

CONFIG_IP_NF_MANGLE=m

CONFIG_IP_NF_TARGET_TOS=m

CONFIG_IP_NF_TARGET_ECN=m
@@ -257,20 +262,8 @@ CONFIG_IP_NF_RAW=m 
CONFIG_IP_NF_ARPTABLES=m

CONFIG_IP_NF_ARPFILTER=m

CONFIG_IP_NF_ARP_MANGLE=m



#

# DCCP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_DCCP is not set



#

# SCTP Configuration (EXPERIMENTAL)

#

# CONFIG_IP_SCTP is not set



#

# TIPC Configuration (EXPERIMENTAL)

#

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set
@@ -297,7 +290,17 @@ CONFIG_NET_CLS_ROUTE=y 
# CONFIG_HAMRADIO is not set

# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set



#

# Wireless

#

# CONFIG_CFG80211 is not set

# CONFIG_WIRELESS_EXT is not set

# CONFIG_MAC80211 is not set

# CONFIG_IEEE80211 is not set

# CONFIG_RFKILL is not set

# CONFIG_NET_9P is not set



#

# Device Drivers
@@ -310,28 +313,12 @@ CONFIG_STANDALONE=y 
CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set

# CONFIG_SYS_HYPERVISOR is not set



#

# Connector - unified userspace <-> kernelspace linker

#

# CONFIG_CONNECTOR is not set



#

# Memory Technology Devices (MTD)

#

# CONFIG_MTD is not set



#

# Parallel port support

#

CONFIG_PARPORT=m

# CONFIG_PARPORT_GSC is not set

# CONFIG_PARPORT_AX88796 is not set

CONFIG_PARPORT_1284=y



#

# Plug and Play support

#

CONFIG_PNP=y

# CONFIG_PNP_DEBUG is not set
@@ -339,29 +326,19 @@ CONFIG_PNP=y 
# Protocols

#

CONFIG_ISAPNP=y



#

# Block devices

#

# CONFIG_PNPACPI is not set

CONFIG_BLK_DEV=y

# CONFIG_BLK_DEV_COW_COMMON is not set

CONFIG_BLK_DEV_LOOP=y

# CONFIG_BLK_DEV_CRYPTOLOOP is not set

CONFIG_BLK_DEV_NBD=m

# CONFIG_BLK_DEV_RAM is not set

# CONFIG_BLK_DEV_INITRD is not set

CONFIG_CDROM_PKTCDVD=m

CONFIG_CDROM_PKTCDVD_BUFFERS=8

CONFIG_CDROM_PKTCDVD_WCACHE=y

# CONFIG_ATA_OVER_ETH is not set



#

# Misc devices

#

# CONFIG_TIFM_CORE is not set



#

# ATA/ATAPI/MFM/RLL support

#

CONFIG_MISC_DEVICES=y

# CONFIG_EEPROM_93CX6 is not set

CONFIG_IDE=y

CONFIG_BLK_DEV_IDE=y
@@ -376,16 +353,17 @@ CONFIG_BLK_DEV_IDECD=y 
# CONFIG_BLK_DEV_IDEFLOPPY is not set

# CONFIG_BLK_DEV_IDESCSI is not set

# CONFIG_IDE_TASK_IOCTL is not set

CONFIG_IDE_PROC_FS=y



#

# IDE chipset support/bugfixes

#

CONFIG_IDE_GENERIC=y

# CONFIG_BLK_DEV_IDEPNP is not set

# CONFIG_IDEPCI_PCIBUS_ORDER is not set

# CONFIG_IDE_ARM is not set

# CONFIG_IDE_CHIPSETS is not set

# CONFIG_BLK_DEV_IDEDMA is not set

# CONFIG_IDEDMA_AUTO is not set

# CONFIG_BLK_DEV_HD is not set



#
@@ -393,6 +371,8 @@ CONFIG_IDE_GENERIC=y 
#

# CONFIG_RAID_ATTRS is not set

CONFIG_SCSI=y

# CONFIG_SCSI_DMA is not set

# CONFIG_SCSI_TGT is not set

# CONFIG_SCSI_NETLINK is not set

CONFIG_SCSI_PROC_FS=y
@@ -413,6 +393,8 @@ CONFIG_CHR_DEV_SG=m 
CONFIG_SCSI_MULTI_LUN=y

CONFIG_SCSI_CONSTANTS=y

# CONFIG_SCSI_LOGGING is not set

# CONFIG_SCSI_SCAN_ASYNC is not set

CONFIG_SCSI_WAIT_SCAN=m



#

# SCSI Transports
@@ -420,12 +402,8 @@ CONFIG_SCSI_CONSTANTS=y 
CONFIG_SCSI_SPI_ATTRS=y

# CONFIG_SCSI_FC_ATTRS is not set

# CONFIG_SCSI_ISCSI_ATTRS is not set

# CONFIG_SCSI_SAS_ATTRS is not set

# CONFIG_SCSI_SAS_LIBSAS is not set



#

# SCSI low-level drivers

#

CONFIG_SCSI_LOWLEVEL=y

# CONFIG_ISCSI_TCP is not set

# CONFIG_SCSI_AHA152X is not set

# CONFIG_SCSI_AIC7XXX_OLD is not set
@@ -441,19 +419,6 @@ CONFIG_SCSI_SPI_ATTRS=y 
# CONFIG_SCSI_SYM53C416 is not set

# CONFIG_SCSI_T128 is not set

# CONFIG_SCSI_DEBUG is not set



#

# Serial ATA (prod) and Parallel ATA (experimental) drivers

#



#

# Old CD-ROM drivers (not SCSI, not IDE)

#

# CONFIG_CD_NO_IDESCSI is not set



#

# Multi-device support (RAID and LVM)

#

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y

# CONFIG_MD_LINEAR is not set
@@ -470,43 +435,17 @@ CONFIG_DM_SNAPSHOT=m 
# CONFIG_DM_MIRROR is not set

# CONFIG_DM_ZERO is not set

# CONFIG_DM_MULTIPATH is not set



#

# Fusion MPT device support

#

# CONFIG_FUSION is not set



#

# IEEE 1394 (FireWire) support

#



#

# I2O device support

#



#

# Network device support

#

# CONFIG_DM_DELAY is not set

CONFIG_NETDEVICES=y

# CONFIG_NETDEVICES_MULTIQUEUE is not set

CONFIG_DUMMY=m

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set

# CONFIG_EQUALIZER is not set

# CONFIG_TUN is not set

# CONFIG_NET_SB1000 is not set



#

# ARCnet devices

#

# CONFIG_ARCNET is not set



#

# PHY device support

#

# CONFIG_PHYLIB is not set



#

# Ethernet (10 or 100Mbit)

#

CONFIG_NET_ETHERNET=y

CONFIG_MII=y

CONFIG_NET_VENDOR_3COM=y
@@ -536,28 +475,15 @@ CONFIG_NET_PCI=y 
# CONFIG_APRICOT is not set

# CONFIG_CS89x0 is not set

# CONFIG_NET_POCKET is not set



#

# Ethernet (1000 Mbit)

#



#

# Ethernet (10000 Mbit)

#



#

# Token Ring devices

#

CONFIG_NETDEV_1000=y

CONFIG_NETDEV_10000=y

# CONFIG_TR is not set



#

# Wireless LAN (non-hamradio)

#

# CONFIG_NET_RADIO is not set



#

# Wan interfaces

# Wireless LAN

#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_WAN is not set

# CONFIG_PLIP is not set

# CONFIG_PPP is not set
@@ -566,15 +492,7 @@ CONFIG_NET_PCI=y 
# CONFIG_NETCONSOLE is not set

# CONFIG_NETPOLL is not set

# CONFIG_NET_POLL_CONTROLLER is not set



#

# ISDN subsystem

#

# CONFIG_ISDN is not set



#

# Telephony Support

#

# CONFIG_PHONE is not set



#
@@ -582,6 +500,7 @@ CONFIG_NET_PCI=y 
#

CONFIG_INPUT=y

# CONFIG_INPUT_FF_MEMLESS is not set

# CONFIG_INPUT_POLLDEV is not set



#

# Userland interfaces
@@ -607,12 +526,19 @@ CONFIG_KEYBOARD_ATKBD=y 
# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_INPUT_MOUSE=y

CONFIG_MOUSE_PS2=y

CONFIG_MOUSE_PS2_ALPS=y

CONFIG_MOUSE_PS2_LOGIPS2PP=y

CONFIG_MOUSE_PS2_SYNAPTICS=y

CONFIG_MOUSE_PS2_LIFEBOOK=y

CONFIG_MOUSE_PS2_TRACKPOINT=y

# CONFIG_MOUSE_PS2_TOUCHKIT is not set

# CONFIG_MOUSE_SERIAL is not set

# CONFIG_MOUSE_INPORT is not set

# CONFIG_MOUSE_LOGIBM is not set

# CONFIG_MOUSE_PC110PAD is not set

# CONFIG_MOUSE_VSXXXAA is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set

# CONFIG_INPUT_TOUCHSCREEN is not set

# CONFIG_INPUT_MISC is not set
@@ -657,35 +583,17 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_PRINTER is not set

# CONFIG_PPDEV is not set

# CONFIG_TIPAR is not set



#

# IPMI

#

# CONFIG_IPMI_HANDLER is not set



#

# Watchdog Cards

#

# CONFIG_WATCHDOG is not set

# CONFIG_HW_RANDOM is not set

# CONFIG_RTC is not set

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set



#

# Ftape, the floppy tape device driver

#

# CONFIG_RAW_DRIVER is not set



#

# TPM devices

#

# CONFIG_TCG_TPM is not set



#

# I2C support

#

CONFIG_DEVPORT=y

CONFIG_I2C=m

CONFIG_I2C_BOARDINFO=y

CONFIG_I2C_CHARDEV=m



#
@@ -702,6 +610,8 @@ CONFIG_I2C_ELEKTOR=m 
# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_PARPORT is not set

# CONFIG_I2C_PARPORT_LIGHT is not set

# CONFIG_I2C_SIMTEC is not set

# CONFIG_I2C_TAOS_EVM is not set

# CONFIG_I2C_STUB is not set

# CONFIG_I2C_PCA_ISA is not set
@@ -710,11 +620,13 @@ CONFIG_I2C_ELEKTOR=m 
#

# CONFIG_SENSORS_DS1337 is not set

# CONFIG_SENSORS_DS1374 is not set

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_EEPROM is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set

# CONFIG_I2C_DEBUG_BUS is not set
@@ -725,21 +637,17 @@ CONFIG_I2C_ELEKTOR=m 
#

# CONFIG_SPI is not set

# CONFIG_SPI_MASTER is not set



#

# Dallas's 1-wire bus

#

# CONFIG_W1 is not set



#

# Hardware Monitoring support

#

# CONFIG_POWER_SUPPLY is not set

CONFIG_HWMON=y

CONFIG_HWMON_VID=m

# CONFIG_SENSORS_ABITUGURU is not set

# CONFIG_SENSORS_ABITUGURU3 is not set

# CONFIG_SENSORS_AD7418 is not set

CONFIG_SENSORS_ADM1021=m

CONFIG_SENSORS_ADM1025=m

# CONFIG_SENSORS_ADM1026 is not set

# CONFIG_SENSORS_ADM1029 is not set

CONFIG_SENSORS_ADM1031=m

# CONFIG_SENSORS_ADM9240 is not set

CONFIG_SENSORS_ASB100=m
@@ -761,8 +669,12 @@ CONFIG_SENSORS_LM85=m 
# CONFIG_SENSORS_LM87 is not set

CONFIG_SENSORS_LM90=m

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_LM93 is not set

CONFIG_SENSORS_MAX1619=m

# CONFIG_SENSORS_MAX6650 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_DME1737 is not set

CONFIG_SENSORS_SMSC47M1=m

# CONFIG_SENSORS_SMSC47M192 is not set

# CONFIG_SENSORS_SMSC47B397 is not set
@@ -770,11 +682,17 @@ CONFIG_SENSORS_SMSC47M1=m 
CONFIG_SENSORS_W83781D=m

# CONFIG_SENSORS_W83791D is not set

# CONFIG_SENSORS_W83792D is not set

# CONFIG_SENSORS_W83793 is not set

CONFIG_SENSORS_W83L785TS=m

CONFIG_SENSORS_W83627HF=m

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_HWMON_DEBUG_CHIP is not set



#

# Multifunction device drivers

#

# CONFIG_MFD_SM501 is not set



#

# Multimedia devices

#
@@ -782,17 +700,9 @@ CONFIG_VIDEO_DEV=m 
CONFIG_VIDEO_V4L1=y

CONFIG_VIDEO_V4L1_COMPAT=y

CONFIG_VIDEO_V4L2=y



#

# Video Capture Adapters

#



#

# Video Capture Adapters

#

CONFIG_VIDEO_CAPTURE_DRIVERS=y

# CONFIG_VIDEO_ADV_DEBUG is not set

CONFIG_VIDEO_HELPER_CHIPS_AUTO=y

# CONFIG_VIDEO_VIVI is not set

# CONFIG_VIDEO_PMS is not set

CONFIG_VIDEO_BWQCAM=m

CONFIG_VIDEO_CQCAM=m
@@ -801,11 +711,9 @@ CONFIG_VIDEO_CQCAM=m 
# CONFIG_VIDEO_SAA5246A is not set

# CONFIG_VIDEO_SAA5249 is not set

# CONFIG_TUNER_3036 is not set

# CONFIG_TUNER_TEA5761 is not set

# CONFIG_VIDEO_M32R_AR is not set



#

# Radio Adapters

#

CONFIG_RADIO_ADAPTERS=y

# CONFIG_RADIO_CADET is not set

# CONFIG_RADIO_RTRACK is not set

# CONFIG_RADIO_RTRACK2 is not set
@@ -817,16 +725,20 @@ CONFIG_VIDEO_CQCAM=m 
# CONFIG_RADIO_TRUST is not set

# CONFIG_RADIO_TYPHOON is not set

# CONFIG_RADIO_ZOLTRIX is not set

# CONFIG_DVB_CORE is not set

CONFIG_DAB=y



#

# Digital Video Broadcasting Devices

# Graphics support

#

# CONFIG_DVB is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Graphics support

# Display device support

#

CONFIG_FIRMWARE_EDID=y

# CONFIG_DISPLAY_SUPPORT is not set

# CONFIG_VGASTATE is not set

CONFIG_VIDEO_OUTPUT_CONTROL=m

# CONFIG_FB is not set



#
@@ -836,16 +748,15 @@ CONFIG_VGA_CONSOLE=y 
# CONFIG_VGACON_SOFT_SCROLLBACK is not set

# CONFIG_MDA_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#

# Sound

#

# CONFIG_SOUND is not set



#

# USB support

#

CONFIG_HID_SUPPORT=y

CONFIG_HID=y

CONFIG_HID_DEBUG=y

CONFIG_USB_SUPPORT=y

# CONFIG_USB_ARCH_HAS_HCD is not set

# CONFIG_USB_ARCH_HAS_OHCI is not set

# CONFIG_USB_ARCH_HAS_EHCI is not set
@@ -858,50 +769,19 @@ CONFIG_DUMMY_CONSOLE=y 
# USB Gadget Support

#

# CONFIG_USB_GADGET is not set



#

# MMC/SD Card support

#

# CONFIG_MMC is not set



#

# LED devices

#

# CONFIG_NEW_LEDS is not set



#

# LED drivers

#



#

# LED Triggers

#



#

# InfiniBand support

#



#

# EDAC - error detection and reporting (RAS) (EXPERIMENTAL)

#



#

# Real Time Clock

#

# CONFIG_RTC_CLASS is not set

# CONFIG_AUXDISPLAY is not set



#

# DMA Engine support

#

# CONFIG_DMA_ENGINE is not set



#

# DMA Clients

#



#

# DMA Devices

# Userspace I/O

#

# CONFIG_UIO is not set



#

# File systems
@@ -1000,6 +880,7 @@ CONFIG_LOCKD_V4=y 
CONFIG_EXPORTFS=m

CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

# CONFIG_SUNRPC_BIND34 is not set

# CONFIG_RPCSEC_GSS_KRB5 is not set

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -1007,7 +888,6 @@ CONFIG_SUNRPC=y 
# CONFIG_NCP_FS is not set

# CONFIG_CODA_FS is not set

# CONFIG_AFS_FS is not set

# CONFIG_9P_FS is not set



#

# Partition Types
@@ -1059,6 +939,11 @@ CONFIG_NLS_ISO8859_1=y 
# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set



#

# Distributed Lock Manager

#

# CONFIG_DLM is not set



#

# Profiling support

#
@@ -1072,29 +957,24 @@ CONFIG_OPROFILE=m 
CONFIG_ENABLE_MUST_CHECK=y

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_UNUSED_SYMBOLS is not set

# CONFIG_DEBUG_FS is not set

# CONFIG_HEADERS_CHECK is not set

# CONFIG_DEBUG_KERNEL is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_DEBUG_BUGVERBOSE=y

# CONFIG_DEBUG_FS is not set

# CONFIG_FRAME_POINTER is not set

# CONFIG_UNWIND_INFO is not set

# CONFIG_HEADERS_CHECK is not set



#

# Security options

#

# CONFIG_KEYS is not set

# CONFIG_SECURITY is not set



#

# Cryptographic options

#

CONFIG_CRYPTO=y

CONFIG_CRYPTO_ALGAPI=y

CONFIG_CRYPTO_BLKCIPHER=m

CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_HMAC=y

# CONFIG_CRYPTO_XCBC is not set

CONFIG_CRYPTO_NULL=m

CONFIG_CRYPTO_MD4=m

CONFIG_CRYPTO_MD5=m
@@ -1103,9 +983,14 @@ CONFIG_CRYPTO_SHA256=m 
CONFIG_CRYPTO_SHA512=m

CONFIG_CRYPTO_WP512=m

# CONFIG_CRYPTO_TGR192 is not set

# CONFIG_CRYPTO_GF128MUL is not set

CONFIG_CRYPTO_ECB=m

CONFIG_CRYPTO_CBC=m

CONFIG_CRYPTO_PCBC=m

# CONFIG_CRYPTO_LRW is not set

# CONFIG_CRYPTO_CRYPTD is not set

CONFIG_CRYPTO_DES=m

# CONFIG_CRYPTO_FCRYPT is not set

CONFIG_CRYPTO_BLOWFISH=m

CONFIG_CRYPTO_TWOFISH=m

CONFIG_CRYPTO_TWOFISH_COMMON=m
@@ -1120,21 +1005,23 @@ CONFIG_CRYPTO_AES=m 
# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

CONFIG_CRYPTO_CRC32C=m

# CONFIG_CRYPTO_CAMELLIA is not set

# CONFIG_CRYPTO_TEST is not set



#

# Hardware crypto devices

#

CONFIG_CRYPTO_HW=y



#

# Library routines

#

CONFIG_BITREVERSE=y

CONFIG_CRC_CCITT=m

CONFIG_CRC16=m

# CONFIG_CRC_ITU_T is not set

CONFIG_CRC32=y

# CONFIG_CRC7 is not set

CONFIG_LIBCRC32C=m

CONFIG_TEXTSEARCH=y

CONFIG_TEXTSEARCH_KMP=m

CONFIG_TEXTSEARCH_BM=m

CONFIG_TEXTSEARCH_FSM=m

CONFIG_PLIST=y

CONFIG_HAS_IOMEM=y

arch/m32r/m32700ut/defconfig.m32700ut.smp→arch/m32r/configs/m32700ut.smp_defconfig

+120 −229

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/m32r/m32700ut/defconfig.m32700ut.up→arch/m32r/configs/m32700ut.up_defconfig

+120 −229

File changed and moved.

Preview size limit exceeded, changes collapsed.