From: Tom Rini <trini@ti.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v7 19/29] SPL: NAND: Move arch/arm/cpu/armv7/omap-common/spl_nand.c to common/spl
Date: Mon, 24 Sep 2012 17:30:57 -0700 [thread overview]
Message-ID: <1348533068-13038-20-git-send-email-trini@ti.com> (raw)
In-Reply-To: <1348533068-13038-1-git-send-email-trini@ti.com>
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%)
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
--
1.7.9.5
next prev parent reply other threads:[~2012-09-25 0:30 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-25 0:30 [U-Boot] [PATCH v7 0/29] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 01/29] Makefile: Move SPL files to clobber, remove from clean Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 02/29] spl_mmc: Make FAT checks / calls guarded with CONFIG_SPL_FAT_SUPPORT Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 03/29] omap-common: SPL: Add CONFIG_SPL_DISPLAY_PRINT / spl_display_print() Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 04/29] omap-common: Fix typo in save_boot_params() in lowlevel_init.S Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 05/29] omap-common: SPL: Fix whitespace in omap-common/u-boot-spl.lds Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 06/29] ARM: SPL: Rename omap_boot_device to spl_boot_device Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 07/29] ARM: SPL: Rename omap_boot_mode to spl_boot_mode() Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 08/29] ARM: SPL: Remove NAND_MODE_HW_ECC from spl_nand.c Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 09/29] ARM: SPL: Only call mem_malloc_init if configured Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 10/29] ARM: SPL: Add <asm/spl.h> and <asm/arch/spl.h> Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 11/29] ARM: SPL: Make spl_mmc.c more generic Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 12/29] ARM: SPL: Clean up spl.c / spl_nand.c slightly Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 13/29] ARM: SPL: Start hooking in the current SPI SPL support Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 14/29] ARM: SPL: Move gpmc_init() to spl_board_init() Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 15/29] SPL: Move the omap SPL framework to common/spl Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 16/29] SPL: Create arch/arm/lib/spl.c for board_init_f and jump_to_image_linux Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 17/29] SPL: do not use fix value for u-boot size Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 18/29] SPL: Use image_get_xxx() functions to access header values Tom Rini
2012-09-25 0:30 ` Tom Rini [this message]
2012-09-25 0:30 ` [U-Boot] [PATCH v7 20/29] ARM: SPL: Convert davinci to CONFIG_SPL_FRAMEWORK Tom Rini
2012-09-27 18:20 ` Tom Rini
2012-09-25 0:30 ` [U-Boot] [PATCH v7 21/29] hawkboard: Update config file to work with common spl framework Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 22/29] da850: Add README.da850 Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 23/29] SPL: Add NOR flash booting support Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 24/29] SPL: Add option to skip copying of the mkimage header Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 25/29] SPL: SPI: Enhance spi_spl_load to match the other load functions Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 26/29] SPL: Enable use of custom defined U-Boot entry point Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 27/29] SPL: Make un-supported boot device puts a debug instead Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 28/29] SPL: Rework how we inform about un-headered images Tom Rini
2012-09-25 0:31 ` [U-Boot] [PATCH v7 29/29] SPL: Add support for loading image from ram in SPL Tom Rini
2012-09-27 20:04 ` [U-Boot] [PATCH v7 0/29] ARM: SPL: Make more generic, merge DaVinci and OMAP Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348533068-13038-20-git-send-email-trini@ti.com \
--to=trini@ti.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox