On Wed, Feb 17, 2016 at 12:45:08PM +1100, David Gibson wrote:
> On Mon, Feb 15, 2016 at 02:49:18PM +0100, Andrew Jones wrote:
> > Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
> > Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>
> > Tested-by: Laurent Vivier <lvivier@xxxxxxxxxx>
> > ---
> > powerpc/Makefile.common | 40 ++++++++++------------------------------
> > powerpc/Makefile.ppc64 | 15 +++++++--------
> > powerpc/flat.lds | 14 ++++++++++----
> > 3 files changed, 27 insertions(+), 42 deletions(-)
> >
> > diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common
> > index dd3a0ca327d06..13b828ab171d6 100644
> > --- a/powerpc/Makefile.common
> > +++ b/powerpc/Makefile.common
> > @@ -1,17 +1,15 @@
> > #
> > -# arm common makefile
> > +# powerpc common makefile
> > #
> > # Authors: Andrew Jones <drjones@xxxxxxxxxx>
> > #
> >
> > ifeq ($(LOADADDR),)
> > - # qemu mach-virt default load address
> > - LOADADDR = 0x40000000
> > + LOADADDR = 0x0
>
> I was trying to check what LOADADDR means, to see if this was correct,
> but it appears it isn't actually being used yet.
Yeah, we probably won't ever need it for powerpc. I probably should
just remove the unused variable to avoid confusion.
>
> Otherwise,
>
> Reviewed-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
Thanks,
drew
>
> > endif
> >
> > tests-common = \
> > - $(TEST_DIR)/selftest.flat \
> > - $(TEST_DIR)/spinlock-test.flat
> > + $(TEST_DIR)/selftest.elf
> >
> > all: test_cases
> >
> > @@ -30,38 +28,21 @@ include scripts/asm-offsets.mak
> > cflatobjs += lib/util.o
> > cflatobjs += lib/alloc.o
> > cflatobjs += lib/devicetree.o
> > -cflatobjs += lib/virtio.o
> > -cflatobjs += lib/virtio-mmio.o
> > -cflatobjs += lib/chr-testdev.o
> > -cflatobjs += lib/arm/io.o
> > -cflatobjs += lib/arm/setup.o
> > -cflatobjs += lib/arm/mmu.o
> > -cflatobjs += lib/arm/bitops.o
> > -cflatobjs += lib/arm/psci.o
> > -cflatobjs += lib/arm/smp.o
> > -
> > -libeabi = lib/arm/libeabi.a
> > -eabiobjs = lib/arm/eabi_compat.o
> > +cflatobjs += lib/powerpc/io.o
> >
> > libgcc := $(shell $(CC) $(machine) --print-libgcc-file-name)
> > start_addr := $(shell printf "%x\n" $$(( $(phys_base) + $(kernel_offset) )))
> >
> > -FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libgcc) $(libeabi)
> > +FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libgcc)
> > %.elf: LDFLAGS = $(CFLAGS) -nostdlib
> > -%.elf: %.o $(FLATLIBS) arm/flat.lds
> > +%.elf: %.o $(FLATLIBS) powerpc/flat.lds
> > $(CC) $(LDFLAGS) -o $@ \
> > - -Wl,-T,arm/flat.lds,--build-id=none,-Ttext=$(start_addr) \
> > + -Wl,-T,powerpc/flat.lds,--build-id=none,-Ttext=$(start_addr) \
> > $(filter %.o, $^) $(FLATLIBS)
> >
> > -%.flat: %.elf
> > - $(OBJCOPY) -O binary $^ $@
> > -
> > -$(libeabi): $(eabiobjs)
> > - $(AR) rcs $@ $^
> > -
> > -arm_clean: libfdt_clean asm_offsets_clean
> > - $(RM) $(TEST_DIR)/*.{o,flat,elf} $(libeabi) $(eabiobjs) \
> > - $(TEST_DIR)/.*.d lib/arm/.*.d
> > +powerpc_clean: libfdt_clean asm_offsets_clean
> > + $(RM) $(TEST_DIR)/*.{o,elf} \
> > + $(TEST_DIR)/.*.d lib/powerpc/.*.d
> >
> > ##################################################################
> >
> > @@ -70,4 +51,3 @@ generated_files = $(asm-offsets)
> > test_cases: $(generated_files) $(tests-common) $(tests)
> >
> > $(TEST_DIR)/selftest.elf: $(cstart.o) $(TEST_DIR)/selftest.o
> > -$(TEST_DIR)/spinlock-test.elf: $(cstart.o) $(TEST_DIR)/spinlock-test.o
> > diff --git a/powerpc/Makefile.ppc64 b/powerpc/Makefile.ppc64
> > index 0b0761c729c7c..95bf6772d65ed 100644
> > --- a/powerpc/Makefile.ppc64
> > +++ b/powerpc/Makefile.ppc64
> > @@ -1,20 +1,19 @@
> > #
> > -# arm64 makefile
> > +# ppc64 makefile
> > #
> > # Authors: Andrew Jones <drjones@xxxxxxxxxx>
> > #
> > bits = 64
> > -ldarch = elf64-littleaarch64
> > -kernel_offset = 0x80000
> > +ldarch = elf64-powerpc
> > +kernel_offset = 0x0
> >
> > cstart.o = $(TEST_DIR)/cstart64.o
> > -cflatobjs += lib/arm64/processor.o
> > -cflatobjs += lib/arm64/spinlock.o
> > +cflatobjs += lib/ppc64/spinlock.o
> >
> > -# arm64 specific tests
> > +# ppc64 specific tests
> > tests =
> >
> > include $(TEST_DIR)/Makefile.common
> >
> > -arch_clean: arm_clean
> > - $(RM) lib/arm64/.*.d
> > +arch_clean: powerpc_clean
> > + $(RM) lib/ppc64/.*.d
> > diff --git a/powerpc/flat.lds b/powerpc/flat.lds
> > index efdf5d7109ffb..84087057c0ce2 100644
> > --- a/powerpc/flat.lds
> > +++ b/powerpc/flat.lds
> > @@ -4,6 +4,8 @@ SECTIONS
> > .text : { *(.init) *(.text) *(.text.*) }
> > . = ALIGN(64K);
> > etext = .;
> > + .opd : { *(.opd) }
> > + . = ALIGN(16);
> > .data : {
> > *(.data)
> > }
> > @@ -11,16 +13,20 @@ SECTIONS
> > .rodata : { *(.rodata) }
> > . = ALIGN(16);
> > .bss : { *(.bss) }
> > + . = ALIGN(256);
> > + /*
> > + * tocptr is tocbase + 32K, allowing toc offsets to be +-32K
> > + */
> > + tocptr = . + 32K;
> > + .got : { *(.toc) *(.got) }
> > . = ALIGN(64K);
> > edata = .;
> > . += 64K;
> > . = ALIGN(64K);
> > /*
> > - * stack depth is 16K for arm and PAGE_SIZE for arm64, see THREAD_SIZE
> > - * sp must be 16 byte aligned for arm64, and 8 byte aligned for arm
> > - * sp must always be strictly less than the true stacktop
> > + * stackptr set with initial stack frame (64 bytes) preallocated
> > */
> > - stackptr = . - 16;
> > + stackptr = . - 64;
> > stacktop = .;
> > }
> >
>
> --
> David Gibson | I'll have my music baroque, and my code
> david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
> | _way_ _around_!
> http://www.ozlabs.org/~dgibson
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
