Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-09-21 07:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

SPL: NAND: Move arch/arm/cpu/armv7/omap-common/spl_nand.c to common/spl

Browse source 
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>
This commit is contained in:
Tom Rini 2012-08-14 14:33:02 -07:00
parent 77552b0633
commit d97b4ce805
3 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
arch/arm/cpu/armv7/omap-common/Makefile
View file

@ -42,12 +42,6 @@ COBJS += boot-common.o
SOBJS += lowlevel_init.o SOBJS += lowlevel_init.o
endif endif
ifdef CONFIG_SPL_BUILD
ifdef CONFIG_SPL_NAND_SUPPORT
COBJS += spl_nand.o
endif
endif
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),) ifneq ($(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX),)
COBJS += mem-common.o COBJS += mem-common.o

1
common/spl/Makefile
View file

@ -16,6 +16,7 @@ LIB = $(obj)libspl.o
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o COBJS-$(CONFIG_SPL_FRAMEWORK) += spl.o
COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += spl_ymodem.o
COBJS-$(CONFIG_SPL_NAND_SUPPORT) += spl_nand.o
endif endif
COBJS := $(sort $(COBJS-y)) COBJS := $(sort $(COBJS-y))

10
arch/arm/cpu/armv7/omap-common/spl_nand.c → common/spl/spl_nand.c
View file

@ -21,12 +21,10 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#include <common.h> #include <common.h>
#include <config.h>
#include <spl.h> #include <spl.h>
#include <asm/u-boot.h>
#include <asm/utils.h>
#include <asm/io.h> #include <asm/io.h>
#include <nand.h> #include <nand.h>
#include <version.h>
void spl_nand_load_image(void) void spl_nand_load_image(void)
{ {
@ -71,10 +69,10 @@ void spl_nand_load_image(void)
nand_deselect(); nand_deselect();
return; return;
} else { } else {
printf("The Expected Linux image was not" puts("The Expected Linux image was not "
"found. Please check your NAND" "found. Please check your NAND "
"configuration.\n"); "configuration.\n");
printf("Trying to start u-boot now...\n"); puts("Trying to start u-boot now...\n");
} }
} }
#endif #endif