[U-Boot] [RFC][PATCH v2 14/19] nand_fsl_nfc: get rid of local var

Heiko Schocher hs at denx.de
Tue Aug 3 12:15:36 CEST 2010


If we have -fPIC enabled, this var leads in one entry in the
GOT. The result of this is that the image size is > 0x800.
So make it a "static const" and this brings the size again < 0x800

Signed-off-by: Heiko Schocher <hs at denx.de>
Acked-by: Scott Wood <scottwood at freescale.com>
---

- changes since v1
  add comment from Scott Wood:
  - make the var nfc static const

 nand_spl/nand_boot_fsl_nfc.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/nand_spl/nand_boot_fsl_nfc.c b/nand_spl/nand_boot_fsl_nfc.c
index 9720f6a..50d6ea9 100644
--- a/nand_spl/nand_boot_fsl_nfc.c
+++ b/nand_spl/nand_boot_fsl_nfc.c
@@ -34,7 +34,7 @@
 #include <asm/io.h>
 #include <fsl_nfc.h>

-struct fsl_nfc_regs *nfc;
+static struct fsl_nfc_regs *const nfc = (void *)NFC_BASE_ADDR;

 static void nfc_wait_ready(void)
 {
@@ -228,8 +228,6 @@ static int nand_load(unsigned int from, unsigned int size, unsigned char *buf)
 	unsigned int maxpages = CONFIG_SYS_NAND_SIZE /
 				CONFIG_SYS_NAND_PAGE_SIZE;

-	nfc = (void *)NFC_BASE_ADDR;
-
 	nfc_nand_init();

 	/* Convert to page number */
@@ -279,8 +277,6 @@ void nand_boot(void)
 {
 	__attribute__((noreturn)) void (*uboot)(void);

-	nfc = (void *)NFC_BASE_ADDR;
-
 	/*
 	 * CONFIG_SYS_NAND_U_BOOT_OFFS and CONFIG_SYS_NAND_U_BOOT_SIZE must
 	 * be aligned to full pages
-- 
1.6.2.5

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany


More information about the U-Boot mailing list