diff options
| author | Konstantin Porotchkin <kostap@marvell.com> | 2018-07-25 11:00:34 +0300 |
|---|---|---|
| committer | Konstantin Porotchkin <kostap@marvell.com> | 2018-09-03 14:48:36 +0300 |
| commit | ef16369076d3bf0619f4a2bc90cf24949bb1d304 (patch) | |
| tree | 8bef4adb73ebc5a9eeda0bee3c8801452947d607 | |
| parent | 77d5a2b3e2635002bfc7042abb0388395648bf71 (diff) | |
fix: comphy: Exclude COMPHY support in PD builds
Remove COMPHY support from PD builds on A8K+ platforms
Change-Id: I27d4561b602ac4746330ea95d7f88dfeb04b2ae1
Signed-off-by: Konstantin Porotchkin <kostap@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/58378
Reviewed-by: Igal Liberman <igall@marvell.com>
Reviewed-by: Hanna Hawa <hannah@marvell.com>
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
| -rw-r--r-- | plat/marvell/a8k-p/common/a8kp_common.mk | 7 | ||||
| -rw-r--r-- | plat/marvell/common/mrvl_sip_svc.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/plat/marvell/a8k-p/common/a8kp_common.mk b/plat/marvell/a8k-p/common/a8kp_common.mk index d1175a3d..26841ba6 100644 --- a/plat/marvell/a8k-p/common/a8kp_common.mk +++ b/plat/marvell/a8k-p/common/a8kp_common.mk @@ -92,8 +92,11 @@ MARVELL_BL1_DRV := $(MARVELL_DRV_BASE)/ccu.c \ MARVELL_BL31_DRV := $(MARVELL_DRV_BASE)/amb_adec.c \ $(MARVELL_DRV_BASE)/cache_llc.c \ $(MARVELL_DRV_BASE)/icu.c \ - $(MARVELL_DRV_BASE)/iob.c \ - $(MARVELL_DRV_BASE)/comphy/phy-comphy-cp110.c + $(MARVELL_DRV_BASE)/iob.c + +ifeq (${PALLADIUM}, 0) +MARVELL_BL31_DRV += $(MARVELL_DRV_BASE)/comphy/phy-comphy-cp110.c +endif MARVELL_MOCHI_DRV := $(MARVELL_DRV_BASE)/mochi/ap810_setup.c \ $(MARVELL_DRV_BASE)/mochi/cp110_setup.c diff --git a/plat/marvell/common/mrvl_sip_svc.c b/plat/marvell/common/mrvl_sip_svc.c index ec293afa..499e096e 100644 --- a/plat/marvell/common/mrvl_sip_svc.c +++ b/plat/marvell/common/mrvl_sip_svc.c @@ -76,7 +76,7 @@ uintptr_t mrvl_sip_smc_handler(uint32_t smc_fid, } switch (smc_fid) { - +#if PALLADIUM == 0 /* Comphy related FID's */ case MV_SIP_COMPHY_POWER_ON: /* x1: comphy_base, x2: comphy_index, x3: comphy_mode */ @@ -98,7 +98,7 @@ uintptr_t mrvl_sip_smc_handler(uint32_t smc_fid, /* x1: comphy_base, x2: comphy_index, x3: mode, x4: command */ ret = mvebu_cp110_comphy_digital_reset(x1, x2, x3, x4); SMC_RET1(handle, ret); - +#endif /* Miscellaneous FID's' */ case MV_SIP_DRAM_SIZE: /* x1: ap_base_addr */ |