Commit 662f11cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Fix PCI ROM access
  powerpc/pseries: Really fix the oprofile CPU type on pseries
  serial/nwpserial: Fix wrong register read address and add interrupt acknowledge.
  powerpc/cell: Make ptcal more reliable
  powerpc: Allow mem=x cmdline to work with 4G+
  powerpc/mpic: Fix incorrect allocation of interrupt rev-map
  powerpc: Fix oprofile sampling of marked events on POWER7
  powerpc/iseries: Fix pci breakage due to bad dma_data initialization
  powerpc: Fix mktree build error on Mac OS X host
  powerpc/virtex: Fix duplicate level irq events.
  powerpc/virtex: Add uImage to the default images list
  powerpc/boot: add simpleImage.* to clean-files list
  powerpc/8xx: Update defconfigs
  powerpc/embedded6xx: Update defconfigs
  powerpc/86xx: Update defconfigs
  powerpc/85xx: Update defconfigs
  powerpc/83xx: Update defconfigs
  powerpc/fsl_soc: Remove mpc83xx_wdt_init, again
parents 1f71ebed ad892a63

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y)) 
clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \

	zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \

	zImage.iseries zImage.miboot zImage.pmac zImage.pseries \

	otheros.bld *.dtb

	simpleImage.* otheros.bld *.dtb



# clean up files cached by wrapper

clean-kernel := vmlinux.strip vmlinux.bin

arch/powerpc/boot/mktree.c

