fix conflicts

freakishness · Feb 7, 2024 · 726769e · 726769e
1 parent 71481ca
commit 726769e
Showing 1 changed file with 16 additions and 14 deletions.
diff --git a/arch/risc-v/Kconfig b/arch/risc-v/Kconfig
@@ -261,20 +261,22 @@ config ARCH_FAMILY
 
 config ARCH_CHIP
 	string
-	default "fe310"		if ARCH_CHIP_FE310
-	default "k210"		if ARCH_CHIP_K210
-	default "litex"		if ARCH_CHIP_LITEX
-	default "bl602"		if ARCH_CHIP_BL602
-	default "esp32c3"	if ARCH_CHIP_ESP32C3
-	default "esp32c6"	if ARCH_CHIP_ESP32C6
-	default "espressif"	if ARCH_CHIP_ESPRESSIF
-	default "c906"		if ARCH_CHIP_C906
-	default "mpfs"		if ARCH_CHIP_MPFS
-	default "rv32m1"	if ARCH_CHIP_RV32M1
-	default "qemu-rv"	if ARCH_CHIP_QEMU_RV
-	default "hpm6750"	if ARCH_CHIP_HPM6750
-	default "jh7110"	if ARCH_CHIP_JH7110
-	default "hpm6000"   if ARCH_CHIP_HPM6000
+	default "fe310"					if ARCH_CHIP_FE310
+	default "k210"					if ARCH_CHIP_K210
+	default "litex"					if ARCH_CHIP_LITEX
+	default "bl602"					if ARCH_CHIP_BL602
+	default "esp32c3-legacy"			if ARCH_CHIP_ESP32C3
+	default "esp32c3"				if ARCH_CHIP_ESP32C3_GENERIC
+	default "esp32c6"				if ARCH_CHIP_ESP32C6
+	default "esp32h2"				if ARCH_CHIP_ESP32H2
+	default "c906"					if ARCH_CHIP_C906
+	default "mpfs"					if ARCH_CHIP_MPFS
+	default "rv32m1"				if ARCH_CHIP_RV32M1
+	default "qemu-rv"				if ARCH_CHIP_QEMU_RV
+	default "hpm6750"				if ARCH_CHIP_HPM6750
+	default "jh7110"				if ARCH_CHIP_JH7110
+	default "bl808"					if ARCH_CHIP_BL808
+	default "k230"					if ARCH_CHIP_K230
 
 config ARCH_RISCV_INTXCPT_EXTENSIONS
 	bool "RISC-V Integer Context Extensions"