You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/12/17 06:33:03 UTC
[incubator-nuttx-apps] branch master updated: system: adb: Fix
compile issues in adb_main.c
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git
The following commit(s) were added to refs/heads/master by this push:
new 9f542c4 system: adb: Fix compile issues in adb_main.c
9f542c4 is described below
commit 9f542c42e576dc6d0eeb79942b992d13d6776753
Author: Masayuki Ishikawa <ma...@gmail.com>
AuthorDate: Thu Dec 17 11:23:26 2020 +0900
system: adb: Fix compile issues in adb_main.c
Summary:
- This commit fixes compile issues for the following condition
- CONFIG_ADBD_BOARD_INIT=n && CONFIG_BOARDCTL_RESET=y
Impact:
- adb only
Testing:
- Tested with stm32f4discovery:adb (not pushed yet)
Signed-off-by: Masayuki Ishikawa <Ma...@jp.sony.com>
---
system/adb/adb_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/system/adb/adb_main.c b/system/adb/adb_main.c
index e72d221..e5e7b12 100644
--- a/system/adb/adb_main.c
+++ b/system/adb/adb_main.c
@@ -24,8 +24,8 @@
#include "adb.h"
-#ifdef CONFIG_ADBD_BOARD_INIT
-#include <sys/boardctl.h>
+#if defined(CONFIG_ADBD_BOARD_INIT) || defined (CONFIG_BOARDCTL_RESET)
+# include <sys/boardctl.h>
#endif
#ifdef CONFIG_ADBD_NET_INIT