leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename CFG_ENV_IS_NOWHERE in CONFIG_ENV_IS_NOWHERE

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
Jean-Christophe PLAGNIOL-VILLARD 2008-09-10 22:48:00 +02:00
parent 2556ef7811
commit 93f6d72544
57 changed files with 69 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/xilinx/xilinx_enet/emac_adapter.c
View File

@ -56,7 +56,7 @@ static XEmac Emac;
static char etherrxbuff[PKTSIZE_ALIGN]; /* Receive buffer */ static char etherrxbuff[PKTSIZE_ALIGN]; /* Receive buffer */
/* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/ /* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/
#ifdef CFG_ENV_IS_NOWHERE #ifdef CONFIG_ENV_IS_NOWHERE
static u8 EMACAddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 }; static u8 EMACAddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 };
#endif #endif
@ -87,7 +87,7 @@ eth_init(bd_t * bis)
/* make sure the Emac is stopped before it is started */ /* make sure the Emac is stopped before it is started */
(void) XEmac_Stop(&Emac); (void) XEmac_Stop(&Emac);
#ifdef CFG_ENV_IS_NOWHERE #ifdef CONFIG_ENV_IS_NOWHERE
memcpy(bis->bi_enetaddr, EMACAddr, 6); memcpy(bis->bi_enetaddr, EMACAddr, 6);
#endif #endif

6
common/cmd_nvedit.c
View File

