Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename CFG_ENV_IS_IN_DATAFLASH in CONFIG_ENV_IS_IN_DATAFLASH

Browse Source 
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
master
Jean-Christophe PLAGNIOL-VILLARD 17 years ago
parent d1034bc8db
commit 057c849c45
11 changed files with 17 additions and 17 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      README
  2. 2
      common/cmd_nvedit.c
  3. 4
      common/env_dataflash.c
  4. 2
      include/configs/at91cap9adk.h
  5. 6
      include/configs/at91rm9200dk.h
  6. 4
      include/configs/at91sam9260ek.h
  7. 2
      include/configs/at91sam9261ek.h
  8. 2
      include/configs/at91sam9263ek.h
  9. 2
      include/configs/at91sam9rlek.h
  10. 6
      include/configs/csb637.h
  11. 2
      include/configs/m501sk.h

2
README
Unescape View File

@ -2242,7 +2242,7 @@ 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.

2
common/cmd_nvedit.c
Unescape View File

@ -55,7 +55,7 @@ DECLARE_GLOBAL_DATA_PTR;
#if !defined(CFG_ENV_IS_IN_NVRAM) && \ #if !defined(CFG_ENV_IS_IN_NVRAM) && \
!defined(CONFIG_ENV_IS_IN_EEPROM) && \ !defined(CONFIG_ENV_IS_IN_EEPROM) && \
!defined(CFG_ENV_IS_IN_FLASH) && \ !defined(CFG_ENV_IS_IN_FLASH) && \
!defined(CFG_ENV_IS_IN_DATAFLASH) && \ !defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
!defined(CFG_ENV_IS_IN_NAND) && \ !defined(CFG_ENV_IS_IN_NAND) && \
!defined(CFG_ENV_IS_IN_ONENAND) && \ !defined(CFG_ENV_IS_IN_ONENAND) && \
!defined(CFG_ENV_IS_IN_SPI_FLASH) && \ !defined(CFG_ENV_IS_IN_SPI_FLASH) && \

4
common/env_dataflash.c
Unescape View File

@ -19,7 +19,7 @@
*/ */
#include <common.h> #include <common.h>
#if defined(CFG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */ #if defined(CONFIG_ENV_IS_IN_DATAFLASH) /* Environment is in DataFlash */
#include <command.h> #include <command.h>
#include <environment.h> #include <environment.h>
@ -101,4 +101,4 @@ int env_init(void)
return (0); return (0);
} }
#endif /* CFG_ENV_IS_IN_DATAFLASH */ #endif /* CONFIG_ENV_IS_IN_DATAFLASH */

2
include/configs/at91cap9adk.h
Unescape View File

@ -148,7 +148,7 @@
#ifdef CFG_USE_DATAFLASH #ifdef CFG_USE_DATAFLASH
/* bootstrap + u-boot + env + linux in dataflash */ /* bootstrap + u-boot + env + linux in dataflash */
#define CFG_ENV_IS_IN_DATAFLASH 1 #define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_OFFSET 0x4200
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)

6
include/configs/at91rm9200dk.h
Unescape View File

@ -179,9 +179,9 @@
#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 */
#undef CFG_ENV_IS_IN_DATAFLASH #undef CONFIG_ENV_IS_IN_DATAFLASH
#ifdef CFG_ENV_IS_IN_DATAFLASH #ifdef CONFIG_ENV_IS_IN_DATAFLASH
#define CFG_ENV_OFFSET 0x20000 #define CFG_ENV_OFFSET 0x20000
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */ #define CFG_ENV_SIZE 0x2000 /* 0x8000 */
@ -194,7 +194,7 @@
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */ #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x60000) /* after u-boot.bin */
#define CFG_ENV_SIZE 0x10000 /* sectors are 64K here */ #define CFG_ENV_SIZE 0x10000 /* sectors are 64K here */
#endif /* CONFIG_SKIP_LOWLEVEL_INIT */ #endif /* CONFIG_SKIP_LOWLEVEL_INIT */
#endif /* CFG_ENV_IS_IN_DATAFLASH */ #endif /* CONFIG_ENV_IS_IN_DATAFLASH */
#define CFG_LOAD_ADDR 0x21000000 /* default load address */ #define CFG_LOAD_ADDR 0x21000000 /* default load address */

4
include/configs/at91sam9260ek.h
Unescape View File