+5 −5
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int main(int argc, char *argv[]) 
{

	int	in_fd, out_fd;

	int	nblks, i;

	uint	cksum, *cp;

	unsigned int	cksum, *cp;

	struct	stat	st;

	boot_block_t	bt;
@@ -90,7 +90,7 @@ int main(int argc, char *argv[]) 


	cksum = 0;

	cp = (void *)&bt;

	for (i=0; i<sizeof(bt)/sizeof(uint); i++)

	for (i = 0; i < sizeof(bt) / sizeof(unsigned int); i++)

		cksum += *cp++;



	/* Assume zImage is an ELF file, and skip the 64K header.
@@ -101,7 +101,7 @@ int main(int argc, char *argv[]) 
		exit(4);

	}



	if ((*(uint *)tmpbuf) != htonl(0x7f454c46)) {

	if ((*(unsigned int *)tmpbuf) != htonl(0x7f454c46)) {

		fprintf(stderr, "%s is not an ELF image\n", argv[1]);

		exit(4);

	}
@@ -125,8 +125,8 @@ int main(int argc, char *argv[]) 
			perror("zImage read");

			exit(5);

		}

		cp = (uint *)tmpbuf;

		for (i=0; i<sizeof(tmpbuf)/sizeof(uint); i++)

		cp = (unsigned int *)tmpbuf;

		for (i = 0; i < sizeof(tmpbuf) / sizeof(unsigned int); i++)

			cksum += *cp++;

		if (write(out_fd, tmpbuf, sizeof(tmpbuf)) != sizeof(tmpbuf)) {

			perror("boot-image write");

arch/powerpc/configs/83xx/asp8347_defconfig

+76 −28
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc2

# Mon Jan 26 15:35:47 2009

# Linux kernel version: 2.6.30-rc3

# Wed May 13 17:22:05 2009

#

# CONFIG_PPC64 is not set
@@ -14,6 +14,7 @@ CONFIG_6xx=y 
# CONFIG_40x is not set

# CONFIG_44x is not set

# CONFIG_E200 is not set

CONFIG_PPC_BOOK3S=y

CONFIG_PPC_FPU=y

CONFIG_FSL_EMB_PERFMON=y

# CONFIG_ALTIVEC is not set
@@ -57,6 +58,7 @@ CONFIG_REDBOOT=y 
CONFIG_ARCH_SUSPEND_POSSIBLE=y

# CONFIG_PPC_DCR_NATIVE is not set

# CONFIG_PPC_DCR_MMIO is not set

CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

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



#
@@ -74,6 +76,15 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set



#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_GROUP_SCHED=y
@@ -88,19 +99,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y 
# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_GZIP=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y

CONFIG_EMBEDDED=y

CONFIG_SYSCTL_SYSCALL=y

# CONFIG_KALLSYMS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

# CONFIG_EPOLL is not set

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y
@@ -110,16 +124,19 @@ CONFIG_AIO=y 
CONFIG_VM_EVENT_COUNTERS=y

CONFIG_PCI_QUIRKS=y

CONFIG_SLUB_DEBUG=y

CONFIG_COMPAT_BRK=y

# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y

CONFIG_HAVE_IOREMAP_PROT=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

# CONFIG_SLOW_WORK is not set

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -132,7 +149,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -148,18 +164,11 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_FREEZER is not set



#

# Platform support

#

CONFIG_PPC_MULTIPLATFORM=y

CONFIG_CLASSIC32=y

# CONFIG_PPC_CHRP is not set

# CONFIG_MPC5121_ADS is not set

# CONFIG_MPC5121_GENERIC is not set
@@ -184,6 +193,8 @@ CONFIG_ASP834x=y 
CONFIG_PPC_MPC834x=y

# CONFIG_PPC_86xx is not set

# CONFIG_EMBEDDED6xx is not set

# CONFIG_AMIGAONE is not set

CONFIG_PPC_OF_BOOT_TRAMPOLINE=y

CONFIG_IPIC=y

# CONFIG_MPIC is not set

# CONFIG_MPIC_WEIRD is not set
@@ -245,9 +256,12 @@ CONFIG_ZONE_DMA_FLAG=1 
CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_PPC_4K_PAGES=y

# CONFIG_PPC_16K_PAGES is not set

# CONFIG_PPC_64K_PAGES is not set

# CONFIG_PPC_256K_PAGES is not set

CONFIG_FORCE_MAX_ZONEORDER=11

CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set
@@ -273,6 +287,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y 
# CONFIG_PCI_MSI is not set

# CONFIG_PCI_LEGACY is not set

# CONFIG_PCI_STUB is not set

# CONFIG_PCI_IOV is not set

# CONFIG_PCCARD is not set

# CONFIG_HOTPLUG_PCI is not set

# CONFIG_HAS_RAPIDIO is not set
@@ -295,7 +310,6 @@ CONFIG_NET=y 
#

# Networking options

#

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y
@@ -351,6 +365,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -363,7 +378,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

CONFIG_WIRELESS=y

# CONFIG_CFG80211 is not set

CONFIG_WIRELESS_OLD_REGULATORY=y
@@ -469,7 +483,6 @@ CONFIG_MTD_PHYSMAP_OF=y 
# LPDDR flash memory drivers

#

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_QINFO_PROBE is not set



#

# UBI - Unsorted block images
@@ -499,13 +512,20 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 
# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

# CONFIG_PHANTOM is not set

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_ISL29003 is not set

# CONFIG_C2PORT is not set



#

# EEPROM support

#

# CONFIG_EEPROM_AT24 is not set

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -532,6 +552,7 @@ CONFIG_HAVE_IDE=y 
# CONFIG_I2O is not set

# CONFIG_MACINTOSH_DRIVERS is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -565,6 +586,8 @@ CONFIG_MII=y 
# CONFIG_SUNGEM is not set

# CONFIG_CASSINI is not set

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_ETHOC is not set

# CONFIG_DNET is not set

# CONFIG_NET_TULIP is not set

# CONFIG_HP100 is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -584,6 +607,7 @@ CONFIG_NETDEV_1000=y 
# CONFIG_E1000E is not set

# CONFIG_IP1000 is not set

# CONFIG_IGB is not set

# CONFIG_IGBVF is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set
@@ -594,11 +618,12 @@ CONFIG_NETDEV_1000=y 
# CONFIG_VIA_VELOCITY is not set

# CONFIG_TIGON3 is not set

# CONFIG_BNX2 is not set

CONFIG_FSL_PQ_MDIO=y

CONFIG_GIANFAR=y

# CONFIG_MV643XX_ETH is not set

# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1E is not set

# CONFIG_ATL1C is not set

# CONFIG_JME is not set

# CONFIG_NETDEV_10000 is not set

# CONFIG_TR is not set
@@ -608,7 +633,6 @@ CONFIG_GIANFAR=y 
#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -759,12 +783,9 @@ CONFIG_I2C_MPC=y 
# Miscellaneous I2C Chip support

#

# CONFIG_DS1682 is not set

# CONFIG_EEPROM_AT24 is not set

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 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
@@ -796,6 +817,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_F71882FG is not set

# CONFIG_SENSORS_F75375S is not set

# CONFIG_SENSORS_G760A is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set
@@ -810,11 +832,14 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_LM93 is not set

# CONFIG_SENSORS_LTC4215 is not set

# CONFIG_SENSORS_LTC4245 is not set

# CONFIG_SENSORS_LM95241 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_MAX6650 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_SIS5595 is not set

# CONFIG_SENSORS_DME1737 is not set

# CONFIG_SENSORS_SMSC47M1 is not set
@@ -959,11 +984,11 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y 
# CONFIG_USB_TMC is not set



#

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may

#



#

# see USB_STORAGE Help for more information

# also be needed; see USB_STORAGE Help for more info

#

# CONFIG_USB_LIBUSUAL is not set
@@ -991,7 +1016,6 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y 
# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGET is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

# CONFIG_USB_APPLEDISPLAY is not set
@@ -1006,6 +1030,7 @@ CONFIG_USB_EHCI_HCD_PPC_OF=y 
#

# OTG and related infrastructure

#

# CONFIG_NOP_USB_XCEIV is not set

# CONFIG_UWB is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set
@@ -1067,8 +1092,9 @@ CONFIG_RTC_DRV_DS1374=y 
#

# on-CPU RTC drivers

#

# CONFIG_RTC_DRV_PPC is not set

# CONFIG_RTC_DRV_GENERIC is not set

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set
@@ -1079,6 +1105,7 @@ CONFIG_EXT2_FS=y 
# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set
@@ -1100,6 +1127,11 @@ CONFIG_INOTIFY_USER=y 
# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set



#

# Caches

#

# CONFIG_FSCACHE is not set



#

# CD-ROM/DVD Filesystems

#
@@ -1154,6 +1186,7 @@ CONFIG_JFFS2_RTIME=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y
@@ -1166,7 +1199,6 @@ CONFIG_LOCKD_V4=y 
CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

# CONFIG_SUNRPC_REGISTER_V4 is not set

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -1233,6 +1265,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" 
# CONFIG_NLS_KOI8_U is not set

# CONFIG_NLS_UTF8 is not set

# CONFIG_DLM is not set

# CONFIG_BINARY_PRINTF is not set



#

# Library routines
@@ -1248,11 +1281,12 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

CONFIG_DECOMPRESS_GZIP=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_HAVE_LMB=y

CONFIG_NLATTR=y



#

# Kernel hacking
@@ -1274,13 +1308,24 @@ CONFIG_FRAME_WARN=1024 
# CONFIG_LATENCYTOP is not set

# CONFIG_SYSCTL_SYSCALL_CHECK is not set

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers

#

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

CONFIG_PRINT_STACK_DEPTH=64
@@ -1309,10 +1354,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y 
CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_PCOMP=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

CONFIG_CRYPTO_WORKQUEUE=y

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_TEST is not set
@@ -1381,6 +1428,7 @@ CONFIG_CRYPTO_DES=y 
# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_ZLIB is not set

# CONFIG_CRYPTO_LZO is not set



#

arch/powerpc/configs/83xx/mpc8313_rdb_defconfig

+83 −31
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.29-rc2

# Mon Jan 26 15:35:48 2009

# Linux kernel version: 2.6.30-rc3

# Wed May 13 17:22:06 2009

#

# CONFIG_PPC64 is not set
@@ -14,6 +14,7 @@ CONFIG_6xx=y 
# CONFIG_40x is not set

# CONFIG_44x is not set

# CONFIG_E200 is not set

CONFIG_PPC_BOOK3S=y

CONFIG_PPC_FPU=y

# CONFIG_FSL_EMB_PERFMON is not set

# CONFIG_ALTIVEC is not set
@@ -56,6 +57,7 @@ CONFIG_DEFAULT_UIMAGE=y 
CONFIG_ARCH_SUSPEND_POSSIBLE=y

# CONFIG_PPC_DCR_NATIVE is not set

# CONFIG_PPC_DCR_MMIO is not set

CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y

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



#
@@ -73,6 +75,15 @@ CONFIG_SYSVIPC_SYSCTL=y 
# CONFIG_BSD_PROCESS_ACCT is not set

# CONFIG_TASKSTATS is not set

# CONFIG_AUDIT is not set



#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_IKCONFIG is not set

CONFIG_LOG_BUF_SHIFT=14

CONFIG_GROUP_SCHED=y
@@ -87,19 +98,22 @@ CONFIG_SYSFS_DEPRECATED_V2=y 
# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y

CONFIG_INITRAMFS_SOURCE=""

CONFIG_RD_GZIP=y

# CONFIG_RD_BZIP2 is not set

# CONFIG_RD_LZMA is not set

# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set

CONFIG_SYSCTL=y

CONFIG_ANON_INODES=y

CONFIG_EMBEDDED=y

CONFIG_SYSCTL_SYSCALL=y

# CONFIG_KALLSYMS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y

CONFIG_ELF_CORE=y

CONFIG_COMPAT_BRK=y

CONFIG_BASE_FULL=y

CONFIG_FUTEX=y

CONFIG_ANON_INODES=y

# CONFIG_EPOLL is not set

CONFIG_SIGNALFD=y

CONFIG_TIMERFD=y
@@ -109,16 +123,19 @@ CONFIG_AIO=y 
CONFIG_VM_EVENT_COUNTERS=y

CONFIG_PCI_QUIRKS=y

CONFIG_SLUB_DEBUG=y

CONFIG_COMPAT_BRK=y

# CONFIG_SLAB is not set

CONFIG_SLUB=y

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y

CONFIG_HAVE_IOREMAP_PROT=y

CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_ARCH_TRACEHOOK=y

# CONFIG_SLOW_WORK is not set

# CONFIG_HAVE_GENERIC_DMA_COHERENT is not set

CONFIG_SLABINFO=y

CONFIG_RT_MUTEXES=y
@@ -131,7 +148,6 @@ CONFIG_MODULE_UNLOAD=y 
# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -147,18 +163,11 @@ CONFIG_DEFAULT_AS=y 
# CONFIG_DEFAULT_CFQ is not set

# CONFIG_DEFAULT_NOOP is not set

CONFIG_DEFAULT_IOSCHED="anticipatory"

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

# CONFIG_FREEZER is not set



#

# Platform support

#

CONFIG_PPC_MULTIPLATFORM=y

CONFIG_CLASSIC32=y

# CONFIG_PPC_CHRP is not set

# CONFIG_MPC5121_ADS is not set

# CONFIG_MPC5121_GENERIC is not set
@@ -183,6 +192,8 @@ CONFIG_MPC831x_RDB=y 
CONFIG_PPC_MPC831x=y

# CONFIG_PPC_86xx is not set

# CONFIG_EMBEDDED6xx is not set

# CONFIG_AMIGAONE is not set

CONFIG_PPC_OF_BOOT_TRAMPOLINE=y

CONFIG_IPIC=y

# CONFIG_MPIC is not set

# CONFIG_MPIC_WEIRD is not set
@@ -244,9 +255,12 @@ CONFIG_ZONE_DMA_FLAG=1 
CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_PPC_4K_PAGES=y

# CONFIG_PPC_16K_PAGES is not set

# CONFIG_PPC_64K_PAGES is not set

# CONFIG_PPC_256K_PAGES is not set

CONFIG_FORCE_MAX_ZONEORDER=11

CONFIG_PROC_DEVICETREE=y

# CONFIG_CMDLINE_BOOL is not set
@@ -273,6 +287,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y 
# CONFIG_PCI_LEGACY is not set

# CONFIG_PCI_DEBUG is not set

# CONFIG_PCI_STUB is not set

# CONFIG_PCI_IOV is not set

# CONFIG_PCCARD is not set

# CONFIG_HOTPLUG_PCI is not set

# CONFIG_HAS_RAPIDIO is not set
@@ -295,7 +310,6 @@ CONFIG_NET=y 
#

# Networking options

#

CONFIG_COMPAT_NET_DEV_OPS=y

CONFIG_PACKET=y

# CONFIG_PACKET_MMAP is not set

CONFIG_UNIX=y
@@ -351,6 +365,7 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_LAPB is not set

# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -363,7 +378,6 @@ CONFIG_DEFAULT_TCP_CONG="cubic" 
# CONFIG_IRDA is not set

# CONFIG_BT is not set

# CONFIG_AF_RXRPC is not set

# CONFIG_PHONET is not set

CONFIG_WIRELESS=y

# CONFIG_CFG80211 is not set

CONFIG_WIRELESS_OLD_REGULATORY=y
@@ -481,7 +495,6 @@ CONFIG_MTD_NAND_FSL_ELBC=y 
# LPDDR flash memory drivers

#

# CONFIG_MTD_LPDDR is not set

# CONFIG_MTD_QINFO_PROBE is not set



#

# UBI - Unsorted block images
@@ -512,13 +525,21 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 
# CONFIG_BLK_DEV_HD is not set

CONFIG_MISC_DEVICES=y

# CONFIG_PHANTOM is not set

# CONFIG_EEPROM_93CX6 is not set

# CONFIG_SGI_IOC4 is not set

# CONFIG_TIFM_CORE is not set

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set

# CONFIG_HP_ILO is not set

# CONFIG_ISL29003 is not set

# CONFIG_C2PORT is not set



#

# EEPROM support

#

# CONFIG_EEPROM_AT24 is not set

# CONFIG_EEPROM_AT25 is not set

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

# CONFIG_IDE is not set
@@ -576,9 +597,11 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_MEGARAID_NEWGEN is not set

# CONFIG_MEGARAID_LEGACY is not set

# CONFIG_MEGARAID_SAS is not set

# CONFIG_SCSI_MPT2SAS is not set

# CONFIG_SCSI_HPTIOP is not set

# CONFIG_SCSI_BUSLOGIC is not set

# CONFIG_LIBFC is not set

# CONFIG_LIBFCOE is not set

# CONFIG_FCOE is not set

# CONFIG_SCSI_DMX3191D is not set

# CONFIG_SCSI_EATA is not set
@@ -600,6 +623,7 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_SCSI_DEBUG is not set

# CONFIG_SCSI_SRP is not set

# CONFIG_SCSI_DH is not set

# CONFIG_SCSI_OSD_INITIATOR is not set

# CONFIG_ATA is not set

CONFIG_MD=y

CONFIG_BLK_DEV_MD=y
@@ -626,6 +650,7 @@ CONFIG_MD_RAID1=y 
# CONFIG_I2O is not set

# CONFIG_MACINTOSH_DRIVERS is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -660,6 +685,8 @@ CONFIG_MII=y 
# CONFIG_CASSINI is not set

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_ENC28J60 is not set

# CONFIG_ETHOC is not set

# CONFIG_DNET is not set

# CONFIG_NET_TULIP is not set

# CONFIG_HP100 is not set

# CONFIG_IBM_NEW_EMAC_ZMII is not set
@@ -697,6 +724,7 @@ CONFIG_NETDEV_1000=y 
# CONFIG_E1000E is not set

# CONFIG_IP1000 is not set

# CONFIG_IGB is not set

# CONFIG_IGBVF is not set

# CONFIG_NS83820 is not set

# CONFIG_HAMACHI is not set

# CONFIG_YELLOWFIN is not set
@@ -707,11 +735,12 @@ CONFIG_NETDEV_1000=y 
# CONFIG_VIA_VELOCITY is not set

# CONFIG_TIGON3 is not set

# CONFIG_BNX2 is not set

CONFIG_FSL_PQ_MDIO=y

CONFIG_GIANFAR=y

# CONFIG_MV643XX_ETH is not set

# CONFIG_QLA3XXX is not set

# CONFIG_ATL1 is not set

# CONFIG_ATL1E is not set

# CONFIG_ATL1C is not set

# CONFIG_JME is not set

CONFIG_NETDEV_10000=y

# CONFIG_CHELSIO_T1 is not set
@@ -721,6 +750,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y 
# CONFIG_IXGBE is not set

# CONFIG_IXGB is not set

# CONFIG_S2IO is not set

# CONFIG_VXGE is not set

# CONFIG_MYRI10GE is not set

# CONFIG_NETXEN_NIC is not set

# CONFIG_NIU is not set
@@ -730,6 +760,7 @@ CONFIG_CHELSIO_T3_DEPENDS=y 
# CONFIG_BNX2X is not set

# CONFIG_QLGE is not set

# CONFIG_SFC is not set

# CONFIG_BE2NET is not set

# CONFIG_TR is not set



#
@@ -737,7 +768,6 @@ CONFIG_CHELSIO_T3_DEPENDS=y 
#

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set

# CONFIG_IWLWIFI_LEDS is not set



#

# Enable WiMAX (Networking options) to see the WiMAX drivers
@@ -815,6 +845,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 
#

# Non-8250 serial port support

#

# CONFIG_SERIAL_MAX3100 is not set

# CONFIG_SERIAL_UARTLITE is not set

CONFIG_SERIAL_CORE=y

CONFIG_SERIAL_CORE_CONSOLE=y
@@ -827,6 +858,7 @@ CONFIG_LEGACY_PTY_COUNT=256 
# CONFIG_HVC_UDBG is not set

# CONFIG_IPMI_HANDLER is not set

CONFIG_HW_RANDOM=y

# CONFIG_HW_RANDOM_TIMERIOMEM is not set

# CONFIG_NVRAM is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set
@@ -889,12 +921,9 @@ CONFIG_I2C_MPC=y 
# Miscellaneous I2C Chip support

#

# CONFIG_DS1682 is not set

# CONFIG_EEPROM_AT24 is not set

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_SENSORS_PCF8574 is not set

# CONFIG_PCF8575 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
@@ -914,7 +943,6 @@ CONFIG_SPI_MPC83xx=y 
#

# SPI Protocol Masters

#

# CONFIG_EEPROM_AT25 is not set

# CONFIG_SPI_SPIDEV is not set

# CONFIG_SPI_TLE62X0 is not set

CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
@@ -942,6 +970,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_F71882FG is not set

# CONFIG_SENSORS_F75375S is not set

# CONFIG_SENSORS_G760A is not set

# CONFIG_SENSORS_GL518SM is not set

# CONFIG_SENSORS_GL520SM is not set

# CONFIG_SENSORS_IT87 is not set
@@ -957,12 +986,15 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_LM90 is not set

# CONFIG_SENSORS_LM92 is not set

# CONFIG_SENSORS_LM93 is not set

# CONFIG_SENSORS_LTC4215 is not set

# CONFIG_SENSORS_LTC4245 is not set

# CONFIG_SENSORS_LM95241 is not set

# CONFIG_SENSORS_MAX1111 is not set

# CONFIG_SENSORS_MAX1619 is not set

# CONFIG_SENSORS_MAX6650 is not set

# CONFIG_SENSORS_PC87360 is not set

# CONFIG_SENSORS_PC87427 is not set

# CONFIG_SENSORS_PCF8591 is not set

# CONFIG_SENSORS_SIS5595 is not set

# CONFIG_SENSORS_DME1737 is not set

# CONFIG_SENSORS_SMSC47M1 is not set
@@ -981,6 +1013,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_W83L786NG is not set

# CONFIG_SENSORS_W83627HF is not set

# CONFIG_SENSORS_W83627EHF is not set

# CONFIG_SENSORS_LIS3_SPI is not set

# CONFIG_HWMON_DEBUG_CHIP is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set
@@ -1077,7 +1110,6 @@ CONFIG_HID=y 
#

# Special HID drivers

#

CONFIG_HID_COMPAT=y

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

CONFIG_USB_ARCH_HAS_OHCI=y
@@ -1135,11 +1167,11 @@ CONFIG_USB_UHCI_HCD=y 
# CONFIG_USB_TMC is not set



#

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;

# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may

#



#

# see USB_STORAGE Help for more information

# also be needed; see USB_STORAGE Help for more info

#

CONFIG_USB_STORAGE=y

# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1181,7 +1213,6 @@ CONFIG_USB_STORAGE=y 
# CONFIG_USB_LED is not set

# CONFIG_USB_CYPRESS_CY7C63 is not set

# CONFIG_USB_CYTHERM is not set

# CONFIG_USB_PHIDGET is not set

# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

# CONFIG_USB_APPLEDISPLAY is not set
@@ -1228,6 +1259,7 @@ CONFIG_USB_ETH_RNDIS=y 
#

# OTG and related infrastructure

#

# CONFIG_NOP_USB_XCEIV is not set

# CONFIG_UWB is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set
@@ -1296,8 +1328,9 @@ CONFIG_RTC_DRV_DS1307=y 
#

# on-CPU RTC drivers

#

# CONFIG_RTC_DRV_PPC is not set

# CONFIG_RTC_DRV_GENERIC is not set

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_UIO is not set

# CONFIG_STAGING is not set
@@ -1308,6 +1341,7 @@ CONFIG_EXT2_FS=y 
# CONFIG_EXT2_FS_XATTR is not set

# CONFIG_EXT2_FS_XIP is not set

CONFIG_EXT3_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

CONFIG_EXT3_FS_XATTR=y

# CONFIG_EXT3_FS_POSIX_ACL is not set

# CONFIG_EXT3_FS_SECURITY is not set
@@ -1329,6 +1363,11 @@ CONFIG_INOTIFY_USER=y 
# CONFIG_AUTOFS4_FS is not set

# CONFIG_FUSE_FS is not set



#

# Caches

#

# CONFIG_FSCACHE is not set



#

# CD-ROM/DVD Filesystems

#
@@ -1383,6 +1422,7 @@ CONFIG_JFFS2_RTIME=y 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y
@@ -1395,7 +1435,6 @@ CONFIG_LOCKD_V4=y 
CONFIG_NFS_COMMON=y

CONFIG_SUNRPC=y

CONFIG_SUNRPC_GSS=y

# CONFIG_SUNRPC_REGISTER_V4 is not set

CONFIG_RPCSEC_GSS_KRB5=y

# CONFIG_RPCSEC_GSS_SPKM3 is not set

# CONFIG_SMB_FS is not set
@@ -1427,6 +1466,7 @@ CONFIG_MSDOS_PARTITION=y 
# CONFIG_SYSV68_PARTITION is not set

# CONFIG_NLS is not set

# CONFIG_DLM is not set

# CONFIG_BINARY_PRINTF is not set



#

# Library routines
@@ -1442,11 +1482,12 @@ CONFIG_CRC32=y 
# CONFIG_LIBCRC32C is not set

CONFIG_ZLIB_INFLATE=y

CONFIG_ZLIB_DEFLATE=y

CONFIG_PLIST=y

CONFIG_DECOMPRESS_GZIP=y

CONFIG_HAS_IOMEM=y

CONFIG_HAS_IOPORT=y

CONFIG_HAS_DMA=y

CONFIG_HAVE_LMB=y

CONFIG_NLATTR=y



#

# Kernel hacking
@@ -1464,6 +1505,9 @@ CONFIG_DEBUG_KERNEL=y 
CONFIG_DETECT_SOFTLOCKUP=y

# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set

CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0

CONFIG_DETECT_HUNG_TASK=y

# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set

CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0

CONFIG_SCHED_DEBUG=y

# CONFIG_SCHEDSTATS is not set

# CONFIG_TIMER_STATS is not set
@@ -1493,9 +1537,12 @@ CONFIG_SCHED_DEBUG=y 
# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

CONFIG_SYSCTL_SYSCALL_CHECK=y

# CONFIG_DEBUG_PAGEALLOC is not set

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y

CONFIG_HAVE_DYNAMIC_FTRACE=y

CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers
@@ -1503,17 +1550,19 @@ CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y 
# CONFIG_FUNCTION_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_DYNAMIC_PRINTK_DEBUG is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

# CONFIG_BLK_DEV_IO_TRACE is not set

# CONFIG_SAMPLES is not set

CONFIG_HAVE_ARCH_KGDB=y

# CONFIG_KGDB is not set

CONFIG_PRINT_STACK_DEPTH=64

# CONFIG_DEBUG_STACKOVERFLOW is not set

# CONFIG_DEBUG_STACK_USAGE is not set

# CONFIG_DEBUG_PAGEALLOC is not set

# CONFIG_CODE_PATCHING_SELFTEST is not set

# CONFIG_FTR_FIXUP_SELFTEST is not set

# CONFIG_MSI_BITMAP_SELFTEST is not set
@@ -1544,10 +1593,12 @@ CONFIG_CRYPTO_BLKCIPHER2=y 
CONFIG_CRYPTO_HASH=y

CONFIG_CRYPTO_HASH2=y

CONFIG_CRYPTO_RNG2=y

CONFIG_CRYPTO_PCOMP=y

CONFIG_CRYPTO_MANAGER=y

CONFIG_CRYPTO_MANAGER2=y

# CONFIG_CRYPTO_GF128MUL is not set

# CONFIG_CRYPTO_NULL is not set

CONFIG_CRYPTO_WORKQUEUE=y

# CONFIG_CRYPTO_CRYPTD is not set

# CONFIG_CRYPTO_AUTHENC is not set

# CONFIG_CRYPTO_TEST is not set
@@ -1616,6 +1667,7 @@ CONFIG_CRYPTO_DES=y 
# Compression

#

# CONFIG_CRYPTO_DEFLATE is not set

# CONFIG_CRYPTO_ZLIB is not set

# CONFIG_CRYPTO_LZO is not set



#

arch/powerpc/configs/83xx/mpc8315_rdb_defconfig

+83 −31

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE