Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-28 08:35:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mtd: OneNAND: allow board init function fail

Browse source 
Signed-off-by: Ladislav Michl <ladis@linux-mips.org>
This commit is contained in:
Ladislav Michl 2016-07-12 20:28:20 +02:00 • committed by Tom Rini
parent d9098ee55f
commit 77b93e5e9b
6 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
board/micronas/vct/ebi_onenand.c
View file

@ -169,7 +169,7 @@ static int ebi_write_bufferram(struct mtd_info *mtd, loff_t addr, int area,
return 0; return 0;
} }
void onenand_board_init(struct mtd_info *mtd) int onenand_board_init(struct mtd_info *mtd)
{ {
struct onenand_chip *chip = mtd->priv; struct onenand_chip *chip = mtd->priv;
@ -181,4 +181,6 @@ void onenand_board_init(struct mtd_info *mtd)
chip->read_bufferram = ebi_read_bufferram; chip->read_bufferram = ebi_read_bufferram;
chip->write_bufferram = ebi_write_bufferram; chip->write_bufferram = ebi_write_bufferram;
return 0;
} }

4
board/samsung/goni/onenand.c
View file

@ -11,11 +11,13 @@
#include <linux/mtd/samsung_onenand.h> #include <linux/mtd/samsung_onenand.h>
#include <onenand_uboot.h> #include <onenand_uboot.h>
void onenand_board_init(struct mtd_info *mtd) int onenand_board_init(struct mtd_info *mtd)
{ {
struct onenand_chip *this = mtd->priv; struct onenand_chip *this = mtd->priv;
this->base = (void *)CONFIG_SYS_ONENAND_BASE; this->base = (void *)CONFIG_SYS_ONENAND_BASE;
this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK; this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK;
this->chip_probe = s5pc110_chip_probe; this->chip_probe = s5pc110_chip_probe;
return 0;
} }

4
board/samsung/smdkc100/onenand.c
View file

@ -16,7 +16,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
void onenand_board_init(struct mtd_info *mtd) int onenand_board_init(struct mtd_info *mtd)
{ {
struct onenand_chip *this = mtd->priv; struct onenand_chip *this = mtd->priv;
struct s5pc100_clock *clk = struct s5pc100_clock *clk =
@ -65,4 +65,6 @@ void onenand_board_init(struct mtd_info *mtd)
writel(value, &onenand->int_err_mask); writel(value, &onenand->int_err_mask);
s3c_onenand_init(mtd); s3c_onenand_init(mtd);
return 0;
} }

4
board/samsung/universal_c210/onenand.c
View file

@ -10,11 +10,13 @@
#include <linux/mtd/onenand.h> #include <linux/mtd/onenand.h>
#include <linux/mtd/samsung_onenand.h> #include <linux/mtd/samsung_onenand.h>
void onenand_board_init(struct mtd_info *mtd) int onenand_board_init(struct mtd_info *mtd)
{ {
struct onenand_chip *this = mtd->priv; struct onenand_chip *this = mtd->priv;
this->base = (void *)CONFIG_SYS_ONENAND_BASE; this->base = (void *)CONFIG_SYS_ONENAND_BASE;
this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK; this->options |= ONENAND_RUNTIME_BADBLOCK_CHECK;
this->chip_probe = s5pc210_chip_probe; this->chip_probe = s5pc210_chip_probe;
return 0;
} }

12
drivers/mtd/onenand/onenand_uboot.c
View file

@ -24,26 +24,24 @@ static __attribute__((unused)) char dev_name[] = "onenand0";
void onenand_init(void) void onenand_init(void)
{ {
int err = 0;
memset(&onenand_mtd, 0, sizeof(struct mtd_info)); memset(&onenand_mtd, 0, sizeof(struct mtd_info));
memset(&onenand_chip, 0, sizeof(struct onenand_chip)); memset(&onenand_chip, 0, sizeof(struct onenand_chip));
onenand_mtd.priv = &onenand_chip; onenand_mtd.priv = &onenand_chip;
#ifdef CONFIG_USE_ONENAND_BOARD_INIT #ifdef CONFIG_USE_ONENAND_BOARD_INIT
/* /* It's used for some board init required */
* It's used for some board init required err = onenand_board_init(&onenand_mtd);
*/
onenand_board_init(&onenand_mtd);
#else #else
onenand_chip.base = (void *) CONFIG_SYS_ONENAND_BASE; onenand_chip.base = (void *) CONFIG_SYS_ONENAND_BASE;
#endif #endif
onenand_scan(&onenand_mtd, 1); if (!err && !(onenand_scan(&onenand_mtd, 1))) {
if (onenand_chip.device_id & DEVICE_IS_FLEXONENAND) if (onenand_chip.device_id & DEVICE_IS_FLEXONENAND)
puts("Flex-"); puts("Flex-");
puts("OneNAND: "); puts("OneNAND: ");
print_size(onenand_chip.chipsize, "\n");
#ifdef CONFIG_MTD_DEVICE #ifdef CONFIG_MTD_DEVICE
/* /*
@ -53,4 +51,6 @@ void onenand_init(void)
onenand_mtd.name = dev_name; onenand_mtd.name = dev_name;
add_mtd_device(&onenand_mtd); add_mtd_device(&onenand_mtd);
#endif #endif
}
print_size(onenand_chip.chipsize, "\n");
} }

2
include/onenand_uboot.h
View file

@ -26,7 +26,7 @@ extern struct mtd_info onenand_mtd;
extern struct onenand_chip onenand_chip; extern struct onenand_chip onenand_chip;
/* board */ /* board */
extern void onenand_board_init(struct mtd_info *); extern int onenand_board_init(struct mtd_info *);
/* Functions */ /* Functions */
extern void onenand_init(void); extern void onenand_init(void);