diff options
author | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-10-18 21:59:44 +0200 |
commit | f82642e33899766892499b163e60560fbbf87773 (patch) | |
tree | ab90f076f18e56b2b3e8c9375b95917daa78c1d9 /include/configs/ADS860.h | |
parent | b59b16ca24bc7e77ec113021a6d77b9b32fcf192 (diff) | |
parent | 360fe71e82b83e264c964c9447c537e9a1f643c8 (diff) | |
download | u-boot-imx-f82642e33899766892499b163e60560fbbf87773.zip u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.gz u-boot-imx-f82642e33899766892499b163e60560fbbf87773.tar.bz2 |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'include/configs/ADS860.h')
-rw-r--r-- | include/configs/ADS860.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/ADS860.h b/include/configs/ADS860.h index f677b9c..688e77a 100644 --- a/include/configs/ADS860.h +++ b/include/configs/ADS860.h @@ -27,12 +27,12 @@ #define CONFIG_BAUDRATE 38400 /* Console baudrate */ #if 0 -#define CFG_8XX_FACT 1526 /* 32.768 kHz crystal on XTAL/EXTAL */ +#define CONFIG_SYS_8XX_FACT 1526 /* 32.768 kHz crystal on XTAL/EXTAL */ #else -#define CFG_8XX_FACT 12 /* 4 MHz oscillator on EXTCLK */ +#define CONFIG_SYS_8XX_FACT 12 /* 4 MHz oscillator on EXTCLK */ #endif -#define CFG_PLPRCR (((CFG_8XX_FACT-1) << PLPRCR_MF_SHIFT) | \ +#define CONFIG_SYS_PLPRCR (((CONFIG_SYS_8XX_FACT-1) << PLPRCR_MF_SHIFT) | \ PLPRCR_SPLSS | PLPRCR_TEXPS | PLPRCR_TMIST) #define CONFIG_DRAM_50MHZ 1 @@ -53,6 +53,6 @@ #include "../../board/fads/fads.h" -#define CFG_PC_IDE_RESET ((ushort)0x0008) /* PC 12 */ +#define CONFIG_SYS_PC_IDE_RESET ((ushort)0x0008) /* PC 12 */ #endif /* __CONFIG_H */ |