Merge git://git.denx.de/u-boot into x1

[oweals/u-boot.git] / board / lpc2292sodimm / flash.c

diff --git a/board/lpc2292sodimm/flash.c b/board/lpc2292sodimm/flash.c
index 0fb08430c53edecfc43ad9742b4be1fbdb9eaa3f..a7e175d8edbcf3502322cf178bbb6eb98860cc02 100644 (file)
--- a/board/lpc2292sodimm/flash.c
+++ b/board/lpc2292sodimm/flash.c
@@ -28,7 +28,7 @@
 #define SST_ADDR2 ((volatile ushort*)(SST_BASEADDR + (0x2AAA << 1)))
 
 
-flash_info_t flash_info[CFG_MAX_FLASH_BANKS];
+flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];
 
 extern int lpc2292_copy_buffer_to_flash(flash_info_t *, ulong);
 extern int lpc2292_flash_erase(flash_info_t *, int, int);
@@ -97,8 +97,8 @@ ulong flash_init (void)
                 &flash_info[0]);
 
        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]);
 
        return size;