Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h
index ebfdafa..163f1a2 100644 (file)
--- a/include/configs/davinci_sonata.h
+++ b/include/configs/davinci_sonata.h
@@ -108,7 +108,6 @@
 #define CONFIG_BOOTP_DNS2
 #define CONFIG_BOOTP_SEND_HOSTNAME
 #define CONFIG_NET_RETRY_COUNT 10
-#define CONFIG_NET_MULTI
 /*=====================*/
 /* Flash & Environment */
 /*=====================*/
@@ -139,6 +138,7 @@
 #define CONFIG_SYS_MAX_FLASH_BANKS     1               /* max number of flash banks */
 #define CONFIG_SYS_FLASH_SECT_SZ       0x20000         /* 128KB sect size AMD Flash */
 #define CONFIG_ENV_OFFSET              (CONFIG_SYS_FLASH_SECT_SZ*2)
+#define CONFIG_ENV_SIZE                CONFIG_SYS_FLASH_SECT_SZ
 #define PHYS_FLASH_1           0x02000000      /* CS2 Base address      */
 #define CONFIG_SYS_FLASH_BASE          PHYS_FLASH_1    /* Flash Base for U-Boot */
 #define PHYS_FLASH_SIZE                0x2000000       /* Flash size 32MB       */