rename CFG_ENV_IS_IN_EEPROM in CONFIG_ENV_IS_IN_EEPROM

[karo-tx-uboot.git] / include / configs / kb9202.h

diff --git a/include/configs/kb9202.h b/include/configs/kb9202.h
index 75d9c3b3b46ef52a2c16084c195ead5909162361..8df222b88ef1fe08dd3c3d7a8771abad9537284f 100644 (file)
--- a/include/configs/kb9202.h
+++ b/include/configs/kb9202.h
@@ -54,10 +54,13 @@
 
 #define        CFG_LONGHELP
 
+#ifndef roundup
+#define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
+#endif
 /*
  * Size of malloc() pool
  */
-#define CFG_MALLOC_LEN (CFG_ENV_SIZE + 128*1024)
+#define CFG_MALLOC_LEN (roundup(CFG_ENV_SIZE,4096) + 128*1024)
 #define CFG_GBL_DATA_SIZE      128     /* size in bytes reserved for initial data */
 
 #define CONFIG_BAUDRATE 115200
@@ -125,7 +128,7 @@
 
 #define        CONFIG_HARD_I2C
 
-#define        CFG_ENV_IS_IN_EEPROM
+#define        CONFIG_ENV_IS_IN_EEPROM
 
 #ifdef CONFIG_KB9202
 #define CFG_ENV_OFFSET                 0x3E00
@@ -150,7 +153,7 @@
 #define CFG_MAXARGS            16              /* max number of command args */
 #define CFG_PBSIZE             (CFG_CBSIZE+sizeof(CFG_PROMPT)+16) /* Print Buffer Size */
 
-#define        CFG_FLASH_CFI_DRIVER
+#define        CONFIG_FLASH_CFI_DRIVER
 #define        CFG_FLASH_CFI
 
 #ifndef __ASSEMBLY__