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 /include/tsec.h | |
| 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 'include/tsec.h')
| -rw-r--r-- | include/tsec.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/tsec.h b/include/tsec.h index f7e5857..d2951f6 100644 --- a/include/tsec.h +++ b/include/tsec.h @@ -20,8 +20,8 @@ #include <net.h> #include <config.h> -#ifndef CFG_TSEC1_OFFSET - #define CFG_TSEC1_OFFSET (0x24000) +#ifndef CONFIG_SYS_TSEC1_OFFSET + #define CONFIG_SYS_TSEC1_OFFSET (0x24000) #endif #define TSEC_SIZE 0x01000 @@ -29,7 +29,7 @@ /* FIXME: Should these be pushed back to 83xx and 85xx config files? */ #if defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx) \ || defined(CONFIG_MPC83XX) - #define TSEC_BASE_ADDR (CFG_IMMR + CFG_TSEC1_OFFSET) + #define TSEC_BASE_ADDR (CONFIG_SYS_IMMR + CONFIG_SYS_TSEC1_OFFSET) #endif #define STD_TSEC_INFO(num) \ @@ -107,8 +107,8 @@ #define miim_end -2 #define miim_read -1 -#ifndef CFG_TBIPA_VALUE - #define CFG_TBIPA_VALUE 0x1f +#ifndef CONFIG_SYS_TBIPA_VALUE + #define CONFIG_SYS_TBIPA_VALUE 0x1f #endif #define MIIMCFG_INIT_VALUE 0x00000003 #define MIIMCFG_RESET 0x80000000 |