Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

[platform/kernel/u-boot.git] / include / configs / GEN860T.h

diff --git a/include/configs/GEN860T.h b/include/configs/GEN860T.h
index 037b115..1627344 100644 (file)
--- a/include/configs/GEN860T.h
+++ b/include/configs/GEN860T.h
@@ -166,7 +166,7 @@
 #define CFG_EEPROM_PAGE_WRITE_BITS             6               /* 64 byte pages                */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 12              /* 10 mS w/ 20% margin  */
 #define        CFG_I2C_EEPROM_ADDR_LEN                 2               /* need 16 bit address  */
-#define CFG_ENV_EEPROM_SIZE                            (32 * 1024)
+#define CONFIG_ENV_EEPROM_SIZE                         (32 * 1024)
 
 /*
  * Enable I2C and select the hardware/software driver
@@ -280,7 +280,7 @@
 #define CFG_FPGA_PROG_FEEDBACK
 
 
-#define CFG_NAND_LEGACY
+#define CONFIG_NAND_LEGACY
 
 /*
  * Verbose help from command monitor.
@@ -434,21 +434,21 @@
  * Select environment placement.  NOTE that u-boot.lds must
  * be edited if this is changed!
  */
-#undef CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_IS_IN_EEPROM
+#undef CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_IS_IN_EEPROM
 
-#if defined(CFG_ENV_IS_IN_EEPROM)
-#define CFG_ENV_SIZE                   (2 * 1024)
-#define CFG_ENV_OFFSET                 (CFG_ENV_EEPROM_SIZE - (8 * 1024))
+#if defined(CONFIG_ENV_IS_IN_EEPROM)
+#define CONFIG_ENV_SIZE                        (2 * 1024)
+#define CONFIG_ENV_OFFSET                      (CONFIG_ENV_EEPROM_SIZE - (8 * 1024))
 #else
-#define CFG_ENV_SIZE                   0x1000
-#define CFG_ENV_SECT_SIZE              CFG_FLASH_SECT_SIZE
+#define CONFIG_ENV_SIZE                        0x1000
+#define CONFIG_ENV_SECT_SIZE           CFG_FLASH_SECT_SIZE
 
 /*
  * This ultimately gets passed right into the linker script, so we have to
  * use a number :(
  */
-#define CFG_ENV_OFFSET                 0x060000
+#define CONFIG_ENV_OFFSET                      0x060000
 #endif
 
 /*