From d406c6f81f52f610b3380c5b65f292ddd82466a9 Mon Sep 17 00:00:00 2001 From: Baikal Electronics Date: Thu, 6 Apr 2023 12:12:51 +0300 Subject: [PATCH] drivers/cpu/Kconfig: cleanup --- drivers/cpu/Kconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/cpu/Kconfig b/drivers/cpu/Kconfig index fa83d71354..eda76c8907 100644 --- a/drivers/cpu/Kconfig +++ b/drivers/cpu/Kconfig @@ -20,13 +20,12 @@ config CPU_RISCV help Support CPU cores for RISC-V architecture. -<<<<<<< HEAD config CPU_BAIKAL bool "Enable Baikal-T1 CPU driver" depends on CPU help Support CPU cores for Baikal mips chips. -======= + config CPU_MICROBLAZE bool "Enable Microblaze CPU driver" depends on CPU && MICROBLAZE @@ -34,4 +33,3 @@ config CPU_MICROBLAZE select XILINX_MICROBLAZE0_PVR help Support CPU cores for Microblaze architecture. ->>>>>>> upstream_testing -- 2.39.5