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

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

diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h
index 9cb9838b5ad0bb1cdd17155b60304a61fc8c48a8..875dda4442c6c6c8bb6c6e7bf78f512d4fe7a406 100644 (file)
--- a/include/configs/davinci_schmoogie.h
+++ b/include/configs/davinci_schmoogie.h
@@ -19,7 +19,6 @@
 
 #ifndef __CONFIG_H
 #define __CONFIG_H
-#include <asm/sizes.h>
 
 /*=======*/
 /* Board */
@@ -70,6 +69,7 @@
 /* Network & Ethernet Configuration */
 /*==================================*/
 #define CONFIG_DRIVER_TI_EMAC
+#define CONFIG_EMAC_MDIO_PHY_NUM       1
 #define CONFIG_MII
 #define CONFIG_BOOTP_DEFAULT
 #define CONFIG_BOOTP_DNS
@@ -84,9 +84,10 @@
 #undef CONFIG_ENV_IS_IN_FLASH
 #define CONFIG_SYS_NO_FLASH
 #define CONFIG_NAND_DAVINCI
+#define CONFIG_SYS_NAND_CS             2
 #define CONFIG_ENV_IS_IN_NAND          /* U-Boot env in NAND Flash  */
 #define CONFIG_ENV_SECT_SIZE   2048    /* Env sector Size */
-#define CONFIG_ENV_SIZE                SZ_128K
+#define CONFIG_ENV_SIZE                (128 << 10)     /* 128 KiB */
 #define CONFIG_SKIP_LOWLEVEL_INIT      /* U-Boot is loaded by a bootloader */
 #define CONFIG_SKIP_RELOCATE_UBOOT     /* to a proper address, init done */
 #define CONFIG_SYS_NAND_BASE           0x02000000