diff --git a/src/soc/amd/morgana/Kconfig b/src/soc/amd/morgana/Kconfig
index 23d296c..69b6959 100644
--- a/src/soc/amd/morgana/Kconfig
+++ b/src/soc/amd/morgana/Kconfig
@@ -39,43 +39,43 @@
 	select RESET_VECTOR_IN_RAM
 	select RTC
 	select SOC_AMD_COMMON
-	select SOC_AMD_COMMON_BLOCK_ACP_GEN2		# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_ACP_GEN2
 	select SOC_AMD_COMMON_BLOCK_ACPI		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_ACPIMMIO		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_ACPI_ALIB		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_ACPI_CPPC		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_ACPI_GPIO		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_ACPI_IVRS		# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_AOAC		# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_AOAC
 	select SOC_AMD_COMMON_BLOCK_APOB		# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_APOB_HASH		# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS	# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_APOB_HASH
+	select SOC_AMD_COMMON_BLOCK_BANKED_GPIOS
 	select SOC_AMD_COMMON_BLOCK_DATA_FABRIC
-	select SOC_AMD_COMMON_BLOCK_EMMC		# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_EMMC
 	select SOC_AMD_COMMON_BLOCK_ESPI_EXTENDED_DECODE_RANGES # TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_GRAPHICS		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_HAS_ESPI		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_HAS_ESPI_ALERT_ENABLE # TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_I2C			# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_I23C_PAD_CTRL	# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_IOMMU		# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_I2C
+	select SOC_AMD_COMMON_BLOCK_I23C_PAD_CTRL
+	select SOC_AMD_COMMON_BLOCK_IOMMU
 	select SOC_AMD_COMMON_BLOCK_LPC			# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_MCAX		# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_NONCAR		# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_MCAX
+	select SOC_AMD_COMMON_BLOCK_NONCAR
 	select SOC_AMD_COMMON_BLOCK_PCI			# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_PCI_MMCONF		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_PCIE_GPP_DRIVER	# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_PM			# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_PM_CHIPSET_STATE_SAVE # TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_PM
+	select SOC_AMD_COMMON_BLOCK_PM_CHIPSET_STATE_SAVE
 	select SOC_AMD_COMMON_BLOCK_PSP_GEN2		# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_SMBUS		# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_SMI			# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_SMBUS
+	select SOC_AMD_COMMON_BLOCK_SMI
 	select SOC_AMD_COMMON_BLOCK_SMM			# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_BLOCK_SMU			# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_SPI			# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_TSC_FAM17H_19H	# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_UART		# TODO: Check if this is still correct
-	select SOC_AMD_COMMON_BLOCK_UCODE		# TODO: Check if this is still correct
+	select SOC_AMD_COMMON_BLOCK_SPI
+	select SOC_AMD_COMMON_BLOCK_TSC_FAM17H_19H
+	select SOC_AMD_COMMON_BLOCK_UART
+	select SOC_AMD_COMMON_BLOCK_UCODE
 	select SOC_AMD_COMMON_FSP_CCX_CPPC_HOB		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_FSP_DMI_TABLES		# TODO: Check if this is still correct
 	select SOC_AMD_COMMON_FSP_PCI			# TODO: Check if this is still correct