From d97b4ce8056ff01ca8f1a63a7c69fa5316d33830 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@ti.com>
Date: Tue, 14 Aug 2012 14:33:02 -0700
Subject: [PATCH] SPL: NAND: Move arch/arm/cpu/armv7/omap-common/spl_nand.c to
common/spl
We move the spl_nand_load_image function to common/spl. This will allow
for easier integration of SPL-boots-Linux code on other arches.
Signed-off-by: Tom Rini <trini@ti.com>
---
arch/arm/cpu/armv7/omap-common/Makefile | 6 ------
common/spl/Makefile | 1 +
.../cpu/armv7/omap-common => common/spl}/spl_nand.c | 10 ++++------
3 files changed, 5 insertions(+), 12 deletions(-)
rename {arch/arm/cpu/armv7/omap-common => common/spl}/spl_nand.c (94%)
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 6e815c674d..1f2fa027c8 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -42,12 +42,6 @@ COBJS += boot-common.o
SOBJS += lowlevel_init.o
endif
-ifdef CONFIG_SPL_BUILD
-ifdef CONFIG_SPL_NAND_SUPPORT
-COBJS += spl_nand.o
-endif
-endif
-
ifndef CONFIG_SPL_BUILD
ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
COBJS += mem-common.o
diff --git a/common/spl/Makefile b/common/spl/Makefile
index b61b438282..b9c9fd8521 100644
--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -16,6 +16,7 @@ LIB = $(obj)libspl.o
ifdef CONFIG_SPL_BUILD
COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o
COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o
+COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o
endif
COBJS := $(sort $(COBJS-y))
diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/common/spl/spl_nand.c
similarity index 94%
rename from arch/arm/cpu/armv7/omap-common/spl_nand.c
rename to common/spl/spl_nand.c
index 9e9206ce3b..61de5a4f05 100644
--- a/arch/arm/cpu/armv7/omap-common/spl_nand.c
+++ b/common/spl/spl_nand.c
@@ -21,12 +21,10 @@
* MA 02111-1307 USA
*/
#include <common.h>
+#include <config.h>
#include <spl.h>
-#include <asm/u-boot.h>
-#include <asm/utils.h>
#include <asm/io.h>
#include <nand.h>
-#include <version.h>
void spl_nand_load_image(void)
{
@@ -71,10 +69,10 @@ void spl_nand_load_image(void)
nand_deselect();
return;
} else {
- printf("The Expected Linux image was not"
- "found. Please check your NAND"
+ puts("The Expected Linux image was not "
+ "found. Please check your NAND "
"configuration.\n");
- printf("Trying to start u-boot now...\n");
+ puts("Trying to start u-boot now...\n");
}
}
#endif
--
2.39.5