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

diff --git a/board/congatec/cgtqmx6eval/README b/board/congatec/cgtqmx6eval/README
index 1d736dc..f2c9599 100644 (file)
--- a/board/congatec/cgtqmx6eval/README
+++ b/board/congatec/cgtqmx6eval/README
@@ -25,11 +25,15 @@ host PC (/tftpboot , for example).
 
 => sf probe
 
+=> setenv serverip <server_ip_address>
+
+=> setenv ipaddr <board_ip_address>
+
 => tftp 0x12000000 SPL
 
 => sf erase 0x0 0x10000
 
-=> sf write 0x12000000 0x400 0x100
+=> sf write 0x12000000 0x400 0x10000
 
 => tftp 0x12000000 u-boot.img
 

diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c
index fc37f1e..823b70f 100644 (file)
--- a/board/solidrun/mx6cuboxi/mx6cuboxi.c
+++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c
@@ -143,8 +143,9 @@ static void setup_iomux_enet(void)
        SETUP_IOMUX_PADS(enet_pads);
 
        gpio_direction_output(ETH_PHY_RESET, 0);
-       mdelay(2);
+       mdelay(10);
        gpio_set_value(ETH_PHY_RESET, 1);
+       udelay(100);
 }
 
 int board_phy_config(struct phy_device *phydev)
@@ -594,10 +595,6 @@ static void gpr_init(void)
        writel(0x007F007F, &iomux->gpr[7]);
 }
 
-/*
- * This section requires the differentiation between Solidrun mx6 boards, but
- * for now, it will configure only for the mx6dual hummingboard version.
- */
 static void spl_dram_init(int width)
 {
        struct mx6_ddr_sysinfo sysinfo = {