dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-01 08:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix problem with default #defines

Browse Source 
Cleanup compiler warning
This commit is contained in:
wdenk
2003-03-06 14:23:06 +00:00
parent 47cd00fa70
commit 500545cc6b
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/env_flash.c
View File

@@ -160,9 +160,11 @@ int env_init(void)
#ifdef CMD_SAVEENV #ifdef CMD_SAVEENV
int saveenv(void) int saveenv(void)
{ {
int rc = 1;
ulong up_data = 0;
char *saved_data = NULL; char *saved_data = NULL;
int rc = 1;
#if CFG_ENV_SECT_SIZE > CFG_ENV_SIZE
ulong up_data = 0;
#endif
debug ("Protect off %08lX ... %08lX\n", debug ("Protect off %08lX ... %08lX\n",
(ulong)flash_addr, end_addr); (ulong)flash_addr, end_addr);

11
include/environment.h
View File

@@ -47,8 +47,15 @@
# if !defined(CFG_ENV_ADDR_REDUND) && defined(CFG_ENV_OFFSET_REDUND) # if !defined(CFG_ENV_ADDR_REDUND) && defined(CFG_ENV_OFFSET_REDUND)
# define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + CFG_ENV_OFFSET_REDUND) # define CFG_ENV_ADDR_REDUND (CFG_FLASH_BASE + CFG_ENV_OFFSET_REDUND)
# endif # endif
# ifndef CFG_ENV_SIZE # if defined(CFG_ENV_SECT_SIZE) || defined(CFG_ENV_SIZE)
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # ifndef CFG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE
# endif
# ifndef CFG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
# endif
# else
# error "Both CFG_ENV_SECT_SIZE and CFG_ENV_SIZE undefined"
# endif # endif
# if defined(CFG_ENV_ADDR_REDUND) && !defined(CFG_ENV_SIZE_REDUND) # if defined(CFG_ENV_ADDR_REDUND) && !defined(CFG_ENV_SIZE_REDUND)
# define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE # define CFG_ENV_SIZE_REDUND CFG_ENV_SIZE