From feb739798587369cff48a8a50a7a465681338cc1 Mon Sep 17 00:00:00 2001 From: Murali Nalajala Date: Thu, 3 Dec 2020 17:19:56 -0800 Subject: [PATCH] haven: remove config to disable hyp uart Hyp uart is default disabled from ABL now. There is no need of CONFIG_HH_DISABLE_UART option anymore. Hyp uart now can be controlled using DEBUG_FS interface. Change-Id: Ie1a0986399d30b89bf62468a23633994c8d6b11b Signed-off-by: Murali Nalajala --- arch/arm64/configs/vendor/genericarmv8-64_defconfig | 1 - arch/arm64/configs/vendor/lahaina_consolidate.config | 1 - drivers/virt/haven/Kconfig | 11 ----------- 3 files changed, 13 deletions(-) diff --git a/arch/arm64/configs/vendor/genericarmv8-64_defconfig b/arch/arm64/configs/vendor/genericarmv8-64_defconfig index 22da3d46d77e..2f3424e04bc4 100644 --- a/arch/arm64/configs/vendor/genericarmv8-64_defconfig +++ b/arch/arm64/configs/vendor/genericarmv8-64_defconfig @@ -213,7 +213,6 @@ CONFIG_MSM_GPI_DMA_DEBUG=y CONFIG_VIRT_DRIVERS=y CONFIG_HAVEN_DRIVERS=y CONFIG_HH_CTRL=y -# CONFIG_HH_DISABLE_UART is not set CONFIG_HH_MSGQ=y CONFIG_HH_RM_DRV=y CONFIG_HH_DBL=y diff --git a/arch/arm64/configs/vendor/lahaina_consolidate.config b/arch/arm64/configs/vendor/lahaina_consolidate.config index 42fb0ad5458e..0a227034bc4d 100644 --- a/arch/arm64/configs/vendor/lahaina_consolidate.config +++ b/arch/arm64/configs/vendor/lahaina_consolidate.config @@ -50,7 +50,6 @@ CONFIG_DEBUG_PANIC_ON_OOM=y CONFIG_USB_F_FS_IPC_LOGGING=y CONFIG_DYNAMIC_DEBUG=y CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG=y -# CONFIG_HH_DISABLE_UART is not set CONFIG_DEBUG_MODULE_LOAD_INFO=y CONFIG_QCOM_MINIDUMP_FTRACE=y CONFIG_QCOM_MINIDUMP_PANIC_DUMP=y diff --git a/drivers/virt/haven/Kconfig b/drivers/virt/haven/Kconfig index fdb017f5995f..b67c71ffd000 100644 --- a/drivers/virt/haven/Kconfig +++ b/drivers/virt/haven/Kconfig @@ -25,17 +25,6 @@ config HH_CTRL hypervisor debug features. See Documentation/ABI/testing/sysfs-hypervisor-haven for more details. -if HH_CTRL -config HH_DISABLE_UART - bool "Disable Haven UART print during kernel boot" - default y - help - The hypervisor UART driver is enabled at boot, - however its use may conflict with use of the - Linux driver. This config requests Haven to - disable its UART driver. -endif - config HH_MSGQ tristate "Haven Message Queue driver" help