@ -59,7 +59,7 @@ DECLARE_GLOBAL_DATA_PTR;
!defined(CONFIG_ENV_IS_IN_NAND) && \ !defined(CONFIG_ENV_IS_IN_NAND) && \
!defined(CONFIG_ENV_IS_IN_ONENAND) && \ !defined(CONFIG_ENV_IS_IN_ONENAND) && \
!defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \ !defined(CONFIG_ENV_IS_IN_SPI_FLASH) && \
!defined(CFG_ENV_IS_NOWHERE) !defined(CONFIG_ENV_IS_NOWHERE)
# error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE} # error Define one of CFG_ENV_IS_IN_{NVRAM|EEPROM|FLASH|DATAFLASH|ONENAND|SPI_FLASH|NOWHERE}
#endif #endif
@ -544,7 +544,7 @@ int getenv_r (char *name, char *buf, unsigned len)
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
&& !defined(CFG_ENV_IS_NOWHERE)) && !defined(CONFIG_ENV_IS_NOWHERE))
int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_saveenv (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {
extern char * env_name_spec; extern char * env_name_spec;
@ -600,7 +600,7 @@ U_BOOT_CMD(
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_FLASH)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_NAND)) \
|| (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \ || (defined(CONFIG_CMD_ENV) && defined(CONFIG_CMD_ONENAND))) \
&& !defined(CFG_ENV_IS_NOWHERE)) && !defined(CONFIG_ENV_IS_NOWHERE))
U_BOOT_CMD( U_BOOT_CMD(
saveenv, 1, 0, do_saveenv, saveenv, 1, 0, do_saveenv,
"saveenv - save environment variables to persistent storage\n", "saveenv - save environment variables to persistent storage\n",

2
common/env_common.c
View File

@ -246,7 +246,7 @@ void env_relocate (void)
#endif #endif
if (gd->env_valid == 0) { if (gd->env_valid == 0) {
#if defined(CONFIG_GTH) || defined(CFG_ENV_IS_NOWHERE) /* Environment not changable */ #if defined(CONFIG_GTH) || defined(CONFIG_ENV_IS_NOWHERE) /* Environment not changable */
puts ("Using default environment\n\n"); puts ("Using default environment\n\n");
#else #else
puts ("*** Warning - bad CRC, using default environment\n\n"); puts ("*** Warning - bad CRC, using default environment\n\n");

4
common/env_nowhere.c
View File

@ -26,7 +26,7 @@
#include <common.h> #include <common.h>
#if defined(CFG_ENV_IS_NOWHERE) /* Environment is nowhere */ #if defined(CONFIG_ENV_IS_NOWHERE) /* Environment is nowhere */
#include <command.h> #include <command.h>
#include <environment.h> #include <environment.h>
@ -62,4 +62,4 @@ int env_init(void)
return (0); return (0);
} }
#endif /* CFG_ENV_IS_NOWHERE) */ #endif /* CONFIG_ENV_IS_NOWHERE) */

2
drivers/net/xilinx_emaclite.c
View File

@ -73,7 +73,7 @@ static xemaclite emaclite;
static char etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */ static char etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */
/* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/ /* hardcoded MAC address for the Xilinx EMAC Core when env is nowhere*/
#ifdef CFG_ENV_IS_NOWHERE #ifdef CONFIG_ENV_IS_NOWHERE
static u8 emacaddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 }; static u8 emacaddr[ENET_ADDR_LENGTH] = { 0x00, 0x0a, 0x35, 0x00, 0x22, 0x01 };
#else #else
static u8 emacaddr[ENET_ADDR_LENGTH]; static u8 emacaddr[ENET_ADDR_LENGTH];

2
include/configs/ADNPESC1.h
View File

@ -129,7 +129,7 @@
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */ #define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else #else
#define CFG_ENV_IS_NOWHERE 1 /* NO Environment */ #define CONFIG_ENV_IS_NOWHERE 1 /* NO Environment */
#endif #endif
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------

2
include/configs/DK1C20.h
View File

@ -117,7 +117,7 @@
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */ #define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else #else
#define CFG_ENV_IS_NOWHERE 1 /* NO Environment */ #define CONFIG_ENV_IS_NOWHERE 1 /* NO Environment */
#endif #endif
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------

2
include/configs/DK1S10.h
View File

@ -133,7 +133,7 @@
#define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */ #define CONFIG_ENV_OVERWRITE /* Serial/eth change Ok */
#else #else
#define CFG_ENV_IS_NOWHERE 1 /* NO Environment */ #define CONFIG_ENV_IS_NOWHERE 1 /* NO Environment */
#endif #endif
/*------------------------------------------------------------------------ /*------------------------------------------------------------------------

2
include/configs/JSE.h
View File

@ -80,7 +80,7 @@
#undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_NVRAM
#undef CFG_ENV_IS_IN_FLASH #undef CFG_ENV_IS_IN_FLASH
#define CONFIG_ENV_IS_IN_EEPROM 1 #define CONFIG_ENV_IS_IN_EEPROM 1
#undef CFG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_NOWHERE
/* This is the 7bit address of the device, not including P. */ /* This is the 7bit address of the device, not including P. */
#define CFG_I2C_EEPROM_ADDR 0x50 #define CFG_I2C_EEPROM_ADDR 0x50

2
include/configs/MPC8313ERDB.h
View File

@ -400,7 +400,7 @@
/* Address and size of Redundant Environment Sector */ /* Address and size of Redundant Environment Sector */
#else #else
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8315ERDB.h
View File

@ -383,7 +383,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8323ERDB.h
View File

@ -397,7 +397,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC832XEMDS.h
View File

@ -409,7 +409,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8349EMDS.h
View File

@ -476,7 +476,7 @@
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8349ITX.h
View File

@ -420,7 +420,7 @@ boards, we say we have two, but don't display a message if we find only one. */
#else #else
#define CFG_NO_FLASH /* Flash is not usable now */ #define CFG_NO_FLASH /* Flash is not usable now */
#undef CONFIG_FLASH_CFI_DRIVER #undef CONFIG_FLASH_CFI_DRIVER
#define CFG_ENV_IS_NOWHERE /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8360EMDS.h
View File

@ -440,7 +440,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8360ERDK.h
View File

@ -345,7 +345,7 @@
#define CFG_ENV_SIZE 0x20000 #define CFG_ENV_SIZE 0x20000
#else /* CFG_RAMBOOT */ #else /* CFG_RAMBOOT */
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif /* CFG_RAMBOOT */ #endif /* CFG_RAMBOOT */

2
include/configs/MPC837XEMDS.h
View File

@ -427,7 +427,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC837XERDB.h
View File

@ -448,7 +448,7 @@
#define CFG_ENV_SIZE 0x4000 #define CFG_ENV_SIZE 0x4000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE-0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE-0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8540ADS.h
View File

@ -387,7 +387,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

4
include/configs/MPC8540EVAL.h
View File

@ -256,7 +256,7 @@
/* Environment */ /* Environment */
#ifndef CFG_RAMBOOT #ifndef CFG_RAMBOOT
#if defined(CONFIG_RAM_AS_FLASH) #if defined(CONFIG_RAM_AS_FLASH)
#define CFG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
@ -267,7 +267,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
/* #define CFG_NO_FLASH 1 */ /* Flash is not usable now */ /* #define CFG_NO_FLASH 1 */ /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8560ADS.h
View File

@ -418,7 +418,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8610HPCD.h
View File

@ -443,7 +443,7 @@
#define CFG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */ #define CFG_ENV_SECT_SIZE 0x20000 /* 126k (one sector) for env */
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/MPC8641HPCN.h
View File

@ -509,7 +509,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */ #define CFG_ENV_SECT_SIZE 0x10000 /* 64K(one sector) for env */
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/PM854.h
View File

@ -299,7 +299,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/PM856.h
View File

@ -299,7 +299,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/PN62.h
View File

@ -160,7 +160,7 @@
#define CFG_NO_FLASH 1 /* There is no FLASH memory */ #define CFG_NO_FLASH 1 /* There is no FLASH memory */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */ #define CFG_ENV_OFFSET 0x00004000 /* Offset of Environment Sector */
#define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */ #define CFG_ENV_SIZE 0x00002000 /* Total Size of Environment Sector */

4
include/configs/SBC8540.h
View File

@ -333,7 +333,7 @@
/* Environment */ /* Environment */
#if !defined(CFG_RAMBOOT) #if !defined(CFG_RAMBOOT)
#if defined(CONFIG_RAM_AS_FLASH) #if defined(CONFIG_RAM_AS_FLASH)
#define CFG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
@ -344,7 +344,7 @@
#endif #endif
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/TQM834x.h
View File

@ -306,7 +306,7 @@ extern int tqm834x_num_flash_banks;
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/cm4008.h
View File

@ -52,7 +52,7 @@
/* /*
* select serial console configuration * select serial console configuration
*/ */
#define CFG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SERIAL1 #define CONFIG_SERIAL1
#define CONFIG_CONS_INDEX 1 #define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200

2
include/configs/cm41xx.h
View File

@ -52,7 +52,7 @@
/* /*
* select serial console configuration * select serial console configuration
*/ */
#define CFG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#define CONFIG_SERIAL1 #define CONFIG_SERIAL1
#define CONFIG_CONS_INDEX 1 #define CONFIG_CONS_INDEX 1
#define CONFIG_BAUDRATE 115200 #define CONFIG_BAUDRATE 115200

2
include/configs/dbau1x00.h
View File

@ -198,7 +198,7 @@
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */ #define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
#define CFG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */ /* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR 0xB0030000 #define CFG_ENV_ADDR 0xB0030000

2
include/configs/evb4510.h
View File

@ -172,7 +172,7 @@
/* environment settings */ /* environment settings */
#define CFG_ENV_IS_IN_FLASH #define CFG_ENV_IS_IN_FLASH
#undef CFG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x20000) /* environment start address */ #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x20000) /* environment start address */
#define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */

2
include/configs/gr_cpci_ax2000.h
View File

@ -218,7 +218,7 @@
/* /*
* Environment settings * Environment settings
*/ */
/*#define CFG_ENV_IS_NOWHERE 1*/ /*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_IN_FLASH 1
/* CFG_ENV_ADDR need to be at sector boundary */ /* CFG_ENV_ADDR need to be at sector boundary */
#define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SIZE 0x8000

2
include/configs/gr_ep2s60.h
View File

@ -206,7 +206,7 @@
/* /*
* Environment settings * Environment settings
*/ */
/*#define CFG_ENV_IS_NOWHERE 1*/ /*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_IN_FLASH 1
/* CFG_ENV_ADDR need to be at sector boundary */ /* CFG_ENV_ADDR need to be at sector boundary */
#define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SIZE 0x8000

2
include/configs/gr_xc3s_1500.h
View File

@ -182,7 +182,7 @@
/* /*
* Environment settings * Environment settings
*/ */
/*#define CFG_ENV_IS_NOWHERE 1*/ /*#define CONFIG_ENV_IS_NOWHERE 1*/
#define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_IN_FLASH 1
/* CFG_ENV_ADDR need to be at sector boundary */ /* CFG_ENV_ADDR need to be at sector boundary */
#define CFG_ENV_SIZE 0x8000 #define CFG_ENV_SIZE 0x8000

2
include/configs/grsim.h
View File

@ -209,7 +209,7 @@
/* /*
* Environment settings * Environment settings
*/ */
#define CFG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_IS_NOWHERE 1
/*#define CFG_ENV_IS_IN_FLASH 0*/ /*#define CFG_ENV_IS_IN_FLASH 0*/
/*#define CFG_ENV_SIZE 0x8000*/ /*#define CFG_ENV_SIZE 0x8000*/
#define CFG_ENV_SECT_SIZE 0x40000 #define CFG_ENV_SECT_SIZE 0x40000

2
include/configs/grsim_leon2.h
View File

@ -206,7 +206,7 @@
/* /*
* Environment settings * Environment settings
*/ */
#define CFG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_IS_NOWHERE 1
/*#define CFG_ENV_IS_IN_FLASH 0*/ /*#define CFG_ENV_IS_IN_FLASH 0*/
/*#define CFG_ENV_SIZE 0x8000*/ /*#define CFG_ENV_SIZE 0x8000*/
#define CFG_ENV_SECT_SIZE 0x40000 #define CFG_ENV_SECT_SIZE 0x40000

2
include/configs/gth2.h
View File

@ -153,7 +153,7 @@
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */ #define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
#define CFG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */ /* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR 0xB0030000 #define CFG_ENV_ADDR 0xB0030000

2
include/configs/hcu4.h
View File

@ -123,7 +123,7 @@
#undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_NVRAM
#define CFG_ENV_IS_IN_FLASH #define CFG_ENV_IS_IN_FLASH
#undef CFG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_NOWHERE
#ifdef CONFIG_ENV_IS_IN_EEPROM #ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM configuration */ /* Put the environment after the SDRAM configuration */

2
include/configs/hcu5.h
View File

@ -109,7 +109,7 @@
#undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_NVRAM
#define CFG_ENV_IS_IN_FLASH #define CFG_ENV_IS_IN_FLASH
#undef CONFIG_ENV_IS_IN_EEPROM #undef CONFIG_ENV_IS_IN_EEPROM
#undef CFG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_NOWHERE
#ifdef CONFIG_ENV_IS_IN_EEPROM #ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM and bootstrap configuration */ /* Put the environment after the SDRAM and bootstrap configuration */

2
include/configs/integratorap.h
View File

@ -128,7 +128,7 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* FLASH and environment organization * FLASH and environment organization
*/ */
#define CFG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */ #define CFG_MAX_FLASH_BANKS 1 /* max number of memory banks */
#define PHYS_FLASH_SIZE 0x01000000 /* 16MB */ #define PHYS_FLASH_SIZE 0x01000000 /* 16MB */
/* timeout values are in ticks */ /* timeout values are in ticks */

2
include/configs/mcu25.h
View File

@ -123,7 +123,7 @@
#undef CONFIG_ENV_IS_IN_NVRAM #undef CONFIG_ENV_IS_IN_NVRAM
#define CFG_ENV_IS_IN_FLASH #define CFG_ENV_IS_IN_FLASH
#undef CFG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_NOWHERE
#ifdef CONFIG_ENV_IS_IN_EEPROM #ifdef CONFIG_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM configuration */ /* Put the environment after the SDRAM configuration */

4
include/configs/ml401.h
View File

@ -161,7 +161,7 @@
#define CFG_FLASH_PROTECTION /* hardware flash protection */ #define CFG_FLASH_PROTECTION /* hardware flash protection */
#ifdef RAMENV #ifdef RAMENV
#define CFG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_IS_NOWHERE 1
#define CFG_ENV_SIZE 0x1000 #define CFG_ENV_SIZE 0x1000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE)
@ -174,7 +174,7 @@
#else /* !FLASH */ #else /* !FLASH */
/* ENV in RAM */ /* ENV in RAM */
#define CFG_NO_FLASH 1 #define CFG_NO_FLASH 1
#define CFG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_IS_NOWHERE 1
#define CFG_ENV_SIZE 0x1000 #define CFG_ENV_SIZE 0x1000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE)
#define CFG_FLASH_PROTECTION /* hardware flash protection */ #define CFG_FLASH_PROTECTION /* hardware flash protection */

2
include/configs/modnet50.h
View File

@ -171,7 +171,7 @@
/* environment settings */ /* environment settings */
#define CFG_ENV_IS_IN_FLASH #define CFG_ENV_IS_IN_FLASH
#undef CFG_ENV_IS_NOWHERE #undef CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR 0x1001C000 /* environment start address */ #define CFG_ENV_ADDR 0x1001C000 /* environment start address */
#define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x10000 /* Total Size of Environment Sector */

2
include/configs/ns9750dev.h
View File

@ -186,7 +186,7 @@
/* @TODO */ /* @TODO */
/*#define CFG_ENV_IS_IN_FLASH 1*/ /*#define CFG_ENV_IS_IN_FLASH 1*/
#define CFG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#ifdef CONFIG_STATUS_LED #ifdef CONFIG_STATUS_LED

2
include/configs/pb1x00.h
View File

@ -116,7 +116,7 @@
#define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */ #define CFG_FLASH_ERASE_TOUT (2 * CFG_HZ) /* Timeout for Flash Erase */
#define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */ #define CFG_FLASH_WRITE_TOUT (2 * CFG_HZ) /* Timeout for Flash Write */
#define CFG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_IS_NOWHERE 1
/* Address and size of Primary Environment Sector */ /* Address and size of Primary Environment Sector */
#define CFG_ENV_ADDR 0xB0030000 #define CFG_ENV_ADDR 0xB0030000

2
include/configs/sbc8349.h
View File

@ -424,7 +424,7 @@
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

4
include/configs/sbc8560.h
View File

@ -332,7 +332,7 @@
/* Environment */ /* Environment */
#if !defined(CFG_RAMBOOT) #if !defined(CFG_RAMBOOT)
#if defined(CONFIG_RAM_AS_FLASH) #if defined(CONFIG_RAM_AS_FLASH)
#define CFG_ENV_IS_NOWHERE #define CONFIG_ENV_IS_NOWHERE
#define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000) #define CFG_ENV_ADDR (CFG_FLASH_BASE + 0x100000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
@ -343,7 +343,7 @@
#endif #endif
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/stxgp3.h
View File

@ -294,7 +294,7 @@
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#else #else
#define CFG_NO_FLASH 1 /* Flash is not usable now */ #define CFG_NO_FLASH 1 /* Flash is not usable now */
#define CFG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */ #define CONFIG_ENV_IS_NOWHERE 1 /* Store ENV in memory only */
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - 0x1000)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000
#endif #endif

