phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

This commit is contained in:
Wolfgang Denk 2008-09-12 16:13:12 +02:00
parent b476b03256 deeec4991a
commit afbc526336
830 changed files with 3978 additions and 4050 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1063,7 +1063,7 @@ RPXlite_DW_config: unconfig
$(XECHO) "... with LCD display ..."; \ $(XECHO) "... with LCD display ..."; \
} }
@[ -z "$(findstring _NVRAM,$@)" ] || \ @[ -z "$(findstring _NVRAM,$@)" ] || \
{ echo "#define CFG_ENV_IS_IN_NVRAM" >>$(obj)include/config.h ; \ { echo "#define CONFIG_ENV_IS_IN_NVRAM" >>$(obj)include/config.h ; \
$(XECHO) "... with ENV in NVRAM ..."; \ $(XECHO) "... with ENV in NVRAM ..."; \
} }
@$(MKCONFIG) -a RPXlite_DW ppc mpc8xx RPXlite_dw @$(MKCONFIG) -a RPXlite_DW ppc mpc8xx RPXlite_dw
@ -3213,7 +3213,7 @@ clobber: clean
@rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \ @rm -f $(OBJS) $(obj)*.bak $(obj)ctags $(obj)etags $(obj)TAGS \
$(obj)cscope.* $(obj)*.*~ $(obj)cscope.* $(obj)*.*~
@rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL) @rm -f $(obj)u-boot $(obj)u-boot.map $(obj)u-boot.hex $(ALL)
@rm -f $(obj)tools/{crc32.c,environment.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes} @rm -f $(obj)tools/{crc32.c,env_embedded.c,env/crc32.c,md5.c,sha1.c,inca-swap-bytes}
@rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c,zlib.h} @rm -f $(obj)tools/{image.c,fdt.c,fdt_ro.c,fdt_rw.c,fdt_strerror.c,zlib.h}
@rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h} @rm -f $(obj)tools/{fdt_wip.c,libfdt_internal.h}
@rm -f $(obj)cpu/mpc824x/bedbug_603e.c @rm -f $(obj)cpu/mpc824x/bedbug_603e.c

56
README
View File

@ -2104,7 +2104,7 @@ The following definitions that deal with the placement and management
of environment data (variable area); in general, we support the of environment data (variable area); in general, we support the
following configurations: following configurations:
- CFG_ENV_IS_IN_FLASH: - CONFIG_ENV_IS_IN_FLASH:
Define this if the environment is in flash memory. Define this if the environment is in flash memory.
@ -2120,22 +2120,22 @@ following configurations:
environment in one of the last sectors, leaving a gap environment in one of the last sectors, leaving a gap
between U-Boot and the environment. between U-Boot and the environment.
- CFG_ENV_OFFSET: - CONFIG_ENV_OFFSET:
Offset of environment data (variable area) to the Offset of environment data (variable area) to the
beginning of flash memory; for instance, with bottom boot beginning of flash memory; for instance, with bottom boot
type flash chips the second sector can be used: the offset type flash chips the second sector can be used: the offset
for this sector is given here. for this sector is given here.
CFG_ENV_OFFSET is used relative to CFG_FLASH_BASE. CONFIG_ENV_OFFSET is used relative to CFG_FLASH_BASE.
- CFG_ENV_ADDR: - CONFIG_ENV_ADDR:
This is just another way to specify the start address of This is just another way to specify the start address of
the flash sector containing the environment (instead of the flash sector containing the environment (instead of
CFG_ENV_OFFSET). CONFIG_ENV_OFFSET).
- CFG_ENV_SECT_SIZE: - CONFIG_ENV_SECT_SIZE:
Size of the sector containing the environment. Size of the sector containing the environment.
@ -2144,10 +2144,10 @@ following configurations:
In such a case you don't want to spend a whole sector for In such a case you don't want to spend a whole sector for
the environment. the environment.
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
If you use this in combination with CFG_ENV_IS_IN_FLASH If you use this in combination with CONFIG_ENV_IS_IN_FLASH
and CFG_ENV_SECT_SIZE, you can specify to use only a part and CONFIG_ENV_SECT_SIZE, you can specify to use only a part
of this flash sector for the environment. This saves of this flash sector for the environment. This saves
memory for the RAM copy of the environment. memory for the RAM copy of the environment.
@ -2161,8 +2161,8 @@ following configurations:
wrong before the contents has been restored from a copy in wrong before the contents has been restored from a copy in
RAM, your target system will be dead. RAM, your target system will be dead.
- CFG_ENV_ADDR_REDUND - CONFIG_ENV_ADDR_REDUND
CFG_ENV_SIZE_REDUND CONFIG_ENV_SIZE_REDUND
These settings describe a second storage area used to hold These settings describe a second storage area used to hold
a redundant copy of the environment data, so that there is a redundant copy of the environment data, so that there is
@ -2174,14 +2174,14 @@ source code will make it necessary to adapt <board>/u-boot.lds*
accordingly! accordingly!
- CFG_ENV_IS_IN_NVRAM: - CONFIG_ENV_IS_IN_NVRAM:
Define this if you have some non-volatile memory device Define this if you have some non-volatile memory device
(NVRAM, battery buffered SRAM) which you want to use for the (NVRAM, battery buffered SRAM) which you want to use for the
environment. environment.
- CFG_ENV_ADDR: - CONFIG_ENV_ADDR:
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
These two #defines are used to determine the memory area you These two #defines are used to determine the memory area you
want to use for environment. It is assumed that this memory want to use for environment. It is assumed that this memory
@ -2199,13 +2199,13 @@ keep settings there always unmodified except somebody uses "saveenv"
to save the current settings. to save the current settings.
- CFG_ENV_IS_IN_EEPROM: - CONFIG_ENV_IS_IN_EEPROM:
Use this if you have an EEPROM or similar serial access Use this if you have an EEPROM or similar serial access
device and a driver for it. device and a driver for it.
- CFG_ENV_OFFSET: - CONFIG_ENV_OFFSET:
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
These two #defines specify the offset and size of the These two #defines specify the offset and size of the
environment area within the total memory of your EEPROM. environment area within the total memory of your EEPROM.
@ -2242,39 +2242,39 @@ to save the current settings.
The size in bytes of the EEPROM device. The size in bytes of the EEPROM device.
- CFG_ENV_IS_IN_DATAFLASH: - CONFIG_ENV_IS_IN_DATAFLASH:
Define this if you have a DataFlash memory device which you Define this if you have a DataFlash memory device which you
want to use for the environment. want to use for the environment.
- CFG_ENV_OFFSET: - CONFIG_ENV_OFFSET:
- CFG_ENV_ADDR: - CONFIG_ENV_ADDR:
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
These three #defines specify the offset and size of the These three #defines specify the offset and size of the
environment area within the total memory of your DataFlash placed environment area within the total memory of your DataFlash placed
at the specified address. at the specified address.
- CFG_ENV_IS_IN_NAND: - CONFIG_ENV_IS_IN_NAND:
Define this if you have a NAND device which you want to use Define this if you have a NAND device which you want to use
for the environment. for the environment.
- CFG_ENV_OFFSET: - CONFIG_ENV_OFFSET:
- CFG_ENV_SIZE: - CONFIG_ENV_SIZE:
These two #defines specify the offset and size of the environment These two #defines specify the offset and size of the environment
area within the first NAND device. area within the first NAND device.
- CFG_ENV_OFFSET_REDUND - CONFIG_ENV_OFFSET_REDUND
This setting describes a second storage area of CFG_ENV_SIZE This setting describes a second storage area of CONFIG_ENV_SIZE
size used to hold a redundant copy of the environment data, size used to hold a redundant copy of the environment data,
so that there is a valid backup copy in case there is a so that there is a valid backup copy in case there is a
power failure during a "saveenv" operation. power failure during a "saveenv" operation.
Note: CFG_ENV_OFFSET and CFG_ENV_OFFSET_REDUND must be aligned Note: CONFIG_ENV_OFFSET and CONFIG_ENV_OFFSET_REDUND must be aligned
to a block boundary, and CFG_ENV_SIZE must be a multiple of to a block boundary, and CONFIG_ENV_SIZE must be a multiple of
the NAND devices block size. the NAND devices block size.
- CFG_SPI_INIT_OFFSET - CFG_SPI_INIT_OFFSET

