summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cmd/fastboot/Kconfig7
-rw-r--r--configs/imx6dlsabreautoandroid_defconfig2
-rw-r--r--configs/imx6dlsabresdandroid_defconfig2
-rw-r--r--configs/imx6qpsabreautoandroid_defconfig2
-rw-r--r--configs/imx6qpsabresdandroid_defconfig2
-rw-r--r--configs/imx6qsabreautoandroid_defconfig2
-rw-r--r--configs/imx6qsabresdandroid_defconfig2
-rw-r--r--configs/imx6sxsabresdandroid_defconfig2
-rw-r--r--configs/imx7dsabresdandroid_defconfig2
-rw-r--r--configs/imx7ulp_evk_android_defconfig2
-rwxr-xr-xconfigs/imx8mm_evk_android_defconfig2
-rw-r--r--configs/imx8mq_aiy_android_defconfig2
-rw-r--r--configs/imx8mq_evk_android_defconfig2
-rw-r--r--configs/imx8qm_mek_android_defconfig2
-rw-r--r--configs/imx8qm_mek_androidauto_trusty_defconfig2
-rw-r--r--configs/imx8qxp_mek_android_defconfig2
-rw-r--r--configs/imx8qxp_mek_androidauto_trusty_defconfig2
-rw-r--r--drivers/usb/gadget/f_fastboot.c4
18 files changed, 43 insertions, 0 deletions
diff --git a/cmd/fastboot/Kconfig b/cmd/fastboot/Kconfig
index 0dbf306d532..a8e9763467d 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 0f314b28df9..0cf7b95f358 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 dfe864b3a30..a7427da2d47 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 ec61501ba78..a9c74e5f07f 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 698be71226d..e8d1e70f921 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 3553a10f6a0..99b61fcca7c 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 ec5cd414a29..9b412452378 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 ebf6af609ce..7b06bfefbaa 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 e09ec4523e0..3087751112e 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 aab5bf9e86d..4e43ebcaadc 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 5db4c1175d4..9765d6e3d77 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 5f4332f10b5..28ae8880834 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 9bada1f0022..ed7d27205f0 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 400e766e701..7a0deec6b4a 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 353e97d652c..412d6d3bb1f 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 e88c05a1eb7..13b21653381 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 0fda5e3d5ea..23983a760b7 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 f217360403a..2b8bd3abc18 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,
@@ -4401,6 +4404,7 @@ static const struct cmd_dispatch_info cmd_dispatch_info[] = {
.cb = cb_run_uboot_acmd,
},
#endif
+#endif
{
.cmd = "reboot",
.cb = cb_reboot,
generated by cgit v1.2.3 (git 2.0.4) at 2024-10-06 11:02:55 +0000