2
include/configs/suzaku.h
View File

@ -90,7 +90,7 @@
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* NVRAM organization * NVRAM organization
*/ */
#define CFG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_IS_NOWHERE 1
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */ #define CFG_ENV_SECT_SIZE 0x10000 /* see README - env sector total size */

2
include/configs/versatile.h
View File

@ -185,7 +185,7 @@
#define PHYS_FLASH_1 (CFG_FLASH_BASE) #define PHYS_FLASH_1 (CFG_FLASH_BASE)
#define CFG_ENV_IS_IN_FLASH 1 /* env in flash instead of CFG_ENV_IS_NOWHERE */ #define CFG_ENV_IS_IN_FLASH 1 /* env in flash instead of CONFIG_ENV_IS_NOWHERE */
#define CFG_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */ #define CFG_ENV_SECT_SIZE 0x00020000 /* 256 KB sectors (x2) */
#define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */ #define CFG_ENV_SIZE 0x10000 /* Total Size of Environment Sector */
#define CFG_ENV_OFFSET 0x01f00000 /* environment starts here */ #define CFG_ENV_OFFSET 0x01f00000 /* environment starts here */

2
include/configs/xupv2p.h
View File

@ -150,7 +150,7 @@
#define CFG_INIT_SP_OFFSET CFG_MALLOC_BASE #define CFG_INIT_SP_OFFSET CFG_MALLOC_BASE
#define CFG_NO_FLASH 1 #define CFG_NO_FLASH 1
#define CFG_ENV_IS_NOWHERE 1 #define CONFIG_ENV_IS_NOWHERE 1
#define CFG_ENV_SIZE 0x1000 #define CFG_ENV_SIZE 0x1000
#define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE) #define CFG_ENV_ADDR (CFG_MONITOR_BASE - CFG_ENV_SIZE)

