On Nov 6, 2009, at 2:27 AM, Liu Yu wrote:
Signed-off-by: Liu Yu yu.liu@freescale.com
board/freescale/common/pq-mds-pib.c | 2 +- board/freescale/mpc8569mds/mpc8569mds.c | 7 +++++++ include/configs/MPC8569MDS.h | 3 +++ 3 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/board/freescale/common/pq-mds-pib.c b/board/freescale/ common/pq-mds-pib.c index 6c72aa1..5f7a67d 100644 --- a/board/freescale/common/pq-mds-pib.c +++ b/board/freescale/common/pq-mds-pib.c @@ -63,7 +63,7 @@ int pib_init(void) #endif
#if defined(CONFIG_PQ_MDS_PIB_ATM) -#if defined(CONFIG_MPC8360EMDS) +#if defined(CONFIG_MPC8360EMDS) || defined(CONFIG_MPC8569MDS) val8 = 0; i2c_write(0x20, 0x6, 1, &val8, 1); i2c_write(0x20, 0x7, 1, &val8, 1); diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/ freescale/mpc8569mds/mpc8569mds.c index cdd7813..02e6920 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -39,6 +39,9 @@ #include <fsl_esdhc.h>
#include "bcsr.h" +#if defined(CONFIG_PQ_MDS_PIB) +#include "../common/pq-mds-pib.h" +#endif
phys_size_t fixed_sdram(void);
@@ -542,6 +545,10 @@ pci_init_board(void) r = hose->regions; pcie_configured = is_fsl_pci_cfg(LAW_TRGT_IF_PCIE_1, io_sel);
+#if defined(CONFIG_PQ_MDS_PIB)
- pib_init();
+#endif
- if (pcie_configured && !(gur->devdisr & MPC85xx_DEVDISR_PCIE)){ printf ("\n PCIE connected to slot as %s (base address %x)", pcie_ep ? "End Point" : "Root Complex",
diff --git a/include/configs/MPC8569MDS.h b/include/configs/ MPC8569MDS.h index 17ea3bb..7462abb 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -44,6 +44,9 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_FSL_LAW 1 /* Use common FSL init code */
+#define CONFIG_PQ_MDS_PIB +#define CONFIG_PQ_MDS_PIB_ATM
Shouldn't we set these based on the make target?
So something like MPC8569MDS_PIB and MPC8569MDS_PIB_ATM in top-level makefile?
- k