diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2011-05-19 16:15:11 -0500 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2011-07-11 13:24:19 -0500 |
| commit | 58b2f96e380f4e5a544dc49b7f33dc04b85eb1c5 (patch) | |
| tree | 8a665694b14402621ba81b8f068e5ab1c233c040 /arch/powerpc/cpu/mpc85xx/p5020_ids.c | |
| parent | eb51f63c0291704350ce39c4f9074097ffc91a5b (diff) | |
| download | talos-obmc-uboot-58b2f96e380f4e5a544dc49b7f33dc04b85eb1c5.tar.gz talos-obmc-uboot-58b2f96e380f4e5a544dc49b7f33dc04b85eb1c5.zip | |
powerpc/85xx: Fix compile errors if CONFIG_SYS_DPAA_QBMAN isn't set
Add ifdef protection for qp_info and liodn associated with Q/BMan. Also
rearrange setting of _tbl_sz variables to utilize existing ifdef
protection for things like FMAN.
Also add protection around setup_portals() call in corenet_ds board
code.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/cpu/mpc85xx/p5020_ids.c')
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/p5020_ids.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/powerpc/cpu/mpc85xx/p5020_ids.c b/arch/powerpc/cpu/mpc85xx/p5020_ids.c index 1255898483..98365888ae 100644 --- a/arch/powerpc/cpu/mpc85xx/p5020_ids.c +++ b/arch/powerpc/cpu/mpc85xx/p5020_ids.c @@ -24,6 +24,7 @@ #include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> +#ifdef CONFIG_SYS_DPAA_QBMAN struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = { /* dqrr liodn, frame data liodn, liodn off, sdest */ SET_QP_INFO( 1, 2, 1, 0), @@ -37,10 +38,13 @@ struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = { SET_QP_INFO( 0, 0, 0, 0), /* for now sdest to 0 */ SET_QP_INFO( 0, 0, 0, 0), /* for now sdest to 0 */ }; +#endif struct liodn_id_table liodn_tbl[] = { +#ifdef CONFIG_SYS_DPAA_QBMAN SET_QMAN_LIODN(31), SET_BMAN_LIODN(32), +#endif SET_SDHC_LIODN(1, 64), @@ -65,6 +69,7 @@ struct liodn_id_table liodn_tbl[] = { SET_GUTS_LIODN(NULL, 201, rio1maintliodnr, 0), SET_GUTS_LIODN(NULL, 202, rio2maintliodnr, 0), }; +int liodn_tbl_sz = ARRAY_SIZE(liodn_tbl); #ifdef CONFIG_SYS_DPAA_FMAN struct liodn_id_table fman1_liodn_tbl[] = { @@ -75,6 +80,7 @@ struct liodn_id_table fman1_liodn_tbl[] = { SET_FMAN_RX_1G_LIODN(1, 4, 14), SET_FMAN_RX_10G_LIODN(1, 0, 15), }; +int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl); #endif struct liodn_id_table sec_liodn_tbl[] = { @@ -89,6 +95,7 @@ struct liodn_id_table sec_liodn_tbl[] = { SET_SEC_DECO_LIODN_ENTRY(0, 97, 98), SET_SEC_DECO_LIODN_ENTRY(1, 99, 100), }; +int sec_liodn_tbl_sz = ARRAY_SIZE(sec_liodn_tbl); struct liodn_id_table liodn_bases[] = { [FSL_HW_PORTAL_SEC] = SET_LIODN_BASE_2(64, 100), @@ -99,7 +106,3 @@ struct liodn_id_table liodn_bases[] = { [FSL_HW_PORTAL_PME] = SET_LIODN_BASE_2(136, 172), #endif }; - -int liodn_tbl_sz = ARRAY_SIZE(liodn_tbl); -int fman1_liodn_tbl_sz = ARRAY_SIZE(fman1_liodn_tbl); -int sec_liodn_tbl_sz = ARRAY_SIZE(sec_liodn_tbl); |
