aboutsummaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorMarek BehĂșn <marek.behun@nic.cz>2021-10-09 19:33:41 +0200
committerStefan Roese <sr@denx.de>2021-10-21 07:39:05 +0200
commitf3c71e75b08b7cbe35acc29d89e90c05edd70d40 (patch)
tree3ef327cf2eb8e0d8c17cc8a21b2cfabb9be69102 /board
parentd3159c6b18115cb395ec3c8eb539d9471d2bf862 (diff)
downloadu-boot-f3c71e75b08b7cbe35acc29d89e90c05edd70d40.zip
u-boot-f3c71e75b08b7cbe35acc29d89e90c05edd70d40.tar.gz
u-boot-f3c71e75b08b7cbe35acc29d89e90c05edd70d40.tar.bz2
arm: mvebu: turris_mox: Always handle reset button
Handle reset button even if we can't configure modules. This happens if we fail retrieving reset GPIO with which we can reset the modules. (Note that this GPIO is different from reset button GPIO.) Signed-off-by: Marek BehĂșn <marek.behun@nic.cz> Reviewed-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board')
-rw-r--r--board/CZ.NIC/turris_mox/turris_mox.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index ff0ed28..7c5acfd 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -617,7 +617,7 @@ int last_stage_init(void)
/* configure modules */
if (get_reset_gpio(&reset_gpio) < 0)
- return 0;
+ goto handle_reset_btn;
if (peridot > 0) {
if (configure_peridots(&reset_gpio) < 0) {
@@ -654,6 +654,7 @@ int last_stage_init(void)
}
}
+handle_reset_btn:
handle_reset_button();
return 0;