Patchwork [U-Boot,v7,19/29] SPL: NAND: Move arch/arm/cpu/armv7/omap-common/spl_nand.c to common/spl

login
register
mail settings
Submitter Tom Rini
Date Sept. 25, 2012, 12:30 a.m.
Message ID <1348533068-13038-20-git-send-email-trini@ti.com>
Download mbox | patch
Permalink /patch/186659/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

Tom Rini - Sept. 25, 2012, 12:30 a.m.
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>
---
Changes in v4:
- Leave nand_spl_load.c alone, move the new load into nand_spl_simple.c

Changes in v5:
- Move the file to common/spl/ rather than integrate with another file, after talking with Scott Wood

Changes in v6:
- Make common/spl/spl_nand.o build for CONFIG_SPL_NAND_SUPPORT (noticed by Scott Wood)

 arch/arm/cpu/armv7/omap-common/Makefile            |    6 ------
 common/spl/Makefile                                |    1 +
 .../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%)

Patch

diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index 6e815c6..1f2fa02 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 b61b438..b9c9fd8 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 9e9206c..61de5a4 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