From patchwork Mon Mar 23 10:06:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 46178 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f198.google.com (mail-we0-f198.google.com [74.125.82.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3D55220D10 for ; Mon, 23 Mar 2015 10:07:25 +0000 (UTC) Received: by wesk11 with SMTP id k11sf21471585wes.3 for ; Mon, 23 Mar 2015 03:07:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=9JdVqMbrZckTTuCMxEoS2kcH4AQh7bYeTgliV1nYrTk=; b=aeuTgn3bMFP1Exq/U9BQGH1a3O4iSfGdeBdB9wtiWTzW5zkYEXEuR597291bIBp/Es tX2TO05NOTDdkk+gHw/Ga6h5MJMTD7FyOgZ0ZyVHz/UIh1FJO1eTvPdxFfrZsRB+0D3R WWHbeXseQuHcOXMxudBazO6wR8z9y9QTiAoOdXO5paum9Zg/HTFKy2KpPFcvkQlPZOVM HJuoptDD7PJ3XpgHk5bP7eOvcCRFZLjjYn5hUh1tlhP0BDynWVRLLq4X4O2dn4IyI+WL 6px92M1Bm3f29HD3dy10oWHXWmS/JYZtxC9nwsKgJLwuWdPdgFZIn2U9ymh2QmUJW7ks qGCw== X-Gm-Message-State: ALoCoQkehT56aZwERxGV59vyShH8ivEf81l9gjH3B2B6wxdVtBcGqSKWcR8iJccE/k7hffQq/lfJ X-Received: by 10.180.211.199 with SMTP id ne7mr1857731wic.5.1427105244548; Mon, 23 Mar 2015 03:07:24 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.225.163 with SMTP id rl3ls109279lac.83.gmail; Mon, 23 Mar 2015 03:07:24 -0700 (PDT) X-Received: by 10.152.183.196 with SMTP id eo4mr20625144lac.22.1427105244382; Mon, 23 Mar 2015 03:07:24 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id bb1si227771lab.113.2015.03.23.03.07.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Mar 2015 03:07:24 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by labon10 with SMTP id on10so29320589lab.2 for ; Mon, 23 Mar 2015 03:07:24 -0700 (PDT) X-Received: by 10.152.28.5 with SMTP id x5mr81799321lag.112.1427105244245; Mon, 23 Mar 2015 03:07:24 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.57.201 with SMTP id k9csp725124lbq; Mon, 23 Mar 2015 03:07:23 -0700 (PDT) X-Received: by 10.68.100.4 with SMTP id eu4mr19675228pbb.139.1427105242501; Mon, 23 Mar 2015 03:07:22 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id vy7si523646pac.53.2015.03.23.03.07.20; Mon, 23 Mar 2015 03:07:22 -0700 (PDT) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BB7A8A746F; Mon, 23 Mar 2015 11:07:10 +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 zhdYfKbIS0oz; Mon, 23 Mar 2015 11:07:10 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 09B15A7474; Mon, 23 Mar 2015 11:07:03 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 494C3A7437 for ; Mon, 23 Mar 2015 11:06:57 +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 DOfzjiSkAUXg for ; Mon, 23 Mar 2015 11:06:57 +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-lb0-f173.google.com (mail-lb0-f173.google.com [209.85.217.173]) by theia.denx.de (Postfix) with ESMTPS id 0EBECA746F for ; Mon, 23 Mar 2015 11:06:49 +0100 (CET) Received: by lbbsy1 with SMTP id sy1so114650983lbb.1 for ; Mon, 23 Mar 2015 03:06:49 -0700 (PDT) X-Received: by 10.112.130.100 with SMTP id od4mr60611975lbb.86.1427105208944; Mon, 23 Mar 2015 03:06:48 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id x7sm87147lag.3.2015.03.23.03.06.46 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Mar 2015 03:06:47 -0700 (PDT) From: Linus Walleij To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Mon, 23 Mar 2015 11:06:14 +0100 Message-Id: <1427105174-20072-5-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1427105174-20072-1-git-send-email-linus.walleij@linaro.org> References: <1427105174-20072-1-git-send-email-linus.walleij@linaro.org> Cc: Steve Rae , u-boot-review@google.com Subject: [U-Boot] [PATCH 5/5] vexpress64: cut config and defaults for unclear variant X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: 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" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This variant that is neither FVP / Base Model or Juno Versatile Express 64bit is confusing. Get rid of it unless someone can point out what machine that really is. Seems to be an evolutional artifact in the config base. Signed-off-by: Linus Walleij --- board/armltd/vexpress64/Kconfig | 13 ------------- configs/vexpress_aemv8a_defconfig | 3 --- include/configs/vexpress_aemv8a.h | 28 ++++------------------------ 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 configs/vexpress_aemv8a_defconfig diff --git a/board/armltd/vexpress64/Kconfig b/board/armltd/vexpress64/Kconfig index 7d5e7bee8b9a..f5693aebacc5 100644 --- a/board/armltd/vexpress64/Kconfig +++ b/board/armltd/vexpress64/Kconfig @@ -1,16 +1,3 @@ -if TARGET_VEXPRESS64_AEMV8A - -config SYS_BOARD - default "vexpress64" - -config SYS_VENDOR - default "armltd" - -config SYS_CONFIG_NAME - default "vexpress_aemv8a" - -endif - if TARGET_VEXPRESS64_BASE_FVP config SYS_BOARD diff --git a/configs/vexpress_aemv8a_defconfig b/configs/vexpress_aemv8a_defconfig deleted file mode 100644 index 9f4b87655613..000000000000 --- a/configs/vexpress_aemv8a_defconfig +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_VEXPRESS64_AEMV8A=y -CONFIG_DEFAULT_DEVICE_TREE="vexpress64" diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index cda89d8ca814..027c7d1555ba 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -20,14 +20,6 @@ #define CONFIG_REMAKE_ELF -#if !defined(CONFIG_TARGET_VEXPRESS64_BASE_FVP) && \ - !defined(CONFIG_TARGET_VEXPRESS64_JUNO) -/* Base FVP and Juno not using GICv3 yet */ -#define CONFIG_GICV3 -#endif - -/*#define CONFIG_ARMV8_SWITCH_TO_EL1*/ - #define CONFIG_SUPPORT_RAW_INITRD /* Cache Definitions */ @@ -46,8 +38,7 @@ #define CONFIG_SYS_TEXT_BASE 0xe0000000 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) #else -#define CONFIG_SYS_TEXT_BASE 0x80000000 -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) +#error "Unknown board variant" #endif /* Flat Device Tree Definitions */ @@ -117,10 +108,9 @@ #define GICD_BASE (0x2C010000) #define GICC_BASE (0x2C02f000) #else -#define GICD_BASE (0x2C001000) -#define GICC_BASE (0x2C002000) -#endif +#error "Unknown board variant" #endif +#endif /* !CONFIG_GICV3 */ #define CONFIG_SYS_MEMTEST_START V2M_BASE #define CONFIG_SYS_MEMTEST_END (V2M_BASE + 0x80000000) @@ -249,17 +239,7 @@ #define CONFIG_BOOTDELAY 1 #else - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_addr_r=0x80000000\0" \ - "initrd_addr_r=0x88000000\0" \ - "fdt_addr_r=0x83000000\0" \ - "fdt_high=0xa0000000\0" - -#define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 root=/dev/ram0" -#define CONFIG_BOOTCOMMAND "bootm $kernel_addr_r " \ - "$initrd_addr_r:$initrd_size $fdt_addr_r" -#define CONFIG_BOOTDELAY -1 +#error "Unknown board variant" #endif /* Do not preserve environment */