Commit 1be21cdc authored by 张青山(steven.zhang)'s avatar 张青山(steven.zhang)

Merge branch 'neuros' of...

Merge branch 'neuros' of ssh://git@git.neuros.com.cn/git/git-pub/osd20/linux-davinci-2.6 into neuros
parents d5fa328c 271364e8
...@@ -473,7 +473,7 @@ CONFIG_MTD_NAND_IDS=y ...@@ -473,7 +473,7 @@ CONFIG_MTD_NAND_IDS=y
# CONFIG_MTD_NAND_DISKONCHIP is not set # CONFIG_MTD_NAND_DISKONCHIP is not set
# CONFIG_MTD_NAND_NANDSIM is not set # CONFIG_MTD_NAND_NANDSIM is not set
# CONFIG_MTD_NAND_PLATFORM is not set # CONFIG_MTD_NAND_PLATFORM is not set
# CONFIG_MTD_NAND_DAVINCI is not set CONFIG_MTD_NAND_DAVINCI=y
# CONFIG_MTD_ONENAND is not set # CONFIG_MTD_ONENAND is not set
# #
......
...@@ -100,11 +100,40 @@ static struct platform_device ntosd_644xa_norflash_device = { ...@@ -100,11 +100,40 @@ static struct platform_device ntosd_644xa_norflash_device = {
}; };
#if defined(CONFIG_MTD_NAND_DAVINCI) || defined(CONFIG_MTD_NAND_DAVINCI_MODULE) #if defined(CONFIG_MTD_NAND_DAVINCI) || defined(CONFIG_MTD_NAND_DAVINCI_MODULE)
#define UBOOT_START 0x18000
struct mtd_partition ntosd_644xa_nandflash_partition[] = { struct mtd_partition ntosd_644xa_nandflash_partition[] = {
/* 5 MB space at the beginning for bootloader and kernel */ /* uboot parameter */
{
.name = "u-boot-parameter",
.offset = 0,
.size = 1 * SZ_16K,
.mask_flags = 0,
},
/* ubl */
{
.name = "ubl",
.offset = 1 * SZ_16K,
.size = 5 * SZ_16K,
.mask_flags = 0,
},
/* 1 MB space from bootloader start for bootloader */
{
.name = "u-boot",
.offset = UBOOT_START,
.size = 1 * SZ_1M,
.mask_flags = 0,
},
/* 5 MB space for kernel */
{
.name = "kernel",
.offset = 1 * SZ_1M + UBOOT_START,
.size = 5 * SZ_1M,
.mask_flags = 0,
},
/* the rest for rootfs */
{ {
.name = "NAND filesystem", .name = "NAND filesystem",
.offset = 5 * SZ_1M, .offset = 6 * SZ_1M + UBOOT_START,
.size = MTDPART_SIZ_FULL, .size = MTDPART_SIZ_FULL,
.mask_flags = 0, .mask_flags = 0,
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment