diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-01-26 22:29:51 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-01-26 22:29:51 +0100 |
| commit | 0a42c3a433e25dd30b5062aa251f5a240478cbbb (patch) | |
| tree | 558cc8b14b64c36db3cfd6b666e455ab67149e5d /include | |
| parent | 5912d3650740468329a0df014109132431d2140d (diff) | |
| parent | 66e821ebe96123b3a81ec9ca25cec9c0560fe232 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/MPC8569MDS.h | 5 | ||||
| -rw-r--r-- | include/configs/P1_P2_RDB.h | 1 | ||||
| -rw-r--r-- | include/fsl_esdhc.h | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index e16f0e147b..ae2fc19f4b 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -51,6 +51,11 @@ extern unsigned long get_clock_freq(void); #define CONFIG_SYS_CLK_FREQ 66666666 #define CONFIG_DDR_CLK_FREQ CONFIG_SYS_CLK_FREQ +#ifdef CONFIG_MK_ATM +#define CONFIG_PQ_MDS_PIB +#define CONFIG_PQ_MDS_PIB_ATM +#endif + /* * These can be toggled for performance analysis, otherwise use default. */ diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h index 15bfeefa46..405e6d5042 100644 --- a/include/configs/P1_P2_RDB.h +++ b/include/configs/P1_P2_RDB.h @@ -203,6 +203,7 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7 #define CONFIG_BOARD_EARLY_INIT_R /* call board_early_init_r function */ +#define CONFIG_HWCONFIG #define CONFIG_SYS_INIT_RAM_LOCK 1 #define CONFIG_SYS_INIT_RAM_ADDR 0xffd00000 /* stack in RAM */ diff --git a/include/fsl_esdhc.h b/include/fsl_esdhc.h index 89b8304d5f..eac6a2bd48 100644 --- a/include/fsl_esdhc.h +++ b/include/fsl_esdhc.h @@ -32,7 +32,7 @@ #define SYSCTL 0x0002e02c #define SYSCTL_INITA 0x08000000 #define SYSCTL_TIMEOUT_MASK 0x000f0000 -#define SYSCTL_CLOCK_MASK 0x00000fff +#define SYSCTL_CLOCK_MASK 0x0000fff0 #define SYSCTL_PEREN 0x00000004 #define SYSCTL_HCKEN 0x00000002 #define SYSCTL_IPGEN 0x00000001 |