From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1CEC6C47082 for ; Thu, 3 Jun 2021 13:39:41 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4039A6121D for ; Thu, 3 Jun 2021 13:39:40 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4039A6121D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id BFF4B82F3D; Thu, 3 Jun 2021 15:39:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id B8B0082FC2; Thu, 3 Jun 2021 15:39:18 +0200 (CEST) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) (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 412CA82FB1 for ; Thu, 3 Jun 2021 15:39:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qk1-f182.google.com with SMTP id 76so5853101qkn.13 for ; Thu, 03 Jun 2021 06:39:14 -0700 (PDT) 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=zA+EmnZ6kuyhN5ZUWUm4+tiWubdYMl9bO4NeMgecDl8=; b=EhmhhGvB+I+WjUgC0L0MhK4UF1QnQt6j3Lyhnzr5dPDbaDc27wkSMsB8Nkjz04hFK9 GG/2UM9LQwZe4xmajQf1mwcQ+pzwaCNO+Yt1wGEVziOmf3DspEv3X6bBc8+ImPgvRr5k RiyDpaLGHfWn+glM3NI/I+LWvS66DJczHOkIcg9Om99fmi9KQknuzdfgwDXW5eShfSU6 rM0z+OpHZLgO7WVWRJ9FNfEV+3UkGfsBNKU2yxXbNhTJyBJj5ChyCRKDJibC2teI5mac HHwk2gwKi+d8aj6Yuicz4R+DB2XCfkYS9tCXGgfj2RrdmouKozj3OYGQjDQgRLOJjkjX bXug== X-Gm-Message-State: AOAM533QtR2PexDTXYN5+etitMawzTs6MnyyUA741wfcnDahRJeTfMg3 zJt9zvsl06siBZFuqJMQhJ0eWKMRVQ== X-Google-Smtp-Source: ABdhPJzYBd5WvwCEwWOGd6KopeSySz2jLGUoW5ZeD2+N0U6MlfXt88FXDPyBtBufiMoqnKv8g6fU0A== X-Received: by 2002:a05:620a:40c7:: with SMTP id g7mr32756018qko.365.1622727552675; Thu, 03 Jun 2021 06:39:12 -0700 (PDT) Received: from bill-the-cat.lan (2603-6081-7b01-cbda-7400-11d1-4e05-ef18.res6.spectrum.com. [2603:6081:7b01:cbda:7400:11d1:4e05:ef18]) by smtp.gmail.com with ESMTPSA id q23sm1733794qtn.49.2021.06.03.06.39.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Jun 2021 06:39:12 -0700 (PDT) From: Tom Rini To: u-boot@lists.denx.de Cc: Siew Chin Lim , Chee Hong Ang , Dalon Westergreen Subject: [PATCH 3/4] socfpga64: Do not define CONFIG_SYS_MEM_RESERVE_SECURE to 0 Date: Thu, 3 Jun 2021 09:39:01 -0400 Message-Id: <20210603133902.4192-3-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210603133902.4192-1-trini@konsulko.com> References: <20210518091947.63513-1-rasmus.villemoes@prevas.dk> <20210603133902.4192-1-trini@konsulko.com> 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 Based on the comment in socfpga_soc64_common.h, the intention is for CONFIG_SYS_MEM_RESERVE_SECURE to be unused. However, in the code we do: ... and that will evaluate to true. This leads to unwanted code being compiled. Further, as CONFIG_SYS_MEM_RESERVE_SECURE has not been migrated to Kconfig, this leads to a mismatch in the size of gd depending on if we have or have not also had also included yet. Remove the define as it's not needed. Cc: Siew Chin Lim Cc: Chee Hong Ang Cc: Dalon Westergreen Signed-off-by: Tom Rini --- include/configs/socfpga_soc64_common.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/socfpga_soc64_common.h b/include/configs/socfpga_soc64_common.h index 5afdb104543e..38fd775b5b6e 100644 --- a/include/configs/socfpga_soc64_common.h +++ b/include/configs/socfpga_soc64_common.h @@ -21,7 +21,6 @@ /* sysmgr.boot_scratch_cold4 & 5 (64bit) will be used for PSCI_CPU_ON call */ #define CPU_RELEASE_ADDR 0xFFD12210 #define CONFIG_SYS_CACHELINE_SIZE 64 -#define CONFIG_SYS_MEM_RESERVE_SECURE 0 /* using OCRAM, not DDR */ /* * U-Boot console configurations -- 2.17.1