From patchwork Mon Dec 5 16:11:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 86584 Delivered-To: patch@linaro.org Received: by 10.140.20.101 with SMTP id 92csp1558927qgi; Mon, 5 Dec 2016 08:12:03 -0800 (PST) X-Received: by 10.28.74.133 with SMTP id n5mr9511435wmi.132.1480954323486; Mon, 05 Dec 2016 08:12:03 -0800 (PST) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id l131si627910wmf.79.2016.12.05.08.12.03; Mon, 05 Dec 2016 08:12:03 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5BA93B3847; Mon, 5 Dec 2016 17:12:02 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xJ_og3oFqOlW; Mon, 5 Dec 2016 17:12:02 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CB334A75BF; Mon, 5 Dec 2016 17:12:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6D10EA75BF for ; Mon, 5 Dec 2016 17:11:58 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XLt-G92PFEs7 for ; Mon, 5 Dec 2016 17:11:58 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by theia.denx.de (Postfix) with ESMTPS id 2FBBAA75AC for ; Mon, 5 Dec 2016 17:11:54 +0100 (CET) Received: by mail-wm0-f50.google.com with SMTP id a197so102420491wmd.0 for ; Mon, 05 Dec 2016 08:11:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=KhGQHwEfoOZOIZaideMphJHReMVAmbV2xBqr3Lbwxdk=; b=QDDIb367v1rhTH5CzYbcfQlYisDHHqBDYYMFeilM+tbUDSecMZDknzDXwbg4rsZJ9E 8tIZsUI0bIhpqstS29UfCoizTbVcM8qjuISnXZSmkdyBWuaaS9POMFA0m9iV2ZyAya4e Vf/xHU1MWHjpAuht6T42QgkzNAytQ6IKuzPsY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=KhGQHwEfoOZOIZaideMphJHReMVAmbV2xBqr3Lbwxdk=; b=MxA9+IC1TQMGNZtzAF/AW8Jf3PEKS8VGRmZhnMg2olCMej3siW1Dxso5Vk60CrpWE0 aJjtZyM6if7AnvupNpHyf2CkBfdWQUPAKTcn6+aPLlDk05uG3gQ0iWqEQTxadlI4PUWu V0X9ZLU77Qd8/wSTbaGtJAUkflG5K5O64sz+0DQ/gKUIlZc4MxpRfOR7ez1ttv/fNbIz Jz2wQpk8XvkThhfrnn4mmYG+HKPOYI/DUuPpd44Db9yWY6kMUk72lzTsDScAdatBn5De SR9QSPt9qOG7txjJQNFqC73WkJUFVV66nawYjB9mDuSsltywANel78yQEzduOFKjaEs/ CiQQ== X-Gm-Message-State: AKaTC01ozYGavNe+FF/j/Ck+a4nzFS9mmbW3S3GfKIjVQofPslnTdmMFEZyqfj6rhNQ3sdLH X-Received: by 10.28.168.70 with SMTP id r67mr9583849wme.19.1480954314390; Mon, 05 Dec 2016 08:11:54 -0800 (PST) Received: from vbox.cambridge.arm.com (82-69-54-187.dsl.in-addr.zen.co.uk. [82.69.54.187]) by smtp.gmail.com with ESMTPSA id d184sm851853wmd.8.2016.12.05.08.11.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Dec 2016 08:11:53 -0800 (PST) From: Ryan Harkin To: u-boot@lists.denx.de Date: Mon, 5 Dec 2016 16:11:45 +0000 Message-Id: <1480954305-11770-1-git-send-email-ryan.harkin@linaro.org> X-Mailer: git-send-email 1.9.1 Cc: Tom Rini , Soby Mathew , Andre Przywara Subject: [U-Boot] [RFC PACH v2 1/1] Add vexpress_aemv8a_aarch32 variant X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The ARM AEMv8 FVP model can be run in Aarch64 or Aarch32 mode. Aarch32 support is enable per-CPU when launching the model, eg: -C cluster0.cpu0.CONFIG64=0 This patch adds a new defconfig and some variant specific selections in vexpress_armv8a.h. This patch is co-authored with Soby Mathew . Signed-off-by: Ryan Harkin --- Changes since v1: This single patch replaces my earlier RFC series of two patches, where the first modified generic code and the other added a new variant. After Tom's suggestion that I review the Raspberry PI code, my original [RFC PATCH 1/2] has been dropped completely. To address the generic problems from the first patch: - move CONFIG_REMAKE_ELF to CONFIG_ARM64 only builds in vexpress_aemv8a.h - define CONFIG_SKIP_LOWLEVEL_INIT for non-ARM64 builds (ie. for CPU_V7) - the ARMv8 MMU code in vexpress64.h becomes conditiononal on CONFIG_ARM64 I'm not sure if the last change is the correct approach, but it works. I suspect that at the very least, a rework of the vexpress code would split this MMU code into an ARM64 specific .c file. arch/arm/Kconfig | 9 +++++++++ board/armltd/vexpress64/Kconfig | 2 +- board/armltd/vexpress64/vexpress64.c | 4 ++++ configs/vexpress_aemv8a_aarch32_defconfig | 31 ++++++++++++++++++++++++++++++ include/configs/vexpress_aemv8a.h | 32 ++++++++++++++++++++++++++++--- 5 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 configs/vexpress_aemv8a_aarch32_defconfig -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3d00948..729c31d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -642,6 +642,15 @@ config TARGET_VEXPRESS64_BASE_FVP select ARM64 select SEMIHOSTING +config TARGET_VEXPRESS_AEMV8_AARCH32 + bool "Support Versatile Express ARMv8a 32-bit FVP BASE model booting from DRAM" + select CPU_V7 + help + This target is derived from TARGET_VEXPRESS64_BASE_FVP and over-rides + the default config to allow the user to load the images directly into + DRAM using model parameters rather than by using semi-hosting to load + the files from the host filesystem. + config TARGET_VEXPRESS64_BASE_FVP_DRAM bool "Support Versatile Express ARMv8a FVP BASE model booting from DRAM" select ARM64 diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index e05f353..06c1ce1 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -1,4 +1,4 @@ -if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO || TARGET_VEXPRESS64_BASE_FVP_DRAM +if TARGET_VEXPRESS64_BASE_FVP || TARGET_VEXPRESS64_JUNO || TARGET_VEXPRESS64_BASE_FVP_DRAM || TARGET_VEXPRESS_AEMV8_AARCH32 config SYS_BOARD default "vexpress64" diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index 4ddbff9..c1d608d 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -14,7 +14,9 @@ #include #include #include "pcie.h" +#ifdef CONFIG_ARM64 #include +#endif DECLARE_GLOBAL_DATA_PTR; @@ -29,6 +31,7 @@ U_BOOT_DEVICE(vexpress_serials) = { .platdata = &serial_platdata, }; +#ifdef CONFIG_ARM64 static struct mm_region vexpress64_mem_map[] = { { .virt = 0x0UL, @@ -50,6 +53,7 @@ static struct mm_region vexpress64_mem_map[] = { }; struct mm_region *mem_map = vexpress64_mem_map; +#endif /* This function gets replaced by platforms supporting PCIe. * The replacement function, eg. on Juno, initialises the PCIe bus. diff --git a/configs/vexpress_aemv8a_aarch32_defconfig b/configs/vexpress_aemv8a_aarch32_defconfig new file mode 100644 index 0000000..8eb3c77 --- /dev/null +++ b/configs/vexpress_aemv8a_aarch32_defconfig @@ -0,0 +1,31 @@ +CONFIG_ARM=y +CONFIG_TARGET_VEXPRESS_AEMV8_AARCH32=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_IDENT_STRING=" vexpress_aemv8a" +CONFIG_BOOTDELAY=1 +# CONFIG_DISPLAY_CPUINFO is not set +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_HUSH_PARSER=y +CONFIG_SYS_PROMPT="VExpress32# " +CONFIG_CMD_BOOTZ=y +# CONFIG_CMD_CONSOLE is not set +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_CMD_ENV_EXISTS is not set +CONFIG_CMD_MEMTEST=y +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_ARMFLASH=y +# CONFIG_CMD_FPGA is not set +# CONFIG_CMD_ITEST is not set +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_DHCP=y +# CONFIG_CMD_NFS is not set +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +# CONFIG_CMD_MISC is not set +CONFIG_CMD_FAT=y +CONFIG_DM=y +CONFIG_DM_SERIAL=y +CONFIG_OF_LIBFDT=y diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index c9841cd..0c69e2e 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -15,13 +15,19 @@ #define CONFIG_ARMV8_SWITCH_TO_EL1 #endif -#define CONFIG_REMAKE_ELF - #define CONFIG_SUPPORT_RAW_INITRD +#ifdef CONFIG_ARM64 +#define CONFIG_REMAKE_ELF +#else +#define CONFIG_SYS_HZ_CLOCK 24000000 +#define CONFIG_SYS_ARCH_TIMER +#define CONFIG_SKIP_LOWLEVEL_INIT +#endif /* Link Definitions */ #if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ - defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM) + defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM) || \ + defined(CONFIG_TARGET_VEXPRESS_AEMV8_AARCH32) /* ATF loads u-boot here for BASE_FVP model */ #define CONFIG_SYS_TEXT_BASE 0x88000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) @@ -259,6 +265,26 @@ #define CONFIG_BOOTCOMMAND "booti $kernel_addr $initrd_addr $fdt_addr" +#elif CONFIG_TARGET_VEXPRESS_AEMV8_AARCH32 +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_EXTRA_ENV_SETTINGS \ + "kernel_addr=0x80080000\0" \ + "initrd_addr=0x84000000\0" \ + "fdt_addr=0x82000000\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" + +#define CONFIG_BOOTARGS "console=ttyAMA0 earlycon=pl011,"\ + "0x1c090000 debug user_debug=31 "\ + "systemd.log_target=null "\ + "androidboot.hardware=fvpbase "\ + "root=/dev/vda2 rw "\ + "rootwait "\ + "loglevel=9" + +#define CONFIG_BOOTCOMMAND "bootz $kernel_addr $initrd_addr $fdt_addr" + + #endif /* Monitor Command Prompt */