diff --git a/src/arch/mips/bootblock.inc b/src/arch/mips/bootblock.inc
index 76a10cf579..dbde803b14 100644
--- a/src/arch/mips/bootblock.inc
+++ b/src/arch/mips/bootblock.inc
@@ -23,18 +23,18 @@
 .globl _start
 _start:
 	/* Set the stack pointer */
-	li	$sp, CONFIG_STACK_TOP
+	li	$sp, CONFIG_BOOTBLOCK_STACK_TOP
 
 	/*
 	 * Initialise the stack to a known value, used later to check for
 	 * overflow.
 	 */
-	li	$t0, CONFIG_STACK_BOTTOM
+	li	$t0, CONFIG_BOOTBLOCK_STACK_BOTTOM
 	addi	$t1, $sp, -4
 	li	$t2, 0xdeadbeef
 1:	sw	$t2, 0($t0)
 	bne	$t0, $t1, 1b
-	 addi	$t0, $t0, 4
+	addi	$t0, $t0, 4
 
 	/* Run main */
 	b	main
diff --git a/src/soc/imgtec/danube/Kconfig b/src/soc/imgtec/danube/Kconfig
index 0e3c629fef..138795ca33 100644
--- a/src/soc/imgtec/danube/Kconfig
+++ b/src/soc/imgtec/danube/Kconfig
@@ -55,15 +55,17 @@ config CBMEM_CONSOLE_PRERAM_BASE
 	  Allocate 4KB to the pre-ram console buffer, we should be able to use
 	  GRAM eventually and have a much larger buffer.
 
-config STACK_TOP
+config BOOTBLOCK_STACK_BOTTOM
+	hex
+	default 0x9b00e000
+	help
+	  This allocates 6KB of stack space. One needs to verify that this is
+	  sufficient.
+
+config BOOTBLOCK_STACK_TOP
 	hex
 	default CBMEM_CONSOLE_PRERAM_BASE
-
-config STACK_BOTTOM
-	hex
-	default 0x9b00f000
 	help
-	  Allocating 12KB for the stack, should be able to have more once GRAM
-	  is available.
-
+	  Bootblock stack starts immediately under the CBMEM console buffer,
+	  stack location might be changed by ro stage.
 endif