4 files changed, 2 insertions, 25 deletions
diff --git a/src/cpu/allwinner/a10/bootblock.c b/src/cpu/allwinner/a10/bootblock.c
index d470755453..808982c1c4 100644
--- a/src/cpu/allwinner/a10/bootblock.c
+++ b/src/cpu/allwinner/a10/bootblock.c
@@ -10,7 +10,7 @@
 #include <arch/cache.h>
 #include <bootblock_common.h>
 
-void bootblock_cpu_init(void)
+void bootblock_soc_init(void)
 {
 	uint32_t sctlr;
 
diff --git a/src/cpu/armltd/cortex-a9/Kconfig b/src/cpu/armltd/cortex-a9/Kconfig
index c4568473ad..fb6cd0fca4 100644
--- a/src/cpu/armltd/cortex-a9/Kconfig
+++ b/src/cpu/armltd/cortex-a9/Kconfig
@@ -7,10 +7,4 @@ config CPU_ARMLTD_CORTEX_A9
 
 if CPU_ARMLTD_CORTEX_A9
 
-config BOOTBLOCK_CPU_INIT
-	string
-	default "cpu/armltd/cortex-a9/bootblock.c"
-	help
-	  CPU/SoC-specific bootblock code.
-
 endif
diff --git a/src/cpu/armltd/cortex-a9/bootblock.c b/src/cpu/armltd/cortex-a9/bootblock.c
deleted file mode 100644
index 8925439d2a..0000000000
--- a/src/cpu/armltd/cortex-a9/bootblock.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright (C) 2013 Google, Inc.
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-void bootblock_cpu_init(void);
-void bootblock_cpu_init(void)
-{
-}
diff --git a/src/cpu/ti/am335x/bootblock.c b/src/cpu/ti/am335x/bootblock.c
index 04c930426f..f586e17550 100644
--- a/src/cpu/ti/am335x/bootblock.c
+++ b/src/cpu/ti/am335x/bootblock.c
@@ -22,7 +22,7 @@
 #include <arch/cache.h>
 #include <bootblock_common.h>
 
-void bootblock_cpu_init(void)
+void bootblock_soc_init(void)
 {
 	uint32_t sctlr;