Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-17 22:49:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

env: Drop unused env_ptr variables

Browse source 
This variable is declared as a global in most environment location
drivers. But it is not used outside the drivers and most of the
declarations are unnecessary.

Also some drivers call free() on env_ptr which seems wrong since it is
not in the heap.

Drop the variable where possible, and all calls to free().

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Simon Glass 2017-08-03 12:22:04 -06:00 • committed by Tom Rini
parent ac358beb85
commit 98b5755fb0
8 changed files with 0 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
env/dataflash.c vendored
View file

@ -14,8 +14,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
env_t *env_ptr;
static unsigned char env_dataflash_get_char(int index) static unsigned char env_dataflash_get_char(int index)
{ {
uchar c; uchar c;

4
env/eeprom.c vendored
View file

@ -21,8 +21,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
env_t *env_ptr;
static int eeprom_bus_read(unsigned dev_addr, unsigned offset, static int eeprom_bus_read(unsigned dev_addr, unsigned offset,
uchar *buffer, unsigned cnt) uchar *buffer, unsigned cnt)
{ {
@ -196,8 +194,6 @@ static int env_eeprom_save(void)
char flag_obsolete = OBSOLETE_FLAG; char flag_obsolete = OBSOLETE_FLAG;
#endif #endif
BUG_ON(env_ptr != NULL);
rc = env_export(&env_new); rc = env_export(&env_new);
if (rc) if (rc)
return rc; return rc;

2
env/ext4.c vendored
View file

@ -31,8 +31,6 @@
#include <ext4fs.h> #include <ext4fs.h>
#include <mmc.h> #include <mmc.h>
env_t *env_ptr;
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_CMD_SAVEENV #ifdef CONFIG_CMD_SAVEENV

2
env/fat.c vendored
View file

@ -31,8 +31,6 @@
# endif # endif
#endif #endif
env_t *env_ptr;
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CMD_SAVEENV #ifdef CMD_SAVEENV

6
env/mmc.c vendored
View file

@ -23,12 +23,6 @@
#error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE #error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE
#endif #endif
#ifdef ENV_IS_EMBEDDED
env_t *env_ptr = &environment;
#else /* ! ENV_IS_EMBEDDED */
env_t *env_ptr;
#endif /* ENV_IS_EMBEDDED */
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if !defined(CONFIG_ENV_OFFSET) #if !defined(CONFIG_ENV_OFFSET)

2
env/nowhere.c vendored
View file

@ -15,8 +15,6 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
env_t *env_ptr;
U_BOOT_ENV_LOCATION(nowhere) = { U_BOOT_ENV_LOCATION(nowhere) = {
.location = ENVL_NOWHERE, .location = ENVL_NOWHERE,
ENV_NAME("nowhere") ENV_NAME("nowhere")

1
env/nvram.c vendored
View file

@ -36,7 +36,6 @@ DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE #ifdef CONFIG_SYS_NVRAM_ACCESS_ROUTINE
extern void *nvram_read(void *dest, const long src, size_t count); extern void *nvram_read(void *dest, const long src, size_t count);
extern void nvram_write(long dest, const void *src, size_t count); extern void nvram_write(long dest, const void *src, size_t count);
env_t *env_ptr;
#else #else
env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR; env_t *env_ptr = (env_t *)CONFIG_ENV_ADDR;
#endif #endif

2
env/ubi.c vendored
View file

@ -16,8 +16,6 @@
#include <ubi_uboot.h> #include <ubi_uboot.h>
#undef crc32 #undef crc32
env_t *env_ptr;
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#ifdef CONFIG_CMD_SAVEENV #ifdef CONFIG_CMD_SAVEENV