[U-Boot] [PATCH 0/3] fix: regression in SMDK6400

[U-Boot] [PATCH 0/3] fix: regression in SMDK6400

[Simon Schwarz]

This is a fix for a regression introduced by my patch 
55f429bb39614a16b1bacc9a8bea9ac01a60bfc8 to u-boot-ti/next

The issue is described here:
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/108873

Simon Schwarz (3):
  nand: Remove static modifier from common functions
  nand: Add common functions to nand.h
  Fix regression in SMDK6400

 drivers/mtd/nand/nand_base.c             |    6 +++---
 drivers/mtd/nand/s3c64xx.c               |   26 --------------------------
 include/nand.h                           |   10 +++++++---
 nand_spl/board/samsung/smdk6400/Makefile |    9 ++++++---
 4 files changed, 16 insertions(+), 35 deletions(-)

-- 
1.7.4.1

[U-Boot] [PATCH 1/3] nand: Remove static modifier from common functions

[Simon Schwarz]

Removed static modifiers from functions that were often duplicated in
SPL implementations.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
---
 drivers/mtd/nand/nand_base.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index e7dfcb1..109d2cf 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -133,7 +133,7 @@ static void nand_release_device (struct mtd_info *mtd)
  *
  * Default read function for 8bit buswith
  */
-static uint8_t nand_read_byte(struct mtd_info *mtd)
+uint8_t nand_read_byte(struct mtd_info *mtd)
 {
 	struct nand_chip *chip = mtd->priv;
 	return readb(chip->IO_ADDR_R);
@@ -196,7 +196,7 @@ static void nand_select_chip(struct mtd_info *mtd, int chipnr)
  *
  * Default write function for 8bit buswith
  */
-static void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
+void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
 	int i;
 	struct nand_chip *chip = mtd->priv;
@@ -249,7 +249,7 @@ static int nand_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
  *
  * Default write function for 16bit buswith
  */
-static void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
+void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
 	int i;
 	struct nand_chip *chip = mtd->priv;
-- 
1.7.4.1

[U-Boot] [PATCH 2/3] nand: Add common functions to nand.h

[Simon Schwarz]

Functions often used in SPL are now part of nand.h.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
---
 include/nand.h |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/nand.h b/include/nand.h
index b4140794..980408a 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -135,9 +135,6 @@ int nand_get_lock_status(nand_info_t *meminfo, loff_t offset);
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst);
 void nand_deselect(void);
 
-void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
-void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
-
 #ifdef CONFIG_SYS_NAND_SELECT_DEVICE
 void board_nand_select_device(struct nand_chip *nand, int chip);
 #endif
@@ -154,3 +151,10 @@ __attribute__((noreturn)) void nand_boot(void);
 #define ENV_OFFSET_SIZE 8
 int get_nand_env_oob(nand_info_t *nand, unsigned long *result);
 #endif
+
+/* Standard NAND functions from nand_base.c */
+void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len);
+void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len);
+void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
+void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
+uint8_t nand_read_byte(struct mtd_info *mtd);
-- 
1.7.4.1

[U-Boot] [PATCH 2/3] nand: Add common functions to nand.h

[Scott Wood]

On 09/29/2011 02:44 AM, Simon Schwarz wrote:
> Functions often used in SPL are now part of nand.h.
> 
> Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
> ---
>  include/nand.h |   10 +++++++---
>  1 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/include/nand.h b/include/nand.h
> index b4140794..980408a 100644
> --- a/include/nand.h
> +++ b/include/nand.h
> @@ -135,9 +135,6 @@ int nand_get_lock_status(nand_info_t *meminfo, loff_t offset);
>  int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst);
>  void nand_deselect(void);
>  
> -void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
> -void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
> -
>  #ifdef CONFIG_SYS_NAND_SELECT_DEVICE
>  void board_nand_select_device(struct nand_chip *nand, int chip);
>  #endif
> @@ -154,3 +151,10 @@ __attribute__((noreturn)) void nand_boot(void);
>  #define ENV_OFFSET_SIZE 8
>  int get_nand_env_oob(nand_info_t *nand, unsigned long *result);
>  #endif
> +
> +/* Standard NAND functions from nand_base.c */
> +void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len);
> +void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len);
> +void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
> +void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
> +uint8_t nand_read_byte(struct mtd_info *mtd);

