diff options
| author | Igal Liberman <igall@marvell.com> | 2017-04-25 14:37:06 +0300 |
|---|---|---|
| committer | Kostya Porotchkin <kostap@marvell.com> | 2017-04-30 16:43:48 +0300 |
| commit | cfc7a27dcaf10ab1b805b256ae642693eb07078b (patch) | |
| tree | 52a51f0a7d947cb74910da38d61df3be47f60884 | |
| parent | 75b186aaba1af0e232ab4b243ae32ec10a00f955 (diff) | |
fix: pcac: a70x0: fix linkage issue in plat_get_pcie_hw_data
plat_get_pcie_hw_data() has weak implementation in pci_ep_setup.c
and another implementation for A70x0 PCAC in marvell_plat_config.c.
Currently, there's an issue with A70x0 PCAC linkage and the weak
implementation is chosen.
The issue is caused by the fact that the A70x0 PCAC implementation
is located under #ifndef BLE but the PCIe code is located in the BLE.
This patch fixes the linkage issue (by moving the
plat_get_pcie_hw_data() code out if the #ifndef).
Change-Id: I53cd32af6f858b0bfd63a0fffd562c34e17eb2e3
Signed-off-by: Igal Liberman <igall@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/39020
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Kostya Porotchkin <kostap@marvell.com>
| -rw-r--r-- | plat/marvell/a8k/a7040_pcac/board/marvell_plat_config.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/plat/marvell/a8k/a7040_pcac/board/marvell_plat_config.c b/plat/marvell/a8k/a7040_pcac/board/marvell_plat_config.c index a32dc398..beced658 100644 --- a/plat/marvell/a8k/a7040_pcac/board/marvell_plat_config.c +++ b/plat/marvell/a8k/a7040_pcac/board/marvell_plat_config.c @@ -37,8 +37,8 @@ * If bootrom is currently at BLE there's no need to include the memory * maps structure at this point */ -#ifndef IMAGE_BLE #include <plat_def.h> +#ifndef IMAGE_BLE /******************************************************************************* * AMB Configuration @@ -150,6 +150,8 @@ int marvell_get_ccu_memory_map(struct ccu_win **win, uint32_t *size) return 0; } +/* In reference to #ifndef IMAGE_BLE, this part is used for BLE only. */ +#else /******************************************************************************* * PCIe Configuration ******************************************************************************/ @@ -171,8 +173,7 @@ struct pci_hw_cfg *plat_get_pcie_hw_data(void) { return &a70x0_pci_hw_cfg; } -/* In reference to #ifndef IMAGE_BLE, this part is used for BLE only. */ -#else + /******************************************************************************* * SKIP IMAGE Configuration ******************************************************************************/ |