tz/linuxOS_MC3302
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change nand oob from 128 to 64

Browse Source
This commit is contained in:
hyx 2026-04-17 17:32:27 +08:00
parent 20a5d3eb9f
commit ca3cc481c3
10 changed files with 53 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/X-AIOS-LT00-V1.0.4/base/soc/qm10xd/linux/bsp/kernel/linux-5.10.y/drivers/mtd/nand/raw/nand_ids.c
View File

@ -78,17 +78,17 @@ struct nand_flash_dev nand_flash_ids[] = {
SZ_2K, SZ_128, SZ_128K, 0, 2, 64, NAND_ECC_INFO(8, SZ_1K)},
{"MX35LF1G24AD 3.3V SPI",
{ .id = {0xC2, 0x14} },
SZ_2K, SZ_128, SZ_128K, 0, 2, 128, NAND_ECC_INFO(24, SZ_1K)},
SZ_2K, SZ_128, SZ_128K, 0, 2, 64, NAND_ECC_INFO(8, SZ_1K)},
{"F35SQA001G 3.3V SPI",
{ .id = {0xCD, 0x71, 0x71} },
SZ_2K, SZ_128, SZ_128K, 0, 3, 64, NAND_ECC_INFO(8, SZ_1K)},
{"GD5F1GQ5X",
{ .id = {0xC8, 0x51} },
SZ_2K, SZ_128, SZ_128K, NAND_FORCE_SLC, 2, 128, NAND_ECC_INFO(24, SZ_1K)},
SZ_2K, SZ_128, SZ_128K, NAND_FORCE_SLC, 2, 64, NAND_ECC_INFO(8, SZ_1K)},
{"GD5F1GM7X",
{ .id = {0xC8, 0x91} },
SZ_2K, SZ_128, SZ_128K, NAND_FORCE_SLC, 2, 128, NAND_ECC_INFO(24, SZ_1K)},
SZ_2K, SZ_128, SZ_128K, NAND_FORCE_SLC, 2, 64, NAND_ECC_INFO(8, SZ_1K)},
{"FM25S01A",
{ .id = {0xA1, 0xD4} },
SZ_2K, SZ_128, SZ_128K, 0, 2, 64, NAND_ECC_INFO(8, SZ_1K)},

12
sdk/X-AIOS-LT00-V1.0.4/base/soc/qm10xd/linux/bsp/ramboot/board/molchip/flash/molchip_nand_spl.c
View File

