Kconfig: sandbox: enable cmd_avb and dependencies

Enables cmd_avb and its dependencies need to run the AVB tests.

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
[trini: Disable for sandbox_noblk]
Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index 074ede13a9a344809e5162dc4563c8d06c88b1de..1f2f407d64dd2a7cca3425fcd293e0c74f885371 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -106,6 +106,10 @@ config SANDBOX
        imply LZMA
        imply SCSI
        imply TEE
+       imply AVB_VERIFY
+       imply LIBAVB
+       imply CMD_AVB
+       imply UDP_FUNCTION_FASTBOOT
 
 config SH
        bool "SuperH architecture"

diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig
index c8d33c7a1d97ed33222db607951b3e71d5b6d36f..93b22401855dee16569c4ac1be51ee53f4d1b619 100644 (file)
--- a/configs/sandbox_noblk_defconfig
+++ b/configs/sandbox_noblk_defconfig
@@ -2,7 +2,6 @@ CONFIG_SYS_TEXT_BASE=0
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_NR_DRAM_BANKS=1
-CONFIG_ANDROID_BOOT_IMAGE=y
 CONFIG_FIT=y
 CONFIG_FIT_SIGNATURE=y
 CONFIG_FIT_VERBOSE=y
@@ -17,6 +16,7 @@ CONFIG_CONSOLE_RECORD=y
 CONFIG_CONSOLE_RECORD_OUT_SIZE=0x1000
 CONFIG_SILENT_CONSOLE=y
 CONFIG_DISPLAY_BOARDINFO_LATE=y
+# CONFIG_AVB_VERIFY is not set
 CONFIG_CMD_CPU=y
 CONFIG_CMD_LICENSE=y
 CONFIG_CMD_BOOTZ=y

diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig
index bc25ea1d9c7ac8452c2a2b894d91e90dff23be13..d63ecdd27e4bb6d3a6187c3b36c8e3180889112f 100644 (file)
--- a/drivers/fastboot/Kconfig
+++ b/drivers/fastboot/Kconfig
@@ -35,6 +35,7 @@ config FASTBOOT_BUF_ADDR
                                ROCKCHIP_RK3399
        default 0x280000 if ROCKCHIP_RK3368
        default 0x100000 if ARCH_ZYNQMP
+       default 0 if SANDBOX
        help
          The fastboot protocol requires a large memory buffer for
          downloads. Define this to the starting RAM address to use for
@@ -45,6 +46,7 @@ config FASTBOOT_BUF_SIZE
        default 0x8000000 if ARCH_ROCKCHIP
        default 0x6000000 if ARCH_ZYNQMP
        default 0x2000000 if ARCH_SUNXI
+       default 0x8192 if SANDBOX
        default 0x7000000
        help
          The fastboot protocol requires a large memory buffer for