From: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 28/40] env: Rename environment to embedded_environment
Date: Thu, 1 Aug 2019 20:26:43 +0200 [thread overview]
Message-ID: <0cf8ccd9-7ebe-558e-e305-00114199e82c@gmail.com> (raw)
In-Reply-To: <20190801154715.225318-29-sjg@chromium.org>
Am 01.08.2019 um 17:47 schrieb Simon Glass:
> The name 'environment' is widely used in U-Boot so is not a very useful
> name of a variable. Rename it to better indicate its purpose.
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
> ---
>
> Changes in v2: None
>
> env/flash.c | 2 +-
> include/env_default.h | 2 +-
> include/environment.h | 2 +-
> tools/envcrc.c | 4 ++--
> 4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/env/flash.c b/env/flash.c
> index dca6567a09..a26d94309d 100644
> --- a/env/flash.c
> +++ b/env/flash.c
> @@ -47,7 +47,7 @@ DECLARE_GLOBAL_DATA_PTR;
> #if defined(CONFIG_ENV_ADDR_REDUND) && defined(CMD_SAVEENV) || \
> !defined(CONFIG_ENV_ADDR_REDUND) && defined(INITENV)
> #ifdef ENV_IS_EMBEDDED
> -static env_t *env_ptr = &environment;
> +static env_t *env_ptr = &embedded_environment;
> #else /* ! ENV_IS_EMBEDDED */
>
> static env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
> diff --git a/include/env_default.h b/include/env_default.h
> index 86b639d3e2..56a8bae39a 100644
> --- a/include/env_default.h
> +++ b/include/env_default.h
> @@ -10,7 +10,7 @@
> #include <env_callback.h>
>
> #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
> -env_t environment __UBOOT_ENV_SECTION__(environment) = {
> +env_t embedded_environment __UBOOT_ENV_SECTION__(environment) = {
> ENV_CRC, /* CRC Sum */
> #ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
> 1, /* Flags: valid */
> diff --git a/include/environment.h b/include/environment.h
> index d23b92833e..44a527e1fa 100644
> --- a/include/environment.h
> +++ b/include/environment.h
> @@ -153,7 +153,7 @@ typedef struct environment_s {
> } env_t;
>
> #ifdef ENV_IS_EMBEDDED
> -extern env_t environment;
> +extern env_t embedded_environment;
> #endif /* ENV_IS_EMBEDDED */
>
> extern const unsigned char default_environment[];
> diff --git a/tools/envcrc.c b/tools/envcrc.c
> index 505949289f..7eb7246d45 100644
> --- a/tools/envcrc.c
> +++ b/tools/envcrc.c
> @@ -61,7 +61,7 @@
> #ifdef CONFIG_BUILD_ENVCRC
> # include <environment.h>
> extern unsigned int env_size;
> -extern env_t environment;
> +extern env_t embedded_environment;
> #endif /* CONFIG_BUILD_ENVCRC */
>
> extern uint32_t crc32 (uint32_t, const unsigned char *, unsigned int);
> @@ -71,7 +71,7 @@ int main (int argc, char **argv)
> #ifdef CONFIG_BUILD_ENVCRC
> unsigned char pad = 0x00;
> uint32_t crc;
> - unsigned char *envptr = (unsigned char *)&environment,
> + unsigned char *envptr = (unsigned char *)&embedded_environment,
> *dataptr = envptr + ENV_HEADER_SIZE;
> unsigned int datasize = ENV_SIZE;
> unsigned int eoe;
>
next prev parent reply other threads:[~2019-08-01 18:26 UTC|newest]
Thread overview: 95+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-01 15:46 [U-Boot] [PATCH v2 00/40] env: common: Remove environment definitions from common.h Simon Glass
2019-08-01 15:46 ` [U-Boot] [PATCH v2 01/40] common: Move gzip functions into a new gzip header Simon Glass
2019-08-01 18:23 ` Simon Goldschmidt
2019-08-13 16:52 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 02/40] common: Drop the dpram_... functions Simon Glass
2019-08-01 18:24 ` Simon Goldschmidt
2019-08-13 16:52 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 03/40] common: Move lcd_setmem() to lcd.h Simon Glass
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 04/40] common: Remove video_setmem() Simon Glass
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 05/40] env: Create a new file for environment functions Simon Glass
2019-08-01 18:25 ` Simon Goldschmidt
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 06/40] env: Move get_env_id() to env.h Simon Glass
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 07/40] env: Move env_get_f() " Simon Glass
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 08/40] env: Move env_init() " Simon Glass
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 09/40] env: Move env_relocate() " Simon Glass
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 10/40] env: Move envmatch() " Simon Glass
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 11/40] env: Move env_set_hex() " Simon Glass
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 12/40] env: Move env_set_ulong() " Simon Glass
2019-08-13 16:53 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 13/40] env: Move env_get_ulong() " Simon Glass
2019-08-13 16:54 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 14/40] env: Move env_get_yesno() " Simon Glass
2019-08-13 16:54 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 15/40] env: Move env_get_hex() " Simon Glass
2019-08-13 16:54 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 16/40] env: Move env_set() " Simon Glass
2019-08-13 16:54 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 17/40] env: Move env_get() " Simon Glass
2019-08-13 16:54 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 18/40] env: Move eth_env_get/set_enetaddr() " Simon Glass
2019-08-13 16:54 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 19/40] env: net: Move eth_parse_enetaddr() to net.c/h Simon Glass
2019-08-02 16:47 ` Joe Hershberger
2019-08-13 16:54 ` Tom Rini
2019-09-12 16:59 ` Ondřej Jirman
2019-09-12 18:22 ` Simon Glass
2019-09-12 18:28 ` Ondřej Jirman
2019-09-12 19:28 ` Simon Glass
2019-09-12 23:39 ` Ondřej Jirman
2019-09-13 14:25 ` Simon Glass
2019-09-13 14:34 ` Ondřej Jirman
2019-09-13 15:21 ` Tom Rini
2019-09-13 21:40 ` Joe Hershberger
2019-08-01 15:46 ` [U-Boot] [PATCH v2 20/40] env: Move env_fix_drivers() to env.h Simon Glass
2019-08-02 16:46 ` Joe Hershberger
2019-08-13 16:54 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 21/40] env: Move set_default_vars " Simon Glass
2019-08-13 16:54 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 22/40] env: Move env_load/save functions " Simon Glass
2019-08-13 16:54 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 23/40] env: Move env import/export " Simon Glass
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:46 ` [U-Boot] [PATCH v2 24/40] env: Drop env_crc_update() Simon Glass
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 25/40] env: Move get/set_default_env() to env.h Simon Glass
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 26/40] env: Move env_get_char() " Simon Glass
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 27/40] env: Move env_reloc() " Simon Glass
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 28/40] env: Rename environment to embedded_environment Simon Glass
2019-08-01 18:26 ` Simon Goldschmidt [this message]
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 29/40] env: Move env_valid to env.h Simon Glass
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 30/40] env: Move callback definitions " Simon Glass
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 31/40] env: Drop the ENTRY typedef Simon Glass
2019-08-01 15:47 ` [U-Boot] [PATCH v2 32/40] env: Drop _ENTRY Simon Glass
2019-08-01 15:47 ` [U-Boot] [PATCH v2 33/40] env: Rename the redundancy flags Simon Glass
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 34/40] env: Drop the ACTION typedef Simon Glass
2019-08-02 16:55 ` Joe Hershberger
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 35/40] env: Drop the double underscores in search.h Simon Glass
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 36/40] env: Move TOTAL_MALLOC_LEN to environment.h Simon Glass
2019-08-01 18:28 ` Simon Goldschmidt
2019-08-13 16:55 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 37/40] env: Drop environment.h header file where not needed Simon Glass
2019-08-13 16:56 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 38/40] env: Rename environment.h to env_internal.h Simon Glass
2019-08-01 18:31 ` Simon Goldschmidt
2019-08-01 15:47 ` [U-Boot] [PATCH v2 39/40] Drop PCMCIA Simon Glass
2019-08-13 16:56 ` Tom Rini
2019-08-01 15:47 ` [U-Boot] [PATCH v2 40/40] common: Add a note about the effort to reduce common.h Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0cf8ccd9-7ebe-558e-e305-00114199e82c@gmail.com \
--to=simon.k.r.goldschmidt@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox