diff --git a/src/soc/marvell/bg4cd/Kconfig b/src/soc/marvell/bg4cd/Kconfig
index 0a9778d7ad..f8bf0b9fcd 100644
--- a/src/soc/marvell/bg4cd/Kconfig
+++ b/src/soc/marvell/bg4cd/Kconfig
@@ -20,16 +20,16 @@
 config SOC_MARVELL_BG4CD
 	bool
 	default n
-	select CPU_HAS_BOOTBLOCK_INIT
-	select HAVE_MONOTONIC_TIMER
-	select GENERIC_UDELAY
-	select EARLY_CONSOLE
-	select DYNAMIC_CBMEM
 	select ARCH_BOOTBLOCK_ARMV7
-	select ARCH_VERSTAGE_ARMV7
-	select ARCH_ROMSTAGE_ARMV7
 	select ARCH_RAMSTAGE_ARMV7
+	select ARCH_ROMSTAGE_ARMV7
+	select ARCH_VERSTAGE_ARMV7
 	select BOOTBLOCK_CONSOLE
+	select CPU_HAS_BOOTBLOCK_INIT
+	select DYNAMIC_CBMEM
+	select EARLY_CONSOLE
+	select GENERIC_UDELAY
+	select HAVE_MONOTONIC_TIMER
 
 if SOC_MARVELL_BG4CD
 
diff --git a/src/soc/marvell/bg4cd/Makefile.inc b/src/soc/marvell/bg4cd/Makefile.inc
index 7d114dd6f6..7d49486254 100644
--- a/src/soc/marvell/bg4cd/Makefile.inc
+++ b/src/soc/marvell/bg4cd/Makefile.inc
@@ -18,24 +18,24 @@
 ##
 
 bootblock-y += cbmem.c
-bootblock-y += monotonic_timer.c
-bootblock-y += media.c
 bootblock-y += i2c.c
+bootblock-y += media.c
+bootblock-y += monotonic_timer.c
 
-verstage-y += monotonic_timer.c
 verstage-y += i2c.c
 verstage-y += media.c
+verstage-y += monotonic_timer.c
 
 romstage-y += cbmem.c
-romstage-y += monotonic_timer.c
 romstage-y += i2c.c
 romstage-y += media.c
+romstage-y += monotonic_timer.c
 romstage-y += sdram.c
 
 ramstage-y += cbmem.c
-ramstage-y += monotonic_timer.c
 ramstage-y += i2c.c
 ramstage-y += media.c
+ramstage-y += monotonic_timer.c
 
 $(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf
 	cp $< $@