3 files changed, 3 insertions, 24 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index e414ef82673..c56285738a2 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -199,7 +199,7 @@ static void boot_prep_linux(struct bootm_headers *images)
 {
 	char *commandline = env_get("bootargs");
 
-	if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) {
+	if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) {
 		debug("using: FDT\n");
 		if (image_setup_linux(images)) {
 			panic("FDT creation failed!");
diff --git a/arch/arm/lib/debug.S b/arch/arm/lib/debug.S
index 5983f2c04ce..af4beb4d9d2 100644
--- a/arch/arm/lib/debug.S
+++ b/arch/arm/lib/debug.S
@@ -21,22 +21,10 @@
 #include CONFIG_DEBUG_LL_INCLUDE
 #endif
 
-#ifdef CONFIG_MMU
-		.macro	addruart_current, rx, tmp1, tmp2
-		addruart	\tmp1, \tmp2, \rx
-		mrc		p15, 0, \rx, c1, c0
-		tst		\rx, #1
-		moveq		\rx, \tmp1
-		movne		\rx, \tmp2
-		.endm
-
-#else /* !CONFIG_MMU */
 		.macro	addruart_current, rx, tmp1, tmp2
 		addruart	\rx, \tmp1, \tmp2
 		.endm
 
-#endif /* CONFIG_MMU */
-
 /*
  * Useful debugging routines
  */
@@ -97,15 +85,6 @@ ENTRY(printch)
 		b	1b
 ENDPROC(printch)
 
-#ifdef CONFIG_MMU
-ENTRY(debug_ll_addr)
-		addruart r2, r3, ip
-		str	r2, [r0]
-		str	r3, [r1]
-		mov	pc, lr
-ENDPROC(debug_ll_addr)
-#endif
-
 #else
 
 ENTRY(printascii)
diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c
index f4ee86a89c6..f7b23faf0d6 100644
--- a/arch/arm/lib/save_prev_bl_data.c
+++ b/arch/arm/lib/save_prev_bl_data.c
@@ -60,9 +60,9 @@ int save_prev_bl_data(void)
 		return -ENODATA;
 	}
 
-	if (CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR))
+	if (IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR))
 		env_set_addr("prevbl_fdt_addr", (void *)reg0);
-	if (!CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR))
+	if (!IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR))
 		return 0;
 
 	node = fdt_path_offset(fdt_blob, "/chosen");