Sorry for not noticing this before, but these should go in
include/linux/mtd/nand.h since that corresponds to
drivers/mtd/nand/nand_base.c.  include/nand.h is for U-Boot-specific things.

As it stands now, drivers/mtd/nand/nand_base.c does not include
include/nand.h, so we won't get warned if the function signatures diverge.

-Scott

[U-Boot] [PATCH 2/3] nand: Add common functions to nand.h

[Simon Schwarz]

Hi Scott,

ok. Will have a look - hopefully this weekend.

Regards
Simon

2011/10/14 Simon Schwarz <simonschwarzcor@googlemail.com>:
> Hi Scott,
>
> ok. Will have a look - hopefully this weekend.
>
> Regards
> Simon
>
> 2011/10/4 Scott Wood <scottwood@freescale.com>:
>> On 09/29/2011 02:44 AM, Simon Schwarz wrote:
>>> Functions often used in SPL are now part of nand.h.
>>>
>>> Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
>>> ---
>>> ?include/nand.h | ? 10 +++++++---
>>> ?1 files changed, 7 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/include/nand.h b/include/nand.h
>>> index b4140794..980408a 100644
>>> --- a/include/nand.h
>>> +++ b/include/nand.h
>>> @@ -135,9 +135,6 @@ int nand_get_lock_status(nand_info_t *meminfo, loff_t offset);
>>> ?int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst);
>>> ?void nand_deselect(void);
>>>
>>> -void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
>>> -void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
>>> -
>>> ?#ifdef CONFIG_SYS_NAND_SELECT_DEVICE
>>> ?void board_nand_select_device(struct nand_chip *nand, int chip);
>>> ?#endif
>>> @@ -154,3 +151,10 @@ __attribute__((noreturn)) void nand_boot(void);
>>> ?#define ENV_OFFSET_SIZE 8
>>> ?int get_nand_env_oob(nand_info_t *nand, unsigned long *result);
>>> ?#endif
>>> +
>>> +/* Standard NAND functions from nand_base.c */
>>> +void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len);
>>> +void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len);
>>> +void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
>>> +void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
>>> +uint8_t nand_read_byte(struct mtd_info *mtd);
>>
>> Sorry for not noticing this before, but these should go in
>> include/linux/mtd/nand.h since that corresponds to
>> drivers/mtd/nand/nand_base.c. ?include/nand.h is for U-Boot-specific things.
>>
>> As it stands now, drivers/mtd/nand/nand_base.c does not include
>> include/nand.h, so we won't get warned if the function signatures diverge.
>>
>> -Scott
>>
>>
>

[U-Boot] [PATCH 3/3] Fix regression in SMDK6400

[Simon Schwarz]

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>
---
 drivers/mtd/nand/s3c64xx.c               |   26 --------------------------
 nand_spl/board/samsung/smdk6400/Makefile |    9 ++++++---
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/drivers/mtd/nand/s3c64xx.c b/drivers/mtd/nand/s3c64xx.c
index 084e475..7260537 100644
--- a/drivers/mtd/nand/s3c64xx.c
+++ b/drivers/mtd/nand/s3c64xx.c
@@ -60,32 +60,6 @@ static void print_oob(const char *header, struct mtd_info *mtd)
 }
 #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)
 {
 	int ctrl = readl(NFCONT);
diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile
index 2f9c307..c9e75ba 100644
--- a/nand_spl/board/samsung/smdk6400/Makefile
+++ b/nand_spl/board/samsung/smdk6400/Makefile
@@ -33,12 +33,12 @@ nandobj	:= $(OBJTREE)/nand_spl/
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
-	   $(LDFLAGS_FINAL)
+		$(LDFLAGS_FINAL) -gc-sections
 AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+CFLAGS	+= -DCONFIG_NAND_SPL -ffunction-sections
 
 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))
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
@@ -98,6 +98,9 @@ $(obj)smdk6400_nand_spl.c:
 	@rm -f $@
 	@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
-- 
1.7.4.1

