diff options
| author | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
|---|---|---|
| committer | Markus Klotzbuecher <mk@denx.de> | 2008-10-21 09:18:01 +0200 |
| commit | 50bd0057ba8fceeb48533f8b1a652ccd0e170838 (patch) | |
| tree | ea1a183343573c2a48248923b96d316c0956727c /board/davinci/common/misc.c | |
| parent | 9dbc366744960013965fce8851035b6141f3b3ae (diff) | |
| parent | f82642e33899766892499b163e60560fbbf87773 (diff) | |
| download | u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.zip u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.gz u-boot-imx-50bd0057ba8fceeb48533f8b1a652ccd0e170838.tar.bz2 | |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
Diffstat (limited to 'board/davinci/common/misc.c')
| -rw-r--r-- | board/davinci/common/misc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/board/davinci/common/misc.c b/board/davinci/common/misc.c index 71a3b87..be709bf 100644 --- a/board/davinci/common/misc.c +++ b/board/davinci/common/misc.c @@ -39,7 +39,7 @@ int dram_init(void) static int dv_get_pllm_output(uint32_t pllm) { - return (pllm + 1) * (CFG_HZ_CLOCK / 1000000); + return (pllm + 1) * (CONFIG_SYS_HZ_CLOCK / 1000000); } void dv_display_clk_infos(void) @@ -54,9 +54,9 @@ void dv_display_clk_infos(void) */ int dvevm_read_mac_address(uint8_t *buf) { -#ifdef CFG_I2C_EEPROM_ADDR +#ifdef CONFIG_SYS_I2C_EEPROM_ADDR /* Read MAC address. */ - if (i2c_read(CFG_I2C_EEPROM_ADDR, 0x7F00, CFG_I2C_EEPROM_ADDR_LEN, + if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0x7F00, CONFIG_SYS_I2C_EEPROM_ADDR_LEN, (uint8_t *) &buf[0], 6)) goto i2cerr; @@ -67,9 +67,9 @@ int dvevm_read_mac_address(uint8_t *buf) return 1; /* Found */ i2cerr: - printf("Read from EEPROM @ 0x%02x failed\n", CFG_I2C_EEPROM_ADDR); + printf("Read from EEPROM @ 0x%02x failed\n", CONFIG_SYS_I2C_EEPROM_ADDR); err: -#endif /* CFG_I2C_EEPROM_ADDR */ +#endif /* CONFIG_SYS_I2C_EEPROM_ADDR */ return 0; } |