2
api/api.c
View File

@ -534,7 +534,7 @@ static int API_env_enum(va_list ap)
for (i = 0; env_get_char(i) != '\0'; i = n + 1) { for (i = 0; env_get_char(i) != '\0'; i = n + 1) {
for (n = i; env_get_char(n) != '\0'; ++n) { for (n = i; env_get_char(n) != '\0'; ++n) {
if (n >= CFG_ENV_SIZE) { if (n >= CONFIG_ENV_SIZE) {
/* XXX shouldn't we set *next = NULL?? */ /* XXX shouldn't we set *next = NULL?? */
return 0; return 0;
} }

2
board/BuS/EB+MCF-EV123/u-boot.lds
View File

@ -63,7 +63,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset; */ /* . = env_offset; */
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/LEOX/elpt860/README.LEOX
View File

@ -106,7 +106,7 @@ version - print monitor version
? - alias for 'help' ? - alias for 'help'
################################################## ##################################################
# Environment Variables (CFG_ENV_IS_IN_NVRAM) # Environment Variables (CONFIG_ENV_IS_IN_NVRAM)
############################## ##############################
LEOX_elpt860: printenv LEOX_elpt860: printenv

10
board/LEOX/elpt860/flash.c
View File

@ -61,8 +61,8 @@
#include <mpc8xx.h> #include <mpc8xx.h>
#ifndef CFG_ENV_ADDR #ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@ -122,11 +122,11 @@ flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE-1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/LEOX/elpt860/u-boot.lds
View File

@ -77,7 +77,7 @@ SECTIONS
lib_ppc/ticks.o (.text) lib_ppc/ticks.o (.text)
. = env_offset; . = env_offset;
common/environment.o (.text) common/env_embedded.o (.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/LEOX/elpt860/u-boot.lds.debug
View File

@ -70,7 +70,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
. = env_offset; . = env_offset;
common/environment.o (.text) common/env_embedded.o (.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

6
board/MAI/AmigaOneG3SE/flash_new.c
View File

@ -123,11 +123,11 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/MAI/AmigaOneG3SE/u-boot.lds
View File

@ -62,7 +62,7 @@ SECTIONS
cpu/74xx_7xx/start.o (.text) cpu/74xx_7xx/start.o (.text)
/* store the environment in a seperate sector in the boot flash */ /* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */ /* . = env_offset; */
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/Marvell/common/bootseq.txt
View File

@ -88,7 +88,7 @@ in_flash:
nothing nothing
mem_malloc_init mem_malloc_init
malloc_bin_reloc malloc_bin_reloc
spi_init (r or f)??? (CFG_ENV_IS_IN_EEPROM) spi_init (r or f)??? (CONFIG_ENV_IS_IN_EEPROM)
env_relocated env_relocated
misc_init_r(bd): (board/evb64260/evb64260.c) misc_init_r(bd): (board/evb64260/evb64260.c)
mpsc_init2 mpsc_init2

2
board/Marvell/db64360/u-boot.lds
View File

@ -60,7 +60,7 @@ SECTIONS
/* store the environment in a seperate sector in the boot flash */ /* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */ /* . = env_offset; */
/* common/environment.o(.text) */ /* common/env_embedded.o(.text) */
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/Marvell/db64460/u-boot.lds
View File

@ -60,7 +60,7 @@ SECTIONS
/* store the environment in a seperate sector in the boot flash */ /* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */ /* . = env_offset; */
/* common/environment.o(.text) */ /* common/env_embedded.o(.text) */
*(.text) *(.text)
*(.fixup) *(.fixup)

4
board/MigoR/u-boot.lds
View File

@ -49,9 +49,9 @@ SECTIONS
{ {
cpu/sh4/start.o (.text) cpu/sh4/start.o (.text)
. = ALIGN(8192); . = ALIGN(8192);
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
. = ALIGN(8192); . = ALIGN(8192);
common/environment.o (.ppcenvr) common/env_embedded.o (.ppcenvr)
. = ALIGN(8192); . = ALIGN(8192);
*(.text) *(.text)
. = ALIGN(4); . = ALIGN(4);

2
board/RPXClassic/u-boot.lds
View File

@ -64,7 +64,7 @@ SECTIONS
/* XXX ? /* XXX ?
. = env_offset; . = env_offset;
*/ */
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/RPXClassic/u-boot.lds.debug
View File

@ -61,7 +61,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
. = env_offset; . = env_offset;
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/RPXlite/u-boot.lds
View File

@ -64,7 +64,7 @@ SECTIONS
/* XXX ? /* XXX ?
. = env_offset; . = env_offset;
*/ */
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/RPXlite/u-boot.lds.debug
View File

@ -61,7 +61,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
. = env_offset; . = env_offset;
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/RPXlite_dw/README
View File

@ -21,7 +21,7 @@ make distclean
make RPXlite_DW_64_config make RPXlite_DW_64_config
make all make all
2. CFG_ENV_IS_IN_FLASH/CFG_ENV_IS_IN_NVRAM 2. CONFIG_ENV_IS_IN_FLASH/CONFIG_ENV_IS_IN_NVRAM
The default environment parameter is stored in FLASH because it is a common choice for The default environment parameter is stored in FLASH because it is a common choice for
environment parameter.So I make NVRAM as backup parameter storeage.The reason why I environment parameter.So I make NVRAM as backup parameter storeage.The reason why I

2
board/RPXlite_dw/u-boot.lds
View File

@ -64,7 +64,7 @@ SECTIONS
/* XXX ? /* XXX ?
. = env_offset; . = env_offset;
*/ */
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/RPXlite_dw/u-boot.lds.debug
View File

@ -61,7 +61,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
. = env_offset; . = env_offset;
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

10
board/RRvision/flash.c
View File

@ -26,8 +26,8 @@
#include <common.h> #include <common.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#ifndef CFG_ENV_ADDR #ifndef CONFIG_ENV_ADDR
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@ -77,11 +77,11 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/RRvision/u-boot.lds
View File

@ -66,7 +66,7 @@ SECTIONS
lib_ppc/time.o (.text) lib_ppc/time.o (.text)
. = env_offset; . = env_offset;
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
*(.text) *(.text)
*(.fixup) *(.fixup)

22
board/a3000/flash.c
View File

@ -25,15 +25,15 @@
#include <common.h> #include <common.h>
#include <mpc824x.h> #include <mpc824x.h>
#if defined(CFG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -108,12 +108,12 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
DEBUGF("protect environtment %x @ %x\n", CFG_ENV_ADDR, CFG_ENV_SECT_SIZE); DEBUGF("protect environtment %x @ %x\n", CONFIG_ENV_ADDR, CONFIG_ENV_SECT_SIZE);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/actux1/u-boot.lds
View File

@ -37,7 +37,7 @@ SECTIONS
common/dlmalloc.o(.text) common/dlmalloc.o(.text)
cpu/ixp/cpu.o(.text) cpu/ixp/cpu.o(.text)
. = env_offset; . = env_offset;
common/environment.o(.ppcenv) common/env_embedded.o(.ppcenv)
* (.text) * (.text)
} }

2
board/actux2/u-boot.lds
View File

@ -38,7 +38,7 @@ SECTIONS
cpu/ixp/cpu.o(.text) cpu/ixp/cpu.o(.text)
. = env_offset; . = env_offset;
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
* (.text) * (.text)
} }

2
board/actux3/u-boot.lds
View File

@ -38,7 +38,7 @@ SECTIONS
cpu/ixp/cpu.o (.text) cpu/ixp/cpu.o (.text)
. = env_offset; . = env_offset;
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
* (.text) * (.text)
} }

8
board/alaska/flash.c
View File

@ -144,11 +144,11 @@ unsigned long flash_init (void)
#endif #endif
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV1_ADDR, CONFIG_ENV1_ADDR,
CFG_ENV1_ADDR + CFG_ENV1_SIZE - 1, &flash_info[1]); CONFIG_ENV1_ADDR + CONFIG_ENV1_SIZE - 1, &flash_info[1]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[3]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[3]);
return size; return size;
} }