[U-Boot] [PATCH 0/3] fix: regression in SMDK6400

[Scott Wood]

On 09/29/2011 02:44 AM, Simon Schwarz wrote:
> This is a fix for a regression introduced by my patch 
> 55f429bb39614a16b1bacc9a8bea9ac01a60bfc8 to u-boot-ti/next
> 
> The issue is described here:
> http://article.gmane.org/gmane.comp.boot-loaders.u-boot/108873
> 
> Simon Schwarz (3):
>   nand: Remove static modifier from common functions
>   nand: Add common functions to nand.h
>   Fix regression in SMDK6400
> 
>  drivers/mtd/nand/nand_base.c             |    6 +++---
>  drivers/mtd/nand/s3c64xx.c               |   26 --------------------------
>  include/nand.h                           |   10 +++++++---
>  nand_spl/board/samsung/smdk6400/Makefile |    9 ++++++---
>  4 files changed, 16 insertions(+), 35 deletions(-)
> 

Acked-by: Scott Wood <scottwood@freescale.com>

I guess this will be taken by the ti tree, since it fixes a problem
there?  I assume patch 3 won't apply to what's currently in mainline.

-Scott

[U-Boot] [PATCH 0/3] fix: regression in SMDK6400

[Simon Schwarz]

This is a fix for a regression introduced by my patch
55f429bb39614a16b1bacc9a8bea9ac01a60bfc8 to u-boot-ti/next

The issue is described here:
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/108873

Simon Schwarz (3):
  nand: Remove static modifier from common functions
  nand: Add common functions to linux/mtd/nand.h
  Fix regression in SMDK6400

 drivers/mtd/nand/nand_base.c             |    6 +++---
 drivers/mtd/nand/s3c64xx.c               |   28 ++--------------------------
 include/linux/mtd/nand.h                 |    7 +++++++
 include/nand.h                           |    3 ---
 nand_spl/board/samsung/smdk6400/Makefile |    9 ++++++---
 5 files changed, 18 insertions(+), 35 deletions(-)

-- 
1.7.4.1

[U-Boot] [PATCH 1/3] nand: Remove static modifier from common functions

[Simon Schwarz]

Removed static modifiers from functions that were often duplicated in
SPL implementations.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Cc: scottwood at freescale.com
Cc: s-paulraj at ti.com
Cc: albert.u.boot at aribaud.net
---
Changes V2:
nothing
---
 drivers/mtd/nand/nand_base.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index e7dfcb1..109d2cf 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -133,7 +133,7 @@ static void nand_release_device (struct mtd_info *mtd)
  *
  * Default read function for 8bit buswith
  */
-static uint8_t nand_read_byte(struct mtd_info *mtd)
+uint8_t nand_read_byte(struct mtd_info *mtd)
 {
 	struct nand_chip *chip = mtd->priv;
 	return readb(chip->IO_ADDR_R);
@@ -196,7 +196,7 @@ static void nand_select_chip(struct mtd_info *mtd, int chipnr)
  *
  * Default write function for 8bit buswith
  */
-static void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
+void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
 	int i;
 	struct nand_chip *chip = mtd->priv;
@@ -249,7 +249,7 @@ static int nand_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
  *
  * Default write function for 16bit buswith
  */
-static void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
+void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
 	int i;
 	struct nand_chip *chip = mtd->priv;
-- 
1.7.4.1

[U-Boot] [PATCH 1/3] nand: Remove static modifier from common functions

[Scott Wood]

On 10/16/2011 05:50 AM, Simon Schwarz wrote:
> Removed static modifiers from functions that were often duplicated in
> SPL implementations.
> 
> Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
> Cc: scottwood at freescale.com
> Cc: s-paulraj at ti.com
> Cc: albert.u.boot at aribaud.net
> ---
> Changes V2:
> nothing
> ---
>  drivers/mtd/nand/nand_base.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)

Ideally the prototypes would be added in the same patch, but it's not
worth respinning over, especially since U-Boot doesn't appear to enable
-Wmissing-prototypes.

Acked-by: Scott Wood <scottwood@freescale.com>

Will this be taken via an ARM tree due to patch 3/3?

-Scott

