From patchwork Fri Apr 9 02:13:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Anderson X-Patchwork-Id: 1464126 X-Patchwork-Delegate: uboot@andestech.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=YCPTor1Q; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4FGhYG31gjz9sW1 for ; Fri, 9 Apr 2021 12:15:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 23FC880553; Fri, 9 Apr 2021 04:13:58 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YCPTor1Q"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F34CA80218; Fri, 9 Apr 2021 04:13:35 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id AF77D8004F for ; Fri, 9 Apr 2021 04:13:30 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=seanga2@gmail.com Received: by mail-qv1-xf2b.google.com with SMTP id x27so1952793qvd.2 for ; Thu, 08 Apr 2021 19:13:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XhITySYmkB3uuXVNkhikLM9XyD4R9lxGK2KQB2XXEf0=; b=YCPTor1Qc7+W/UKyUcOQMv5AElMD74aP9uKcKyQRXxVnjGX1zFid6VAumELpXbFEnA KawffkORUhhGphZAvou5TUIQxwRRHAEqZJh1u1T9isPVk4wVeCJr+tEj2q6bqmmhSs4w NNm3YSM7Vf6J/2ButYFC6/h9oGEj02kLvA9L2ehX4zozT9hlP9f1bbb9KdfpBENDp37U XkC9+EmUFhCmsYXzZO58NvqtfBus6L0DYmukpZnNGBZFKfuCmc6w9D/ieHRl+Kmg+okb 4wLgni/Mjz4phz+IfhEi3D+v5RWKfOL2jFjIXGGbo6WBBwy6Knd9yrQFxjYM7sUfPpB/ HBxA== 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:mime-version:content-transfer-encoding; bh=XhITySYmkB3uuXVNkhikLM9XyD4R9lxGK2KQB2XXEf0=; b=ewdlCJ+s/H1Sv5KmOJf6rTVSPIdQRV3EYfylgpDr2MZwzN1rSA+zrpSIzY28a6zCFC CMWaZ2fgMxdYxXP49UDOHcU3d3F9x1AgQQHdn6cKt590rNU3Rf9PHVxl/Xp1OuVBrbDo wQEKaEO0MGZIFIo6cZY+WulSWhm4chK4yLCjDXYH7YeLXNb4knzQynX8zWCVOWtFU4i2 7s2z5qqMzCwi9EB7FqF5y8ZsJlRxQSMFXydDR7P9fAYkJvh7cFWHN9AU7HMvpKh/Hdjr i7VedDe5lYwB1XpZHsgbBFP67FjUxvYSfVronYTW712QYKvHQ8Z4mdbw4GAJjXwebiHb JySg== X-Gm-Message-State: AOAM530GQcPXVOoU4QPHNU9ocSoT4px98ZkJtvuKUcIWSMAih+m437eN ITzhwIQnh0qLn8sHPZLiQKziGtXIlkE= X-Google-Smtp-Source: ABdhPJw2bzJrONlj5IHaTujox8wL73gffddEBzEzKQVHJbltib1nM+txu45PVONYBHqi022sN7s1Pg== X-Received: by 2002:a0c:9e5e:: with SMTP id z30mr11944792qve.61.1617934409520; Thu, 08 Apr 2021 19:13:29 -0700 (PDT) Received: from godwin.fios-router.home (pool-108-51-35-162.washdc.fios.verizon.net. [108.51.35.162]) by smtp.gmail.com with ESMTPSA id h8sm951678qta.53.2021.04.08.19.13.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Apr 2021 19:13:29 -0700 (PDT) From: Sean Anderson To: u-boot@lists.denx.de Cc: Bin Meng , Leo Liang , Rick Chen , Heinrich Schuchardt , Sean Anderson Subject: [PATCH v3 08/11] riscv: Enable AI ram on K210 Date: Thu, 8 Apr 2021 22:13:10 -0400 Message-Id: <20210409021313.433558-9-seanga2@gmail.com> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210409021313.433558-1-seanga2@gmail.com> References: <20210409021313.433558-1-seanga2@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.4 at phobos.denx.de X-Virus-Status: Clean We just need to initialize all the clocks pre-reloc. The clock driver creates a bunch of devices, so we need to increase the pre-reloc malloc arena. Signed-off-by: Sean Anderson --- (no changes since v1) board/sipeed/maix/maix.c | 12 +++++++++++- configs/sipeed_maix_bitm_defconfig | 2 ++ include/configs/sipeed-maix.h | 3 +-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/board/sipeed/maix/maix.c b/board/sipeed/maix/maix.c index cbcb23cf5c..6e582911f8 100644 --- a/board/sipeed/maix/maix.c +++ b/board/sipeed/maix/maix.c @@ -14,7 +14,7 @@ phys_size_t get_effective_memsize(void) return CONFIG_SYS_SDRAM_SIZE; } -int board_init(void) +static int sram_init(void) { int ret, i; const char * const banks[] = { "sram0", "sram1", "airam" }; @@ -39,3 +39,13 @@ int board_init(void) return 0; } + +int board_early_init_f(void) +{ + return sram_init(); +} + +int board_init(void) +{ + return 0; +} diff --git a/configs/sipeed_maix_bitm_defconfig b/configs/sipeed_maix_bitm_defconfig index 210848cccf..bd877cd055 100644 --- a/configs/sipeed_maix_bitm_defconfig +++ b/configs/sipeed_maix_bitm_defconfig @@ -1,4 +1,5 @@ CONFIG_RISCV=y +CONFIG_SYS_MALLOC_F_LEN=0x10000 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0xfff000 CONFIG_ENV_SECT_SIZE=0x1000 @@ -7,6 +8,7 @@ CONFIG_ARCH_RV64I=y CONFIG_STACK_SIZE=0x100000 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run k210_bootcmd" +CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_MTDIDS_DEFAULT="nor0=spi3:0" CONFIG_MTDPARTS_DEFAULT="nor0:1M(u-boot),0x1000@0xfff000(env)" diff --git a/include/configs/sipeed-maix.h b/include/configs/sipeed-maix.h index 4c1ff98ec6..0fbe8a5905 100644 --- a/include/configs/sipeed-maix.h +++ b/include/configs/sipeed-maix.h @@ -15,8 +15,7 @@ #define CONFIG_SYS_CACHELINE_SIZE 64 #define CONFIG_SYS_SDRAM_BASE 0x80000000 -/* Don't relocate into AI ram since it isn't set up yet */ -#define CONFIG_SYS_SDRAM_SIZE (SZ_4M + SZ_2M) +#define CONFIG_SYS_SDRAM_SIZE SZ_8M #ifndef CONFIG_EXTRA_ENV_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \