diff options
author | Tom Rini <trini@konsulko.com> | 2016-01-10 09:17:52 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-01-10 09:17:52 -0500 |
commit | e6c516a973dff2718488d065d859bcfe64fb05aa (patch) | |
tree | 49f13c443e16d02307851127c7643aef8a70d754 | |
parent | d77a092dd3619ca747fb8290ae8f255e9799aaa6 (diff) | |
parent | b5e7c1e754b174e7ea9bf9d5de57d451a7acdf78 (diff) |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
-rw-r--r-- | board/congatec/cgtqmx6eval/README | 6 | ||||
-rw-r--r-- | board/solidrun/mx6cuboxi/mx6cuboxi.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/board/congatec/cgtqmx6eval/README b/board/congatec/cgtqmx6eval/README index 1d736dc351..f2c959949c 100644 --- 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 fc37f1eef0..823b70f7ed 100644 --- 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 = { |