diff options
| author | Tom Rini <trini@ti.com> | 2015-02-10 10:40:43 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2015-02-10 10:40:43 -0500 |
| commit | 307367eaffc8638e10ba1784fc66bfe623ae79e2 (patch) | |
| tree | 087641ed4c29320f8759cda28e377e36ff82cb78 /tools | |
| parent | a4fb5df214c7e8d5bc949c1068d92252f105427a (diff) | |
| parent | aee0013e53b339a573e2a8d66062fe87765aa3bd (diff) | |
| download | blackbird-obmc-uboot-307367eaffc8638e10ba1784fc66bfe623ae79e2.tar.gz blackbird-obmc-uboot-307367eaffc8638e10ba1784fc66bfe623ae79e2.zip | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/imximage.c | 2 | ||||
| -rw-r--r-- | tools/imximage.h | 2 | ||||
| -rw-r--r-- | tools/logos/compulab.bmp | bin | 0 -> 31810 bytes | |||
| -rw-r--r-- | tools/mxsboot.c | 6 |
4 files changed, 10 insertions, 0 deletions
diff --git a/tools/imximage.c b/tools/imximage.c index 3d37591886..6f469ae633 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -38,6 +38,7 @@ static table_entry_t imximage_boot_offset[] = { {FLASH_OFFSET_SATA, "sata", "SATA Disk", }, {FLASH_OFFSET_SD, "sd", "SD Card", }, {FLASH_OFFSET_SPI, "spi", "SPI Flash", }, + {FLASH_OFFSET_QSPI, "qspi", "QSPI NOR Flash",}, {-1, "", "Invalid", }, }; @@ -52,6 +53,7 @@ static table_entry_t imximage_boot_loadsize[] = { {FLASH_LOADSIZE_SATA, "sata", "SATA Disk", }, {FLASH_LOADSIZE_SD, "sd", "SD Card", }, {FLASH_LOADSIZE_SPI, "spi", "SPI Flash", }, + {FLASH_LOADSIZE_QSPI, "qspi", "QSPI NOR Flash",}, {-1, "", "Invalid", }, }; diff --git a/tools/imximage.h b/tools/imximage.h index 5b5ad0edf4..36fe0958fe 100644 --- a/tools/imximage.h +++ b/tools/imximage.h @@ -29,6 +29,7 @@ #define FLASH_OFFSET_ONENAND 0x100 #define FLASH_OFFSET_NOR 0x1000 #define FLASH_OFFSET_SATA FLASH_OFFSET_STANDARD +#define FLASH_OFFSET_QSPI 0x1000 /* Initial Load Region Size */ #define FLASH_LOADSIZE_UNDEFINED 0xFFFFFFFF @@ -39,6 +40,7 @@ #define FLASH_LOADSIZE_ONENAND 0x400 #define FLASH_LOADSIZE_NOR 0x0 /* entire image */ #define FLASH_LOADSIZE_SATA FLASH_LOADSIZE_STANDARD +#define FLASH_LOADSIZE_QSPI 0x0 /* entire image */ #define IVT_HEADER_TAG 0xD1 #define IVT_VERSION 0x40 diff --git a/tools/logos/compulab.bmp b/tools/logos/compulab.bmp Binary files differnew file mode 100644 index 0000000000..df5435cb59 --- /dev/null +++ b/tools/logos/compulab.bmp diff --git a/tools/mxsboot.c b/tools/mxsboot.c index 90b21737b9..6d48cfb3e4 100644 --- a/tools/mxsboot.c +++ b/tools/mxsboot.c @@ -142,6 +142,9 @@ static inline uint32_t mx28_nand_get_ecc_strength(uint32_t page_data_size, if (page_oob_size == 218) return 16; + + if (page_oob_size == 224) + return 16; } return 0; @@ -269,6 +272,9 @@ static struct mx28_nand_fcb *mx28_nand_get_fcb(uint32_t size) } else if (nand_oobsize == 218) { fcb->ecc_block_n_ecc_type = 8; fcb->ecc_block_0_ecc_type = 8; + } else if (nand_oobsize == 224) { + fcb->ecc_block_n_ecc_type = 8; + fcb->ecc_block_0_ecc_type = 8; } } |
