summaryrefslogtreecommitdiff
path: root/board/bmw
diff options
context:
space:
mode:
Diffstat (limited to 'board/bmw')
-rw-r--r--board/bmw/bmw.c2
-rw-r--r--board/bmw/flash.c18
2 files changed, 10 insertions, 10 deletions
diff --git a/board/bmw/bmw.c b/board/bmw/bmw.c
index 0431431..b629c38 100644
--- a/board/bmw/bmw.c
+++ b/board/bmw/bmw.c
@@ -125,7 +125,7 @@ void doc_init (void)
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 */
void*
diff --git a/board/bmw/flash.c b/board/bmw/flash.c
index 4c7971a..0d0bc2f 100644
--- a/board/bmw/flash.c
+++ b/board/bmw/flash.c
@@ -32,14 +32,14 @@
flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
#if defined(CONFIG_ENV_IS_IN_FLASH)
-# ifndef CFG_ENV_ADDR
-# define CFG_ENV_ADDR (CFG_FLASH_BASE + CFG_ENV_OFFSET)
+# ifndef CONFIG_ENV_ADDR
+# define CONFIG_ENV_ADDR (CFG_FLASH_BASE + CONFIG_ENV_OFFSET)
# endif
-# ifndef CFG_ENV_SIZE
-# define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
+# ifndef CONFIG_ENV_SIZE
+# define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE
# endif
-# ifndef CFG_ENV_SECT_SIZE
-# define CFG_ENV_SECT_SIZE CFG_ENV_SIZE
+# ifndef CONFIG_ENV_SECT_SIZE
+# define CONFIG_ENV_SECT_SIZE CONFIG_ENV_SIZE
# endif
#endif
@@ -224,10 +224,10 @@ unsigned long flash_init (void)
&flash_info[0]);
#endif
-#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CFG_ENV_ADDR)
+#if defined(CONFIG_ENV_IS_IN_FLASH) && defined(CONFIG_ENV_ADDR)
flash_protect (FLAG_PROTECT_SET,
- CFG_ENV_ADDR,
- CFG_ENV_ADDR + CFG_ENV_SIZE - 1,
+ CONFIG_ENV_ADDR,
+ CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1,
&flash_info[0]);
#endif