2
board/amcc/acadia/u-boot-nand.lds
View File

@ -57,7 +57,7 @@ SECTIONS
/* Align to next NAND block */ /* Align to next NAND block */
. = ALIGN(0x4000); . = ALIGN(0x4000);
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
/* Keep some space here for redundant env and potential bad env blocks */ /* Keep some space here for redundant env and potential bad env blocks */
. = ALIGN(0x10000); . = ALIGN(0x10000);

12
board/amcc/bamboo/flash.c
View File

@ -153,13 +153,13 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]); &flash_info[i]);
#if defined(CFG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#if defined(CFG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR_REDUND) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR_REDUND)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#endif #endif
#endif #endif

2
board/amcc/bamboo/u-boot-nand.lds
View File

@ -57,7 +57,7 @@ SECTIONS
/* Align to next NAND block */ /* Align to next NAND block */
. = ALIGN(0x4000); . = ALIGN(0x4000);
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
/* Keep some space here for redundant env and potential bad env blocks */ /* Keep some space here for redundant env and potential bad env blocks */
. = ALIGN(0x10000); . = ALIGN(0x10000);

10
board/amcc/bubinga/flash.c
View File

@ -84,12 +84,12 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/amcc/canyonlands/u-boot-nand.lds
View File

@ -57,7 +57,7 @@ SECTIONS
/* Align to next NAND block */ /* Align to next NAND block */
. = ALIGN(0x20000); . = ALIGN(0x20000);
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
/* Keep some space here for redundant env and potential bad env blocks */ /* Keep some space here for redundant env and potential bad env blocks */
. = ALIGN(0x80000); . = ALIGN(0x80000);

