projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of /home/wd/git/u-boot/custodians
[platform/kernel/u-boot.git]
/
include
/
configs
/
hcu5.h
diff --git
a/include/configs/hcu5.h
b/include/configs/hcu5.h
index
2080868
..
1874ff2
100644
(file)
--- a/
include/configs/hcu5.h
+++ b/
include/configs/hcu5.h
@@
-106,28
+106,28
@@
* Environment
*----------------------------------------------------------------------*/
* Environment
*----------------------------------------------------------------------*/
-#undef C
F
G_ENV_IS_IN_NVRAM
-#define C
F
G_ENV_IS_IN_FLASH
-#undef C
F
G_ENV_IS_IN_EEPROM
-#undef C
F
G_ENV_IS_NOWHERE
+#undef C
ONFI
G_ENV_IS_IN_NVRAM
+#define C
ONFI
G_ENV_IS_IN_FLASH
+#undef C
ONFI
G_ENV_IS_IN_EEPROM
+#undef C
ONFI
G_ENV_IS_NOWHERE
-#ifdef C
F
G_ENV_IS_IN_EEPROM
+#ifdef C
ONFI
G_ENV_IS_IN_EEPROM
/* Put the environment after the SDRAM and bootstrap configuration */
#define PROM_SIZE 2048
#define CFG_BOOSTRAP_OPTION_OFFSET 512
/* Put the environment after the SDRAM and bootstrap configuration */
#define PROM_SIZE 2048
#define CFG_BOOSTRAP_OPTION_OFFSET 512
-#define C
FG_ENV_OFFSET
(CFG_BOOSTRAP_OPTION_OFFSET + 0x10)
-#define C
FG_ENV_SIZE (PROM_SIZE-CF
G_ENV_OFFSET)
+#define C
ONFIG_ENV_OFFSET
(CFG_BOOSTRAP_OPTION_OFFSET + 0x10)
+#define C
ONFIG_ENV_SIZE (PROM_SIZE-CONFI
G_ENV_OFFSET)
#endif
#endif
-#ifdef C
F
G_ENV_IS_IN_FLASH
+#ifdef C
ONFI
G_ENV_IS_IN_FLASH
/* Put the environment in Flash */
/* Put the environment in Flash */
-#define C
FG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
-#define C
FG_ENV_ADDR ((-CFG_MONITOR_LEN)-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE
8*1024 /* 8 KB Environment Sector */
+#define C
ONFIG_ENV_SECT_SIZE
0x10000 /* size of one complete sector */
+#define C
ONFIG_ENV_ADDR ((-CFG_MONITOR_LEN)-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE
8*1024 /* 8 KB Environment Sector */
/* Address and size of Redundant Environment Sector */
/* Address and size of Redundant Environment Sector */
-#define C
FG_ENV_ADDR_REDUND (CFG_ENV_ADDR-CF
G_ENV_SECT_SIZE)
-#define C
FG_ENV_SIZE_REDUND (CF
G_ENV_SIZE)
+#define C
ONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFI
G_ENV_SECT_SIZE)
+#define C
ONFIG_ENV_SIZE_REDUND (CONFI
G_ENV_SIZE)
#endif
#endif
@@
-351,7
+351,7
@@
/* Use common CFI driver */
#define CFG_FLASH_CFI
/* Use common CFI driver */
#define CFG_FLASH_CFI
-#define C
F
G_FLASH_CFI_DRIVER
+#define C
ONFI
G_FLASH_CFI_DRIVER
/* board provides its own flash_init code */
#define CONFIG_FLASH_CFI_LEGACY 1
#define CFG_FLASH_CFI_WIDTH FLASH_CFI_8BIT
/* board provides its own flash_init code */
#define CONFIG_FLASH_CFI_LEGACY 1
#define CFG_FLASH_CFI_WIDTH FLASH_CFI_8BIT