Merge branch '85xx' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc (cf66c897) · Commits · e / devices / android_kernel_fairphone_FP3

arch/powerpc/Kconfig.debug

+0 −5

Original line number	Diff line number	Diff line
		@@ -110,11 +110,6 @@ config SERIAL_TEXT_DEBUG
		depends on 4xx \|\| LOPEC \|\| MV64X60 \|\| PPLUS \|\| PRPMC800 \|\| \
		PPC_GEN550 \|\| PPC_MPC52xx

		config PPC_OCP
		bool
		depends on IBM_OCP \|\| XILINX_OCP
		default y

		choice
		prompt "Early debugging (dangerous)"
		bool

arch/powerpc/Makefile

+1 −5

Original line number	Diff line number	Diff line
		@@ -129,12 +129,8 @@ core-y += arch/powerpc/kernel/ \
		arch/powerpc/lib/ \
		arch/powerpc/sysdev/ \
		arch/powerpc/platforms/
		core-$(CONFIG_MATH_EMULATION) += arch/ppc/math-emu/
		core-$(CONFIG_MATH_EMULATION) += arch/powerpc/math-emu/
		core-$(CONFIG_XMON) += arch/powerpc/xmon/
		core-$(CONFIG_APUS) += arch/ppc/amiga/
		drivers-$(CONFIG_8xx) += arch/ppc/8xx_io/
		drivers-$(CONFIG_4xx) += arch/ppc/4xx_io/
		drivers-$(CONFIG_CPM2) += arch/ppc/8260_io/

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

arch/powerpc/configs/mpc8540_ads_defconfig

+25 −18

