Skip to content

Commit 69e9348

Browse files
JianyuWang0623xiaoxiang781216
authored andcommitted
system/fastboot: Add prefix "SYSTEM" for USB boardctl configuration
- FASTBOOTD_USB_BOARDCTL + SYSTEM_FASTBOOTD_USB_BOARDCTL Signed-off-by: wangjianyu3 <[email protected]>
1 parent c9158a8 commit 69e9348

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

system/fastboot/Kconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,9 @@ config SYSTEM_FASTBOOTD_DOWNLOAD_MAX
2424
int "USB-fastboot download buffer size"
2525
default 40960
2626

27-
config FASTBOOTD_USB_BOARDCTL
27+
config SYSTEM_FASTBOOTD_USB_BOARDCTL
2828
bool "USB Board Control"
29+
default n
2930
depends on BOARDCTL
3031
depends on BOARDCTL_USBDEVCTRL
3132
---help---

system/fastboot/fastboot.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,7 +1001,7 @@ int main(int argc, FAR char **argv)
10011001
FAR void *buffer = NULL;
10021002
int ret = OK;
10031003

1004-
#ifdef CONFIG_FASTBOOTD_USB_BOARDCTL
1004+
#ifdef CONFIG_SYSTEM_FASTBOOTD_USB_BOARDCTL
10051005
struct boardioc_usbdev_ctrl_s ctrl;
10061006
# ifdef CONFIG_USBDEV_COMPOSITE
10071007
uint8_t dev = BOARDIOC_USBDEV_COMPOSITE;
@@ -1035,7 +1035,7 @@ int main(int argc, FAR char **argv)
10351035
fb_err("boardctl(BOARDIOC_USBDEV_CONTROL) failed: %d\n", ret);
10361036
return ret;
10371037
}
1038-
#endif /* FASTBOOTD_USB_BOARDCTL */
1038+
#endif /* SYSTEM_FASTBOOTD_USB_BOARDCTL */
10391039

10401040
if (argc > 1)
10411041
{

0 commit comments

Comments
 (0)