diff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig index 0dbf306d53..a8e9763467 100644 --- a/cmd/fastboot/Kconfig +++ b/cmd/fastboot/Kconfig @@ -1,5 +1,12 @@ comment "FASTBOOT" +config NOT_UUU_BUILD + bool "Disable features used by uuu" + help + This disables the features used by uuu, so that users can't + execute u-boot command other than fastboot throuth the fastboot + function provided by uuu. + menuconfig FASTBOOT bool "Fastboot support" depends on USB_GADGET diff --git a/configs/imx6dlsabreautoandroid_defconfig b/configs/imx6dlsabreautoandroid_defconfig index 0f314b28df..0cf7b95f35 100644 --- a/configs/imx6dlsabreautoandroid_defconfig +++ b/configs/imx6dlsabreautoandroid_defconfig @@ -49,3 +49,5 @@ CONFIG_DM_ETH=y CONFIG_DM_USB=y CONFIG_ENV_IS_IN_MMC=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx6dlsabresdandroid_defconfig b/configs/imx6dlsabresdandroid_defconfig index dfe864b3a3..a7427da2d4 100644 --- a/configs/imx6dlsabresdandroid_defconfig +++ b/configs/imx6dlsabresdandroid_defconfig @@ -49,3 +49,5 @@ CONFIG_DM_ETH=y CONFIG_DM_USB=y CONFIG_ENV_IS_IN_MMC=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx6qpsabreautoandroid_defconfig b/configs/imx6qpsabreautoandroid_defconfig index ec61501ba7..a9c74e5f07 100644 --- a/configs/imx6qpsabreautoandroid_defconfig +++ b/configs/imx6qpsabreautoandroid_defconfig @@ -49,3 +49,5 @@ CONFIG_DM_ETH=y CONFIG_DM_USB=y CONFIG_ENV_IS_IN_MMC=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx6qpsabresdandroid_defconfig b/configs/imx6qpsabresdandroid_defconfig index 698be71226..e8d1e70f92 100644 --- a/configs/imx6qpsabresdandroid_defconfig +++ b/configs/imx6qpsabresdandroid_defconfig @@ -49,3 +49,5 @@ CONFIG_DM_ETH=y CONFIG_DM_USB=y CONFIG_ENV_IS_IN_MMC=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx6qsabreautoandroid_defconfig b/configs/imx6qsabreautoandroid_defconfig index 3553a10f6a..99b61fcca7 100644 --- a/configs/imx6qsabreautoandroid_defconfig +++ b/configs/imx6qsabreautoandroid_defconfig @@ -49,3 +49,5 @@ CONFIG_DM_ETH=y CONFIG_DM_USB=y CONFIG_ENV_IS_IN_MMC=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx6qsabresdandroid_defconfig b/configs/imx6qsabresdandroid_defconfig index ec5cd414a2..9b41245237 100644 --- a/configs/imx6qsabresdandroid_defconfig +++ b/configs/imx6qsabresdandroid_defconfig @@ -49,3 +49,5 @@ CONFIG_DM_ETH=y CONFIG_DM_USB=y CONFIG_ENV_IS_IN_MMC=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx6sxsabresdandroid_defconfig b/configs/imx6sxsabresdandroid_defconfig index ebf6af609c..7b06bfefba 100644 --- a/configs/imx6sxsabresdandroid_defconfig +++ b/configs/imx6sxsabresdandroid_defconfig @@ -63,3 +63,5 @@ CONFIG_VIDEO=y CONFIG_DM_ETH=y CONFIG_FSL_QSPI=y CONFIG_IMX_BOOTAUX=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx7dsabresdandroid_defconfig b/configs/imx7dsabresdandroid_defconfig index e09ec4523e..3087751112 100644 --- a/configs/imx7dsabresdandroid_defconfig +++ b/configs/imx7dsabresdandroid_defconfig @@ -65,3 +65,5 @@ CONFIG_USB_ETHER_ASIX=y CONFIG_VIDEO=y CONFIG_ERRNO_STR=y CONFIG_DM_ETH=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx7ulp_evk_android_defconfig b/configs/imx7ulp_evk_android_defconfig index aab5bf9e86..4e43ebcaad 100644 --- a/configs/imx7ulp_evk_android_defconfig +++ b/configs/imx7ulp_evk_android_defconfig @@ -49,3 +49,5 @@ CONFIG_USB_ETHER_RTL8152=y CONFIG_VIDEO=y CONFIG_FLASH_MCUFIRMWARE_SUPPORT=y CONFIG_IMX_NORTHWEST_MIPI_DSI=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx8mm_evk_android_defconfig b/configs/imx8mm_evk_android_defconfig index 5db4c1175d..9765d6e3d7 100755 --- a/configs/imx8mm_evk_android_defconfig +++ b/configs/imx8mm_evk_android_defconfig @@ -60,3 +60,5 @@ CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx8mq_aiy_android_defconfig b/configs/imx8mq_aiy_android_defconfig index 5f4332f10b..28ae888083 100644 --- a/configs/imx8mq_aiy_android_defconfig +++ b/configs/imx8mq_aiy_android_defconfig @@ -74,3 +74,5 @@ CONFIG_SDP_LOADADDR=0x40400000 CONFIG_SPL_USB_HOST_SUPPORT=y CONFIG_SPL_USB_GADGET_SUPPORT=y CONFIG_SPL_USB_SDP_SUPPORT=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx8mq_evk_android_defconfig b/configs/imx8mq_evk_android_defconfig index 9bada1f002..ed7d27205f 100644 --- a/configs/imx8mq_evk_android_defconfig +++ b/configs/imx8mq_evk_android_defconfig @@ -76,3 +76,5 @@ CONFIG_USB_XHCI_IMX8M=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx8qm_mek_android_defconfig b/configs/imx8qm_mek_android_defconfig index 400e766e70..7a0deec6b4 100644 --- a/configs/imx8qm_mek_android_defconfig +++ b/configs/imx8qm_mek_android_defconfig @@ -92,3 +92,5 @@ CONFIG_CMD_MEMTEST=y CONFIG_SPL=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx8qm_mek_androidauto_trusty_defconfig b/configs/imx8qm_mek_androidauto_trusty_defconfig index 353e97d652..412d6d3bb1 100644 --- a/configs/imx8qm_mek_androidauto_trusty_defconfig +++ b/configs/imx8qm_mek_androidauto_trusty_defconfig @@ -116,3 +116,5 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx8qxp_mek_android_defconfig b/configs/imx8qxp_mek_android_defconfig index e88c05a1eb..13b2165338 100644 --- a/configs/imx8qxp_mek_android_defconfig +++ b/configs/imx8qxp_mek_android_defconfig @@ -92,3 +92,5 @@ CONFIG_CMD_MEMTEST=y CONFIG_SPL=y CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_GPIO_SUPPORT=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/configs/imx8qxp_mek_androidauto_trusty_defconfig b/configs/imx8qxp_mek_androidauto_trusty_defconfig index 0fda5e3d5e..23983a760b 100644 --- a/configs/imx8qxp_mek_androidauto_trusty_defconfig +++ b/configs/imx8qxp_mek_androidauto_trusty_defconfig @@ -118,3 +118,5 @@ CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y + +CONFIG_NOT_UUU_BUILD=y diff --git a/drivers/usb/gadget/f_fastboot.c b/drivers/usb/gadget/f_fastboot.c index f217360403..2b8bd3abc1 100644 --- a/drivers/usb/gadget/f_fastboot.c +++ b/drivers/usb/gadget/f_fastboot.c @@ -3979,6 +3979,7 @@ static void cb_erase(struct usb_ep *ep, struct usb_request *req) } #endif +#ifndef CONFIG_NOT_UUU_BUILD static void cb_run_uboot_cmd(struct usb_ep *ep, struct usb_request *req) { char *cmd = req->buf; @@ -4022,6 +4023,7 @@ static void cb_run_uboot_acmd(struct usb_ep *ep, struct usb_request *req) fastboot_func->in_req->complete = do_acmd_complete; fastboot_tx_write_str("OKAY"); } +#endif #ifdef CONFIG_AVB_SUPPORT static void cb_set_active_avb(struct usb_ep *ep, struct usb_request *req) @@ -4393,6 +4395,7 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { .cb = cb_set_active_avb, }, #endif +#ifndef CONFIG_NOT_UUU_BUILD { .cmd = "UCmd:", .cb = cb_run_uboot_cmd, @@ -4400,6 +4403,7 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = { { .cmd ="ACmd:", .cb = cb_run_uboot_acmd, }, +#endif #endif { .cmd = "reboot",