From patchwork Fri Jul 28 21:46:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 795093 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=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xK2XW4nnDz9s7M for ; Sat, 29 Jul 2017 07:48:27 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 74A2BC22412; Fri, 28 Jul 2017 21:47:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id C7BEBC2240A; Fri, 28 Jul 2017 21:47:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 69EF8C221B0; Fri, 28 Jul 2017 21:46:52 +0000 (UTC) Received: from mail.free-electrons.com (mail.free-electrons.com [62.4.15.54]) by lists.denx.de (Postfix) with ESMTP id E9B8FC22142 for ; Fri, 28 Jul 2017 21:46:48 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 110) id CA7B521F13; Fri, 28 Jul 2017 23:46:47 +0200 (CEST) Received: from localhost (132.230.147.77.rev.sfr.net [77.147.230.132]) by mail.free-electrons.com (Postfix) with ESMTPSA id 79A25207BB; Fri, 28 Jul 2017 23:46:47 +0200 (CEST) From: Thomas Petazzoni To: u-boot@lists.denx.de, Nobuhiro Iwamatsu , Vladimir Zapolskiy Date: Fri, 28 Jul 2017 23:46:38 +0200 Message-Id: <20170728214638.23931-4-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170728214638.23931-1-thomas.petazzoni@free-electrons.com> References: <20170728214638.23931-1-thomas.petazzoni@free-electrons.com> Cc: Thomas Petazzoni Subject: [U-Boot] [PATCH 3/3] common/env_embedded.c: rename PPCENV/PPCTEXT macros X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" The environment has pretty much nothing to do with just "PPC", so rename the macros to just __UBOOT_ENV_SECTION__ which is more readable. In addition, only a single macro is needed: the environment now goes either to the default section (USE_HOSTCC is defined) or in the .text section. Signed-off-by: Thomas Petazzoni --- common/env_embedded.c | 10 ++++------ include/env_default.h | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/common/env_embedded.c b/common/env_embedded.c index 4532589..43694db 100644 --- a/common/env_embedded.c +++ b/common/env_embedded.c @@ -35,13 +35,11 @@ * a seperate section. */ #if defined(USE_HOSTCC) /* Native for 'tools/envcrc' */ -# define __PPCENV__ /*XXX DO_NOT_DEL_THIS_COMMENT*/ -# define __PPCTEXT__ /*XXX DO_NOT_DEL_THIS_COMMENT*/ +# define __UBOOT_ENV_SECTION__ /*XXX DO_NOT_DEL_THIS_COMMENT*/ #else /* Environment is embedded in U-Boot's .text section */ /* XXX - This only works with GNU C */ -# define __PPCENV__ __attribute__ ((section(".text"))) -# define __PPCTEXT__ __attribute__ ((section(".text"))) +# define __UBOOT_ENV_SECTION__ __attribute__ ((section(".text"))) #endif /* @@ -72,7 +70,7 @@ #include #ifdef CONFIG_ENV_ADDR_REDUND -env_t redundand_environment __PPCENV__ = { +env_t redundand_environment __UBOOT_ENV_SECTION__ = { 0, /* CRC Sum: invalid */ 0, /* Flags: invalid */ { @@ -89,7 +87,7 @@ env_t redundand_environment __PPCENV__ = { * .data/.sdata section. * */ -unsigned long env_size __PPCTEXT__ = sizeof(env_t); +unsigned long env_size __UBOOT_ENV_SECTION__ = sizeof(env_t); /* * Add in absolutes. diff --git a/include/env_default.h b/include/env_default.h index ea6704a..acd4198 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -11,7 +11,7 @@ #include #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED -env_t environment __PPCENV__ = { +env_t environment __UBOOT_ENV_SECTION__ = { ENV_CRC, /* CRC Sum */ #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT 1, /* Flags: valid */