Original line number	Diff line number	Diff line
		#
		# Automatically generated make config: don't edit
		# Linux kernel version:
		# Sat Jan 14 15:57:54 2006
		# Linux kernel version: 2.6.16
		# Mon Mar 27 23:37:36 2006
		#
		# CONFIG_PPC64 is not set
		CONFIG_PPC32=y
		@@ -9,6 +9,7 @@ CONFIG_PPC_MERGE=y
		CONFIG_MMU=y
		CONFIG_GENERIC_HARDIRQS=y
		CONFIG_RWSEM_XCHGADD_ALGORITHM=y
		CONFIG_GENERIC_HWEIGHT=y
		CONFIG_GENERIC_CALIBRATE_DELAY=y
		CONFIG_PPC=y
		CONFIG_EARLY_PRINTK=y
		@@ -18,6 +19,7 @@ CONFIG_ARCH_MAY_HAVE_PC_FDC=y
		CONFIG_PPC_OF=y
		CONFIG_PPC_UDBG_16550=y
		# CONFIG_GENERIC_TBSYNC is not set
		CONFIG_DEFAULT_UIMAGE=y

		#
		# Processor support
		@@ -42,7 +44,6 @@ CONFIG_SPE=y
		# Code maturity level options
		#
		CONFIG_EXPERIMENTAL=y
		CONFIG_CLEAN_COMPILE=y
		CONFIG_BROKEN_ON_SMP=y
		CONFIG_INIT_ENV_ARG_LIMIT=32

		@@ -58,6 +59,7 @@ CONFIG_SYSVIPC=y
		CONFIG_SYSCTL=y
		# CONFIG_AUDIT is not set
		# CONFIG_IKCONFIG is not set
		# CONFIG_RELAY is not set
		CONFIG_INITRAMFS_SOURCE=""
		# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
		CONFIG_EMBEDDED=y
		@@ -72,10 +74,6 @@ CONFIG_BASE_FULL=y
		CONFIG_FUTEX=y
		CONFIG_EPOLL=y
		CONFIG_SHMEM=y
		CONFIG_CC_ALIGN_FUNCTIONS=0
		CONFIG_CC_ALIGN_LABELS=0
		CONFIG_CC_ALIGN_LOOPS=0
		CONFIG_CC_ALIGN_JUMPS=0
		CONFIG_SLAB=y
		# CONFIG_TINY_SHMEM is not set
		CONFIG_BASE_SMALL=0
		@@ -90,6 +88,8 @@ CONFIG_BASE_SMALL=0
		# Block layer
		#
		# CONFIG_LBD is not set
		# CONFIG_BLK_DEV_IO_TRACE is not set
		# CONFIG_LSF is not set

		#
		# IO Schedulers
		@@ -183,6 +183,7 @@ CONFIG_NET=y
		#
		# Networking options
		#
		# CONFIG_NETDEBUG is not set
		CONFIG_PACKET=y
		# CONFIG_PACKET_MMAP is not set
		CONFIG_UNIX=y
		@@ -220,6 +221,11 @@ CONFIG_TCP_CONG_BIC=y
		# 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
		# CONFIG_VLAN_8021Q is not set
		@@ -229,11 +235,6 @@ CONFIG_TCP_CONG_BIC=y
		# CONFIG_ATALK is not set
		# CONFIG_X25 is not set
		# CONFIG_LAPB is not set

		#
		# TIPC Configuration (EXPERIMENTAL)
		#
		# CONFIG_TIPC is not set
		# CONFIG_NET_DIVERT is not set
		# CONFIG_ECONET is not set
		# CONFIG_WAN_ROUTER is not set
		@@ -486,6 +487,12 @@ CONFIG_GEN_RTC=y
		#
		# CONFIG_I2C is not set

		#
		# SPI support
		#
		# CONFIG_SPI is not set
		# CONFIG_SPI_MASTER is not set

		#
		# Dallas's 1-wire bus
		#
		@@ -496,16 +503,13 @@ CONFIG_GEN_RTC=y
		#
		CONFIG_HWMON=y
		# CONFIG_HWMON_VID is not set
		# CONFIG_SENSORS_F71805F is not set
		# CONFIG_HWMON_DEBUG_CHIP is not set

		#
		# Misc devices
		#

		#
		# Multimedia Capabilities Port drivers
		#

		#
		# Multimedia devices
		#
		@@ -531,6 +535,7 @@ CONFIG_HWMON=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

		#
		# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
		@@ -551,7 +556,7 @@ CONFIG_HWMON=y
		#

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

		#
		@@ -603,7 +608,6 @@ CONFIG_SYSFS=y
		CONFIG_TMPFS=y
		# CONFIG_HUGETLB_PAGE is not set
		CONFIG_RAMFS=y
		# CONFIG_RELAYFS_FS is not set
		# CONFIG_CONFIGFS_FS is not set

		#
		@@ -658,6 +662,7 @@ CONFIG_PARTITION_ADVANCED=y
		# CONFIG_SGI_PARTITION is not set
		# CONFIG_ULTRIX_PARTITION is not set
		# CONFIG_SUN_PARTITION is not set
		# CONFIG_KARMA_PARTITION is not set
		# CONFIG_EFI_PARTITION is not set

		#
		@@ -695,6 +700,8 @@ CONFIG_DEBUG_MUTEXES=y
		# CONFIG_DEBUG_INFO is not set
		# CONFIG_DEBUG_FS is not set
		# CONFIG_DEBUG_VM is not set
		# CONFIG_UNWIND_INFO is not set
		CONFIG_FORCED_INLINING=y
		# CONFIG_RCU_TORTURE_TEST is not set
		# CONFIG_DEBUGGER is not set
		# CONFIG_BDI_SWITCH is not set

arch/powerpc/kernel/setup_32.c

+0 −6

Original line number	Diff line number	Diff line
		@@ -351,12 +351,6 @@ void __init setup_arch(char **cmdline_p)
		do_init_bootmem();
		if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab);

		#ifdef CONFIG_PPC_OCP
		/* Initialize OCP device list */
		ocp_early_init();
		if ( ppc_md.progress ) ppc_md.progress("ocp: exit", 0x3eab);
		#endif

		#ifdef CONFIG_DUMMY_CONSOLE
		conswitchp = &dummy_con;
		#endif

arch/ppc/math-emu/Makefile→arch/powerpc/math-emu/Makefile

+0 −0

File moved.

View file