@ -121,10 +121,10 @@ struct spi_nand_flash spi_nand_table[] = {
},
.dev_id = {0xC2, 0x14},
.page_size = 2048,
.page_spare_size = 128,
.page_spare_size = 64,
.pages_per_blk = 64,
.blks_per_chip = 1024,
.options = SPINAND_ECC_MODE_24_bit | SPINAND_SUPPORT_DUAL,
.options = SPINAND_SUPPORT_DUAL,
.ecc_mask = 7,
.ecc_uncorr = 7,
},
@ -213,10 +213,10 @@ struct spi_nand_flash spi_nand_table[] = {
},
.dev_id = {0xC8, 0x51},
.page_size = 2048,
.page_spare_size = 128,
.page_spare_size = 64,
.pages_per_blk = 64,
.blks_per_chip = 1024,
.options = SPINAND_ECC_MODE_24_bit | SPINAND_SUPPORT_DUAL | SPINAND_SUPPORT_QUAD ,
.options = SPINAND_SUPPORT_DUAL | SPINAND_SUPPORT_QUAD ,
},
{
@ -227,10 +227,10 @@ struct spi_nand_flash spi_nand_table[] = {
},
.dev_id = {0xC8, 0x91},
.page_size = 2048,
.page_spare_size = 128,
.page_spare_size = 64,
.pages_per_blk = 64,
.blks_per_chip = 1024,
.options = SPINAND_ECC_MODE_24_bit | SPINAND_SUPPORT_DUAL | SPINAND_SUPPORT_QUAD ,
.options = SPINAND_SUPPORT_DUAL | SPINAND_SUPPORT_QUAD ,
},
{

22
sdk/X-AIOS-LT00-V1.0.4/base/soc/qm10xd/linux/bsp/uboot/uboot/board/molchip/flash/molchip_nand_spl.c
View File

@ -121,10 +121,10 @@ struct spi_nand_flash spi_nand_table[] = {
},
.dev_id = {0xC2, 0x14},
.page_size = 2048,
.page_spare_size = 128,
.page_spare_size = 64,
.pages_per_blk = 64,
.blks_per_chip = 1024,
.options = SPINAND_ECC_MODE_24_bit | SPINAND_SUPPORT_DUAL,
.options = SPINAND_SUPPORT_DUAL,
.ecc_mask = 7,
.ecc_uncorr = 7,
},
@ -213,10 +213,24 @@ struct spi_nand_flash spi_nand_table[] = {
},
.dev_id = {0xC8, 0x51},
.page_size = 2048,
.page_spare_size = 128,
.page_spare_size = 64,
.pages_per_blk = 64,
.blks_per_chip = 1024,
.options = SPINAND_ECC_MODE_24_bit | SPINAND_SUPPORT_DUAL | SPINAND_SUPPORT_QUAD ,
.options = SPINAND_SUPPORT_DUAL | SPINAND_SUPPORT_QUAD ,
},
{
.name = "GD5F1GM7X",
.id_info = {
.id_addr = SPI_NAND_ID_NO_DUMMY,
.id_len = 2,
},
.dev_id = {0xC8, 0x91},
.page_size = 2048,
.page_spare_size = 64,
.pages_per_blk = 64,
.blks_per_chip = 1024,
.options = SPINAND_SUPPORT_DUAL | SPINAND_SUPPORT_QUAD ,
},
{

6
sdk/X-AIOS-LT00-V1.0.4/base/soc/qm10xd/linux/bsp/uboot/uboot/drivers/mtd/nand/nand_ids.c
View File

@ -87,7 +87,7 @@ struct nand_flash_dev nand_flash_ids[] = {
0 },
{"MX35LF1G24AD 3.3V SPI",
{ .id = {0xC2, 0x14} },
SZ_2K, SZ_128, SZ_128K, 0, 2, 128, NAND_ECC_INFO(24, SZ_1K),
SZ_2K, SZ_128, SZ_128K, 0, 2, 64, NAND_ECC_INFO(8, SZ_1K),
0 },
{"MX35LF4G24AD 3.3V SPI",
{ .id = {0xC2, 0x35} },
@ -117,11 +117,11 @@ struct nand_flash_dev nand_flash_ids[] = {
#endif
{"GD5F1GQ5X 3.3V SPI",
{ .id = {0xC8, 0x51 } },
SZ_2K, SZ_128, SZ_128K, 0, 2, 128, NAND_ECC_INFO(24, SZ_1K),
SZ_2K, SZ_128, SZ_128K, 0, 2, 64, NAND_ECC_INFO(8, SZ_1K),
0 },
{"GD5F1GM7X 3.3V SPI",
{ .id = {0xC8, 0x91 } },
SZ_2K, SZ_128, SZ_128K, 0, 2, 128, NAND_ECC_INFO(24, SZ_1K),
SZ_2K, SZ_128, SZ_128K, 0, 2, 64, NAND_ECC_INFO(8, SZ_1K),
0 },
{"GD5F2GQ4U 3.3V SPI",
{ .id = {0xC8, 0xb2} },

44
sdk/X-AIOS-LT00-V1.0.4/product/demo_ld/post_mkimg_copy_files.sh
View File

@ -100,28 +100,28 @@ elif [[ "$CONFIG_STORAGE_TYPE_SPINAND" = true ]]; then
echo "start create programmer version"
mkdir -p $PROGRAMMER_DIR
cp $PRJ_TOP_DIR/tools/partition/$CONFIG_XOS_BUILD_BOARD/los_spi-nand/$CONFIG_XOS_PROJECT_TYPE$CONFIG_STORAGE_TYPE/programmer.ini $PROGRAMMER_DIR
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 -s -f $QM_ALL_IMAGES/u-boot-spl-header.img $QM_ALL_IMAGES/u-boot-spl-header_out.img
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/u-boot-spl-header_out.img $PROGRAMMER_DIR/u-boot-spl-header.img.burn
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/u-boot.bin $PROGRAMMER_DIR/u-boot.bin.burn
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/logo.img $PROGRAMMER_DIR/logo.img.burn
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/misc.img $PROGRAMMER_DIR/misc.img.burn
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/recovery.img $PROGRAMMER_DIR/recovery.img.burn
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/recovery-rootfs.ubi $PROGRAMMER_DIR/recovery-rootfs.ubi.burn
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/zImage-dtb $PROGRAMMER_DIR/zImage-dtb.burn
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/system.ubi $PROGRAMMER_DIR/system.ubi.burn
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/rootfs.ubi $PROGRAMMER_DIR/rootfs.ubi.burn
#$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/data.ubi $PROGRAMMER_DIR/data.ubi.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 -s -f $QM_ALL_IMAGES/u-boot-spl-header.img $QM_ALL_IMAGES/u-boot-spl-header_out.img
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/u-boot-spl-header_out.img $PROGRAMMER_DIR/u-boot-spl-header.img.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/u-boot.bin $PROGRAMMER_DIR/u-boot.bin.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/logo.img $PROGRAMMER_DIR/logo.img.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/misc.img $PROGRAMMER_DIR/misc.img.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/recovery.img $PROGRAMMER_DIR/recovery.img.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/recovery-rootfs.ubi $PROGRAMMER_DIR/recovery-rootfs.ubi.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/zImage-dtb $PROGRAMMER_DIR/zImage-dtb.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/system.ubi $PROGRAMMER_DIR/system.ubi.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/rootfs.ubi $PROGRAMMER_DIR/rootfs.ubi.burn
$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/data.ubi $PROGRAMMER_DIR/data.ubi.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 -s -f $QM_ALL_IMAGES/u-boot-spl-header.img $QM_ALL_IMAGES/u-boot-spl-header_out.img
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/u-boot-spl-header_out.img $PROGRAMMER_DIR/u-boot-spl-header.img.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/u-boot.bin $PROGRAMMER_DIR/u-boot.bin.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/logo.img $PROGRAMMER_DIR/logo.img.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/misc.img $PROGRAMMER_DIR/misc.img.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/recovery.img $PROGRAMMER_DIR/recovery.img.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/recovery-rootfs.ubi $PROGRAMMER_DIR/recovery-rootfs.ubi.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/zImage-dtb $PROGRAMMER_DIR/zImage-dtb.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/system.ubi $PROGRAMMER_DIR/system.ubi.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/rootfs.ubi $PROGRAMMER_DIR/rootfs.ubi.burn
$MC_IMAGE_BUILDER -c 8/1024 -p 2048 -o 64 -e 0x20000 -n 64 $QM_ALL_IMAGES/data.ubi $PROGRAMMER_DIR/data.ubi.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 -s -f $QM_ALL_IMAGES/u-boot-spl-header.img $QM_ALL_IMAGES/u-boot-spl-header_out.img
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/u-boot-spl-header_out.img $PROGRAMMER_DIR/u-boot-spl-header.img.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/u-boot.bin $PROGRAMMER_DIR/u-boot.bin.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/logo.img $PROGRAMMER_DIR/logo.img.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/misc.img $PROGRAMMER_DIR/misc.img.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/recovery.img $PROGRAMMER_DIR/recovery.img.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/recovery-rootfs.ubi $PROGRAMMER_DIR/recovery-rootfs.ubi.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/zImage-dtb $PROGRAMMER_DIR/zImage-dtb.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/system.ubi $PROGRAMMER_DIR/system.ubi.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/rootfs.ubi $PROGRAMMER_DIR/rootfs.ubi.burn
#$MC_IMAGE_BUILDER -c 24/1024 -p 2048 -o 128 -e 0x20000 -n 64 $QM_ALL_IMAGES/data.ubi $PROGRAMMER_DIR/data.ubi.burn
echo "end programmer version"
elif [[ "$CONFIG_STORAGE_TYPE_SPINOR" = true ]]; then
echo "CONFIG_STORAGE_TYPE_SPINOR=$CONFIG_STORAGE_TYPE_SPINOR"

2
sdk/X-AIOS-LT00-V1.0.4/tools/partition/qm10xd/los_spi-nand/demo_ld_nand/programmer.ini
View File

@ -1,7 +1,7 @@
[SIGNATURE]
FLAG =MULTIFILE
PartitionFiles =1
BlockSize =22000h
BlockSize =21000h
[FILE0]
PartitionName = boot-spl

BIN
sdk/X-AIOS-LT00-V1.0.4/usb_burn/u-boot-sdl.bin
View File

Binary file not shown.

BIN
sdk/X-AIOS-LT00-V1.0.4/usb_burn/u-boot-spl-header.img
View File

Binary file not shown.

BIN
sdk/X-AIOS-LT00-V1.0.4/usb_burn/u-boot.bin
View File

Binary file not shown.

BIN
sdk/X-AIOS-LT00-V1.0.4/usb_burn/zImage-dtb
View File

Binary file not shown.