diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-02-07 23:51:52 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-02-07 23:51:52 +0100 |
| commit | f8306cb94f59ae2ace5bfede189944d329e5abb3 (patch) | |
| tree | c26c402b9d1c3d28f5a54ffd4fcd2f3a393772de /drivers/mtd/nand/nand.c | |
| parent | 657f2062d8e17ebf4a55f52c9e71c07c0c94c779 (diff) | |
| parent | 2d43e873a29ca4959ba6a30fc7fb396d3fd0dccf (diff) | |
| download | talos-obmc-uboot-f8306cb94f59ae2ace5bfede189944d329e5abb3.tar.gz talos-obmc-uboot-f8306cb94f59ae2ace5bfede189944d329e5abb3.zip | |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'drivers/mtd/nand/nand.c')
| -rw-r--r-- | drivers/mtd/nand/nand.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand.c b/drivers/mtd/nand/nand.c index cf9261786d..70b605f9d2 100644 --- a/drivers/mtd/nand/nand.c +++ b/drivers/mtd/nand/nand.c @@ -28,6 +28,8 @@ #define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } #endif +DECLARE_GLOBAL_DATA_PTR; + int nand_curr_device = -1; nand_info_t nand_info[CONFIG_SYS_MAX_NAND_DEVICE]; @@ -46,6 +48,8 @@ static void nand_init_chip(struct mtd_info *mtd, struct nand_chip *nand, if (nand_scan(mtd, 1) == 0) { if (!mtd->name) mtd->name = (char *)default_nand_name; + else + mtd->name += gd->reloc_off; } else mtd->name = NULL; } else { |
