From patchwork Thu Jan 5 22:42:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Sloyko X-Patchwork-Id: 711592 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3tvjPf0VyCz9rxm for ; Fri, 6 Jan 2017 09:43:02 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="cTGkIn3U"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9B95CB38DC; Thu, 5 Jan 2017 23:42:59 +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 4fDlp-ebwwwf; Thu, 5 Jan 2017 23:42:59 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3C5B1B3908; Thu, 5 Jan 2017 23:42:53 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 89F3AA75C2 for ; Thu, 5 Jan 2017 23:42:47 +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 gq6cOFCo1ebe for ; Thu, 5 Jan 2017 23:42:47 +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-pg0-f43.google.com (mail-pg0-f43.google.com [74.125.83.43]) by theia.denx.de (Postfix) with ESMTPS id 0D91EA75FB for ; Thu, 5 Jan 2017 23:42:44 +0100 (CET) Received: by mail-pg0-f43.google.com with SMTP id g1so205905775pgn.0 for ; Thu, 05 Jan 2017 14:42:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mbvbQuUpjHppWxZ/UcTzAHXChoDY6xkZccX8qR1hOtM=; b=cTGkIn3UxUQPu0YBdoR8E0+QkFzeS/Ql1vN1uCJhDKCUsZR7i0ax2+jyLB6d6hEXNi /c1HfcVMdHkv/Yd/eMwiO/+kHRnClLDtfxsJG1RRI/gWiTbYEmKAugvZ/W1Un5F16ucu 5M4NvbP2nSYjkm3bXMXdFODLw1mNQEsrnTSKKYWphIOU5HB5QFX04mC0ZOV+TOU92kqs 5ySiu6eXxSqXZ09Y24omPhOXpEaboDqRIQf2m+H1DNZNpCAM0j0txLk9oG5KgRsoTLuv tpnzqWs67RdC8TLxcoAa1TLZt+ikU4p8eHY4rCFQ4ADv0r1w3cBpYKYPTp8SAtY4QLsl /8qg== 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:in-reply-to :references; bh=mbvbQuUpjHppWxZ/UcTzAHXChoDY6xkZccX8qR1hOtM=; b=eeoe4k6DCnQOKe/PmbvDo8ewAh2X9ldQ6BZ0+hW+9eIDiN/5fOaDGEjV5qTwFZJ+kz BijTt6QWLnKqgZqLf//r+O3XCf2/V6Xk/5KNck7yJKqatuQY14GEMwt0SlyeKBGfj2xp N8ebYZVNh0DiwCRrAcWY5YXt4Luxi70QYgwQgWrjc9FJcIQqn+CgvpVMr9UQe7aQtQ1i fNzPbKd2bQBr/67sWi17+ckdV839fT318C2awQuiq8JW8Sgp7uTTYLv2V5KbYg0Lvbu2 nPFSuhA97MxkLvvAWVGDksd/oLcOg3Z36W5URLLHYnIviAGJcoA8dpA0Mu6XOrmL2VfW JMkw== X-Gm-Message-State: AIkVDXLxzegSzqo3LDKb2TUEgepNzhhXRrl87T080+AHVMLLpm2Te9dQwNpC7ps+nmUYlVnl X-Received: by 10.99.184.18 with SMTP id p18mr138027882pge.33.1483656163068; Thu, 05 Jan 2017 14:42:43 -0800 (PST) Received: from mxsl.svl.corp.google.com ([100.123.242.80]) by smtp.gmail.com with ESMTPSA id u64sm149619044pgc.39.2017.01.05.14.42.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 05 Jan 2017 14:42:42 -0800 (PST) From: Maxim Sloyko To: Simon Glass Date: Thu, 5 Jan 2017 14:42:13 -0800 Message-Id: <20170105224214.100042-4-maxims@google.com> X-Mailer: git-send-email 2.11.0.390.gc69c2f50cf-goog In-Reply-To: <20170105224214.100042-1-maxims@google.com> References: <20170104194656.124368-1-maxims@google.com> <20170105224214.100042-1-maxims@google.com> Cc: u-boot@lists.denx.de, Tom Rini , Albert Aribaud Subject: [U-Boot] [PATCH v1 3/4] aspeed: Board init functions and common configs for ast2500 based boards 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" --- Changes in v1: - Merge together all patches related to ast2500 boards common functions/configs - Add copyright statement to ast2500-board.c Signed-off-by: Maxim Sloyko --- arch/arm/mach-aspeed/Makefile | 2 +- arch/arm/mach-aspeed/ast2500-board.c | 78 +++++++++++++++++++++++++++++++++ include/configs/aspeed-common.h | 84 ++++++++++++++++++++++++++++++++++++ 3 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 arch/arm/mach-aspeed/ast2500-board.c create mode 100644 include/configs/aspeed-common.h diff --git a/arch/arm/mach-aspeed/Makefile b/arch/arm/mach-aspeed/Makefile index 1f7af71b03..9d29ff7f6f 100644 --- a/arch/arm/mach-aspeed/Makefile +++ b/arch/arm/mach-aspeed/Makefile @@ -5,4 +5,4 @@ # obj-$(CONFIG_ARCH_ASPEED) += ast_wdt.o -obj-$(CONFIG_ASPEED_AST2500) += ast2500/ +obj-$(CONFIG_ASPEED_AST2500) += ast2500/ ast2500-board.o diff --git a/arch/arm/mach-aspeed/ast2500-board.c b/arch/arm/mach-aspeed/ast2500-board.c new file mode 100644 index 0000000000..6ff74f0a1f --- /dev/null +++ b/arch/arm/mach-aspeed/ast2500-board.c @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2016 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/* Second Watchdog Timer by default is configured + * to trigger secondary boot source. + */ +#define AST_2ND_BOOT_WDT (1) + +/* Third Watchdog Timer by default is configured + * to toggle Flash address mode switch before reset. + */ +#define AST_FLASH_ADDR_DETECT_WDT (2) + +DECLARE_GLOBAL_DATA_PTR; + +void lowlevel_init(void) +{ + /* + * These two watchdogs need to be stopped as soon as possible, + * otherwise the board might hang. By default they are set to + * a very short timeout and even simple debug write to serial + * console early in the init process might cause them to fire. + */ + struct ast_wdt *flash_addr_wdt = + (struct ast_wdt *)(WDT_BASE + + sizeof(struct ast_wdt) * + AST_FLASH_ADDR_DETECT_WDT); + + clrbits_le32(&flash_addr_wdt->ctrl, WDT_CTRL_EN); + +#ifndef CONFIG_FIRMWARE_2ND_BOOT + struct ast_wdt *sec_boot_wdt = + (struct ast_wdt *)(WDT_BASE + + sizeof(struct ast_wdt) * + AST_2ND_BOOT_WDT); + + clrbits_le32(&sec_boot_wdt->ctrl, WDT_CTRL_EN); +#endif +} + +int board_init(void) +{ + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + return 0; +} + +int dram_init(void) +{ + struct udevice *dev; + int ret = uclass_get_device(UCLASS_RAM, 0, &dev); + if (ret) { + debug("DRAM FAIL1\r\n"); + return ret; + } + + struct ram_info ram; + ret = ram_get_info(dev, &ram); + if (ret) { + debug("DRAM FAIL2\r\n"); + return ret; + } + + + gd->ram_size = ram.size; + return 0; +} diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h new file mode 100644 index 0000000000..c125e39e3f --- /dev/null +++ b/include/configs/aspeed-common.h @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2012-2020 ASPEED Technology Inc. + * Ryan Chen + * + * Copyright 2016 IBM Corporation + * (C) Copyright 2016 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __AST_COMMON_CONFIG_H +#define __AST_COMMON_CONFIG_H + +/* Misc CPU related */ +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +#define CONFIG_CMDLINE_EDITING 1 + +/* Enable cache controller */ +#define CONFIG_SYS_DCACHE_OFF 1 + +#ifdef CONFIG_PRE_CON_BUF_SZ +#define PRE_CON_RAM_SZ CONFIG_PRE_CON_BUF_SZ +#else +#define PRE_CON_RAM_SZ 0 +#endif + +#define CONFIG_SYS_SDRAM_BASE 0x80000000 +#define CONFIG_SYS_INIT_RAM_ADDR (0x1e720000 + PRE_CON_RAM_SZ) +#define CONFIG_SYS_INIT_RAM_SIZE (36*1024 - PRE_CON_RAM_SZ) +#define SYS_INIT_RAM_END (CONFIG_SYS_INIT_RAM_ADDR \ + + CONFIG_SYS_INIT_RAM_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (SYS_INIT_RAM_END \ + - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_GBL_DATA_OFFSET (CONFIG_SYS_INIT_RAM_SIZE \ + - GENERATED_GBL_DATA_SIZE) + +#define CONFIG_NR_DRAM_BANKS 1 + +#define CONFIG_SYS_TEXT_BASE 0x00000000 + +#define CONFIG_SYS_MALLOC_LEN (32 << 20) + +/* + * NS16550 Configuration + */ +#define CONFIG_BAUDRATE 115200 + +/* + * BOOTP options + */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME +#define CONFIG_BOOTP_SUBNETMASK + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_CBSIZE 256 + +/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ + + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +#define CONFIG_BOOTARGS \ + "console=ttyS4,115200n8" \ + " root=/dev/ram rw" + +#define CONFIG_BOOTCOMMAND "bootm 20080000 20300000" +#define CONFIG_ENV_OVERWRITE + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=yes\0" \ + "spi_dma=yes\0" \ + "" + +#endif /* __AST_COMMON_CONFIG_H */