4 files changed, 18 insertions, 5 deletions
diff --git a/src/cpu/amd/geode_lx/Makefile.inc b/src/cpu/amd/geode_lx/Makefile.inc
index 22a3fda49c..99be61e374 100644
--- a/src/cpu/amd/geode_lx/Makefile.inc
+++ b/src/cpu/amd/geode_lx/Makefile.inc
@@ -3,6 +3,10 @@ subdirs-y += ../../x86/lapic
 subdirs-y += ../../x86/cache
 subdirs-y += ../../x86/smm
 
+romstage-y += cpureginit.c
+romstage-y += syspreinit.c
+romstage-y += msrinit.c
+
 ramstage-y += geode_lx_init.c
 ramstage-y += cpubug.c
 
diff --git a/src/cpu/amd/geode_lx/cpureginit.c b/src/cpu/amd/geode_lx/cpureginit.c
index eac8fa7455..a61501e58e 100644
--- a/src/cpu/amd/geode_lx/cpureginit.c
+++ b/src/cpu/amd/geode_lx/cpureginit.c
@@ -16,9 +16,13 @@
  * GNU General Public License for more details.
  */
 
-/* SetDelayControl */
-#include "cpu/x86/msr.h"
-
+#include <stdint.h>
+#include <spd.h>
+#include <console/console.h>
+#include <cpu/x86/msr.h>
+#include <cpu/amd/lxdef.h>
+#include <northbridge/amd/lx/raminit.h>
+#include <northbridge/amd/lx/northbridge.h>
 
 /**
  * Delay Control Settings table from AMD (MCP 0x4C00000F).
diff --git a/src/cpu/amd/geode_lx/msrinit.c b/src/cpu/amd/geode_lx/msrinit.c
index e6e6247cad..827bb61f3a 100644
--- a/src/cpu/amd/geode_lx/msrinit.c
+++ b/src/cpu/amd/geode_lx/msrinit.c
@@ -14,7 +14,9 @@
  */
 
 #include <stdlib.h>
-#include "cpu/x86/msr.h"
+#include <cpu/amd/lxdef.h>
+#include <cpu/x86/msr.h>
+#include <northbridge/amd/lx/northbridge.h>
 
 static const msrinit_t msr_table[] =
 {
@@ -50,7 +52,7 @@ static const msrinit_t msr_table[] =
 	{MSR_GLIU1_SYSMEM,  {.hi = 0x2000001F,.lo = 0x6BF00100}}, // 0x100000-0x1F6BF000
 };
 
-static void msr_init(void)
+void lx_msr_init(void)
 {
 	int i;
 	for (i = 0; i < ARRAY_SIZE(msr_table); i++)
diff --git a/src/cpu/amd/geode_lx/syspreinit.c b/src/cpu/amd/geode_lx/syspreinit.c
index de6e141a94..801aea91b0 100644
--- a/src/cpu/amd/geode_lx/syspreinit.c
+++ b/src/cpu/amd/geode_lx/syspreinit.c
@@ -16,6 +16,9 @@
  * GNU General Public License for more details.
  */
 
+#include <arch/io.h>
+#include <cpu/amd/lxdef.h>
+
 /**
  *	StartTimer1
  *