From patchwork Thu Aug 20 04:44:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Roese X-Patchwork-Id: 1348146 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=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; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=ofHJDUlZ; 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)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BXBsf3vv4z9sPC for ; Thu, 20 Aug 2020 14:45:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 83C4982256; Thu, 20 Aug 2020 06:45:09 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1597898709; bh=ugCMuo5uLP4mw/DaXXbwZXVQn2+fydafJcKX9+SeOvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=ofHJDUlZko94WO+3QkzmtRfrzWsnOLeQFxe8eS66dEdBIHtGVlz0moaMovmyBOgNT ovor6qi6J/8wnocTZsFqEcejGLPHaEoPs1Qxkj1VcHBbFsnGRv5+a7ugI14jKh3Nle gTvHcRW3gAC7c3WkiuH2ahEvzlYlT5pLXBOfvoPJJ7R65hR3YEHkA7IaGx4Ou/mnvV 7IAWT40pRHGvYAGWz3p89hHRyFmUIZPZ0W920/ccDKoP9G38z5XRAVH6+wDgRvzYun RiUmVSktvAVIUhE0reCzmiU6xeQnXVOSs4Lp/yVPHL7n8BtGgZZkOir3z4DYE0fTv+ OLBwlcNg6OxtQ== Received: by phobos.denx.de (Postfix, from userid 109) id 6A3BB8223D; Thu, 20 Aug 2020 06:45:07 +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=-1.5 required=5.0 tests=BAYES_00,KHOP_HELO_FCRDNS, SPF_HELO_NONE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from mx2.mailbox.org (mx2a.mailbox.org [IPv6:2001:67c:2050:104:0:2:25:2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id E481B80E47 for ; Thu, 20 Aug 2020 06:45:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=none smtp.mailfrom=sr@denx.de Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 43DEBA1666; Thu, 20 Aug 2020 06:45:03 +0200 (CEST) Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id wrQrWFbZV2nT; Thu, 20 Aug 2020 06:44:59 +0200 (CEST) From: Stefan Roese To: u-boot@lists.denx.de Cc: Ovidiu Panait , daniel.schwierzeck@gmail.com, trini@konsulko.com, =?utf-8?q?Pali_Roh=C3=A1r?= , sjg@chromium.org, Patrick Delaunay , Stephen Warren , Vikas Manocha Subject: [PATCH v7 03/10] board_f: Add default values for bi_dram[] in dram_init_banksize() Date: Thu, 20 Aug 2020 06:44:45 +0200 Message-Id: <20200820044452.2786286-4-sr@denx.de> In-Reply-To: <20200820044452.2786286-1-sr@denx.de> References: <20200820044452.2786286-1-sr@denx.de> MIME-Version: 1.0 X-MBO-SPAM-Probability: * X-Rspamd-Score: 1.22 / 15.00 / 15.00 X-Rspamd-Queue-Id: 086F0679 X-Rspamd-UID: c884e5 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.3 at phobos.denx.de X-Virus-Status: Clean Remove the bi_memstart / bi_memsize assignment in setup_bdinfo() and make sure, that bd_dram[] is always configured in the weak default implementation of dram_init_banksize(), when CONFIG_SYS_SDRAM_BASE is not set. Signed-off-by: Stefan Roese Reviewed-by: Ovidiu Panait --- Changes in v7: - Add Reviewe-by tag from Ovidiu Changes in v6: - Simplify dram_init_banksize() even more as suggested by Daniel Changes in v4: - New patch common/board_f.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index d1f0f9af08..8a43df97e4 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -237,10 +237,8 @@ static int show_dram_config(void) __weak int dram_init_banksize(void) { -#if defined(CONFIG_SYS_SDRAM_BASE) - gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; + gd->bd->bi_dram[0].start = gd->ram_base; gd->bd->bi_dram[0].size = get_effective_memsize(); -#endif return 0; } @@ -602,9 +600,6 @@ int setup_bdinfo(void) { struct bd_info *bd = gd->bd; - bd->bi_memstart = gd->ram_base; /* start of memory */ - bd->bi_memsize = gd->ram_size; /* size in bytes */ - if (IS_ENABLED(CONFIG_SYS_HAS_SRAM)) { bd->bi_sramstart = CONFIG_SYS_SRAM_BASE; /* start of SRAM */ bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE; /* size of SRAM */