10
board/amcc/ebony/flash.c
View File

@ -124,12 +124,12 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]); &flash_info[2]);
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[2]); &flash_info[2]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[2]); &flash_info[2]);
#endif #endif

2
board/amcc/kilauea/kilauea.c
View File

@ -219,7 +219,7 @@ int board_early_init_f (void)
int misc_init_r(void) int misc_init_r(void)
{ {
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */ /* Monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN, -CFG_MONITOR_LEN,

2
board/amcc/kilauea/u-boot-nand.lds
View File

@ -57,7 +57,7 @@ SECTIONS
/* Align to next NAND block */ /* Align to next NAND block */
. = ALIGN(0x4000); . = ALIGN(0x4000);
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
/* Keep some space here for redundant env and potential bad env blocks */ /* Keep some space here for redundant env and potential bad env blocks */
. = ALIGN(0x10000); . = ALIGN(0x10000);

10
board/amcc/luan/flash.c
View File

@ -95,12 +95,12 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[2]); &flash_info[2]);
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[2]); &flash_info[2]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[2]); &flash_info[2]);
#endif #endif

2
board/amcc/makalu/makalu.c
View File

@ -210,7 +210,7 @@ int board_early_init_f (void)
int misc_init_r(void) int misc_init_r(void)
{ {
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */ /* Monitor protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN, -CFG_MONITOR_LEN,

10
board/amcc/ocotea/flash.c
View File

@ -134,12 +134,12 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]); &flash_info[i]);
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#endif #endif

2
board/amcc/redwood/u-boot.lds
View File

@ -70,7 +70,7 @@ SECTIONS
board/amcc/redwood/init.o (.text) board/amcc/redwood/init.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
/* common/environment.o(.text)*/ /* common/env_embedded.o(.text)*/
*(.text) *(.text)
*(.fixup) *(.fixup)

6
board/amcc/sequoia/sequoia.c
View File

@ -157,7 +157,7 @@ int misc_init_r(void)
*/ */
flash_get_size(gd->bd->bi_flashstart, 0); flash_get_size(gd->bd->bi_flashstart, 0);
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* Monitor protection ON by default */ /* Monitor protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
-CFG_MONITOR_LEN, -CFG_MONITOR_LEN,
@ -166,8 +166,8 @@ int misc_init_r(void)
/* Env protection ON by default */ /* Env protection ON by default */
(void)flash_protect(FLAG_PROTECT_SET, (void)flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR_REDUND, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + 2*CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + 2*CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/amcc/sequoia/u-boot-nand.lds
View File

@ -57,7 +57,7 @@ SECTIONS
/* Align to next NAND block */ /* Align to next NAND block */
. = ALIGN(0x4000); . = ALIGN(0x4000);
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
/* Keep some space here for redundant env and potential bad env blocks */ /* Keep some space here for redundant env and potential bad env blocks */
. = ALIGN(0x10000); . = ALIGN(0x10000);

10
board/amcc/taihu/flash.c
View File

@ -87,12 +87,12 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif
/* Also protect sector containing initial power-up instruction */ /* Also protect sector containing initial power-up instruction */

10
board/amcc/walnut/flash.c
View File

@ -82,12 +82,12 @@ unsigned long flash_init(void)
CFG_MONITOR_BASE, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[0]); &flash_info[0]);
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/amcc/yucca/cmd_yucca.c
View File

@ -33,8 +33,6 @@ extern void print_evb440spe_info(void);
static int setBootStrapClock(cmd_tbl_t *cmdtp, int incrflag, static int setBootStrapClock(cmd_tbl_t *cmdtp, int incrflag,
int flag, int argc, char *argv[]); int flag, int argc, char *argv[]);
extern int cmd_get_data_size(char* arg, int default_size);
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
int do_evb440spe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) int do_evb440spe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
{ {

12
board/amcc/yucca/flash.c
View File

@ -1037,13 +1037,13 @@ unsigned long flash_init(void)
(void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE, (void)flash_protect(FLAG_PROTECT_SET, CFG_MONITOR_BASE,
CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1, CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
&flash_info[i]); &flash_info[i]);
#if defined(CFG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#if defined(CFG_ENV_ADDR_REDUND) #if defined(CONFIG_ENV_ADDR_REDUND)
(void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND, (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1, CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
&flash_info[i]); &flash_info[i]);
#endif #endif
#endif #endif

2
board/amirix/ap1000/u-boot.lds
View File

@ -69,7 +69,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
/* common/environment.o(.text)*/ /* common/env_embedded.o(.text)*/
*(.text) *(.text)
*(.fixup) *(.fixup)

4
board/ap325rxa/u-boot.lds
View File

@ -49,9 +49,9 @@ SECTIONS
{ {
cpu/sh4/start.o (.text) cpu/sh4/start.o (.text)
. = ALIGN(8192); . = ALIGN(8192);
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
. = ALIGN(8192); . = ALIGN(8192);
common/environment.o (.ppcenvr) common/env_embedded.o (.ppcenvr)
. = ALIGN(8192); . = ALIGN(8192);
*(.text) *(.text)
. = ALIGN(4); . = ALIGN(4);

4
board/armadillo/flash.c
View File

@ -74,8 +74,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

8
board/atc/flash.c
View File

@ -95,12 +95,12 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE)); flash_get_info(CFG_MONITOR_BASE));
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif

4
board/atmel/at91rm9200dk/flash.c
View File

@ -221,8 +221,8 @@ ulong flash_init (void)
/* Protect environment variables */ /* Protect environment variables */
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
/* Protect U-Boot gzipped image */ /* Protect U-Boot gzipped image */
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,

20
board/barco/flash.c
View File

@ -58,15 +58,15 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -224,10 +224,10 @@ unsigned long flash_init(void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/bf533-ezkit/u-boot.lds.S
View File

@ -71,7 +71,7 @@ SECTIONS
board/bf533-ezkit/bf533-ezkit.o (.text) board/bf533-ezkit/bf533-ezkit.o (.text)
. = DEFINED(env_offset) ? env_offset : .; . = DEFINED(env_offset) ? env_offset : .;
common/environment.o (.text) common/env_embedded.o (.text)
#endif #endif
*(.text .text.*) *(.text .text.*)

2
board/bf533-stamp/u-boot.lds.S
View File

@ -69,7 +69,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
. = DEFINED(env_offset) ? env_offset : .; . = DEFINED(env_offset) ? env_offset : .;
common/environment.o (.text) common/env_embedded.o (.text)
#endif #endif
*(.text .text.*) *(.text .text.*)

2
board/bf537-stamp/u-boot.lds.S
View File

@ -69,7 +69,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
. = DEFINED(env_offset) ? env_offset : .; . = DEFINED(env_offset) ? env_offset : .;
common/environment.o (.text) common/env_embedded.o (.text)
#endif #endif
*(.text .text.*) *(.text .text.*)

2
board/bf561-ezkit/u-boot.lds.S
View File

@ -71,7 +71,7 @@ SECTIONS
board/bf561-ezkit/bf561-ezkit.o (.text) board/bf561-ezkit/bf561-ezkit.o (.text)
. = DEFINED(env_offset) ? env_offset : .; . = DEFINED(env_offset) ? env_offset : .;
common/environment.o (.text) common/env_embedded.o (.text)
#endif #endif
*(.text .text.*) *(.text .text.*)

2
board/bmw/bmw.c
View File

@ -125,7 +125,7 @@ void doc_init (void)
doc_probe(DOC_BASE_ADDR); doc_probe(DOC_BASE_ADDR);
} }
#define NV_ADDR ((volatile unsigned char *) CFG_ENV_ADDR) #define NV_ADDR ((volatile unsigned char *) CONFIG_ENV_ADDR)
/* Read from NVRAM */ /* Read from NVRAM */
void* void*

