diff options
| author | Scott Wood <scottwood@freescale.com> | 2015-06-22 22:38:32 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-08-25 22:53:57 -0500 |
| commit | 273310644f4aef806d84d5b8b70c45aa60e7caaf (patch) | |
| tree | 9c118f8aa64efb347f12a0f9df17b556498ad042 /drivers/mtd/nand/nand_bbt.c | |
| parent | c851a2458fbc12495f4f786d4eabb612850a5143 (diff) | |
nand: Remove __UBOOT__ ifdefs
I didn't approve the patch that added them. Get them out of the way
before doing a sync.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'drivers/mtd/nand/nand_bbt.c')
| -rw-r--r-- | drivers/mtd/nand/nand_bbt.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index cf4a82d93a..18c32af9aa 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -59,30 +59,15 @@ * */ -#ifndef __UBOOT__ -#include <linux/slab.h> -#include <linux/types.h> +#include <common.h> +#include <malloc.h> +#include <linux/compat.h> #include <linux/mtd/mtd.h> #include <linux/mtd/bbm.h> #include <linux/mtd/nand.h> #include <linux/mtd/nand_ecc.h> #include <linux/bitops.h> -#include <linux/delay.h> -#include <linux/vmalloc.h> -#include <linux/export.h> #include <linux/string.h> -#else -#include <common.h> -#include <malloc.h> -#include <linux/compat.h> - - #include <linux/mtd/mtd.h> - #include <linux/mtd/bbm.h> - #include <linux/mtd/nand.h> - #include <linux/mtd/nand_ecc.h> - #include <linux/bitops.h> - #include <linux/string.h> -#endif #define BBT_BLOCK_GOOD 0x00 #define BBT_BLOCK_WORN 0x01 @@ -541,11 +526,7 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr { struct nand_chip *this = mtd->priv; int i, chips; -#ifndef __UBOOT__ - int bits, startblock, block, dir; -#else int startblock, block, dir; -#endif int scanlen = mtd->writesize + mtd->oobsize; int bbtblocks; int blocktopage = this->bbt_erase_shift - this->page_shift; @@ -569,11 +550,6 @@ static int search_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr bbtblocks = mtd->size >> this->bbt_erase_shift; } -#ifndef __UBOOT__ - /* Number of bits for each erase block in the bbt */ - bits = td->options & NAND_BBT_NRBITS_MSK; -#endif - for (i = 0; i < chips; i++) { /* Reset version information */ td->version[i] = 0; |