GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-22 14:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix regression in SMDK6400

Browse source 
s3c64xx.c implemented its own nand_read_byte, nand_write_buf and
nand_read_buf functions. This provoked a regression when these functions
were made public by patch 55f429bb39614a16b1bacc9a8bea9ac01a60bfc8.

This deletes these duplicated functions from s3c64xx.c and adds the generic
implementations in nand_base.c to the spl Makefile. It also adds
-ffcuntion-sections and -gc-sections to the compilation flags of the SPL to
avoid errors originating from unused functions in nand_base.c.

Description of the regression:
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/108873

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Cc: scottwood@freescale.com
Cc: s-paulraj@ti.com
Cc: albert.u.boot@aribaud.net
This commit is contained in:
Simon Schwarz 2011-10-31 06:34:45 +00:00 • committed by Albert ARIBAUD
parent 82645f816f
commit 56c91bc3b6
2 changed files with 8 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

28
drivers/mtd/nand/s3c64xx.c
View file

@ -28,6 +28,8 @@
#include <common.h> #include <common.h>
#include <nand.h> #include <nand.h>
#include <linux/mtd/nand.h>
#include <asm/arch/s3c6400.h> #include <asm/arch/s3c6400.h>
#include <asm/io.h> #include <asm/io.h>
@ -60,32 +62,6 @@ static void print_oob(const char *header, struct mtd_info *mtd)
} }
#endif /* S3C_NAND_DEBUG */ #endif /* S3C_NAND_DEBUG */
#ifdef CONFIG_NAND_SPL
static u_char nand_read_byte(struct mtd_info *mtd)
{
struct nand_chip *this = mtd->priv;
return readb(this->IO_ADDR_R);
}
static void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
{
int i;
struct nand_chip *this = mtd->priv;
for (i = 0; i < len; i++)
writeb(buf[i], this->IO_ADDR_W);
}
static void nand_read_buf(struct mtd_info *mtd, u_char *buf, int len)
{
int i;
struct nand_chip *this = mtd->priv;
for (i = 0; i < len; i++)
buf[i] = readb(this->IO_ADDR_R);
}
#endif
static void s3c_nand_select_chip(struct mtd_info *mtd, int chip) static void s3c_nand_select_chip(struct mtd_info *mtd, int chip)
{ {
int ctrl = readl(NFCONT); int ctrl = readl(NFCONT);

9
nand_spl/board/samsung/smdk6400/Makefile
View file

@ -33,12 +33,12 @@ nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
$(LDFLAGS_FINAL) $(LDFLAGS_FINAL) -gc-sections
AFLAGS += -DCONFIG_NAND_SPL AFLAGS += -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL -ffunction-sections
SOBJS = start.o cpu_init.o lowlevel_init.o SOBJS = start.o cpu_init.o lowlevel_init.o
COBJS = nand_boot.o nand_ecc.o s3c64xx.o smdk6400_nand_spl.o COBJS = nand_boot.o nand_ecc.o s3c64xx.o smdk6400_nand_spl.o nand_base.o
SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c)) SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
@ -98,6 +98,9 @@ $(obj)smdk6400_nand_spl.c:
@rm -f $@ @rm -f $@
@ln -s $(TOPDIR)/board/samsung/smdk6400/smdk6400_nand_spl.c $@ @ln -s $(TOPDIR)/board/samsung/smdk6400/smdk6400_nand_spl.c $@
$(obj)nand_base.c:
@rm -f $@
@ln -s $(TOPDIR)/drivers/mtd/nand/nand_base.c $@
######################################################################### #########################################################################
$(obj)%.o: $(obj)%.S $(obj)%.o: $(obj)%.S