20
board/bmw/flash.c
View File

@ -31,15 +31,15 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -224,10 +224,10 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

16
board/c2mon/flash.c
View File

@ -24,8 +24,8 @@
#include <common.h> #include <common.h>
#include <mpc8xx.h> #include <mpc8xx.h>
#ifndef CFG_ENV_ADDR #ifndef CONFIG_ENV_ADDR
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@ -95,11 +95,11 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
@ -122,11 +122,11 @@ unsigned long flash_init (void)
&flash_info[1]); &flash_info[1]);
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
&flash_info[1]); &flash_info[1]);
#endif #endif
} else { } else {

2
board/c2mon/u-boot.lds
View File

@ -63,7 +63,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
. = env_offset; . = env_offset;
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/c2mon/u-boot.lds.debug
View File

@ -61,7 +61,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
. = env_offset; . = env_offset;
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

4
board/cerf250/flash.c
View File

@ -90,8 +90,8 @@ unsigned long flash_init (void)
&flash_info[0] ); &flash_info[0] );
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0] ); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0] );
return size; return size;
} }

12
board/cmc_pu2/flash.c
View File

@ -29,8 +29,8 @@
#include <common.h> #include <common.h>
#ifndef CFG_ENV_ADDR #ifndef CONFIG_ENV_ADDR
#define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) #define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
#endif #endif
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
@ -71,12 +71,12 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE)); flash_get_info(CFG_MONITOR_BASE));
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif
return size ? size : 1; return size ? size : 1;