4
lib_avr32/board.c
View File

@ -261,7 +261,7 @@ void board_init_f(ulong board_type)
void board_init_r(gd_t *new_gd, ulong dest_addr) void board_init_r(gd_t *new_gd, ulong dest_addr)
{ {
extern void malloc_bin_reloc (void); extern void malloc_bin_reloc (void);
#ifndef CFG_ENV_IS_NOWHERE #ifndef CONFIG_ENV_IS_NOWHERE
extern char * env_name_spec; extern char * env_name_spec;
#endif #endif
char *s; char *s;
@ -302,7 +302,7 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
} }
/* there are some other pointer constants we must deal with */ /* there are some other pointer constants we must deal with */
#ifndef CFG_ENV_IS_NOWHERE #ifndef CONFIG_ENV_IS_NOWHERE
env_name_spec += gd->reloc_off; env_name_spec += gd->reloc_off;
#endif #endif

4
lib_m68k/board.c
View File

@ -443,7 +443,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
int i; int i;
extern void malloc_bin_reloc (void); extern void malloc_bin_reloc (void);
#ifndef CFG_ENV_IS_NOWHERE #ifndef CONFIG_ENV_IS_NOWHERE
extern char * env_name_spec; extern char * env_name_spec;
#endif #endif
#ifndef CFG_NO_FLASH #ifndef CFG_NO_FLASH
@ -494,7 +494,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif #endif
} }
/* there are some other pointer constants we must deal with */ /* there are some other pointer constants we must deal with */
#ifndef CFG_ENV_IS_NOWHERE #ifndef CONFIG_ENV_IS_NOWHERE
env_name_spec += gd->reloc_off; env_name_spec += gd->reloc_off;
#endif #endif