[U-Boot] [PATCH 2/3] nand: Add common functions to linux/mtd/nand.h

[Simon Schwarz]

Functions often used in SPL are now part of linux/mtd/nand.h.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Cc: scottwood at freescale.com
Cc: s-paulraj at ti.com
Cc: albert.u.boot at aribaud.net
---
Changes V2:
CHG moved function definiton from nand.h to linux/mtd/nand.h because of:
	http://article.gmane.org/gmane.comp.boot-loaders.u-boot/110219
---
 include/linux/mtd/nand.h |    7 +++++++
 include/nand.h           |    3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 987a2ec..2419c6c 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -624,3 +624,10 @@ struct platform_nand_chip *get_platform_nandchip(struct mtd_info *mtd)
 }
 
 #endif /* __LINUX_MTD_NAND_H */
+
+/* Standard NAND functions from nand_base.c */
+void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len);
+void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len);
+void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
+void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
+uint8_t nand_read_byte(struct mtd_info *mtd);
diff --git a/include/nand.h b/include/nand.h
index b4140794..d444ddc 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -135,9 +135,6 @@ int nand_get_lock_status(nand_info_t *meminfo, loff_t offset);
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst);
 void nand_deselect(void);
 
-void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
-void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
-
 #ifdef CONFIG_SYS_NAND_SELECT_DEVICE
 void board_nand_select_device(struct nand_chip *nand, int chip);
 #endif
-- 
1.7.4.1

[U-Boot] [PATCH 2/3] nand: Add common functions to linux/mtd/nand.h

[Scott Wood]

On 10/16/2011 05:50 AM, Simon Schwarz wrote:
> Functions often used in SPL are now part of linux/mtd/nand.h.
> 
> Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
> Cc: scottwood at freescale.com
> Cc: s-paulraj at ti.com
> Cc: albert.u.boot at aribaud.net
> ---
> Changes V2:
> CHG moved function definiton from nand.h to linux/mtd/nand.h because of:
> 	http://article.gmane.org/gmane.comp.boot-loaders.u-boot/110219
> ---
>  include/linux/mtd/nand.h |    7 +++++++
>  include/nand.h           |    3 ---
>  2 files changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
> index 987a2ec..2419c6c 100644
> --- a/include/linux/mtd/nand.h
> +++ b/include/linux/mtd/nand.h
> @@ -624,3 +624,10 @@ struct platform_nand_chip *get_platform_nandchip(struct mtd_info *mtd)
>  }
>  
>  #endif /* __LINUX_MTD_NAND_H */
> +
> +/* Standard NAND functions from nand_base.c */
> +void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len);
> +void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len);
> +void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
> +void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
> +uint8_t nand_read_byte(struct mtd_info *mtd);

These need to go before the #endif.

-Scott

[U-Boot] [PATCH 3/3] Fix regression in SMDK6400

[Simon Schwarz]

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 at freescale.com
Cc: s-paulraj at ti.com
Cc: albert.u.boot at aribaud.net
---
Changes V2:
CHG include linux/mtd/nand.h because of:
  http://article.gmane.org/gmane.comp.boot-loaders.u-boot/110219
---
 drivers/mtd/nand/s3c64xx.c               |   28 ++--------------------------
 nand_spl/board/samsung/smdk6400/Makefile |    9 ++++++---
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/drivers/mtd/nand/s3c64xx.c b/drivers/mtd/nand/s3c64xx.c
index 084e475..87f0341 100644
--- a/drivers/mtd/nand/s3c64xx.c
+++ b/drivers/mtd/nand/s3c64xx.c
@@ -28,6 +28,8 @@
 #include <common.h>
 
 #include <nand.h>
+#include <linux/mtd/nand.h>
+
 #include <asm/arch/s3c6400.h>
 
 #include <asm/io.h>