2
board/cmi/cmi.c
View File

@ -70,4 +70,4 @@ phys_size_t initdram(int board_type)
/* /*
* Absolute environment address for linker file. * Absolute environment address for linker file.
*/ */
GEN_ABS(env_start, CFG_ENV_OFFSET + CFG_FLASH_BASE); GEN_ABS(env_start, CONFIG_ENV_OFFSET + CFG_FLASH_BASE);

20
board/cmi/flash.c
View File

@ -36,15 +36,15 @@
#include <common.h> #include <common.h>
#include <mpc5xx.h> #include <mpc5xx.h>
#if defined(CFG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -110,11 +110,11 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/cobra5272/u-boot.lds
View File

@ -62,7 +62,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
. = DEFINED(env_offset) ? env_offset : .; . = DEFINED(env_offset) ? env_offset : .;
common/environment.o (.text) common/env_embedded.o (.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

20
board/cogent/flash.c
View File

@ -26,15 +26,15 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */ flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CFG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -327,11 +327,11 @@ flash_init(void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SECT_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SECT_SIZE-1,
&flash_info[0]); &flash_info[0]);
#endif #endif
return total; return total;

2
board/cogent/u-boot.lds
View File

@ -53,7 +53,7 @@ SECTIONS
.text : .text :
{ {
*(.text) *(.text)
common/environment.o(.text) common/env_embedded.o(.text)
*(.fixup) *(.fixup)
*(.got1) *(.got1)
} }

2
board/cogent/u-boot.lds.debug
View File

@ -61,7 +61,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
. = env_offset; . = env_offset;
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

26
board/cpc45/flash.c
View File

@ -25,15 +25,15 @@
#include <mpc824x.h> #include <mpc824x.h>
#include <asm/processor.h> #include <asm/processor.h>
#if defined(CFG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -174,15 +174,15 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE #if CONFIG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);
#else #else
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
#endif #endif
#endif #endif

16
board/cpu86/flash.c
View File

@ -230,20 +230,20 @@ unsigned long flash_init (void)
#endif #endif
#endif #endif
#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# if CFG_ENV_ADDR >= CFG_BOOTROM_BASE # if CONFIG_ENV_ADDR >= CFG_BOOTROM_BASE
if (size_b1) { if (size_b1) {
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);
} }
# else # else
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
# endif # endif
#endif #endif

16
board/cpu87/flash.c
View File

@ -236,20 +236,20 @@ unsigned long flash_init (void)
#endif #endif
#endif #endif
#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# if CFG_ENV_ADDR >= CFG_BOOTROM_BASE # if CONFIG_ENV_ADDR >= CFG_BOOTROM_BASE
if (size_b1) { if (size_b1) {
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[1]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[1]);
} }
# else # else
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
# endif # endif
#endif #endif

4
board/cradle/flash.c
View File

@ -76,8 +76,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect (FLAG_PROTECT_SET, flash_protect (FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

2
board/cray/L1/u-boot.lds
View File

@ -75,7 +75,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/*. = env_offset;*/ /*. = env_offset;*/
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/cray/L1/u-boot.lds.debug
View File

@ -61,7 +61,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
lib_ppc/extable.o (.text) lib_ppc/extable.o (.text)
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

4
board/csb226/flash.c
View File

@ -81,8 +81,8 @@ ulong flash_init(void)
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
return size; return size;

2
board/csb272/u-boot.lds
View File

@ -76,7 +76,7 @@ SECTIONS
lib_ppc/board.o (.text) lib_ppc/board.o (.text)
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
/* common/environment.o(.text)*/ /* common/env_embedded.o(.text)*/
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/csb472/u-boot.lds
View File

@ -76,7 +76,7 @@ SECTIONS
lib_ppc/board.o (.text) lib_ppc/board.o (.text)
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
/* common/environment.o(.text)*/ /* common/env_embedded.o(.text)*/
*(.text) *(.text)
*(.fixup) *(.fixup)

26
board/cu824/flash.c
View File

@ -25,15 +25,15 @@
#include <mpc824x.h> #include <mpc824x.h>
#include <asm/processor.h> #include <asm/processor.h>
#if defined(CFG_ENV_IS_IN_FLASH) #if defined(CONFIG_ENV_IS_IN_FLASH)
# ifndef CFG_ENV_ADDR # ifndef CONFIG_ENV_ADDR
# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET) # define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif # endif
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
# ifndef CFG_ENV_SECT_SIZE # ifndef CONFIG_ENV_SECT_SIZE
# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE # define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif # endif
#endif #endif
@ -135,16 +135,16 @@ unsigned long flash_init(void)
#endif #endif
#endif #endif
#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
#if CFG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE #if CONFIG_ENV_ADDR >= CFG_FLASH_BASE + FLASH_BANK_SIZE
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[1]); &flash_info[1]);
#else #else
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif
#endif #endif