4
lib_mips/board.c
View File

@ -308,7 +308,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
ulong size; ulong size;
#endif #endif
extern void malloc_bin_reloc (void); extern void malloc_bin_reloc (void);
#ifndef CFG_ENV_IS_NOWHERE #ifndef CONFIG_ENV_IS_NOWHERE
extern char * env_name_spec; extern char * env_name_spec;
#endif #endif
char *s, *e; char *s, *e;
@ -353,7 +353,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif #endif
} }
/* there are some other pointer constants we must deal with */ /* there are some other pointer constants we must deal with */
#ifndef CFG_ENV_IS_NOWHERE #ifndef CONFIG_ENV_IS_NOWHERE
env_name_spec += gd->reloc_off; env_name_spec += gd->reloc_off;
#endif #endif

4
lib_ppc/board.c
View File

@ -651,7 +651,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
bd_t *bd; bd_t *bd;
int i; int i;
extern void malloc_bin_reloc (void); extern void malloc_bin_reloc (void);
#ifndef CFG_ENV_IS_NOWHERE #ifndef CONFIG_ENV_IS_NOWHERE
extern char * env_name_spec; extern char * env_name_spec;
#endif #endif
@ -713,7 +713,7 @@ void board_init_r (gd_t *id, ulong dest_addr)
#endif #endif
} }
/* there are some other pointer constants we must deal with */ /* there are some other pointer constants we must deal with */
#ifndef CFG_ENV_IS_NOWHERE #ifndef CONFIG_ENV_IS_NOWHERE
env_name_spec += gd->reloc_off; env_name_spec += gd->reloc_off;
#endif #endif