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=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, 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 97009C2B9F4 for ; Fri, 25 Jun 2021 19:23:34 +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 1D31B6193F for ; Fri, 25 Jun 2021 19:23:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1D31B6193F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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 25E3082C60; Fri, 25 Jun 2021 21:23:32 +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="sMFghv4L"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 06D4B82C61; Fri, 25 Jun 2021 21:23:25 +0200 (CEST) Received: from mail-io1-xd32.google.com (mail-io1-xd32.google.com [IPv6:2607:f8b0:4864:20::d32]) (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 D01D482C4F for ; Fri, 25 Jun 2021 21:23:20 +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=aford173@gmail.com Received: by mail-io1-xd32.google.com with SMTP id o5so13821448iob.4 for ; Fri, 25 Jun 2021 12:23:20 -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=KTXl6sUMgE4ZiAifHOKyXzFaw6UjftV5zotR5NY/Fxk=; b=sMFghv4LV7dCzcx6rk7tkFtQYBwiUPMU9zOVqsdv4qz2RpRutQTIEZ7Tj73Wo4jVym p1KYsgNHNO5VtY5rKHfZBnal0aHs+QWoYwhBEhoyRciBXpxfU3qlOl0DS/cFJSx+Ldh+ fE8QHx2WEt/S9scK7f1wgZb58H+FHsL2WpFSv21ex3cAo+fUkwhmIxC9ghcbPyQw3qKE nJbiQSPeah3oGFdYGikrb05NDXdvqmCQbyqqo8+l/mURKmj2llGZeYleIuP01aoJh/MR RJfjhkAQxHh2t9iQ2AIKctp+BJ/GMkym+3n9LZsAX1VvMMj8zcKo6wTYdsy9KqqSENtg Q3eg== 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=KTXl6sUMgE4ZiAifHOKyXzFaw6UjftV5zotR5NY/Fxk=; b=tMHuKx62AAqpz5QYxP8lCj/Sowx0wK+QaLbaknMWTnFZlIye1cfgZ2sEY/YTlnTZBZ dFDPgqS3dHt2Gu07/i9YI0+xib86K36IMKBaalrLqhg3Kg9YMhYEauD/H0/QX8RhYynh Z+iDuTo0e/QBgZtrwN6ZTAgXoU4ktm6f9lKxA4aAHg+zgBeN7CFYrH2vZCoCf0kZgsn0 VIrqPK3SgBn3uFjVjGlMQphuH9pGWPjmP10BEe7AkW8kl+eokhDXqnrnrb3BcdNDevdv Ac6bibApJiVkmmkjYTsTcVR66Ib8+PDsIy3CLzrOqts196+/ZRf+yqq1IaovfOQ4KJkS aOdQ== X-Gm-Message-State: AOAM531Zm/AguENvh0VQ4QB5zkb49Ih5rpcqS3N8uueUVUE4pPfTOlSO /tRSbn/xEnlbXcJqX4HjfEtUEFZRp9MGCg== X-Google-Smtp-Source: ABdhPJwW5EjGIORpcYX7xKV15NuPQR1fIZQ0hJjF0WBjRA17B/ZpL0ZjLZRo799Rptb6WaIARAJkfg== X-Received: by 2002:a6b:3b95:: with SMTP id i143mr3230412ioa.173.1624648999185; Fri, 25 Jun 2021 12:23:19 -0700 (PDT) Received: from aford-IdeaCentre-A730.lan (c-73-37-219-234.hsd1.mn.comcast.net. [73.37.219.234]) by smtp.gmail.com with ESMTPSA id n20sm3826136ioo.23.2021.06.25.12.23.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Jun 2021 12:23:18 -0700 (PDT) From: Adam Ford To: u-boot@lists.denx.de Cc: lukma@denx.de, pavel@ucw.cz, pali@kernel.org, lokeshvutla@ti.com, aford@beaconembedded.com, Adam Ford Subject: [PATCH V2 2/3] arm: omap3: Make secureworld_exit() static Date: Fri, 25 Jun 2021 14:23:07 -0500 Message-Id: <20210625192308.277136-3-aford173@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210625192308.277136-1-aford173@gmail.com> References: <20210625192308.277136-1-aford173@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.103.2 at phobos.denx.de X-Virus-Status: Clean secureworld_exit() is only used in one file, so make it static to that file and remove it from sys_proto.h. This may help with some further optimization in the future. Signed-off-by: Adam Ford --- V2: Move secureworld_exit into area encompassed by ifdef to only define when potentially used to avoid error: error: 'secure_unlock_mem' defined but not used diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h index 656f848a73..a6e9ff84aa 100644 --- a/arch/arm/include/asm/arch-omap3/sys_proto.h +++ b/arch/arm/include/asm/arch-omap3/sys_proto.h @@ -59,7 +59,6 @@ u32 is_running_in_sdram(void); u32 is_running_in_sram(void); u32 is_running_in_flash(void); u32 get_device_type(void); -void secureworld_exit(void); u32 get_boot_type(void); void invalidate_dcache(u32); u32 wait_on_value(u32, u32, void *, u32); diff --git a/arch/arm/mach-omap2/omap3/board.c b/arch/arm/mach-omap2/omap3/board.c index ef4fa80c7b..41d0d3ef69 100644 --- a/arch/arm/mach-omap2/omap3/board.c +++ b/arch/arm/mach-omap2/omap3/board.c @@ -114,7 +114,7 @@ void secure_unlock_mem(void) * configure secure registers and exit secure world * general use. *****************************************************************************/ -void secureworld_exit(void) +static void secureworld_exit(void) { unsigned long i; -- 2.25.1