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

Commit 437a58db authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Move remaining .c files from arch/ppc64 to arch/powerpc 



This also deletes the now-unused Makefiles under arch/ppc64.

Both of the files moved over could use some merging, but for now I
have moved them as-is and arranged for them to be used only in 64-bit
kernels.  For 32-bit kernels we still use arch/ppc/kernel/idle.c and
drivers/char/generic_nvram.c as before.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent f62859bb

arch/powerpc/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -125,11 +125,11 @@ head-$(CONFIG_PPC64) += arch/powerpc/kernel/entry_64.o 
head-$(CONFIG_PPC_FPU)		+= arch/powerpc/kernel/fpu.o



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

				   arch/$(OLDARCH)/kernel/ \

				   arch/powerpc/mm/ \

				   arch/powerpc/lib/ \

				   arch/powerpc/sysdev/ \

				   arch/powerpc/platforms/

core-$(CONFIG_PPC32)		+= arch/ppc/kernel/

core-$(CONFIG_MATH_EMULATION)	+= arch/ppc/math-emu/

core-$(CONFIG_XMON)		+= arch/powerpc/xmon/

core-$(CONFIG_APUS)		+= arch/ppc/amiga/
@@ -165,7 +165,7 @@ define archhelp 
  @echo '                    (your) ~/bin/installkernel or'

  @echo '                    (distribution) /sbin/installkernel or'

  @echo '                    install to $$(INSTALL_PATH) and run lilo'

  @echo '  *_defconfig     - Select default config from arch/$(ARCH)/ppc/configs'

  @echo '  *_defconfig     - Select default config from arch/$(ARCH)/configs'

endef



archclean:

arch/powerpc/kernel/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ obj-y += vdso32/ 
obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \

				   signal_64.o ptrace32.o systbl.o \

				   paca.o ioctl32.o cpu_setup_power4.o \

				   firmware.o sysfs.o udbg.o

				   firmware.o sysfs.o udbg.o idle_64.o

obj-$(CONFIG_PPC64)		+= vdso64/

obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o

obj-$(CONFIG_POWER4)		+= idle_power4.o
@@ -35,6 +35,7 @@ obj-$(CONFIG_PPC_PSERIES) += udbg_16550.o 
obj-$(CONFIG_PPC_MAPLE)		+= udbg_16550.o

udbgscc-$(CONFIG_PPC64)		:= udbg_scc.o

obj-$(CONFIG_PPC_PMAC)		+= $(udbgscc-y)

obj64-$(CONFIG_PPC_MULTIPLATFORM) += nvram_64.o



ifeq ($(CONFIG_PPC_MERGE),y)
@@ -78,5 +79,7 @@ smpobj-$(CONFIG_SMP) += smp.o 


endif



obj-$(CONFIG_PPC64)		+= $(obj64-y)



extra-$(CONFIG_PPC_FPU)		+= fpu.o

extra-$(CONFIG_PPC64)		+= entry_64.o

arch/ppc64/kernel/idle.c→arch/powerpc/kernel/idle_64.c

+0 −0

File moved.

View file

arch/ppc64/kernel/nvram.c→arch/powerpc/kernel/nvram_64.c

+0 −0

File moved.

View file

arch/ppc64/Makefile

deleted100644 → 0
+0 −142
Original line number Diff line number Diff line 
# This file is included by the global makefile so that you can add your own

# architecture-specific flags and dependencies. Remember to do have actions

# for "archclean" and "archdep" for cleaning up and making dependencies for

# this architecture

#

# This file is subject to the terms and conditions of the GNU General Public

# License.  See the file "COPYING" in the main directory of this archive

# for more details.

#

# Copyright (C) 1994 by Linus Torvalds

# Changes for PPC by Gary Thomas

# Rewritten by Cort Dougan and Paul Mackerras

# Adjusted for PPC64 by Tom Gall

#



KERNELLOAD	:= 0xc000000000000000



# Set default 32 bits cross compilers for vdso and boot wrapper

CROSS32_COMPILE ?=



CROSS32CC		:= $(CROSS32_COMPILE)gcc

CROSS32AS		:= $(CROSS32_COMPILE)as

CROSS32LD		:= $(CROSS32_COMPILE)ld

CROSS32OBJCOPY		:= $(CROSS32_COMPILE)objcopy



# If we have a biarch compiler, use it for 32 bits cross compile if

# CROSS32_COMPILE wasn't explicitely defined, and add proper explicit

# target type to target compilers



HAS_BIARCH      := $(call cc-option-yn, -m64)

ifeq ($(HAS_BIARCH),y)

ifeq ($(CROSS32_COMPILE),)

