Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

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

diff --git a/include/configs/sh7763rdp.h b/include/configs/sh7763rdp.h
index d537071..1306702 100644 (file)
--- a/include/configs/sh7763rdp.h
+++ b/include/configs/sh7763rdp.h
@@ -52,7 +52,7 @@
 #undef  CONFIG_SHOW_BOOT_PROGRESS
 
 /* SCIF */
-#define CFG_SCIF_CONSOLE        1
+#define CONFIG_SCIF_CONSOLE        1
 #define CONFIG_BAUDRATE         115200
 #define CONFIG_CONS_SCIF2              1
 
@@ -66,12 +66,6 @@
 #define CFG_BAUDRATE_TABLE     { 115200 }      /* List of legal baudrate
                                                                                                settings for this board */
 
-/* Ethernet */
-#define CONFIG_SH_ETHER 1
-#define CONFIG_SH_ETHER_USE_PORT (1)
-#define CONFIG_SH_ETHER_PHY_ADDR (0x01)
-#define CFG_RX_ETH_BUFFER      (8)
-
 /* SDRAM */
 #define CFG_SDRAM_BASE         (0x8C000000)
 #define CFG_SDRAM_SIZE         (64 * 1024 * 1024)
@@ -95,7 +89,7 @@
 #define CFG_BOOTMAPSZ          (8 * 1024 * 1024)
 
 #define CFG_FLASH_CFI
-#define CFG_FLASH_CFI_DRIVER
+#define CONFIG_FLASH_CFI_DRIVER
 #undef  CFG_FLASH_QUIET_TEST
 #define CFG_FLASH_EMPTY_INFO   /* print 'E' for empty sector on flinfo */
 /* Timeout for Flash erase operations (in ms) */
@@ -123,4 +117,9 @@
 #define TMU_CLK_DIVIDER                (4)     /* 4 (default), 16, 64, 256 or 1024 */
 #define CFG_HZ                         (CONFIG_SYS_CLK_FREQ / TMU_CLK_DIVIDER)
 
+/* Ether */
+#define CONFIG_SH_ETHER 1
+#define CONFIG_SH_ETHER_USE_PORT (1)
+#define CONFIG_SH_ETHER_PHY_ADDR (0x01)
+
 #endif /* __SH7763RDP_H */