diff options
| author | Tom Rini <trini@ti.com> | 2013-01-08 08:28:27 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-01-08 14:26:42 -0700 |
| commit | 91c038f087d7f643c85609897af3710d5f8b42a9 (patch) | |
| tree | e96b3c73031aafdd000a253e6dcf5ae6966e8c65 /board/teejet/mt_ventoux/mt_ventoux.c | |
| parent | e56cdd778ca08fc8c32ffc3ddebbb6102519f344 (diff) | |
| parent | 7528cf5f016b5b8b8b12b373f6f31a10bf89233d (diff) | |
| download | u-boot-imx-91c038f087d7f643c85609897af3710d5f8b42a9.zip u-boot-imx-91c038f087d7f643c85609897af3710d5f8b42a9.tar.gz u-boot-imx-91c038f087d7f643c85609897af3710d5f8b42a9.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'board/teejet/mt_ventoux/mt_ventoux.c')
| -rw-r--r-- | board/teejet/mt_ventoux/mt_ventoux.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/board/teejet/mt_ventoux/mt_ventoux.c b/board/teejet/mt_ventoux/mt_ventoux.c index 9622a81..c516c75 100644 --- a/board/teejet/mt_ventoux/mt_ventoux.c +++ b/board/teejet/mt_ventoux/mt_ventoux.c @@ -73,10 +73,10 @@ static struct { static struct panel_config lcd_cfg[] = { { - .timing_h = PANEL_TIMING_H(4, 8, 41), - .timing_v = PANEL_TIMING_V(2, 4, 10), - .pol_freq = 0x00000000, /* Pol Freq */ - .divisor = 0x0001000d, /* 33Mhz Pixel Clock */ + .timing_h = PANEL_TIMING_H(40, 5, 2), + .timing_v = PANEL_TIMING_V(8, 8, 2), + .pol_freq = 0x00003000, /* Pol Freq */ + .divisor = 0x00010033, /* 9 Mhz Pixel Clock */ .panel_type = 0x01, /* TFT */ .data_lines = 0x03, /* 24 Bit RGB */ .load_mode = 0x02, /* Frame Mode */ @@ -258,21 +258,26 @@ int board_init(void) return 0; } +#ifndef CONFIG_SPL_BUILD int misc_init_r(void) { char *eth_addr; + struct tam3517_module_info info; + int ret; + TAM3517_READ_EEPROM(&info, ret); dieid_num_r(); - eth_addr = getenv("ethaddr"); - if (eth_addr) + if (ret) return 0; + eth_addr = getenv("ethaddr"); + if (!eth_addr) + TAM3517_READ_MAC_FROM_EEPROM(&info); -#ifndef CONFIG_SPL_BUILD - TAM3517_READ_MAC_FROM_EEPROM; -#endif + TAM3517_PRINT_SOM_INFO(&info); return 0; } +#endif /* * Routine: set_muxconf_regs |