Merge branch 'master' of /home/wd/git/u-boot/custodians

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

diff --git a/include/configs/sbc8240.h b/include/configs/sbc8240.h
index 0e878f0..10ff7ab 100644 (file)
--- a/include/configs/sbc8240.h
+++ b/include/configs/sbc8240.h
@@ -339,11 +339,11 @@ typedef unsigned int led_id_t;
        /* Warining: environment is not EMBEDDED in the U-Boot code.
         * It's stored in flash separately.
         */
-#define CFG_ENV_IS_IN_FLASH    1
-#define CFG_ENV_ADDR           0xFFF70000
-#define CFG_ENV_SIZE           0x4000  /* Size of the Environment              */
-#define CFG_ENV_OFFSET         0       /* starting right at the beginning      */
-#define CFG_ENV_SECT_SIZE      0x40000 /* Size of the Environment Sector       */
+#define CONFIG_ENV_IS_IN_FLASH 1
+#define CONFIG_ENV_ADDR                0xFFF70000
+#define CONFIG_ENV_SIZE                0x4000  /* Size of the Environment              */
+#define CONFIG_ENV_OFFSET              0       /* starting right at the beginning      */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* Size of the Environment Sector       */
 
 /*-----------------------------------------------------------------------
  * Cache Configuration