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

Commit 94b212c2 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Move ppc64 boot wrapper code over to arch/powerpc 



This also extends the code to handle 32-bit ELF vmlinux files as well
as 64-bit ones.  This is sufficient for booting on new-world 32-bit
powermacs (i.e. all recent machines).

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

arch/powerpc/Makefile

+7 −18
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 


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



ifeq ($(CONFIG_PPC64),y)

OLDARCH	:= ppc64

SZ	:= 64



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

CROSS32_COMPILE ?=
@@ -37,6 +33,10 @@ endif 


export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY



ifeq ($(CONFIG_PPC64),y)

OLDARCH	:= ppc64

SZ	:= 64



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



ifeq ($(new_nm),y)
@@ -139,7 +139,7 @@ drivers-$(CONFIG_CPM2) += arch/ppc/8260_io/ 


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



defaultimage-$(CONFIG_PPC32)	:= uImage zImage

defaultimage-$(CONFIG_PPC32)	:= zImage

defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux

defaultimage-$(CONFIG_PPC_PSERIES) := zImage

KBUILD_IMAGE := $(defaultimage-y)
@@ -154,23 +154,13 @@ BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm 


.PHONY: $(BOOT_TARGETS)



boot := arch/$(OLDARCH)/boot

boot := arch/$(ARCH)/boot



# urk

ifeq ($(CONFIG_PPC64),y)

$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

else

$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) ARCH=ppc $(build)=$(boot) $@

endif



uImage: vmlinux

	$(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot)/images $(boot)/images/$@



define archhelp

  @echo '* zImage          - Compressed kernel image (arch/$(ARCH)/boot/images/zImage.*)'

  @echo '  uImage          - Create a bootable image for U-Boot / PPCBoot'

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

  @echo '  install         - Install kernel using'

  @echo '                    (your) ~/bin/installkernel or'

  @echo '                    (distribution) /sbin/installkernel or'
@@ -180,7 +170,6 @@ endef 


archclean:

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

	# Temporary hack until we have migrated to asm-powerpc

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



archprepare: checkbin

arch/ppc64/boot/Makefile→arch/powerpc/boot/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 




HOSTCC		:= gcc

BOOTCFLAGS	:= $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem $(shell $(CROSS32CC) -print-file-name=include) -fPIC

BOOTCFLAGS	:= $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem \

		   $(shell $(CROSS32CC) -print-file-name=include) -fPIC

BOOTAFLAGS	:= -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc

BOOTLFLAGS	:= -T $(srctree)/$(src)/zImage.lds

OBJCOPYFLAGS    := contents,alloc,load,readonly,data
@@ -98,7 +99,7 @@ quiet_cmd_ramdisk = RAMDISK $@ 
      cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@



quiet_cmd_stripvm = STRIP   $@

      cmd_stripvm = $(STRIP) -s $< -o $@

      cmd_stripvm = $(STRIP) -s -R .comment $< -o $@



vmlinux.strip: vmlinux

	$(call if_changed,stripvm)

arch/ppc64/boot/README→arch/powerpc/boot/README

+0 −0

File moved.

View file

arch/ppc64/boot/addnote.c→arch/powerpc/boot/addnote.c

+0 −0

File moved.

View file