2
board/dave/PPChameleonEVB/u-boot.lds
View File

@ -147,7 +147,7 @@ SECTIONS
. = 0xFFFF8000; . = 0xFFFF8000;
.ppcenv : .ppcenv :
{ {
common/environment.o(.ppcenv); common/env_embedded.o(.ppcenv);
} }
_end = . ; _end = . ;

4
board/dnp1110/flash.c
View File

@ -88,8 +88,8 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
return size; return size;

2
board/eltec/bab7xx/u-boot.lds
View File

@ -60,7 +60,7 @@ SECTIONS
/* store the environment in a seperate sector in the boot flash */ /* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */ /* . = env_offset; */
/* common/environment.o(.text) */ /* common/env_embedded.o(.text) */
*(.text) *(.text)
*(.fixup) *(.fixup)

4
board/eltec/elppc/misc.c
View File

@ -42,7 +42,7 @@ extern int read_eeprom (struct eth_device *dev, int location, int addr_len);
void *nvram_read (void *dest, const long src, size_t count) void *nvram_read (void *dest, const long src, size_t count)
{ {
uchar *d = (uchar *) dest; uchar *d = (uchar *) dest;
uchar *s = (uchar *) (CFG_ENV_MAP_ADRS + src); uchar *s = (uchar *) (CONFIG_ENV_MAP_ADRS + src);
while (count--) while (count--)
*d++ = *s++; *d++ = *s++;
@ -52,7 +52,7 @@ void *nvram_read (void *dest, const long src, size_t count)
void nvram_write (long dest, const void *src, size_t count) void nvram_write (long dest, const void *src, size_t count)
{ {
uchar *d = (uchar *) (CFG_ENV_MAP_ADRS + dest); uchar *d = (uchar *) (CONFIG_ENV_MAP_ADRS + dest);
uchar *s = (uchar *) src; uchar *s = (uchar *) src;
while (count--) while (count--)

2
board/eltec/elppc/u-boot.lds
View File

@ -60,7 +60,7 @@ SECTIONS
/* store the environment in a seperate sector in the boot flash */ /* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */ /* . = env_offset; */
/* common/environment.o(.text) */ /* common/env_embedded.o(.text) */
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/eltec/mhpc/u-boot.lds
View File

@ -53,7 +53,7 @@ SECTIONS
.text : .text :
{ {
cpu/mpc8xx/start.o (.text) cpu/mpc8xx/start.o (.text)
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/eltec/mhpc/u-boot.lds.debug
View File

@ -61,7 +61,7 @@ SECTIONS
lib_generic/crc32.o (.text) lib_generic/crc32.o (.text)
. = env_offset; . = env_offset;
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

8
board/emk/common/flash.c
View File

@ -113,12 +113,12 @@ unsigned long flash_init (void)
flash_get_info(CFG_MONITOR_BASE)); flash_get_info(CFG_MONITOR_BASE));
#endif #endif
#ifdef CFG_ENV_IS_IN_FLASH #ifdef CONFIG_ENV_IS_IN_FLASH
/* ENV protection ON by default */ /* ENV protection ON by default */
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR+CFG_ENV_SIZE-1, CONFIG_ENV_ADDR+CONFIG_ENV_SIZE-1,
flash_get_info(CFG_ENV_ADDR)); flash_get_info(CONFIG_ENV_ADDR));
#endif #endif

2
board/emk/top860/u-boot.lds.debug
View File

@ -62,7 +62,7 @@ SECTIONS
lib_ppc/extable.o (.text) lib_ppc/extable.o (.text)
. = env_offset; . = env_offset;
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

4
board/ep7312/flash.c
View File

@ -65,8 +65,8 @@ ulong flash_init (void)
&flash_info[0]); &flash_info[0]);
flash_protect ( FLAG_PROTECT_SET, flash_protect ( FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, &flash_info[0]); CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, &flash_info[0]);
return size; return size;
} }

10
board/ep8260/flash.c
View File

@ -157,13 +157,13 @@ unsigned long flash_init (void)
&flash_info[0]); &flash_info[0]);
#endif #endif
#if (CFG_ENV_IS_IN_FLASH == 1) && defined(CFG_ENV_ADDR) #if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
# ifndef CFG_ENV_SIZE # ifndef CONFIG_ENV_SIZE
# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE # define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif # endif
flash_protect(FLAG_PROTECT_SET, flash_protect(FLAG_PROTECT_SET,
CFG_ENV_ADDR, CONFIG_ENV_ADDR,
CFG_ENV_ADDR + CFG_ENV_SIZE - 1, CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]); &flash_info[0]);
#endif #endif

2
board/eric/u-boot.lds
View File

