mgsuvd: update size of environment

[u-boot] / include / configs / mgsuvd.h

diff --git a/include/configs/mgsuvd.h b/include/configs/mgsuvd.h
index 7a80dad0eb269c1873f4da62a4d0229a1de4b960..ff52f8449f08ef16ba27cde783ac62de92c65d61 100644 (file)
--- a/include/configs/mgsuvd.h
+++ b/include/configs/mgsuvd.h
@@ -205,14 +205,12 @@
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OFFSET              0x40000 /*   Offset   of Environment Sector     */
 #define CONFIG_ENV_SIZE                0x08000 /* Total Size of Environment Sector     */
-#define CONFIG_ENV_SECT_SIZE   0x40000 /* Total Size of Environment Sector     */
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* Total Size of Environment Sector     */
 
 /* Address and size of Redundant Environment Sector    */
 #define CONFIG_ENV_OFFSET_REDUND       (CONFIG_ENV_OFFSET+CONFIG_ENV_SECT_SIZE)
 #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 
-#define        CONFIG_SYS_USE_PPCENV                   /* Environment embedded in sect .ppcenv */
-
 /*-----------------------------------------------------------------------
  * Cache Configuration
  */
@@ -346,8 +344,8 @@
 /*
  * Software (bit-bang) I2C driver configuration
  */
-#define I2C_BASE_DIR   (CONFIG_SYS_PIGGY_BASE + 0x04)
-#define I2C_BASE_PORT  (CONFIG_SYS_PIGGY_BASE + 0x09)
+#define I2C_BASE_DIR   ((u16 *)(CONFIG_SYS_PIGGY_BASE + 0x04))
+#define I2C_BASE_PORT  ((u8 *)(CONFIG_SYS_PIGGY_BASE + 0x09))
 
 #define SDA_BIT                0x40
 #define SCL_BIT                0x80
@@ -356,21 +354,19 @@
 
 #define I2C_ACTIVE     do {} while (0)
 #define I2C_TRISTATE   do {} while (0)
-#define I2C_READ       i2c_soft_read_pin ()
+#define I2C_READ       ((in_8(I2C_BASE_PORT) & SDA_BIT) == SDA_BIT)
 #define I2C_SDA(bit)   if(bit) { \
-                               *(unsigned short *)(I2C_BASE_DIR) &=  ~SDA_CONF; \
-                               } \
-                       else    { \
-                               *(unsigned char *)(I2C_BASE_PORT) &= ~SDA_BIT; \
-                               *(unsigned short *)(I2C_BASE_DIR) |= SDA_CONF; \
-                               }
+                               clrbits(be16, I2C_BASE_DIR, SDA_CONF); \
+                       } else { \
+                               clrbits(8, I2C_BASE_PORT, SDA_BIT); \
+                               setbits(be16, I2C_BASE_DIR, SDA_CONF); \
+                       }
 #define I2C_SCL(bit)   if(bit) { \
-                               *(unsigned short *)(I2C_BASE_DIR) &=  ~SCL_CONF; \
-                               } \
-                       else    { \
-                               *(unsigned char *)(I2C_BASE_PORT) &= ~SCL_BIT; \
-                               *(unsigned short *)(I2C_BASE_DIR) |= SCL_CONF; \
-                               }
+                               clrbits(be16, I2C_BASE_DIR, SCL_CONF); \
+                       } else { \
+                               clrbits(8, I2C_BASE_PORT, SCL_BIT); \
+                               setbits(be16, I2C_BASE_DIR, SCL_CONF); \
+                       }
 #define I2C_DELAY      udelay(50)      /* 1/4 I2C clock duration */
 
 #define CONFIG_I2C_MULTI_BUS   1