summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-09-05 12:59:29 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-09-05 12:59:29 +0200
commitbed1a6ffab6ba8f59146af07ccbdc7a625b6496f (patch)
tree6301a84dc2ef2d746a9a60979573e03eb6cc1c6a /drivers/mtd
parentb40aeb00d32f07c5b1b617ea4e88032cb895d8b3 (diff)
parentd5b6012ac1e674e7ce285d6b47cd346d765267d0 (diff)
downloadbarebox-bed1a6ffab6ba8f59146af07ccbdc7a625b6496f.tar.gz
barebox-bed1a6ffab6ba8f59146af07ccbdc7a625b6496f.tar.xz
Merge branch 'for-next/pbl'
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/nand/Makefile1
-rw-r--r--drivers/mtd/nand/nand_s3c24xx.c10
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
index 8c08c9f82c..d52c272c5c 100644
--- a/drivers/mtd/nand/Makefile
+++ b/drivers/mtd/nand/Makefile
@@ -14,4 +14,5 @@ obj-$(CONFIG_NAND_IMX) += nand_imx.o
obj-$(CONFIG_NAND_OMAP_GPMC) += nand_omap_gpmc.o nand_omap_bch_decoder.o
obj-$(CONFIG_NAND_ATMEL) += atmel_nand.o
obj-$(CONFIG_NAND_S3C24XX) += nand_s3c24xx.o
+pbl-$(CONFIG_NAND_S3C24XX) += nand_s3c24xx.o
obj-$(CONFIG_NAND_MXS) += nand_mxs.o
diff --git a/drivers/mtd/nand/nand_s3c24xx.c b/drivers/mtd/nand/nand_s3c24xx.c
index c6297011a3..3d5732e02a 100644
--- a/drivers/mtd/nand/nand_s3c24xx.c
+++ b/drivers/mtd/nand/nand_s3c24xx.c
@@ -603,6 +603,16 @@ void __nand_boot_init s3c24x0_nand_load_image(void *dest, int size, int page)
disable_nand_controller(host);
}
+#include <asm-generic/sections.h>
+
+void __nand_boot_init nand_boot(void)
+{
+ void *dest = _text;
+ int size = barebox_image_size;
+ int page = 0;
+
+ s3c24x0_nand_load_image(dest, size, page);
+}
#ifdef CONFIG_NAND_S3C_BOOT_DEBUG
#include <command.h>