powerpc: consolidate cputable.c (4920960f) · Commits · e / devices / android_kernel_teracube_2e

arch/powerpc/kernel/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ CFLAGS_prom_init.o += -fPIC
		CFLAGS_btext.o += -fPIC
		endif

		obj-y := semaphore.o
		obj-y := semaphore.o cputable.o
		obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
		obj-$(CONFIG_POWER4) += idle_power4.o

arch/ppc/kernel/cputable.c→arch/powerpc/kernel/cputable.c

+302 −111

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/ppc/kernel/Makefile

+2 −2

Original line number	Diff line number	Diff line
		@@ -15,7 +15,7 @@ extra-y += vmlinux.lds
		obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
		process.o signal.o ptrace.o align.o \
		syscalls.o setup.o \
		cputable.o ppc_htab.o perfmon.o
		ppc_htab.o perfmon.o
		obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
		obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
		obj-$(CONFIG_POWER4) += cpu_setup_power4.o
		@@ -39,7 +39,7 @@ endif
		else
		obj-y := irq.o idle.o time.o \
		signal.o ptrace.o align.o \
		syscalls.o cputable.o perfmon.o
		syscalls.o perfmon.o
		obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
		obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
		obj-$(CONFIG_MODULES) += module.o

arch/ppc64/kernel/Makefile

+24 −61

Original line number	Diff line number	Diff line
		@@ -7,13 +7,17 @@ ifneq ($(CONFIG_PPC_MERGE),y)
		EXTRA_CFLAGS += -mno-minimal-toc
		extra-y := head.o vmlinux.lds

		obj-y := setup.o entry.o irq.o idle.o dma.o \
		time.o signal.o syscalls.o misc.o ptrace.o \
		obj-y := setup.o entry.o misc.o prom.o

		endif

		obj-y += irq.o idle.o dma.o \
		time.o signal.o syscalls.o ptrace.o \
		align.o bitops.o pacaData.o \
		udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
		ptrace32.o signal32.o rtc.o \
		cputable.o cpu_setup_power4.o \
		iommu.o sysfs.o vdso.o pmc.o firmware.o prom.o
		cpu_setup_power4.o \
		iommu.o sysfs.o vdso.o pmc.o firmware.o
		obj-y += vdso32/ vdso64/

		obj-$(CONFIG_PPC_OF) += of_device.o
		@@ -22,7 +26,10 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o

		obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y)

		obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o
		obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o
		ifneq ($(CONFIG_PPC_MERGE),y)
		obj-$(CONFIG_PPC_MULTIPLATFORM) += prom_init.o
		endif

		obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o

		@@ -34,22 +41,29 @@ obj-$(CONFIG_EEH) += eeh.o
		obj-$(CONFIG_PROC_FS) += proc_ppc64.o
		obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o
		obj-$(CONFIG_SMP) += smp.o
		obj-$(CONFIG_MODULES) += module.o ppc_ksyms.o
		obj-$(CONFIG_MODULES) += module.o
		ifneq ($(CONFIG_PPC_MERGE),y)
		obj-$(CONFIG_MODULES) += ppc_ksyms.o
		endif
		obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o
		obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
		obj-$(CONFIG_SCANLOG) += scanlog.o
		obj-$(CONFIG_LPARCFG) += lparcfg.o
		obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
		ifneq ($(CONFIG_PPC_MERGE),y)
		obj-$(CONFIG_BOOTX_TEXT) += btext.o
		endif
		obj-$(CONFIG_HVCS) += hvcserver.o

		obj-$(CONFIG_IBMVIO) += vio.o $(vio-obj-y)
		obj-$(CONFIG_IBMVIO) += vio.o
		obj-$(CONFIG_XICS) += xics.o
		ifneq ($(CONFIG_PPC_MERGE),y)
		obj-$(CONFIG_MPIC) += mpic.o

		obj-$(CONFIG_PPC_PMAC) += pmac_setup.o pmac_feature.o pmac_pci.o \
		pmac_time.o pmac_nvram.o pmac_low_i2c.o \
		udbg_scc.o
		endif

		obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \
		udbg_16550.o
		@@ -57,7 +71,9 @@ obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \
		obj-$(CONFIG_U3_DART) += u3_iommu.o

		ifdef CONFIG_SMP
		ifneq ($(CONFIG_PPC_MERGE),y)
		obj-$(CONFIG_PPC_PMAC) += pmac_smp.o smp-tbsync.o
		endif
		obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o
		endif

		@@ -65,62 +81,9 @@ obj-$(CONFIG_KPROBES) += kprobes.o

		CFLAGS_ioctl32.o += -Ifs/

		ifneq ($(CONFIG_PPC_MERGE),y)
		ifeq ($(CONFIG_PPC_ISERIES),y)
		arch/ppc64/kernel/head.o: arch/powerpc/kernel/lparmap.s
		AFLAGS_head.o += -Iarch/powerpc/kernel
		endif

		else

		# Things still needed from here by the merged ppc code

		obj-y := irq.o idle.o dma.o \
		time.o signal.o syscalls.o ptrace.o \
		align.o bitops.o pacaData.o \
		udbg.o binfmt_elf32.o sys_ppc32.o ioctl32.o \
		ptrace32.o signal32.o rtc.o \
		cputable.o cpu_setup_power4.o \
		iommu.o sysfs.o vdso.o pmc.o firmware.o
		obj-y += vdso32/ vdso64/

		pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o

		obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y)

		obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o

		obj-$(CONFIG_PPC_PSERIES) += rtasd.o ras.o udbg_16550.o

		obj-$(CONFIG_PPC_BPA) += bpa_setup.o bpa_iommu.o bpa_nvram.o \
		bpa_iic.o spider-pic.o

		obj-$(CONFIG_KEXEC) += machine_kexec.o
		obj-$(CONFIG_EEH) += eeh.o
		obj-$(CONFIG_PROC_FS) += proc_ppc64.o
		obj-$(CONFIG_RTAS_FLASH) += rtas_flash.o
		obj-$(CONFIG_SMP) += smp.o
		obj-$(CONFIG_MODULES) += module.o
		obj-$(CONFIG_PPC_RTAS) += rtas.o rtas_pci.o
		obj-$(CONFIG_RTAS_PROC) += rtas-proc.o
		obj-$(CONFIG_SCANLOG) += scanlog.o
		obj-$(CONFIG_LPARCFG) += lparcfg.o
		obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o
		obj-$(CONFIG_HVCS) += hvcserver.o

		obj-$(CONFIG_IBMVIO) += vio.o
		obj-$(CONFIG_XICS) += xics.o

		obj-$(CONFIG_PPC_MAPLE) += maple_setup.o maple_pci.o maple_time.o \
		udbg_16550.o

		obj-$(CONFIG_U3_DART) += u3_iommu.o

		ifdef CONFIG_SMP
		obj-$(CONFIG_PPC_MAPLE) += smp-tbsync.o
		endif

		obj-$(CONFIG_KPROBES) += kprobes.o

		CFLAGS_ioctl32.o += -Ifs/

		endif

arch/ppc64/kernel/cputable.c

deleted100644 → 0

+0 −260

File deleted.

Preview size limit exceeded, changes collapsed.