CROSS32CC	:= $(CC) -m32

CROSS32AS	:= $(AS) -a32

CROSS32LD	:= $(LD) -m elf32ppc

CROSS32OBJCOPY	:= $(OBJCOPY)

endif

override AS	+= -a64

override LD	+= -m elf64ppc

override CC	+= -m64

endif



export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY



new_nm := $(shell if $(NM) --help 2>&1 | grep -- '--synthetic' > /dev/null; then echo y; else echo n; fi)



ifeq ($(new_nm),y)

NM		:= $(NM) --synthetic



endif



CHECKFLAGS	+= -m64 -D__powerpc__ -D__powerpc64__



LDFLAGS		:= -m elf64ppc

LDFLAGS_vmlinux	:= -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)

CFLAGS		+= -msoft-float -pipe -mminimal-toc -mtraceback=none \

		   -mcall-aixdesc

# Temporary hack until we have migrated to asm-powerpc

CPPFLAGS	+= -Iarch/$(ARCH)/include



GCC_VERSION     := $(call cc-version)

GCC_BROKEN_VEC	:= $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi ;)



ifeq ($(CONFIG_POWER4_ONLY),y)

ifeq ($(CONFIG_ALTIVEC),y)

ifeq ($(GCC_BROKEN_VEC),y)

	CFLAGS += $(call cc-option,-mcpu=970)

else

	CFLAGS += $(call cc-option,-mcpu=power4)

endif

else

	CFLAGS += $(call cc-option,-mcpu=power4)

endif

else

	CFLAGS += $(call cc-option,-mtune=power4)

endif



# No AltiVec instruction when building kernel

CFLAGS	+= $(call cc-option, -mno-altivec)



# Enable unit-at-a-time mode when possible. It shrinks the

# kernel considerably.

CFLAGS += $(call cc-option,-funit-at-a-time)



head-y := arch/ppc64/kernel/head.o

head-y += arch/powerpc/kernel/fpu.o

head-y += arch/powerpc/kernel/entry_64.o



core-y				+= arch/ppc64/kernel/ arch/powerpc/kernel/

core-y				+= arch/powerpc/mm/

core-y				+= arch/powerpc/sysdev/

core-y				+= arch/powerpc/platforms/

core-y				+= arch/powerpc/lib/

core-$(CONFIG_XMON)		+= arch/powerpc/xmon/

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



boot := arch/ppc64/boot



boottargets-$(CONFIG_PPC_PSERIES) += zImage zImage.initrd

boottargets-$(CONFIG_PPC_PMAC) += zImage.vmode zImage.initrd.vmode

boottargets-$(CONFIG_PPC_MAPLE) += zImage zImage.initrd

boottargets-$(CONFIG_PPC_ISERIES) += vmlinux.sminitrd vmlinux.initrd vmlinux.sm

boottargets-$(CONFIG_PPC_BPA) += zImage zImage.initrd

$(boottargets-y): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



bootimage-$(CONFIG_PPC_PSERIES) := $(boot)/zImage

bootimage-$(CONFIG_PPC_PMAC) := vmlinux

bootimage-$(CONFIG_PPC_MAPLE) := $(boot)/zImage

bootimage-$(CONFIG_PPC_BPA) := $(boot)/zImage

bootimage-$(CONFIG_PPC_ISERIES) := vmlinux

BOOTIMAGE := $(bootimage-y)

install: vmlinux

	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(BOOTIMAGE) $@



defaultimage-$(CONFIG_PPC_PSERIES) := zImage

defaultimage-$(CONFIG_PPC_PMAC) := zImage.vmode

defaultimage-$(CONFIG_PPC_MAPLE) := zImage

defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux

KBUILD_IMAGE := $(defaultimage-y)

all: $(KBUILD_IMAGE)



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

	# Temporary hack until we have migrated to asm-powerpc

	$(Q)rm -rf arch/$(ARCH)/include





# Temporary hack until we have migrated to asm-powerpc

include/asm: arch/$(ARCH)/include/asm

arch/$(ARCH)/include/asm:

	$(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi

	$(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm



define archhelp

  echo  '  zImage.vmode        - Compressed kernel image (arch/$(ARCH)/boot/zImage.vmode)'

  echo  '  zImage.initrd.vmode - Compressed kernel image with initrd attached,'

  echo  '                        sourced from arch/$(ARCH)/boot/ramdisk.image.gz'

  echo  '                        (arch/$(ARCH)/boot/zImage.initrd.vmode)'

  echo  '  zImage              - zImage for pSeries machines'

  echo  '  zImage.initrd       - zImage with initrd for pSeries machines'

endef