@ -134,7 +134,7 @@
#ifdef CFG_USE_DATAFLASH_CS0 #ifdef CFG_USE_DATAFLASH_CS0
/* bootstrap + u-boot + env + linux in dataflash on CS0 */ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CFG_ENV_IS_IN_DATAFLASH 1 #define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_OFFSET 0x4200
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
@ -148,7 +148,7 @@
#elif CFG_USE_DATAFLASH_CS1 #elif CFG_USE_DATAFLASH_CS1
/* bootstrap + u-boot + env + linux in dataflash on CS1 */ /* bootstrap + u-boot + env + linux in dataflash on CS1 */
#define CFG_ENV_IS_IN_DATAFLASH 1 #define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400) #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS1 + 0x8400)
#define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_OFFSET 0x4200
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET) #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS1 + CFG_ENV_OFFSET)

2
include/configs/at91sam9261ek.h
Unescape View File

@ -148,7 +148,7 @@
#ifdef CFG_USE_DATAFLASH_CS0 #ifdef CFG_USE_DATAFLASH_CS0
/* bootstrap + u-boot + env + linux in dataflash on CS0 */ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CFG_ENV_IS_IN_DATAFLASH 1 #define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_OFFSET 0x4200
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)

2
include/configs/at91sam9263ek.h
Unescape View File

@ -154,7 +154,7 @@
#ifdef CFG_USE_DATAFLASH #ifdef CFG_USE_DATAFLASH
/* bootstrap + u-boot + env + linux in dataflash on CS0 */ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CFG_ENV_IS_IN_DATAFLASH 1 #define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_OFFSET 0x4200
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)

2
include/configs/at91sam9rlek.h
Unescape View File

@ -123,7 +123,7 @@
#ifdef CFG_USE_DATAFLASH #ifdef CFG_USE_DATAFLASH
/* bootstrap + u-boot + env + linux in dataflash on CS0 */ /* bootstrap + u-boot + env + linux in dataflash on CS0 */
#define CFG_ENV_IS_IN_DATAFLASH 1 #define CONFIG_ENV_IS_IN_DATAFLASH 1
#define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400) #define CFG_MONITOR_BASE (CFG_DATAFLASH_LOGIC_ADDR_CS0 + 0x8400)
#define CFG_ENV_OFFSET 0x4200 #define CFG_ENV_OFFSET 0x4200
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)

6
include/configs/csb637.h
Unescape View File

@ -191,9 +191,9 @@
#define CFG_JFFS2_FIRST_SECTOR 3 #define CFG_JFFS2_FIRST_SECTOR 3
#define CFG_JFFS2_NUM_BANKS 1 #define CFG_JFFS2_NUM_BANKS 1
#undef CFG_ENV_IS_IN_DATAFLASH #undef CONFIG_ENV_IS_IN_DATAFLASH
#ifdef CFG_ENV_IS_IN_DATAFLASH #ifdef CONFIG_ENV_IS_IN_DATAFLASH
#define CFG_ENV_OFFSET 0x20000 #define CFG_ENV_OFFSET 0x20000
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
#define CFG_ENV_SIZE 0x2000 /* 0x8000 */ #define CFG_ENV_SIZE 0x2000 /* 0x8000 */
@ -201,7 +201,7 @@
#define CFG_ENV_IS_IN_FLASH 1 #define CFG_ENV_IS_IN_FLASH 1
#define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* after u-boot.bin */ #define CFG_ENV_ADDR (PHYS_FLASH_1 + 0x20000) /* after u-boot.bin */
#define CFG_ENV_SIZE 0x20000 /* sectors are 128K here */ #define CFG_ENV_SIZE 0x20000 /* sectors are 128K here */
#endif /* CFG_ENV_IS_IN_DATAFLASH */ #endif /* CONFIG_ENV_IS_IN_DATAFLASH */
#define CFG_LOAD_ADDR 0x21000000 /* default load address */ #define CFG_LOAD_ADDR 0x21000000 /* default load address */

2
include/configs/m501sk.h
Unescape View File

@ -154,7 +154,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 */
#ifdef CFG_ENV_IS_IN_DATAFLASH #ifdef CONFIG_ENV_IS_IN_DATAFLASH
#define CFG_ENV_OFFSET 0x20000 #define CFG_ENV_OFFSET 0x20000
#define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET) #define CFG_ENV_ADDR (CFG_DATAFLASH_LOGIC_ADDR_CS0 + CFG_ENV_OFFSET)
#define CFG_ENV_SIZE 0x2000 #define CFG_ENV_SIZE 0x2000

Write Preview
Loading…
Cancel
Save