code.vuplus.com Git - vuplus_openvuplus/blob - meta-bsp/vuuno/recipes/linux/linux-vuplus-3.1.1/linux_3.1.1_vuuno.patch

   1 diff --git a/arch/mips/brcmstb/board.c b/arch/mips/brcmstb/board.c
   2 index ab1cb65..4845952 100644
   3 --- a/arch/mips/brcmstb/board.c
   4 +++ b/arch/mips/brcmstb/board.c
   5 @@ -718,15 +718,14 @@ void __init board_get_ram_size(unsigned long *dram0_mb, unsigned long *dram1_mb)
   6
   7  static struct mtd_partition fixed_partition_map[] = {
   8          /* name                 offset          size */
   9 -        { name: "rootfs",               offset: 0,              size:0x1F200000 /* DEFAULT_ROOTFS_SIZE*/ },   /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */
  10 -        { name: "kernel",       offset: 0x1F200000,             size: 4<<20 },
  11 -        { name: "boot",         offset: 0x1F600000,             size: 4<<20 },
  12 -       { name: "splash",       offset: 0x1FA00000,             size: 2<<20 },
  13 -        { name: "cfe",          offset: 0x1FC00000,             size: 1<<20 },
  14 -        { name: "mac",          offset: 0x1FD00000,             size: 1<<19 },
  15 -        { name: "env",          offset: 0x1FD80000,             size: 1<<19 },
  16 -        { name: "nvm",          offset: 0x1FE00000,             size: 1<<20 },
  17 -        { name: "data",         offset: 0x20000000,             size: 0x1FC00000 },
  18 +        { name: "rootfs",       offset: 0,                     size: (128-4-4-2-3-1)<<20 },   /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */
  19 +        { name: "kernel",       offset: 0x07200000,             size: 4<<20 },
  20 +        { name: "boot",         offset: 0x07600000,             size: 4<<20 },
  21 +       { name: "splash",       offset: 0x07a00000,             size: 2<<20 },
  22 +        { name: "cfe",          offset: 0x07c00000,             size: 1<<20 },
  23 +        { name: "mac",          offset: 0x07d00000,             size: 1<<19 },
  24 +        { name: "env",          offset: 0x07d80000,             size: 1<<19 },
  25 +        { name: "nvm",          offset: 0x07e00000,             size: 1<<20 },
  26          /* BBT 1MB not mountable by anyone */
  27  /*        { name: "data",         offset: 0x20000000,             size: 0 },*/
  28  /* Add 1 extra place-holder partition for splash, and a safety guard element */
  29 diff --git a/drivers/mtd/brcmnand/brcmnand_base.c b/drivers/mtd/brcmnand/brcmnand_base.c
  30 index 22035af..ca32167 100644
  31 --- a/drivers/mtd/brcmnand/brcmnand_base.c
  32 +++ b/drivers/mtd/brcmnand/brcmnand_base.c
  33 @@ -226,8 +226,8 @@ static brcmnand_chip_Id brcmnand_chips[] = {
  34                 .options = NAND_USE_FLASH_BBT,          /* Use BBT on flash */
  35                 .idOptions = 0,
  36                                 //| NAND_COMPLEX_OOB_WRITE      /* Write data together with OOB for write_oob */
  37 -               .timing1 = 0, //00070000,
  38 -               .timing2 = 0,
  39 +                .timing1 = 0x4232222D,
  40 +                .timing2 = 0x00000D94,
  41                 .nop=8,
  42                 .ctrlVersion = 0, /* THT Verified on data-sheet 7/10/08: Allows 4 on main and 4 on OOB */
  43         },