@ -75,7 +75,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
common/environment.o(.text) common/env_embedded.o(.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/esd/apc405/u-boot.lds
View File

@ -72,7 +72,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
/* common/environment.o(.text)*/ /* common/env_embedded.o(.text)*/
*(.text) *(.text)
*(.fixup) *(.fixup)

4
board/esd/ar405/u-boot.lds
View File

@ -83,9 +83,9 @@ SECTIONS
/* /*
. = DEFINED(env_offset) ? env_offset : .; . = DEFINED(env_offset) ? env_offset : .;
common/environment.o (.ppcenv) common/env_embedded.o (.ppcenv)
*/ */
common/environment.o (.text) common/env_embedded.o (.text)
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/esd/ash405/u-boot.lds
View File

@ -72,7 +72,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
/* common/environment.o(.text)*/ /* common/env_embedded.o(.text)*/
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/esd/canbt/u-boot.lds
View File

@ -82,7 +82,7 @@ SECTIONS
net/net.o (.text) net/net.o (.text)
/* . = env_offset; /* . = env_offset;
common/environment.o (.text) common/env_embedded.o (.text)
*/ */
*(.text) *(.text)

2
board/esd/cms700/u-boot.lds
View File

@ -72,7 +72,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
/* common/environment.o(.text)*/ /* common/env_embedded.o(.text)*/
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/esd/cpci2dp/u-boot.lds
View File

@ -72,7 +72,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
/* common/environment.o(.text)*/ /* common/env_embedded.o(.text)*/
*(.text) *(.text)
*(.fixup) *(.fixup)

16
board/esd/cpci405/cpci405.c
View File

@ -691,7 +691,7 @@ U_BOOT_CMD(
); );
#define CFG_I2C_EEPROM_ADDR_2 0x51 /* EEPROM CAT28WC32 */ #define CFG_I2C_EEPROM_ADDR_2 0x51 /* EEPROM CAT28WC32 */
#define CFG_ENV_SIZE_2 0x800 /* 2048 bytes may be used for env vars*/ #define CONFIG_ENV_SIZE_2 0x800 /* 2048 bytes may be used for env vars*/
/* /*
* Write backplane ip-address... * Write backplane ip-address...
@ -705,11 +705,11 @@ int do_get_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
char *ptr; char *ptr;
IPaddr_t ipaddr; IPaddr_t ipaddr;
buf = malloc(CFG_ENV_SIZE_2); buf = malloc(CONFIG_ENV_SIZE_2);
if (eeprom_read(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CFG_ENV_SIZE_2)) { if (eeprom_read(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CONFIG_ENV_SIZE_2)) {
puts("\nError reading backplane EEPROM!\n"); puts("\nError reading backplane EEPROM!\n");
} else { } else {
crc = crc32(0, (uchar *)(buf+4), CFG_ENV_SIZE_2-4); crc = crc32(0, (uchar *)(buf+4), CONFIG_ENV_SIZE_2-4);
if (crc != *(ulong *)buf) { if (crc != *(ulong *)buf) {
printf("ERROR: crc mismatch %08lx %08lx\n", crc, *(ulong *)buf); printf("ERROR: crc mismatch %08lx %08lx\n", crc, *(ulong *)buf);
return -1; return -1;
@ -764,14 +764,14 @@ int do_set_bpip(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
} }
printf("Setting bp_ip to %s\n", argv[1]); printf("Setting bp_ip to %s\n", argv[1]);
buf = malloc(CFG_ENV_SIZE_2); buf = malloc(CONFIG_ENV_SIZE_2);
memset(buf, 0, CFG_ENV_SIZE_2); memset(buf, 0, CONFIG_ENV_SIZE_2);
sprintf(str, "bp_ip=%s", argv[1]); sprintf(str, "bp_ip=%s", argv[1]);
strcpy(buf+4, str); strcpy(buf+4, str);
crc = crc32(0, (uchar *)(buf+4), CFG_ENV_SIZE_2-4); crc = crc32(0, (uchar *)(buf+4), CONFIG_ENV_SIZE_2-4);
*(ulong *)buf = crc; *(ulong *)buf = crc;
if (eeprom_write(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CFG_ENV_SIZE_2)) { if (eeprom_write(CFG_I2C_EEPROM_ADDR_2, 0, (uchar *)buf, CONFIG_ENV_SIZE_2)) {
puts("\nError writing backplane EEPROM!\n"); puts("\nError writing backplane EEPROM!\n");
} }

2
board/esd/cpci750/u-boot.lds
View File

@ -60,7 +60,7 @@ SECTIONS
/* store the environment in a seperate sector in the boot flash */ /* store the environment in a seperate sector in the boot flash */
/* . = env_offset; */ /* . = env_offset; */
/* common/environment.o(.text) */ /* common/env_embedded.o(.text) */
*(.text) *(.text)
*(.fixup) *(.fixup)

2
board/esd/cpciiser4/u-boot.lds
View File

@ -72,7 +72,7 @@ SECTIONS
lib_generic/zlib.o (.text) lib_generic/zlib.o (.text)
/* . = env_offset;*/ /* . = env_offset;*/
/* common/environment.o(.text)*/ /* common/env_embedded.o(.text)*/
*(.text) *(.text)
*(.fixup) *(.fixup)

Some files were not shown because too many files have changed in this diff Show More