|
@@ -34,7 +34,7 @@
|
|
#include <asm/io.h>
|
|
#include <asm/io.h>
|
|
#include <fsl_nfc.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)
|
|
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 /
|
|
unsigned int maxpages = CONFIG_SYS_NAND_SIZE /
|
|
CONFIG_SYS_NAND_PAGE_SIZE;
|
|
CONFIG_SYS_NAND_PAGE_SIZE;
|
|
|
|
|
|
- nfc = (void *)NFC_BASE_ADDR;
|
|
|
|
-
|
|
|
|
nfc_nand_init();
|
|
nfc_nand_init();
|
|
|
|
|
|
/* Convert to page number */
|
|
/* Convert to page number */
|
|
@@ -274,8 +272,6 @@ void nand_boot(void)
|
|
{
|
|
{
|
|
__attribute__((noreturn)) void (*uboot)(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
|
|
* CONFIG_SYS_NAND_U_BOOT_OFFS and CONFIG_SYS_NAND_U_BOOT_SIZE must
|
|
* be aligned to full pages
|
|
* be aligned to full pages
|