@@ -60,32 +62,6 @@ static void print_oob(const char *header, struct mtd_info *mtd)
 }
 #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)
 {
 	int ctrl = readl(NFCONT);
diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile
index 2f9c307..c9e75ba 100644
--- a/nand_spl/board/samsung/smdk6400/Makefile
+++ b/nand_spl/board/samsung/smdk6400/Makefile
@@ -33,12 +33,12 @@ nandobj	:= $(OBJTREE)/nand_spl/
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
-	   $(LDFLAGS_FINAL)
+		$(LDFLAGS_FINAL) -gc-sections
 AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+CFLAGS	+= -DCONFIG_NAND_SPL -ffunction-sections
 
 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))
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
@@ -98,6 +98,9 @@ $(obj)smdk6400_nand_spl.c:
 	@rm -f $@
 	@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
-- 
1.7.4.1

[U-Boot] [PATCH V3 0/2] fix: regression in SMDK6400

[Simon Schwarz]

This is a fix for a regression introduced by my patch
55f429bb39614a16b1bacc9a8bea9ac01a60bfc8 to u-boot-ti/next

The issue is described here:
http://article.gmane.org/gmane.comp.boot-loaders.u-boot/108873

changes V3:
- fix for: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/114559
- http://article.gmane.org/gmane.comp.boot-loaders.u-boot/114558


Simon Schwarz (2):
  nand: Add common functions to linux/mtd/nand.h
  Fix regression in SMDK6400

 drivers/mtd/nand/nand_base.c             |    6 +++---
 drivers/mtd/nand/s3c64xx.c               |   28 ++--------------------------
 include/linux/mtd/nand.h                 |    7 +++++++
 include/nand.h                           |    3 ---
 nand_spl/board/samsung/smdk6400/Makefile |    9 ++++++---
 5 files changed, 18 insertions(+), 35 deletions(-)

-- 
1.7.4.1

[U-Boot] [PATCH V3 1/2] nand: Add common functions to linux/mtd/nand.h

[Simon Schwarz]

Functions often used in SPL are now part of linux/mtd/nand.h.
Static modifiers are removed from these functions in
drivers/mtd/nand/nand_base.c.

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Cc: scottwood at freescale.com
Cc: s-paulraj at ti.com
Cc: albert.u.boot at aribaud.net
---
Changes V2:
CHG moved function definiton from nand.h to linux/mtd/nand.h because of:
	http://article.gmane.org/gmane.comp.boot-loaders.u-boot/110219

Changes V3:
CHG moved the definitions before double inculsion detection end
CHG combined function definition and prototype in one patch as advised here:
	http://article.gmane.org/gmane.comp.boot-loaders.u-boot/114558
---
 drivers/mtd/nand/nand_base.c |    6 +++---
 include/linux/mtd/nand.h     |    7 +++++++
 include/nand.h               |    3 ---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index e7dfcb1..109d2cf 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -133,7 +133,7 @@ static void nand_release_device (struct mtd_info *mtd)
  *
  * Default read function for 8bit buswith
  */
-static uint8_t nand_read_byte(struct mtd_info *mtd)
+uint8_t nand_read_byte(struct mtd_info *mtd)
 {
 	struct nand_chip *chip = mtd->priv;
 	return readb(chip->IO_ADDR_R);
@@ -196,7 +196,7 @@ static void nand_select_chip(struct mtd_info *mtd, int chipnr)
  *
  * Default write function for 8bit buswith
  */
-static void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
+void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
 	int i;
 	struct nand_chip *chip = mtd->priv;
@@ -249,7 +249,7 @@ static int nand_verify_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
  *
  * Default write function for 16bit buswith
  */
-static void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
+void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len)
 {
 	int i;
 	struct nand_chip *chip = mtd->priv;
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 987a2ec..1cdc7ae 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -623,4 +623,11 @@ struct platform_nand_chip *get_platform_nandchip(struct mtd_info *mtd)
 	return chip->priv;
 }
 
+/* Standard NAND functions from nand_base.c */
+void nand_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len);
+void nand_write_buf16(struct mtd_info *mtd, const uint8_t *buf, int len);
+void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
+void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
+uint8_t nand_read_byte(struct mtd_info *mtd);
+
 #endif /* __LINUX_MTD_NAND_H */
diff --git a/include/nand.h b/include/nand.h
index b4140794..d444ddc 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -135,9 +135,6 @@ int nand_get_lock_status(nand_info_t *meminfo, loff_t offset);
 int nand_spl_load_image(uint32_t offs, unsigned int size, void *dst);
 void nand_deselect(void);
 
