summaryrefslogtreecommitdiff
path: root/plat
diff options
context:
space:
mode:
authorChristine Gharzuzi <chrisg@marvell.com>2017-08-14 18:49:59 +0300
committerKostya Porotchkin <kostap@marvell.com>2017-08-14 18:33:30 +0300
commitbbf823bef57c939f08aa22ba1914b4c2a49cadbf (patch)
tree7eb1dbe60db3cfef7350ce166d1ab499ff3d75c8 /plat
parenta6fe1c9e38b7d9d1ee3103ff2174571bb1555fcf (diff)
fix: a80x0_mcbin: disable unsupported u-boot recovery button
A80x0-MCBIN board doesn't support U-Boot recovery button. this button is triggering GPIO-in signal, and used to instruct ATF to boot secondery U-Boot image from flash, for recovery in case first U-Boot isn't functional. Change-Id: Ieae328d1284f3586cec84cc0126ca18cca3c63c9 Signed-off-by: Christine Gharzuzi <chrisg@marvell.com> Reviewed-on: http://vgitil04.il.marvell.com:8080/42993 Tested-by: iSoC Platform CI <ykjenk@marvell.com> Reviewed-by: Kostya Porotchkin <kostap@marvell.com>
Diffstat (limited to 'plat')
-rw-r--r--plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c b/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c
index a0244cd1..7a3e9840 100644
--- a/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c
+++ b/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c
@@ -39,8 +39,9 @@
* 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
+
/*******************************************************************************
* GPIO Configuration
@@ -218,17 +219,9 @@ int marvell_get_ccu_memory_map(struct ccu_win **win, uint32_t *size)
* SKIP IMAGE Configuration
******************************************************************************/
-struct skip_image skip_im = {
- .detection_method = GPIO,
- .info.gpio.num = 33,
- .info.gpio.button_state = HIGH,
- .info.test.cp_ap = CP,
- .info.test.cp_index = 0,
-};
-
void *plat_get_skip_image_data(void)
{
- /* Return the skip_image configurations */
- return &skip_im;
+ /* No recovery button on A8k-MCBIN board */
+ return NULL;
}
#endif