From patchwork Tue Aug 27 10:56:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harkin X-Patchwork-Id: 1153749 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="WU8QVght"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 46Hm6716vpz9sBp for ; Tue, 27 Aug 2019 20:57:02 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id AE837C2203A; Tue, 27 Aug 2019 10:56:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BA1BFC21E9F; Tue, 27 Aug 2019 10:56:56 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 7CE6BC21E9F; Tue, 27 Aug 2019 10:56:54 +0000 (UTC) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by lists.denx.de (Postfix) with ESMTPS id 202CFC21E39 for ; Tue, 27 Aug 2019 10:56:54 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id g67so2540445wme.1 for ; Tue, 27 Aug 2019 03:56:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=5eHtRUsyNJcHG1vvGH30unIxcYfeozr8fs4loKc7bJA=; b=WU8QVght85WVcgHta4FkRuz9BKNVI8X6R5QH2snYPpFTFg+Z86yVrQuTE3ZU1u4a8D N9tvZU5flNdmHe1LKVVNR5xeZrMhfMQpXHbdMuLErOFtnYZYLlsQDAfbsMZURbdmRGlW SQQAeFueJTq+WRXHczf+OMXobDS6h7T/pTTvAgAyakPWqz02CW6ZAFsfNZw+DZQISah/ uZgHa8LDLtJGyBpZQrvVmHSMp577ceMsV//t8m5h14KJinJnUKs3wYSRu5ORHfnUnRfa 6RGpWfE/HGTg3qCiG8WisrWHsaEGLa4i4wNUsjGEb5fIbTf7cj/jQNie89vVz/w9Cvjf aoEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5eHtRUsyNJcHG1vvGH30unIxcYfeozr8fs4loKc7bJA=; b=dMrP2VIUu31lNPl8Jrr563p77JeCUaliSEZgy2BtEpFDPRa+lX1uHUZT4YfIWGPXo8 93JT5ZtwHymrYfiPf0EDoqhaCma76e36hUmvTTZpglyeJa5zJT0YXCWDUMiI7xWlXpBL IHhb706vA0OjvI/08JvWgvhQow3WpoXQkkxjBcZdqhq7n+2T6XY1ukuodPAmKK51RvPO 6OwzBtv+IaRyidhlFRzYj/AM0eEH7sTo+DjaaKNossH7iVYx3WwTIZ/VXxJda/3uEkGC kXXbJoU/SgiCZnlGQMv8SFf1V12wyMABGo2Gb/oZLSs7qnAy+UIgRzYM7Ptx1WVMiD5s pExA== X-Gm-Message-State: APjAAAUK9dbBLd6iohk5MkfbONm9Hj7kBbjJBCBlmYYpt6czursKa+Mb 0FzYrgLVD9oImyZPsnm8D3uhrWDi5Lg= X-Google-Smtp-Source: APXvYqxEcYiEBPsQl/mCrCUJwFOKN0h4pPFRjubpN+ToloSy8mjfMy27klGLoNO0chy2VMXzSpHMZA== X-Received: by 2002:a7b:cd17:: with SMTP id f23mr28367268wmj.177.1566903413354; Tue, 27 Aug 2019 03:56:53 -0700 (PDT) Received: from localhost.localdomain (82-69-54-187.dsl.in-addr.zen.co.uk. [82.69.54.187]) by smtp.gmail.com with ESMTPSA id 12sm2466522wmi.34.2019.08.27.03.56.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2019 03:56:52 -0700 (PDT) From: Ryan Harkin To: u-boot@lists.denx.de, Tom Rini Date: Tue, 27 Aug 2019 11:56:49 +0100 Message-Id: <20190827105649.29109-1-ryan.harkin@linaro.org> X-Mailer: git-send-email 2.17.1 Cc: Sudeep Holla Subject: [U-Boot] [PATCH] Revert "vexpress64: fvp dram: add DRAM configuration" X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" This reverts commit fc04b923541d984b1544056fd3bfa8129d4e5aac where the FVP DRAM configuration was added. Signed-off-by: Ryan Harkin Acked-by: Sudeep Holla Acked-by: Linus Walleij --- arch/arm/Kconfig | 10 ------- board/armltd/vexpress64/Kconfig | 2 +- board/armltd/vexpress64/MAINTAINERS | 5 ---- configs/vexpress_aemv8a_dram_defconfig | 39 -------------------------- include/configs/vexpress_aemv8a.h | 17 ++--------- 5 files changed, 3 insertions(+), 70 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index cbb2a2a158..12d5d0fef6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1066,16 +1066,6 @@ config TARGET_VEXPRESS64_BASE_FVP select PL01X_SERIAL select SEMIHOSTING -config TARGET_VEXPRESS64_BASE_FVP_DRAM - bool "Support Versatile Express ARMv8a FVP BASE model booting from DRAM" - select ARM64 - select PL01X_SERIAL - 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_JUNO bool "Support Versatile Express Juno Development Platform" select ARM64 diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index e05f353b80..9014418433 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 config SYS_BOARD default "vexpress64" diff --git a/board/armltd/vexpress64/MAINTAINERS b/board/armltd/vexpress64/MAINTAINERS index 15b0a08646..0ba044d7ff 100644 --- a/board/armltd/vexpress64/MAINTAINERS +++ b/board/armltd/vexpress64/MAINTAINERS @@ -10,11 +10,6 @@ M: Linus Walleij S: Maintained F: configs/vexpress_aemv8a_semi_defconfig -VEXPRESS_AEMV8A_DRAM BOARD -M: Ryan Harkin -S: Maintained -F: configs/vexpress_aemv8a_dram_defconfig - JUNO DEVELOPMENT PLATFORM BOARD M: Linus Walleij S: Maintained diff --git a/configs/vexpress_aemv8a_dram_defconfig b/configs/vexpress_aemv8a_dram_defconfig deleted file mode 100644 index 51860da387..0000000000 --- a/configs/vexpress_aemv8a_dram_defconfig +++ /dev/null @@ -1,39 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM=y -CONFIG_SYS_TEXT_BASE=0x88000000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_NR_DRAM_BANKS=1 -CONFIG_IDENT_STRING=" vexpress_aemv8a" -CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=1 -CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyAMA0 earlycon=pl011,0x1c090000 debug user_debug=31 androidboot.hardware=fvpbase root=/dev/vda2 rw rootwait loglevel=9" -# CONFIG_USE_BOOTCOMMAND is not set -# CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_SYS_PROMPT="VExpress64# " -# CONFIG_CMD_CONSOLE is not set -# CONFIG_CMD_XIMG is not set -# CONFIG_CMD_EDITENV is not set -CONFIG_CMD_MEMTEST=y -CONFIG_CMD_ARMFLASH=y -# CONFIG_CMD_LOADS is not set -# CONFIG_CMD_ITEST is not set -# CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set -CONFIG_CMD_CACHE=y -# CONFIG_CMD_MISC is not set -CONFIG_CMD_UBI=y -# CONFIG_ISO_PARTITION is not set -# CONFIG_EFI_PARTITION is not set -CONFIG_ENV_IS_IN_FLASH=y -CONFIG_DM=y -# CONFIG_MMC is not set -CONFIG_MTD_NOR_FLASH=y -CONFIG_MTD_DEVICE=y -CONFIG_FLASH_CFI_DRIVER=y -CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y -CONFIG_SYS_FLASH_PROTECTION=y -CONFIG_SYS_FLASH_CFI=y -CONFIG_DM_SERIAL=y -CONFIG_OF_LIBFDT=y diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 9746470552..b2c14f9e10 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -16,8 +16,7 @@ #define CONFIG_REMAKE_ELF /* Link Definitions */ -#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ - defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM) +#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP /* ATF loads u-boot here for BASE_FVP model */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x03f00000) #elif CONFIG_TARGET_VEXPRESS64_JUNO @@ -83,8 +82,7 @@ #define GICR_BASE (0x2f100000) #else -#if defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) || \ - defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM) +#ifdef CONFIG_TARGET_VEXPRESS64_BASE_FVP #define GICD_BASE (0x2f000000) #define GICC_BASE (0x2c000000) #elif CONFIG_TARGET_VEXPRESS64_JUNO @@ -191,17 +189,6 @@ "booti $kernel_addr - $fdt_addr" -#elif CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM -#define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr=0x80080000\0" \ - "initrd_addr=0x84000000\0" \ - "fdt_addr=0x83000000\0" \ - "fdt_high=0xffffffffffffffff\0" \ - "initrd_high=0xffffffffffffffff\0" - -#define CONFIG_BOOTCOMMAND "booti $kernel_addr $initrd_addr $fdt_addr" - - #endif /* Monitor Command Prompt */