diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 727176ba30..34f3342d7f 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -33,5 +33,4 @@ config DCACHE_RAM_SIZE
 	hex
 	default 0x10000
 
-
-endif # BOARD_EMULATION_QEMU_X86
+endif # BOARD_EMULATION_QEMU_X86_I440FX
diff --git a/src/mainboard/emulation/qemu-q35/Kconfig b/src/mainboard/emulation/qemu-q35/Kconfig
index 69f596de26..3949937c77 100644
--- a/src/mainboard/emulation/qemu-q35/Kconfig
+++ b/src/mainboard/emulation/qemu-q35/Kconfig
@@ -44,5 +44,4 @@ config DCACHE_RAM_SIZE
 	hex
 	default 0x10000
 
-
-endif # BOARD_EMULATION_QEMU_X86
+endif # BOARD_EMULATION_QEMU_X86_Q35
diff --git a/src/mainboard/iei/juki-511p/Kconfig b/src/mainboard/iei/juki-511p/Kconfig
index e17d69ac13..0aebb03887 100644
--- a/src/mainboard/iei/juki-511p/Kconfig
+++ b/src/mainboard/iei/juki-511p/Kconfig
@@ -38,10 +38,10 @@ if BOARD_IEI_JUKI_511P
 config MAINBOARD_PART_NUMBER
 	string
 	default "JUKI-511P"
-endif
+endif # BOARD_IEI_JUKI_511P
 
 config IRQ_SLOT_COUNT
 	int
 	default 2
 
-endif # BOARD_IEI_JUKI_511P
+endif # BOARD_IEI_JUKI_511P || BOARD_IEI_ROCKY_512
diff --git a/src/mainboard/jetway/j7f2/Kconfig b/src/mainboard/jetway/j7f2/Kconfig
index d2b413b0c2..48a85a14a4 100644
--- a/src/mainboard/jetway/j7f2/Kconfig
+++ b/src/mainboard/jetway/j7f2/Kconfig
@@ -18,10 +18,10 @@ if BOARD_JETWAY_J7F2
 config MAINBOARD_PART_NUMBER
 	string
 	default "J7f2"
-endif
+endif # BOARD_JETWAY_J7F2
 
 config IRQ_SLOT_COUNT
 	int
 	default 10
 
-endif # BOARD_JETWAY_J7F2
+endif # BOARD_JETWAY_J7F2 || BOARD_JETWAY_J7F4K1G2E || BOARD_JETWAY_J7F4K1G5D
diff --git a/src/mainboard/via/epia-m/Kconfig b/src/mainboard/via/epia-m/Kconfig
index f05c99c4e4..5b43921d1b 100644
--- a/src/mainboard/via/epia-m/Kconfig
+++ b/src/mainboard/via/epia-m/Kconfig
@@ -23,10 +23,10 @@ config MAINBOARD_PART_NUMBER
 	string
 	default "EPIA-M"
 
-endif
+endif # BOARD_VIA_EPIA_M
 
 config IRQ_SLOT_COUNT
 	int
 	default 5
 
-endif # BOARD_VIA_EPIA_M
+endif # BOARD_VIA_EPIA_M || BOARD_VIA_EPIA_MII || BOARD_VIA_EPIA_ML