powerpc: Move cpu_setup_6xx.S and temp.c over to arch/powerpc (9b781727) · Commits · 戴 / test

arch/powerpc/Kconfig

+2 −2

Original line number	Diff line number	Diff line
		@@ -491,7 +491,7 @@ config PPC601_SYNC_FIX
		If in doubt, say Y here.

		config TAU
		bool "Thermal Management Support"
		bool "On-chip CPU temperature sensor support"
		depends on 6xx
		help
		G3 and G4 processors have an on-chip temperature sensor called the
		@@ -500,7 +500,7 @@ config TAU
		on-die temperature in /proc/cpuinfo if the cpu supports it.

		Unfortunately, on some chip revisions, this sensor is very inaccurate
		and in some cases, does not work at all, so don't assume the cpu
		and in many cases, does not work at all, so don't assume the cpu
		temp is actually what /proc/cpuinfo says it is.

		config TAU_INT

+2 −1

Original line number	Diff line number	Diff line
		@@ -34,7 +34,8 @@ obj-$(CONFIG_IBMEBUS) += ibmebus.o
		obj-$(CONFIG_GENERIC_TBSYNC) += smp-tbsync.o
		obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o
		obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
		obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o
		obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
		obj-$(CONFIG_TAU) += tau_6xx.o

		ifeq ($(CONFIG_PPC_MERGE),y)

+0 −0

File moved.

+0 −0

File moved.

+0 −4

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ extra-y += vmlinux.lds
		obj-y := entry.o traps.o time.o misc.o \
		setup.o \
		ppc_htab.o
		obj-$(CONFIG_6xx) += cpu_setup_6xx.o
		obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
		obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o
		obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
		@@ -21,7 +20,6 @@ obj-$(CONFIG_PCI) += pci.o
		obj-$(CONFIG_RAPIDIO) += rio.o
		obj-$(CONFIG_KGDB) += ppc-stub.o
		obj-$(CONFIG_SMP) += smp.o smp-tbsync.o
		obj-$(CONFIG_TAU) += temp.o
		ifndef CONFIG_E200
		obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o
		endif
		@@ -34,12 +32,10 @@ endif
		# These are here while we do the architecture merge

		else
		obj-$(CONFIG_6xx) += cpu_setup_6xx.o
		obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
		obj-$(CONFIG_MODULES) += module.o
		obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o
		obj-$(CONFIG_KGDB) += ppc-stub.o
		obj-$(CONFIG_TAU) += temp.o
		ifndef CONFIG_E200
		obj-$(CONFIG_FSL_BOOKE) += perfmon_fsl_booke.o
		endif