-void nand_read_buf16(struct mtd_info *mtd, uint8_t *buf, int len);
-void nand_read_buf(struct mtd_info *mtd, uint8_t *buf, int len);
-
 #ifdef CONFIG_SYS_NAND_SELECT_DEVICE
 void board_nand_select_device(struct nand_chip *nand, int chip);
 #endif
-- 
1.7.4.1

[U-Boot] [PATCH V3 1/2] nand: Add common functions to linux/mtd/nand.h

[Scott Wood]

On 10/31/2011 11:34 AM, Simon Schwarz wrote:
> Functions often used in SPL are now part of linux/mtd/nand.h.
> Static modifiers are removed from these functions in
> drivers/mtd/nand/nand_base.c.
> 
> Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
> Cc: scottwood at freescale.com
> Cc: s-paulraj at ti.com
> Cc: albert.u.boot at aribaud.net

Acked-by: Scott Wood <scottwood@freescale.com>

-Scott

[U-Boot] [PATCH V3 1/2] nand: Add common functions to linux/mtd/nand.h

[Albert ARIBAUD]

Hi Simon, Scott,

Le 31/10/2011 18:52, Scott Wood a ?crit :
> On 10/31/2011 11:34 AM, Simon Schwarz wrote:
>> Functions often used in SPL are now part of linux/mtd/nand.h.
>> Static modifiers are removed from these functions in
>> drivers/mtd/nand/nand_base.c.
>>
>> Signed-off-by: Simon Schwarz<simonschwarzcor@gmail.com>
>> Cc: scottwood at freescale.com
>> Cc: s-paulraj at ti.com
>> Cc: albert.u.boot at aribaud.net
>
> Acked-by: Scott Wood<scottwood@freescale.com>
>
> -Scott

Uhm... Why was this delegated to me? It doesn't seem ARM related, does  it?

Amicalement,
-- 
Albert.

[U-Boot] [PATCH V3 1/2] nand: Add common functions to linux/mtd/nand.h

[Albert ARIBAUD]

Le 25/11/2011 20:05, Albert ARIBAUD a ?crit :
> Hi Simon, Scott,
>
> Le 31/10/2011 18:52, Scott Wood a ?crit :
>> On 10/31/2011 11:34 AM, Simon Schwarz wrote:
>>> Functions often used in SPL are now part of linux/mtd/nand.h.
>>> Static modifiers are removed from these functions in
>>> drivers/mtd/nand/nand_base.c.
>>>
>>> Signed-off-by: Simon Schwarz<simonschwarzcor@gmail.com>
>>> Cc: scottwood at freescale.com
>>> Cc: s-paulraj at ti.com
>>> Cc: albert.u.boot at aribaud.net
>>
>> Acked-by: Scott Wood<scottwood@freescale.com>
>>
>> -Scott
>
> Uhm... Why was this delegated to me? It doesn't seem ARM related, does it?

Never mind. Got it.

> Amicalement,

Amicalement,
-- 
Albert.

[U-Boot] [PATCH V3 2/2] Fix regression in SMDK6400

[Simon Schwarz]

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 at freescale.com
Cc: s-paulraj at ti.com
Cc: albert.u.boot at aribaud.net
---
Changes V2:
CHG include linux/mtd/nand.h because of:
  http://article.gmane.org/gmane.comp.boot-loaders.u-boot/110219

Changes V3:
none
---
 drivers/mtd/nand/s3c64xx.c               |   28 ++--------------------------
 nand_spl/board/samsung/smdk6400/Makefile |    9 ++++++---
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/drivers/mtd/nand/s3c64xx.c b/drivers/mtd/nand/s3c64xx.c
index 084e475..87f0341 100644
--- a/drivers/mtd/nand/s3c64xx.c
+++ b/drivers/mtd/nand/s3c64xx.c
@@ -28,6 +28,8 @@
 #include <common.h>
 
 #include <nand.h>
+#include <linux/mtd/nand.h>
+
 #include <asm/arch/s3c6400.h>
 
 #include <asm/io.h>
