From patchwork Mon Feb 15 13:49:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 582946 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 27E8414030F for ; Tue, 16 Feb 2016 00:50:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753205AbcBONuQ (ORCPT ); Mon, 15 Feb 2016 08:50:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60875 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753299AbcBONuK (ORCPT ); Mon, 15 Feb 2016 08:50:10 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 2B5A88F4F5; Mon, 15 Feb 2016 13:50:10 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-251.brq.redhat.com [10.34.1.251]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1FDnZKR022252; Mon, 15 Feb 2016 08:50:08 -0500 From: Andrew Jones To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com Subject: [kvm-unit-tests PATCH v4 10/17] powerpc/ppc64: add a boot rom Date: Mon, 15 Feb 2016 14:49:19 +0100 Message-Id: <1455544166-19766-11-git-send-email-drjones@redhat.com> In-Reply-To: <1455544166-19766-1-git-send-email-drjones@redhat.com> References: <1455544166-19766-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Make a one line replacement for SLOF. This bootloader just jumps to 0x400000, because we know the kernel will be there. Signed-off-by: Andrew Jones Reviewed-by: Thomas Huth Tested-by: Laurent Vivier Reviewed-by: David Gibson --- powerpc/.gitignore | 1 + powerpc/Makefile.common | 11 +++++++++-- powerpc/boot_rom.S | 5 +++++ 3 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 powerpc/.gitignore create mode 100644 powerpc/boot_rom.S diff --git a/powerpc/.gitignore b/powerpc/.gitignore new file mode 100644 index 0000000000000..2f017a8e61d4b --- /dev/null +++ b/powerpc/.gitignore @@ -0,0 +1 @@ +boot_rom.bin diff --git a/powerpc/Makefile.common b/powerpc/Makefile.common index 13b828ab171d6..0c3eaba0d3aab 100644 --- a/powerpc/Makefile.common +++ b/powerpc/Makefile.common @@ -11,7 +11,7 @@ endif tests-common = \ $(TEST_DIR)/selftest.elf -all: test_cases +all: $(TEST_DIR)/boot_rom.bin test_cases ################################################################## phys_base = $(LOADADDR) @@ -40,8 +40,15 @@ FLATLIBS = $(libcflat) $(LIBFDT_archive) $(libgcc) -Wl,-T,powerpc/flat.lds,--build-id=none,-Ttext=$(start_addr) \ $(filter %.o, $^) $(FLATLIBS) +$(TEST_DIR)/boot_rom.bin: $(TEST_DIR)/boot_rom.elf + dd if=/dev/zero of=$@ bs=256 count=1 + $(OBJCOPY) -O binary $^ >(cat - >>$@) + +$(TEST_DIR)/boot_rom.elf: $(TEST_DIR)/boot_rom.o + $(LD) -nostdlib -Ttext=0x100 --entry=start --build-id=none -o $@ $< + powerpc_clean: libfdt_clean asm_offsets_clean - $(RM) $(TEST_DIR)/*.{o,elf} \ + $(RM) $(TEST_DIR)/*.{o,elf} $(TEST_DIR)/boot_rom.bin \ $(TEST_DIR)/.*.d lib/powerpc/.*.d ################################################################## diff --git a/powerpc/boot_rom.S b/powerpc/boot_rom.S new file mode 100644 index 0000000000000..ae2c08ddce3c1 --- /dev/null +++ b/powerpc/boot_rom.S @@ -0,0 +1,5 @@ +#define SPAPR_KERNEL_LOAD_ADDR 0x400000 +.text +.globl start +start: + b SPAPR_KERNEL_LOAD_ADDR - 0x100