From patchwork Tue Jan 19 10:41:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandar Gerasimovski X-Patchwork-Id: 1428568 X-Patchwork-Delegate: priyanka.jain@nxp.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 (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.a=rsa-sha256 header.s=selector1 header.b=mOEp7pRr; 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 4DKlZJ1KPTz9sVv for ; Tue, 19 Jan 2021 21:41:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C620A828DC; Tue, 19 Jan 2021 11:41:08 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.b="mOEp7pRr"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7EC64828DC; Tue, 19 Jan 2021 11:41:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on20706.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e1a::706]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id BF7E6828D8 for ; Tue, 19 Jan 2021 11:41:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aleksandar.gerasimovski@hitachi-powergrids.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nGKD4UAgzTS08EppVSVTrBB5WMqATqjQt4JB7waRHaAsnMOn1+1M/EfADhZ7CGegUEDhWqicVBJ1cf0CEspS2FIQ74xzVjzmtOd96BZ/Pyp2xG+nXrupSq6lUNvVnBnBYFHUQjqiRt+BY3IvoWmk5RUdXe68874nNduj5Zw5b9v5E5E+recaDRmEDchVEARaNBV67Kicl3j8TQ602TF4oj4Zty3FR/8nPIYCjqGbVvqmvLwLG1fYrub22Mr5e4yFX5E2AZ8ObTiZPXtUVla9ge3uEgn/1EU4bQWw2BL/tH6muCzvNu/qzgSGcj7Lw8WmCJMA5gszZbdHlvdqhXRMOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=86BDPLx8oY3ewIJVYvlJtX/aAr3tuQwegrGbYPl6Ug8=; b=d7VHVimuitb2w+q9xXXe3/8UIvMdPuQEzBnJj26Q6FjQbMakEGf7URwmjcKgEhvlwpZgxTMaIqLQ9bYFr1GBPlMLbkwNJjdOGRuqUivZGaQ+wvcPFIMgak6bsFTHwMSZ7OzE2uCRPmduTgSe+gQU0U9zyMBz2vXZiQMppZKJFaMe2kvo4IyFkBtzbo1CXybgfQ68DZIeJfQeyYepv5uuKzkkFwg1k0YORJVEOKlWXg270QTfu+cMB+7zgO+PDGApUN7KY2HbVDhCrq1M6qEImYu+LqxJQURdckkk4tawP2kviiw/dusDb3S8Ix8ZtuyR6l0iXoX2CaP0DiqWyTnqHg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hitachi-powergrids.com; dmarc=pass action=none header.from=hitachi-powergrids.com; dkim=pass header.d=hitachi-powergrids.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachi-powergrids.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=86BDPLx8oY3ewIJVYvlJtX/aAr3tuQwegrGbYPl6Ug8=; b=mOEp7pRrkdVoYCuYgNHqOO9YSTZfXy7sdtdSbWlRT/1pz6wZC3FAJtqRXX3tmuxK1toIdRwkZ/i909UgZDB3td61qceF7QIM8/E/DnXCb/2g4OC0FnXFl/yfML/Lw8ehPHdvqcaANQZyAdeU0bWyYfNJstnRjIjQMn2j3x7hgwU= Received: from VI1PR06MB4029.eurprd06.prod.outlook.com (2603:10a6:802:5d::10) by VI1PR06MB5454.eurprd06.prod.outlook.com (2603:10a6:803:c3::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11; Tue, 19 Jan 2021 10:41:00 +0000 Received: from VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::64bc:d129:1f5e:ed2e]) by VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::64bc:d129:1f5e:ed2e%5]) with mapi id 15.20.3763.014; Tue, 19 Jan 2021 10:41:00 +0000 From: Aleksandar Gerasimovski To: "Priyanka Jain (OSS)" , "u-boot@lists.denx.de" CC: Valentin Longchamp , Holger Brunck , Rainer Boschung , Matteo Ghidoni Subject: Subject: [PATCH v2 3/4] board/km/common: fix pnvramaddr and varaddr Thread-Topic: Subject: [PATCH v2 3/4] board/km/common: fix pnvramaddr and varaddr Thread-Index: AdbuTuQkxwYymY9DQyGyyyRzZK1utw== Date: Tue, 19 Jan 2021 10:41:00 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-processedbytemplafy: true authentication-results: oss.nxp.com; dkim=none (message not signed) header.d=none;oss.nxp.com; dmarc=none action=none header.from=hitachi-powergrids.com; x-originating-ip: [80.75.192.109] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 9429e8bb-3898-4b6d-b349-08d8bc66b69c x-ms-traffictypediagnostic: VI1PR06MB5454: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-abb-o365-outbound: ABBOUTBOUND1 x-ms-oob-tlc-oobclassifiers: OLM:4941; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: FktPQFrP/CO/IzjB4GRg96YrwdgUUsQ38d0kvNlUC7XQhkrDMOz9/ShvMZ3tez+JgYSpjAU9MIvohT0Q66E0Ma0dI6jaEkGxcfvSMNOh+tN6wkkasISgvG2CF1rmy9RZscqPfuJiNaMdiPGuy2QL6DtpgOVfY1UhjqqU8aoprRjRXjyVSW0e4/RJetm/7po2NwKy67UgE5HjvgMUfAz05WEDhgDXSh30TcQw5hfJ3Qz5X6LDrbmR2YReWljUctb7heZUu2eJMVJa8PhNCNEqkf8yzDLxRlGK+yHTkpfvEidjOQQSqJCeppx5STL8mi5+eH1vVT06a/xo35SgJV95/nR/sZZpJLpzHgKaVm1P79lOHEEFKrfWYqVCqrA1WOSuuMPpsXsKZ+P9LLncxmal9w== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR06MB4029.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(107886003)(44832011)(186003)(26005)(498600001)(4326008)(8936002)(6506007)(53546011)(52536014)(5660300002)(33656002)(66556008)(66476007)(7696005)(66946007)(76116006)(66446008)(64756008)(2906002)(54906003)(9686003)(55016002)(110136005)(86362001)(83380400001)(8676002)(71200400001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: =?iso-8859-1?q?9XL4R0KudYV5X+dQEtfLZ3xqk?= =?iso-8859-1?q?EZVnSnx9RY3+ZLwP/3E80w4bfQua4Oky8svruxce18At3wPxMN46FTdCT9uL?= =?iso-8859-1?q?o8z+LG/QKzgAoV1/0cNzufMwJ2eiKvaBvgM/yXmp6FwNCX0rMxG5zPMc5Lv7?= =?iso-8859-1?q?Cc2pxPom078YVVnFnap4OPw4HqI88kDqanNdi/jWsUfZMn/5ns3CeoOB1cK6?= =?iso-8859-1?q?ypNtKRToxMJhgLQpCNbyiw+ezkpo3GY7nF8c3olrUmmDOYEA1kIIZXBfEhiC?= =?iso-8859-1?q?AKQpOMzDcJTlyDnSCIIFlTrgtRilK0pk3K0ReptH4RQ2r/vpAoQ+7Fs6drOI?= =?iso-8859-1?q?3w/S2H/zh2QkIdqqQMoPOcAex4D5267UNL0fZSmnxC1UZq60xcWWEqIxWDH+?= =?iso-8859-1?q?bQgK8LP7xkg6EwdikOyjf8Sy03XoNZbt8aj4fsfOGPETQynJPRKiOPFPc8Lc?= =?iso-8859-1?q?EBVAU8ck7/58wYnIa1u26A0Y1WD7ePdjhbH4XaxtXnZzMDyRGPiq9tKFCFhQ?= =?iso-8859-1?q?MDNWO+Qw8C8dAT5wWvhA93lJTuy7Unv3SsAOD3Ynk1Hc9p0j/TuDDCooc+7d?= =?iso-8859-1?q?oVukzN69I96BpRp1JXJ3IiOfqkjm4Yr2Nuc2vcXSLnNQq0Gg+F3j4yAUrMtk?= =?iso-8859-1?q?FJbYDrd5YGCkhvpuuFRSWT95Uvn1r/e/Rs+WRTZhV2CwjqSHqNTfG9DOzaZ0?= =?iso-8859-1?q?8l9tU7LYJxd/Xl/5v1paZ42CD3B+ncXu15nhmLgbC5uLwc/4dqWIMXkRO62G?= =?iso-8859-1?q?CM/2/Gfj7qayqa4CgLQZwmNhZOTOnNVJStkPKmc6kvDuh0IDxUL0viHUqm7w?= =?iso-8859-1?q?Bp1Ma9sIEurfwTrnydCEwTHDEvBX6kW0adZ4XB4OLmHyt/6Kx2e3REZ+wZv1?= =?iso-8859-1?q?dkNfXXsL2SVA5M5CgA6Oh/ebXRgGZkXuH1JUWtGj30jTjORLKaAgyvQhugde?= =?iso-8859-1?q?4Fglv0W+Ug8eW1V/FzTBaMmTsyt7bCEk9zOFd9U7Rp45xCNdwgoQkGbyDCtC?= =?iso-8859-1?q?DkRf2C4+bcJKs1O7QQ=3D?= MIME-Version: 1.0 X-OriginatorOrg: hitachi-powergrids.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR06MB4029.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9429e8bb-3898-4b6d-b349-08d8bc66b69c X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Jan 2021 10:41:00.8344 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7831e6d9-dc6c-4cd1-9ec6-1dc2b4133195 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: S3NZtvNqnt/MvRda6p+KI3P8mO1APGqs0l2eahrWv2pnhPJrtrIGOE80svuu5cTFUFt/MCJSIKVrA8r+SvthteiBZZ+25HxQtbalIUm81t/IzGJiqLK9fWkZYV1NOSbTqHyMguby99HyrvRIYavnXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR06MB5454 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 Take into account SDRAM_BASE address when calculating pnvramaddr and varaddr offsets. Up to now Keymile designs had SDRAM_BASE equal to zero and the offsets where calculated correctly, this fix is for the upcoming designs that have SDRAM_BASE different then zero. Signed-off-by: Aleksandar Gerasimovski --- Changes for v2: - fix patch subject to 60 characters --- board/keymile/common/common.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index df507e2..e3e9c4a 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -49,8 +49,8 @@ int set_km_env(void) char *p; unsigned long rootfssize = 0; - pnvramaddr = gd->ram_size - CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM - - CONFIG_KM_PNVRAM; + pnvramaddr = CONFIG_SYS_SDRAM_BASE + gd->ram_size - + CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM - CONFIG_KM_PNVRAM; sprintf((char *)buf, "0x%x", pnvramaddr); env_set("pnvramaddr", (char *)buf); @@ -63,7 +63,8 @@ int set_km_env(void) sprintf((char *)buf, "0x%x", pram); env_set("pram", (char *)buf); - varaddr = gd->ram_size - CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM; + varaddr = CONFIG_SYS_SDRAM_BASE + gd->ram_size - + CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM; sprintf((char *)buf, "0x%x", varaddr); env_set("varaddr", (char *)buf);