@@ -60,32 +62,6 @@ static void print_oob(const char *header, struct mtd_info *mtd)
 }
 #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)
 {
 	int ctrl = readl(NFCONT);
diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile
index 2f9c307..c9e75ba 100644
--- a/nand_spl/board/samsung/smdk6400/Makefile
+++ b/nand_spl/board/samsung/smdk6400/Makefile
@@ -33,12 +33,12 @@ nandobj	:= $(OBJTREE)/nand_spl/
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
 LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
-	   $(LDFLAGS_FINAL)
+		$(LDFLAGS_FINAL) -gc-sections
 AFLAGS	+= -DCONFIG_NAND_SPL
-CFLAGS	+= -DCONFIG_NAND_SPL
+CFLAGS	+= -DCONFIG_NAND_SPL -ffunction-sections
 
 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))
 OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
@@ -98,6 +98,9 @@ $(obj)smdk6400_nand_spl.c:
 	@rm -f $@
 	@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
-- 
1.7.4.1

[U-Boot] [PATCH V3 0/2] fix: regression in SMDK6400

[Albert ARIBAUD]

Hi Simon,

Le 31/10/2011 17:34, Simon Schwarz a ?crit :
> This is a fix for a regression introduced by my patch
> 55f429bb39614a16b1bacc9a8bea9ac01a60bfc8 to u-boot-ti/next
>
> The issue is described here:
> http://article.gmane.org/gmane.comp.boot-loaders.u-boot/108873
>
> changes V3:
> - fix for: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/114559
> - http://article.gmane.org/gmane.comp.boot-loaders.u-boot/114558
>
>
> Simon Schwarz (2):
>    nand: Add common functions to linux/mtd/nand.h
>    Fix regression in SMDK6400
>
>   drivers/mtd/nand/nand_base.c             |    6 +++---
>   drivers/mtd/nand/s3c64xx.c               |   28 ++--------------------------
>   include/linux/mtd/nand.h                 |    7 +++++++
>   include/nand.h                           |    3 ---
>   nand_spl/board/samsung/smdk6400/Makefile |    9 ++++++---
>   5 files changed, 18 insertions(+), 35 deletions(-)

Applied to u-boot-arm/master, under the assumption that you're taking up 
maintainer role for SMDK6400. If you do indeed, can you send a patch to 
MAINTAINERS to make it official? Thanks.

Amicalement,
-- 
Albert.

[U-Boot] [PATCH V3 0/2] fix: regression in SMDK6400

[Simon Schwarz]

Hi Albert,

On 11/25/2011 08:40 PM, Albert ARIBAUD wrote:
> Hi Simon,
>
> Le 31/10/2011 17:34, Simon Schwarz a ?crit :
>> This is a fix for a regression introduced by my patch
>> 55f429bb39614a16b1bacc9a8bea9ac01a60bfc8 to u-boot-ti/next
>>
>> The issue is described here:
>> http://article.gmane.org/gmane.comp.boot-loaders.u-boot/108873
>>
>> changes V3:
>> - fix for: http://article.gmane.org/gmane.comp.boot-loaders.u-boot/114559
>> - http://article.gmane.org/gmane.comp.boot-loaders.u-boot/114558
>>
>>
>> Simon Schwarz (2):
>> nand: Add common functions to linux/mtd/nand.h
>> Fix regression in SMDK6400
>>
>> drivers/mtd/nand/nand_base.c | 6 +++---
>> drivers/mtd/nand/s3c64xx.c | 28 ++--------------------------
>> include/linux/mtd/nand.h | 7 +++++++
>> include/nand.h | 3 ---
>> nand_spl/board/samsung/smdk6400/Makefile | 9 ++++++---
>> 5 files changed, 18 insertions(+), 35 deletions(-)
>
> Applied to u-boot-arm/master, under the assumption that you're taking up
> maintainer role for SMDK6400. If you do indeed, can you send a patch to
> MAINTAINERS to make it official? Thanks.
>

I don't have an SMDK6400 board. So I think it does not make sense to be 
maintainer for it.

The fix was simple and not only related to SMDK6400 - SMDK6400 was just 
the board which made the problem come up.

> Amicalement,

Regards
Simon