From patchwork Tue Feb 17 10:35:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 44739 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5D6A121557 for ; Tue, 17 Feb 2015 10:35:41 +0000 (UTC) Received: by lbiw7 with SMTP id w7sf2329551lbi.0 for ; Tue, 17 Feb 2015 02:35:40 -0800 (PST) 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: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=pHRTNtJ15e5Jc5LxFLy6QgmVBH2ZFQ61jBDqI4HTd98=; b=YIwyHVTGy80vbeT3oTWPifIvi5Fp2RCnYgiv0zBjV3REm831QXgTQJRoy666u1usRg 4NOHfUhgSHxTnMbuwVK+xiMws9BkB0C0MJ4PnyUkVdYLJvx6L59DDuMKO34cW29XObKH fUYrjxkjNJTBGgxnVC+ZDNRAXv/U4iD+tx/4JRYjBntJHxBKZTNKuZHYTJblwiL3rIts Bj/ZvrAJ+s3ZDoIaMXQLBKZi7bjkPOMvNm1QMGTwiNsCf3n5M8gUl69ODRnlJaljyy/L G+vUIf5EuCjhtSA3NuX0r2mbg/ITTSgjSceJUcw2SsIH23L6QA2nw0huaFmRdxKX8oE8 LuWQ== X-Gm-Message-State: ALoCoQlJ7X13o7MYERIN1iziEFLrBR8rYn30mtHaO0ICpr7c2YRbK2V/iGrspWxxoYxCtOXDx3m3 X-Received: by 10.112.64.171 with SMTP id p11mr3462425lbs.12.1424169340372; Tue, 17 Feb 2015 02:35:40 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.4.131 with SMTP id k3ls520969lak.21.gmail; Tue, 17 Feb 2015 02:35:40 -0800 (PST) X-Received: by 10.152.9.2 with SMTP id v2mr27224289laa.67.1424169340224; Tue, 17 Feb 2015 02:35:40 -0800 (PST) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id p3si9045619laa.27.2015.02.17.02.35.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Feb 2015 02:35:40 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by labgq15 with SMTP id gq15so34990036lab.6 for ; Tue, 17 Feb 2015 02:35:40 -0800 (PST) X-Received: by 10.152.5.167 with SMTP id t7mr28586386lat.32.1424169339955; Tue, 17 Feb 2015 02:35:39 -0800 (PST) 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.35.133 with SMTP id h5csp2120120lbj; Tue, 17 Feb 2015 02:35:39 -0800 (PST) X-Received: by 10.194.103.228 with SMTP id fz4mr59130564wjb.82.1424169339257; Tue, 17 Feb 2015 02:35:39 -0800 (PST) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id ev10si6762937wib.44.2015.02.17.02.35.36; Tue, 17 Feb 2015 02:35:39 -0800 (PST) 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 DFC044B6F0; Tue, 17 Feb 2015 11:35:35 +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 trlOwyLs8TAL; Tue, 17 Feb 2015 11:35:35 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8CC8D4B6D4; Tue, 17 Feb 2015 11:35:35 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6DCCD4B6D4 for ; Tue, 17 Feb 2015 11:35:33 +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 wZEVfquM8y7b for ; Tue, 17 Feb 2015 11:35:33 +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-la0-f51.google.com (mail-la0-f51.google.com [209.85.215.51]) by theia.denx.de (Postfix) with ESMTPS id 2FA394B6CE for ; Tue, 17 Feb 2015 11:35:30 +0100 (CET) Received: by lams18 with SMTP id s18so34947772lam.13 for ; Tue, 17 Feb 2015 02:35:30 -0800 (PST) X-Received: by 10.112.132.67 with SMTP id os3mr27741326lbb.90.1424169330243; Tue, 17 Feb 2015 02:35:30 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id la1sm3254816lab.2.2015.02.17.02.35.27 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Feb 2015 02:35:29 -0800 (PST) From: Linus Walleij To: u-boot@lists.denx.de, Albert Aribaud , Tom Rini Date: Tue, 17 Feb 2015 11:35:25 +0100 Message-Id: <1424169325-28380-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Steve Rae , u-boot-review@google.com Subject: [U-Boot] [PATCH] vexpress64: juno: support SMC9118 ethernet 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.49 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 configures the Juno board to enable ethernet using the SMSC9118 ethernet controller found in the board. Tested by TFTP-booting a kernel over ethernet. Signed-off-by: Linus Walleij --- board/armltd/vexpress64/vexpress64.c | 3 +++ include/configs/vexpress_aemv8a.h | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/board/armltd/vexpress64/vexpress64.c b/board/armltd/vexpress64/vexpress64.c index 7ab000cca77b..de6286435d97 100644 --- a/board/armltd/vexpress64/vexpress64.c +++ b/board/armltd/vexpress64/vexpress64.c @@ -137,5 +137,8 @@ int board_eth_init(bd_t *bis) #ifdef CONFIG_SMC91111 rc = smc91111_initialize(0, CONFIG_SMC91111_BASE); #endif +#ifdef CONFIG_SMC911X + rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); +#endif return rc; } diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index e276fff7e442..5ffc84dc5ecd 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -138,9 +138,17 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 << 20)) -/* SMSC91C111 Ethernet Configuration */ +/* Ethernet Configuration */ +#ifdef CONFIG_TARGET_VEXPRESS64_JUNO +/* The real hardware Versatile express uses SMSC9118 */ +#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X_32_BIT 1 +#define CONFIG_SMC911X_BASE (0x018000000) +#else +/* The Vexpress64 simulators use SMSC91C111 */ #define CONFIG_SMC91111 1 #define CONFIG_SMC91111_BASE (0x01A000000) +#endif /* PL011 Serial Configuration */ #define CONFIG_PL011_SERIAL @@ -229,7 +237,7 @@ "fdt_addr_r=0x83000000\0" \ "fdt_high=0xa0000000\0" -#define CONFIG_BOOTARGS "console=ttyAMA0 root=/dev/ram0" +#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