Merge branch 'for-next/imx-bbu-nand-fcb'
Conflicts: common/Kconfig
This commit is contained in:
commit
c5438404db
|
@ -18,12 +18,12 @@
|
||||||
&gpmi {
|
&gpmi {
|
||||||
partition@0 {
|
partition@0 {
|
||||||
label = "barebox";
|
label = "barebox";
|
||||||
reg = <0x0 0x100000>;
|
reg = <0x0 0x400000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
partition@1 {
|
partition@1 {
|
||||||
label = "barebox-environment";
|
label = "barebox-environment";
|
||||||
reg = <0x100000 0x100000>;
|
reg = <0x400000 0x100000>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -127,15 +127,6 @@ config BAREBOX_UPDATE_IMX_EXTERNAL_NAND
|
||||||
depends on MTD_WRITE
|
depends on MTD_WRITE
|
||||||
default y
|
default y
|
||||||
|
|
||||||
config BAREBOX_UPDATE_IMX6_NAND
|
|
||||||
bool
|
|
||||||
depends on ARCH_IMX6
|
|
||||||
depends on BAREBOX_UPDATE
|
|
||||||
depends on MTD
|
|
||||||
depends on MTD_WRITE
|
|
||||||
depends on NAND_MXS
|
|
||||||
default y
|
|
||||||
|
|
||||||
comment "Freescale i.MX System-on-Chip"
|
comment "Freescale i.MX System-on-Chip"
|
||||||
|
|
||||||
config ARCH_IMX1
|
config ARCH_IMX1
|
||||||
|
|
|
@ -22,6 +22,5 @@ obj-y += devices.o imx.o esdctl.o
|
||||||
obj-y += boot.o
|
obj-y += boot.o
|
||||||
obj-$(CONFIG_BAREBOX_UPDATE) += imx-bbu-internal.o
|
obj-$(CONFIG_BAREBOX_UPDATE) += imx-bbu-internal.o
|
||||||
obj-$(CONFIG_BAREBOX_UPDATE_IMX_EXTERNAL_NAND) += imx-bbu-external-nand.o
|
obj-$(CONFIG_BAREBOX_UPDATE_IMX_EXTERNAL_NAND) += imx-bbu-external-nand.o
|
||||||
obj-$(CONFIG_BAREBOX_UPDATE_IMX6_NAND) += imx6-bbu-nand.o
|
|
||||||
pbl-y += esdctl.o
|
pbl-y += esdctl.o
|
||||||
lwl-y += cpu_init.o
|
lwl-y += cpu_init.o
|
||||||
|
|
|
@ -75,15 +75,6 @@ static inline int imx_bbu_external_nor_register_handler(const char *name, char *
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(CONFIG_BAREBOX_UPDATE_IMX6_NAND)
|
|
||||||
int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
|
|
||||||
#else
|
|
||||||
static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
|
|
||||||
{
|
|
||||||
return -ENOSYS;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(CONFIG_BAREBOX_UPDATE_IMX_EXTERNAL_NAND)
|
#if defined(CONFIG_BAREBOX_UPDATE_IMX_EXTERNAL_NAND)
|
||||||
int imx_bbu_external_nand_register_handler(const char *name, char *devicefile,
|
int imx_bbu_external_nand_register_handler(const char *name, char *devicefile,
|
||||||
unsigned long flags);
|
unsigned long flags);
|
||||||
|
|
|
@ -97,6 +97,14 @@ config FILE_LIST
|
||||||
config ARCH_DMA_ADDR_T_64BIT
|
config ARCH_DMA_ADDR_T_64BIT
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
config BAREBOX_UPDATE_IMX_NAND_FCB
|
||||||
|
bool
|
||||||
|
depends on ARCH_IMX6 || ARCH_IMX28
|
||||||
|
depends on BAREBOX_UPDATE
|
||||||
|
depends on MTD_WRITE
|
||||||
|
depends on NAND_MXS
|
||||||
|
default y
|
||||||
|
|
||||||
menu "General Settings"
|
menu "General Settings"
|
||||||
|
|
||||||
config LOCALVERSION
|
config LOCALVERSION
|
||||||
|
|
|
@ -52,6 +52,7 @@ lwl-$(CONFIG_IMD) += imd-barebox.o
|
||||||
obj-$(CONFIG_IMD) += imd.o
|
obj-$(CONFIG_IMD) += imd.o
|
||||||
obj-$(CONFIG_FILE_LIST) += file-list.o
|
obj-$(CONFIG_FILE_LIST) += file-list.o
|
||||||
obj-$(CONFIG_FIRMWARE) += firmware.o
|
obj-$(CONFIG_FIRMWARE) += firmware.o
|
||||||
|
obj-$(CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB) += imx-bbu-nand-fcb.o
|
||||||
|
|
||||||
quiet_cmd_pwd_h = PWDH $@
|
quiet_cmd_pwd_h = PWDH $@
|
||||||
ifdef CONFIG_PASSWORD
|
ifdef CONFIG_PASSWORD
|
||||||
|
|
|
@ -60,6 +60,7 @@ static const struct filetype_str filetype_str[] = {
|
||||||
"TI OMAP CH boot image (big endian)", "ch-image-be" },
|
"TI OMAP CH boot image (big endian)", "ch-image-be" },
|
||||||
[filetype_xz_compressed] = { "XZ compressed", "xz" },
|
[filetype_xz_compressed] = { "XZ compressed", "xz" },
|
||||||
[filetype_exe] = { "MS-DOS executable", "exe" },
|
[filetype_exe] = { "MS-DOS executable", "exe" },
|
||||||
|
[filetype_mxs_bootstream] = { "Freescale MXS bootstream", "mxsbs" },
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *file_type_to_string(enum filetype f)
|
const char *file_type_to_string(enum filetype f)
|
||||||
|
@ -292,6 +293,8 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize)
|
||||||
|
|
||||||
if (buf8[0] == 'M' && buf8[1] == 'Z')
|
if (buf8[0] == 'M' && buf8[1] == 'Z')
|
||||||
return filetype_exe;
|
return filetype_exe;
|
||||||
|
if (le32_to_cpu(buf[5]) == 0x504d5453)
|
||||||
|
return filetype_mxs_bootstream;
|
||||||
|
|
||||||
if (is_barebox_arm_head(_buf))
|
if (is_barebox_arm_head(_buf))
|
||||||
return filetype_arm_barebox;
|
return filetype_arm_barebox;
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#define pr_fmt(fmt) "imx6-bbu-nand: " fmt
|
#define pr_fmt(fmt) "imx-bbu-nand-fcb: " fmt
|
||||||
|
|
||||||
#include <filetype.h>
|
#include <filetype.h>
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
@ -28,17 +28,17 @@
|
||||||
#include <linux/sizes.h>
|
#include <linux/sizes.h>
|
||||||
#include <bbu.h>
|
#include <bbu.h>
|
||||||
#include <fs.h>
|
#include <fs.h>
|
||||||
#include <mach/bbu.h>
|
|
||||||
#include <linux/mtd/mtd-abi.h>
|
#include <linux/mtd/mtd-abi.h>
|
||||||
#include <linux/mtd/nand_mxs.h>
|
#include <linux/mtd/nand_mxs.h>
|
||||||
#include <linux/mtd/mtd.h>
|
#include <linux/mtd/mtd.h>
|
||||||
#include <linux/stat.h>
|
#include <linux/stat.h>
|
||||||
|
#include <io.h>
|
||||||
|
|
||||||
struct dbbt_block {
|
struct dbbt_block {
|
||||||
uint32_t Checksum;
|
uint32_t Checksum;
|
||||||
uint32_t FingerPrint;
|
uint32_t FingerPrint;
|
||||||
uint32_t Version;
|
uint32_t Version;
|
||||||
uint32_t reserved;
|
uint32_t numberBB; /* reserved on i.MX6 */
|
||||||
uint32_t DBBTNumOfPages;
|
uint32_t DBBTNumOfPages;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -102,6 +102,16 @@ struct fcb_block {
|
||||||
uint32_t BBMarkerPhysicalOffsetInSpareData; /* The swap position of main area in spare area */
|
uint32_t BBMarkerPhysicalOffsetInSpareData; /* The swap position of main area in spare area */
|
||||||
};
|
};
|
||||||
|
|
||||||
|
struct imx_nand_fcb_bbu_handler {
|
||||||
|
struct bbu_handler handler;
|
||||||
|
|
||||||
|
void (*fcb_create)(struct imx_nand_fcb_bbu_handler *imx_handler,
|
||||||
|
struct fcb_block *fcb, struct mtd_info *mtd);
|
||||||
|
void (*dbbt_create)(struct imx_nand_fcb_bbu_handler *imx_handler,
|
||||||
|
struct dbbt_block *dbbt, int num_bad_blocks);
|
||||||
|
enum filetype filetype;
|
||||||
|
};
|
||||||
|
|
||||||
#define BF_VAL(v, bf) (((v) & bf##_MASK) >> bf##_OFFSET)
|
#define BF_VAL(v, bf) (((v) & bf##_MASK) >> bf##_OFFSET)
|
||||||
#define GETBIT(v,n) (((v) >> (n)) & 0x1)
|
#define GETBIT(v,n) (((v) >> (n)) & 0x1)
|
||||||
|
|
||||||
|
@ -228,7 +238,8 @@ static ssize_t raw_write_page(struct mtd_info *mtd, void *buf, loff_t offset)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int fcb_create(struct fcb_block *fcb, struct mtd_info *mtd)
|
static int fcb_create(struct imx_nand_fcb_bbu_handler *imx_handler,
|
||||||
|
struct fcb_block *fcb, struct mtd_info *mtd)
|
||||||
{
|
{
|
||||||
fcb->FingerPrint = 0x20424346;
|
fcb->FingerPrint = 0x20424346;
|
||||||
fcb->Version = 0x01000000;
|
fcb->Version = 0x01000000;
|
||||||
|
@ -241,42 +252,37 @@ static int fcb_create(struct fcb_block *fcb, struct mtd_info *mtd)
|
||||||
mxs_nand_get_ecc_strength(mtd->writesize, mtd->oobsize) >> 1;
|
mxs_nand_get_ecc_strength(mtd->writesize, mtd->oobsize) >> 1;
|
||||||
fcb->EccBlockNEccType = fcb->EccBlock0EccType;
|
fcb->EccBlockNEccType = fcb->EccBlock0EccType;
|
||||||
|
|
||||||
/* Also hardcoded in kobs-ng */
|
|
||||||
fcb->DataSetup = 80;
|
|
||||||
fcb->DataHold = 60;
|
|
||||||
fcb->AddressSetup = 25;
|
|
||||||
fcb->DSAMPLE_TIME = 6;
|
|
||||||
fcb->MetadataBytes = 0x0000000a;
|
|
||||||
fcb->EccBlock0Size = 0x00000200;
|
fcb->EccBlock0Size = 0x00000200;
|
||||||
fcb->EccBlockNSize = 0x00000200;
|
fcb->EccBlockNSize = 0x00000200;
|
||||||
|
|
||||||
fcb->NumEccBlocksPerPage = mtd->writesize / fcb->EccBlock0Size - 1;
|
fcb->NumEccBlocksPerPage = mtd->writesize / fcb->EccBlock0Size - 1;
|
||||||
|
|
||||||
/* DBBT search area starts at third block */
|
/* DBBT search area starts at second page on first block */
|
||||||
fcb->DBBTSearchAreaStartAddress = mtd->erasesize / mtd->writesize * 2;
|
fcb->DBBTSearchAreaStartAddress = 1;
|
||||||
|
|
||||||
fcb->BadBlockMarkerByte = mxs_nand_mark_byte_offset(mtd);
|
fcb->BadBlockMarkerByte = mxs_nand_mark_byte_offset(mtd);
|
||||||
fcb->BadBlockMarkerStartBit = mxs_nand_mark_bit_offset(mtd);
|
fcb->BadBlockMarkerStartBit = mxs_nand_mark_bit_offset(mtd);
|
||||||
|
|
||||||
fcb->BBMarkerPhysicalOffset = mtd->writesize;
|
fcb->BBMarkerPhysicalOffset = mtd->writesize;
|
||||||
|
|
||||||
|
imx_handler->fcb_create(imx_handler, fcb, mtd);
|
||||||
|
|
||||||
fcb->Checksum = calc_chksum((void *)fcb + 4, sizeof(*fcb) - 4);
|
fcb->Checksum = calc_chksum((void *)fcb + 4, sizeof(*fcb) - 4);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int imx6_bbu_erase(struct mtd_info *mtd)
|
static int imx_bbu_erase(struct mtd_info *mtd)
|
||||||
{
|
{
|
||||||
uint64_t offset = 0;
|
uint64_t offset = 0;
|
||||||
int len = SZ_2M;
|
|
||||||
struct erase_info erase;
|
struct erase_info erase;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
while (len > 0) {
|
while (offset < mtd->size) {
|
||||||
pr_debug("erasing at 0x%08llx\n", offset);
|
pr_debug("erasing at 0x%08llx\n", offset);
|
||||||
if (mtd_block_isbad(mtd, offset)) {
|
if (mtd_block_isbad(mtd, offset)) {
|
||||||
offset += mtd->erasesize;
|
|
||||||
pr_debug("erase skip block @ 0x%08llx\n", offset);
|
pr_debug("erase skip block @ 0x%08llx\n", offset);
|
||||||
|
offset += mtd->erasesize;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -289,13 +295,13 @@ static int imx6_bbu_erase(struct mtd_info *mtd)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
offset += mtd->erasesize;
|
offset += mtd->erasesize;
|
||||||
len -= mtd->erasesize;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int imx6_bbu_write_firmware(struct mtd_info *mtd, int block, void *buf, size_t len)
|
static int imx_bbu_write_firmware(struct mtd_info *mtd, unsigned block,
|
||||||
|
unsigned num_blocks, void *buf, size_t len)
|
||||||
{
|
{
|
||||||
uint64_t offset = block * mtd->erasesize;
|
uint64_t offset = block * mtd->erasesize;
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -304,13 +310,16 @@ static int imx6_bbu_write_firmware(struct mtd_info *mtd, int block, void *buf, s
|
||||||
while (len > 0) {
|
while (len > 0) {
|
||||||
int now = min(len, mtd->erasesize);
|
int now = min(len, mtd->erasesize);
|
||||||
|
|
||||||
|
if (!num_blocks)
|
||||||
|
return -ENOSPC;
|
||||||
|
|
||||||
pr_debug("writing %p at 0x%08llx, left 0x%08x\n",
|
pr_debug("writing %p at 0x%08llx, left 0x%08x\n",
|
||||||
buf, offset, len);
|
buf, offset, len);
|
||||||
|
|
||||||
if (mtd_block_isbad(mtd, offset)) {
|
if (mtd_block_isbad(mtd, offset)) {
|
||||||
|
pr_debug("write skip block @ 0x%08llx\n", offset);
|
||||||
offset += mtd->erasesize;
|
offset += mtd->erasesize;
|
||||||
block++;
|
block++;
|
||||||
pr_debug("write skip block @ 0x%08llx\n", offset);
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -322,6 +331,7 @@ static int imx6_bbu_write_firmware(struct mtd_info *mtd, int block, void *buf, s
|
||||||
len -= now;
|
len -= now;
|
||||||
buf += now;
|
buf += now;
|
||||||
block++;
|
block++;
|
||||||
|
num_blocks--;
|
||||||
}
|
}
|
||||||
|
|
||||||
return block;
|
return block;
|
||||||
|
@ -348,35 +358,40 @@ static int dbbt_data_create(struct mtd_info *mtd, void *buf, int block_last)
|
||||||
return n_bad_blocks;
|
return n_bad_blocks;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int imx6_bbu_nand_update(struct bbu_handler *handler, struct bbu_data *data)
|
static int imx_bbu_nand_update(struct bbu_handler *handler, struct bbu_data *data)
|
||||||
{
|
{
|
||||||
|
struct imx_nand_fcb_bbu_handler *imx_handler =
|
||||||
|
container_of(handler, struct imx_nand_fcb_bbu_handler, handler);
|
||||||
struct cdev *bcb_cdev;
|
struct cdev *bcb_cdev;
|
||||||
struct mtd_info *mtd;
|
struct mtd_info *mtd;
|
||||||
int ret, block_fw1, block_fw2, block_last;
|
int ret, block_fw1, block_fw2;
|
||||||
struct fcb_block *fcb;
|
struct fcb_block *fcb;
|
||||||
struct dbbt_block *dbbt;
|
struct dbbt_block *dbbt;
|
||||||
void *fcb_raw_page, *dbbt_page, *dbbt_data_page;
|
void *fcb_raw_page, *dbbt_page, *dbbt_data_page;
|
||||||
void *ecc;
|
void *ecc;
|
||||||
int written;
|
int written;
|
||||||
void *fw;
|
void *fw;
|
||||||
unsigned fw_size;
|
unsigned fw_size, partition_size;
|
||||||
int i;
|
int i;
|
||||||
|
enum filetype filetype;
|
||||||
|
unsigned num_blocks_fcb_dbbt, num_blocks, num_blocks_fw;
|
||||||
|
|
||||||
if (file_detect_type(data->image, data->len) != filetype_arm_barebox &&
|
filetype = file_detect_type(data->image, data->len);
|
||||||
!bbu_force(data, "Not an ARM barebox image"))
|
|
||||||
|
if (filetype != imx_handler->filetype &&
|
||||||
|
!bbu_force(data, "Image is not of type %s but of type %s",
|
||||||
|
file_type_to_string(imx_handler->filetype),
|
||||||
|
file_type_to_string(filetype)))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
ret = bbu_confirm(data);
|
bcb_cdev = cdev_by_name(handler->devicefile);
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
bcb_cdev = cdev_by_name("nand0");
|
|
||||||
if (!bcb_cdev) {
|
if (!bcb_cdev) {
|
||||||
pr_err("%s: No FCB device!\n", __func__);
|
pr_err("%s: No FCB device!\n", __func__);
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
mtd = bcb_cdev->mtd;
|
mtd = bcb_cdev->mtd;
|
||||||
|
partition_size = mtd->size;
|
||||||
|
|
||||||
fcb_raw_page = xzalloc(mtd->writesize + mtd->oobsize);
|
fcb_raw_page = xzalloc(mtd->writesize + mtd->oobsize);
|
||||||
|
|
||||||
|
@ -396,30 +411,45 @@ static int imx6_bbu_nand_update(struct bbu_handler *handler, struct bbu_data *da
|
||||||
fw = xzalloc(fw_size);
|
fw = xzalloc(fw_size);
|
||||||
memcpy(fw, data->image, data->len);
|
memcpy(fw, data->image, data->len);
|
||||||
|
|
||||||
block_fw1 = 4;
|
num_blocks_fcb_dbbt = 4;
|
||||||
|
num_blocks = partition_size / mtd->erasesize;
|
||||||
|
num_blocks_fw = (num_blocks - num_blocks_fcb_dbbt) / 2;
|
||||||
|
|
||||||
ret = imx6_bbu_erase(mtd);
|
block_fw1 = num_blocks_fcb_dbbt;
|
||||||
|
block_fw2 = num_blocks_fcb_dbbt + num_blocks_fw;
|
||||||
|
|
||||||
|
pr_info("writing first firmware to block %d (ofs 0x%08x)\n",
|
||||||
|
block_fw1, block_fw1 * mtd->erasesize);
|
||||||
|
pr_info("writing second firmware to block %d (ofs 0x%08x)\n",
|
||||||
|
block_fw2, block_fw2 * mtd->erasesize);
|
||||||
|
pr_info("maximum size per firmware: 0x%08x bytes\n",
|
||||||
|
num_blocks_fw * mtd->erasesize);
|
||||||
|
|
||||||
|
if (num_blocks_fw * mtd->erasesize < fw_size)
|
||||||
|
return -ENOSPC;
|
||||||
|
|
||||||
|
ret = bbu_confirm(data);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
ret = imx6_bbu_write_firmware(mtd, block_fw1, fw, fw_size);
|
ret = imx_bbu_erase(mtd);
|
||||||
|
if (ret)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
ret = imx_bbu_write_firmware(mtd, block_fw1, num_blocks_fw, fw, fw_size);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
block_fw2 = ret;
|
ret = imx_bbu_write_firmware(mtd, block_fw2, num_blocks_fw, fw, fw_size);
|
||||||
|
|
||||||
ret = imx6_bbu_write_firmware(mtd, block_fw2, fw, fw_size);
|
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
block_last = ret;
|
|
||||||
|
|
||||||
fcb->Firmware1_startingPage = block_fw1 * mtd->erasesize / mtd->writesize;
|
fcb->Firmware1_startingPage = block_fw1 * mtd->erasesize / mtd->writesize;
|
||||||
fcb->Firmware2_startingPage = block_fw2 * mtd->erasesize / mtd->writesize;
|
fcb->Firmware2_startingPage = block_fw2 * mtd->erasesize / mtd->writesize;
|
||||||
fcb->PagesInFirmware1 = ALIGN(data->len, mtd->writesize) / mtd->writesize;
|
fcb->PagesInFirmware1 = ALIGN(data->len, mtd->writesize) / mtd->writesize;
|
||||||
fcb->PagesInFirmware2 = fcb->PagesInFirmware1;
|
fcb->PagesInFirmware2 = fcb->PagesInFirmware1;
|
||||||
|
|
||||||
fcb_create(fcb, mtd);
|
fcb_create(imx_handler, fcb, mtd);
|
||||||
encode_hamming_13_8(fcb, ecc, 512);
|
encode_hamming_13_8(fcb, ecc, 512);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -431,10 +461,6 @@ static int imx6_bbu_nand_update(struct bbu_handler *handler, struct bbu_data *da
|
||||||
*/
|
*/
|
||||||
memset(fcb_raw_page + mtd->writesize, 0xFF, 2);
|
memset(fcb_raw_page + mtd->writesize, 0xFF, 2);
|
||||||
|
|
||||||
ret = raw_write_page(mtd, fcb_raw_page, 0);
|
|
||||||
if (ret)
|
|
||||||
goto out;
|
|
||||||
|
|
||||||
ret = raw_write_page(mtd, fcb_raw_page, mtd->erasesize);
|
ret = raw_write_page(mtd, fcb_raw_page, mtd->erasesize);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
@ -443,21 +469,29 @@ static int imx6_bbu_nand_update(struct bbu_handler *handler, struct bbu_data *da
|
||||||
dbbt->FingerPrint = 0x54424244;
|
dbbt->FingerPrint = 0x54424244;
|
||||||
dbbt->Version = 0x01000000;
|
dbbt->Version = 0x01000000;
|
||||||
|
|
||||||
ret = dbbt_data_create(mtd, dbbt_data_page, block_last);
|
ret = dbbt_data_create(mtd, dbbt_data_page, block_fw2 + num_blocks_fw);
|
||||||
if (ret < 0)
|
if (ret < 0)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (ret > 0)
|
if (ret > 0) {
|
||||||
dbbt->DBBTNumOfPages = 1;
|
dbbt->DBBTNumOfPages = 1;
|
||||||
|
if (imx_handler->dbbt_create)
|
||||||
|
imx_handler->dbbt_create(imx_handler, dbbt, ret);
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 2; i < 4; i++) {
|
for (i = 0; i < 4; i++) {
|
||||||
ret = mtd_write(mtd, mtd->erasesize * i, 2048, &written, dbbt_page);
|
ret = raw_write_page(mtd, fcb_raw_page, mtd->erasesize * i);
|
||||||
|
if (ret)
|
||||||
|
goto out;
|
||||||
|
|
||||||
|
ret = mtd_write(mtd, mtd->erasesize * i + mtd->writesize,
|
||||||
|
mtd->writesize, &written, dbbt_page);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
if (dbbt->DBBTNumOfPages > 0) {
|
if (dbbt->DBBTNumOfPages > 0) {
|
||||||
ret = mtd_write(mtd, mtd->erasesize * i + mtd->writesize * 4,
|
ret = mtd_write(mtd, mtd->erasesize * i + mtd->writesize * 5,
|
||||||
2048, &written, dbbt_data_page);
|
mtd->writesize, &written, dbbt_data_page);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@ -472,16 +506,32 @@ out:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void imx6_fcb_create(struct imx_nand_fcb_bbu_handler *imx_handler,
|
||||||
|
struct fcb_block *fcb, struct mtd_info *mtd)
|
||||||
|
{
|
||||||
|
/* Also hardcoded in kobs-ng */
|
||||||
|
fcb->DataSetup = 80;
|
||||||
|
fcb->DataHold = 60;
|
||||||
|
fcb->AddressSetup = 25;
|
||||||
|
fcb->DSAMPLE_TIME = 6;
|
||||||
|
fcb->MetadataBytes = 10;
|
||||||
|
}
|
||||||
|
|
||||||
int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
|
int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
|
||||||
{
|
{
|
||||||
|
struct imx_nand_fcb_bbu_handler *imx_handler;
|
||||||
struct bbu_handler *handler;
|
struct bbu_handler *handler;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
handler = xzalloc(sizeof(*handler));
|
imx_handler = xzalloc(sizeof(*imx_handler));
|
||||||
handler->devicefile = "/dev/nand0";
|
imx_handler->fcb_create = imx6_fcb_create;
|
||||||
|
imx_handler->filetype = filetype_arm_barebox;
|
||||||
|
|
||||||
|
handler = &imx_handler->handler;
|
||||||
|
handler->devicefile = "nand0.barebox";
|
||||||
handler->name = name;
|
handler->name = name;
|
||||||
handler->flags = flags;
|
handler->flags = flags;
|
||||||
handler->handler = imx6_bbu_nand_update;
|
handler->handler = imx_bbu_nand_update;
|
||||||
|
|
||||||
ret = bbu_register_handler(handler);
|
ret = bbu_register_handler(handler);
|
||||||
if (ret)
|
if (ret)
|
||||||
|
@ -489,3 +539,99 @@ int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_ARCH_IMX28
|
||||||
|
#include <mach/imx28-regs.h>
|
||||||
|
|
||||||
|
#define GPMI_TIMING0 0x00000070
|
||||||
|
#define GPMI_TIMING0_ADDRESS_SETUP_MASK (0xff << 16)
|
||||||
|
#define GPMI_TIMING0_ADDRESS_SETUP_OFFSET 16
|
||||||
|
#define GPMI_TIMING0_DATA_HOLD_MASK (0xff << 8)
|
||||||
|
#define GPMI_TIMING0_DATA_HOLD_OFFSET 8
|
||||||
|
#define GPMI_TIMING0_DATA_SETUP_MASK 0xff
|
||||||
|
#define GPMI_TIMING0_DATA_SETUP_OFFSET 0
|
||||||
|
|
||||||
|
#define GPMI_TIMING1 0x00000080
|
||||||
|
|
||||||
|
#define BCH_MODE 0x00000020
|
||||||
|
|
||||||
|
#define BCH_FLASH0LAYOUT0 0x00000080
|
||||||
|
#define BCH_FLASHLAYOUT0_NBLOCKS_MASK (0xff << 24)
|
||||||
|
#define BCH_FLASHLAYOUT0_NBLOCKS_OFFSET 24
|
||||||
|
#define BCH_FLASHLAYOUT0_META_SIZE_MASK (0xff << 16)
|
||||||
|
#define BCH_FLASHLAYOUT0_META_SIZE_OFFSET 16
|
||||||
|
#define BCH_FLASHLAYOUT0_ECC0_MASK (0xf << 12)
|
||||||
|
#define BCH_FLASHLAYOUT0_ECC0_OFFSET 12
|
||||||
|
#define BCH_FLASHLAYOUT0_DATA0_SIZE_MASK 0xfff
|
||||||
|
#define BCH_FLASHLAYOUT0_DATA0_SIZE_OFFSET 0
|
||||||
|
|
||||||
|
#define BCH_FLASH0LAYOUT1 0x00000090
|
||||||
|
#define BCH_FLASHLAYOUT1_PAGE_SIZE_MASK (0xffff << 16)
|
||||||
|
#define BCH_FLASHLAYOUT1_PAGE_SIZE_OFFSET 16
|
||||||
|
#define BCH_FLASHLAYOUT1_ECCN_MASK (0xf << 12)
|
||||||
|
#define BCH_FLASHLAYOUT1_ECCN_OFFSET 12
|
||||||
|
#define BCH_FLASHLAYOUT1_DATAN_SIZE_MASK 0xfff
|
||||||
|
#define BCH_FLASHLAYOUT1_DATAN_SIZE_OFFSET 0
|
||||||
|
|
||||||
|
static void imx28_fcb_create(struct imx_nand_fcb_bbu_handler *imx_handler,
|
||||||
|
struct fcb_block *fcb, struct mtd_info *mtd)
|
||||||
|
{
|
||||||
|
u32 fl0, fl1, t0;
|
||||||
|
void __iomem *bch_regs = (void *)MXS_BCH_BASE;
|
||||||
|
void __iomem *gpmi_regs = (void *)MXS_GPMI_BASE;
|
||||||
|
|
||||||
|
fl0 = readl(bch_regs + BCH_FLASH0LAYOUT0);
|
||||||
|
fl1 = readl(bch_regs + BCH_FLASH0LAYOUT1);
|
||||||
|
t0 = readl(gpmi_regs + GPMI_TIMING0);
|
||||||
|
|
||||||
|
fcb->MetadataBytes = BF_VAL(fl0, BCH_FLASHLAYOUT0_META_SIZE);
|
||||||
|
fcb->DataSetup = BF_VAL(t0, GPMI_TIMING0_DATA_SETUP);
|
||||||
|
fcb->DataHold = BF_VAL(t0, GPMI_TIMING0_DATA_HOLD);
|
||||||
|
fcb->AddressSetup = BF_VAL(t0, GPMI_TIMING0_ADDRESS_SETUP);
|
||||||
|
fcb->MetadataBytes = BF_VAL(fl0, BCH_FLASHLAYOUT0_META_SIZE);
|
||||||
|
fcb->NumEccBlocksPerPage = BF_VAL(fl0, BCH_FLASHLAYOUT0_NBLOCKS);
|
||||||
|
fcb->EraseThreshold = readl(bch_regs + BCH_MODE);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void imx28_dbbt_create(struct imx_nand_fcb_bbu_handler *imx_handler,
|
||||||
|
struct dbbt_block *dbbt, int num_bad_blocks)
|
||||||
|
{
|
||||||
|
uint32_t a = 0;
|
||||||
|
uint8_t *p = (void *)dbbt;
|
||||||
|
int i;
|
||||||
|
|
||||||
|
dbbt->numberBB = num_bad_blocks;
|
||||||
|
|
||||||
|
for (i = 4; i < 512; i++)
|
||||||
|
a += p[i];
|
||||||
|
|
||||||
|
a ^= 0xffffffff;
|
||||||
|
|
||||||
|
dbbt->Checksum = a;
|
||||||
|
}
|
||||||
|
|
||||||
|
int imx28_bbu_nand_register_handler(const char *name, unsigned long flags)
|
||||||
|
{
|
||||||
|
struct imx_nand_fcb_bbu_handler *imx_handler;
|
||||||
|
struct bbu_handler *handler;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
imx_handler = xzalloc(sizeof(*imx_handler));
|
||||||
|
imx_handler->fcb_create = imx28_fcb_create;
|
||||||
|
imx_handler->dbbt_create = imx28_dbbt_create;
|
||||||
|
|
||||||
|
imx_handler->filetype = filetype_mxs_bootstream;
|
||||||
|
|
||||||
|
handler = &imx_handler->handler;
|
||||||
|
handler->devicefile = "nand0.barebox";
|
||||||
|
handler->name = name;
|
||||||
|
handler->flags = flags;
|
||||||
|
handler->handler = imx_bbu_nand_update;
|
||||||
|
|
||||||
|
ret = bbu_register_handler(handler);
|
||||||
|
if (ret)
|
||||||
|
free(handler);
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
#endif
|
|
@ -31,6 +31,16 @@ static int mtd_part_write(struct mtd_info *mtd, loff_t to, size_t len,
|
||||||
len, retlen, buf);
|
len, retlen, buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int mtd_part_write_oob(struct mtd_info *mtd, loff_t to,
|
||||||
|
struct mtd_oob_ops *ops)
|
||||||
|
{
|
||||||
|
if (to >= mtd->size)
|
||||||
|
return -EINVAL;
|
||||||
|
if (ops->datbuf && to + ops->len > mtd->size)
|
||||||
|
return -EINVAL;
|
||||||
|
return mtd->master->write_oob(mtd->master, to + mtd->master_offset, ops);
|
||||||
|
}
|
||||||
|
|
||||||
static int mtd_part_erase(struct mtd_info *mtd, struct erase_info *instr)
|
static int mtd_part_erase(struct mtd_info *mtd, struct erase_info *instr)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
|
@ -160,6 +170,9 @@ struct mtd_info *mtd_add_partition(struct mtd_info *mtd, off_t offset,
|
||||||
part->block_markbad = mtd->block_markbad ? mtd_part_block_markbad : NULL;
|
part->block_markbad = mtd->block_markbad ? mtd_part_block_markbad : NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (mtd->write_oob)
|
||||||
|
part->write_oob = mtd_part_write_oob;
|
||||||
|
|
||||||
part->block_isbad = mtd->block_isbad ? mtd_part_block_isbad : NULL;
|
part->block_isbad = mtd->block_isbad ? mtd_part_block_isbad : NULL;
|
||||||
part->size = size;
|
part->size = size;
|
||||||
part->name = xstrdup(name);
|
part->name = xstrdup(name);
|
||||||
|
|
|
@ -59,4 +59,18 @@ static inline int bbu_register_std_file_update(const char *name, unsigned long f
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(CONFIG_BAREBOX_UPDATE_IMX_NAND_FCB)
|
||||||
|
int imx6_bbu_nand_register_handler(const char *name, unsigned long flags);
|
||||||
|
int imx28_bbu_nand_register_handler(const char *name, unsigned long flags);
|
||||||
|
#else
|
||||||
|
static inline int imx6_bbu_nand_register_handler(const char *name, unsigned long flags)
|
||||||
|
{
|
||||||
|
return -ENOSYS;
|
||||||
|
}
|
||||||
|
static inline int imx28_bbu_nand_register_handler(const char *name, unsigned long flags)
|
||||||
|
{
|
||||||
|
return -ENOSYS;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif /* __INCLUDE_BBU_H */
|
#endif /* __INCLUDE_BBU_H */
|
||||||
|
|
|
@ -34,6 +34,7 @@ enum filetype {
|
||||||
filetype_ch_image_be,
|
filetype_ch_image_be,
|
||||||
filetype_exe,
|
filetype_exe,
|
||||||
filetype_xz_compressed,
|
filetype_xz_compressed,
|
||||||
|
filetype_mxs_bootstream,
|
||||||
filetype_max,
|
filetype_max,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue