diff --git a/src/cpu/ti/Kconfig b/src/cpu/ti/Kconfig
index 0440098..5a62219 100644
--- a/src/cpu/ti/Kconfig
+++ b/src/cpu/ti/Kconfig
@@ -1,12 +1 @@
-config CPU_TI_AM335X
-	depends on ARCH_ARMV7
-	select HAVE_MONOTONIC_TIMER
-	select HAVE_UART_SPECIAL
-	select BOOTBLOCK_CONSOLE
-	select EARLY_CONSOLE
-	bool
-	default n
-
-if CPU_TI_AM335X
 source src/cpu/ti/am335x/Kconfig
-endif
diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig
index 0142c49..fdc5824 100644
--- a/src/cpu/ti/am335x/Kconfig
+++ b/src/cpu/ti/am335x/Kconfig
@@ -1,3 +1,14 @@
+config CPU_TI_AM335X
+	depends on ARCH_ARMV7
+	select HAVE_MONOTONIC_TIMER
+	select HAVE_UART_SPECIAL
+	select BOOTBLOCK_CONSOLE
+	select EARLY_CONSOLE
+	bool
+	default n
+
+if CPU_TI_AM335X
+
 config BOOTBLOCK_CPU_INIT
 	string
 	default "cpu/ti/am335x/bootblock.c"
@@ -47,3 +58,5 @@
 config SYS_SDRAM_BASE
 	hex
 	default 0x40000000
+
+endif