From: schon Date: Wed, 30 Nov 2011 03:45:21 +0000 (+0900) Subject: fix bootlogo X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_openembedded;a=commitdiff_plain;h=df7fcc206284ac27054edece8074a122ffee41bd fix bootlogo update kernel --- diff --git a/recipes/linux/linux-bm750-3.1.1/bm750_defconfig b/recipes/linux/linux-bm750-3.1.1/bm750_defconfig index 2bf3c69..825de1c 100644 --- a/recipes/linux/linux-bm750-3.1.1/bm750_defconfig +++ b/recipes/linux/linux-bm750-3.1.1/bm750_defconfig @@ -2338,7 +2338,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_FS_WBUF_VERIFY is not set diff --git a/recipes/linux/linux-bm750-3.1.1/linux_3.1.1_bm750.patch b/recipes/linux/linux-bm750-3.1.1/linux_3.1.1_bm750.patch new file mode 100644 index 0000000..e624322 --- /dev/null +++ b/recipes/linux/linux-bm750-3.1.1/linux_3.1.1_bm750.patch @@ -0,0 +1,181 @@ +diff --git a/arch/mips/brcmstb/board.c b/arch/mips/brcmstb/board.c +index ab1cb65..2875cf5 100644 +--- a/arch/mips/brcmstb/board.c ++++ b/arch/mips/brcmstb/board.c +@@ -311,7 +311,7 @@ void __init board_pinmux_setup(void) + PINMUX(7, gpio_035, 1); /* UARTB RX */ + PINMUX(7, gpio_038, 1); /* UARTC TX */ + PINMUX(7, gpio_039, 1); /* UARTC RX */ +- ++#if 0 + PINMUX(9, gpio_054, 3); /* MII */ + PINMUX(9, gpio_055, 3); + PINMUX(9, gpio_056, 3); +@@ -330,6 +330,7 @@ void __init board_pinmux_setup(void) + PINMUX(10, gpio_070, 3); + PINMUX(10, gpio_071, 3); + PINMUX(10, gpio_072, 3); ++#endif + + #elif defined(CONFIG_BCM7340) + +@@ -718,15 +719,13 @@ void __init board_get_ram_size(unsigned long *dram0_mb, unsigned long *dram1_mb) + + static struct mtd_partition fixed_partition_map[] = { + /* name offset size */ +- { name: "rootfs", offset: 0, size:0x1F200000 /* DEFAULT_ROOTFS_SIZE*/ }, /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */ +- { name: "kernel", offset: 0x1F200000, size: 4<<20 }, +- { name: "boot", offset: 0x1F600000, size: 4<<20 }, +- { name: "splash", offset: 0x1FA00000, size: 2<<20 }, +- { name: "cfe", offset: 0x1FC00000, size: 1<<20 }, +- { name: "mac", offset: 0x1FD00000, size: 1<<19 }, +- { name: "env", offset: 0x1FD80000, size: 1<<19 }, +- { name: "nvm", offset: 0x1FE00000, size: 1<<20 }, +- { name: "data", offset: 0x20000000, size: 0x1FC00000 }, ++ { name: "rootfs", offset: 0, size: (128-4-2-3-1)<<20 }, /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */ ++ { name: "kernel", offset: 0x07600000, size: 4<<20 }, ++ { name: "boot", offset: 0x07a00000, size: 2<<20 }, ++ { name: "cfe", offset: 0x07C00000, size: 1<<20 }, ++ { name: "mac", offset: 0x07D00000, size: 1<<19 }, ++ { name: "env", offset: 0x07D80000, size: 1<<19 }, ++ { name: "nvm", offset: 0x07E00000, size: 1<<20 }, + /* BBT 1MB not mountable by anyone */ + /* { name: "data", offset: 0x20000000, size: 0 },*/ + /* Add 1 extra place-holder partition for splash, and a safety guard element */ +diff --git a/drivers/mtd/brcmnand/brcmnand_base.c b/drivers/mtd/brcmnand/brcmnand_base.c +index 22035af..b54bc29 100644 +--- a/drivers/mtd/brcmnand/brcmnand_base.c ++++ b/drivers/mtd/brcmnand/brcmnand_base.c +@@ -226,8 +226,8 @@ static brcmnand_chip_Id brcmnand_chips[] = { + .options = NAND_USE_FLASH_BBT, /* Use BBT on flash */ + .idOptions = 0, + //| NAND_COMPLEX_OOB_WRITE /* Write data together with OOB for write_oob */ +- .timing1 = 0, //00070000, +- .timing2 = 0, ++ .timing1 = 0x4232222D, ++ .timing2 = 0x00000D94, + .nop=8, + .ctrlVersion = 0, /* THT Verified on data-sheet 7/10/08: Allows 4 on main and 4 on OOB */ + }, +@@ -7553,10 +7553,7 @@ brcmnand_decode_config(struct brcmnand_chip* chip, uint32_t nand_config) + chip->blockSize = 2048 << 10; + break; + #endif +- case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_256KB: +- chip->blockSize = 256 << 10; +- break; +- case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_512KB: ++ case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_512KB: + chip->blockSize = 512 << 10; + break; + case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_8KB: +@@ -7772,7 +7769,7 @@ is_ecc_strong(int registerEcc, int requiredEcc) + } + + +- ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + static void + brcmnand_set_acccontrol(struct brcmnand_chip * chip , unsigned int chipSelect, + uint32_t pageSize, uint16_t oobSizePerPage, int reqEcc, int codeWorkSize, int nbrBitsPerCell) +@@ -7928,7 +7925,7 @@ PRINTK("%s: gAccControl[CS=%d]=%08x, ACC=%08lx\n", + #endif + } + } +- ++#endif + + static void + brcmnand_read_id(struct mtd_info *mtd, unsigned int chipSelect, unsigned long* dev_id) +@@ -8005,6 +8002,7 @@ printk("After: NandSelect=%08x, nandConfig=%08x\n", nandSelect, nandConfig); + } + + ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + /* + * Type-1 ID string, called from brcmnand_probe with the following condition + * if ((brcmnand_chips[i].idOptions & BRCMNAND_ID_HAS_BYTE4) && +@@ -8202,7 +8200,9 @@ PRINTK("nandConfigChipSize = %04x\n", nandConfigChipSize); + + return nand_config; + } ++#endif + ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + + /* + * Type-2 ID string, called from brcmnand_probe with the following condition +@@ -8372,8 +8372,9 @@ PRINTK("Required ECC level = %d, devIdExt=%08x, eccShift=%02x, sector Size=%d\n" + + return nand_config; + } ++#endif + +- ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + /* + * Type-2 ID string, called from brcmnand_probe with the following condition + * if ((brcmnand_chips[i].idOptions & BRCMNAND_ID_EXT_BYTES_TYPE2) == +@@ -8519,6 +8520,7 @@ PRINTK("Updating Config Reg on CS%1d: Block & Page Size: After: %08x\n", chip->c + + return nand_config; + } ++#endif + + + #if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_4_0 +@@ -9074,7 +9076,7 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) + for (i=0; i < BRCMNAND_MAX_CHIPS; i++) { + if (brcmnand_dev_id == brcmnand_chips[i].chipId + && brcmnand_maf_id == brcmnand_chips[i].mafId) { +- ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + /* No ambiguity in ID#3,4,5 */ + if (brcmnand_chips[i].chipId345[0] == 0x0 + && brcmnand_chips[i].chipId345[1] == 0x0 +@@ -9113,6 +9115,15 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) + } + /* Else not match */ + } ++#else ++ if (brcmnand_chips[i].chipId345[0] == 0x0 ++ && brcmnand_chips[i].chipId345[1] == 0x0 ++ && brcmnand_chips[i].chipId345[2] == 0x0) { ++ foundInIdTable = 1; ++ break; ++ } ++ ++#endif + } + } + +@@ -9312,7 +9323,7 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) + printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, chip->reqEccLevel, chip->eccSectorSize); + } + } +- ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + /* ID not in table, and no CONFIG REG was passed at command line */ + else if (!skipIdLookup && !foundInIdTable) { + uint32_t acc; +@@ -9339,6 +9350,7 @@ printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, c + printk("Spare Area Size = %dB/512B\n", chip->eccOobSize); + + } ++#endif + } + + /* +@@ -9355,10 +9367,11 @@ printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, c + // Also works for dummy entries, but no adjustments possible + brcmnand_adjust_timings(chip, &brcmnand_chips[i]); + ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + // Adjust perchip NAND ACC CONTROL + // updateInternalData = not ONFI .or. not in ID table + brcmnand_adjust_acccontrol(chip, isONFI, foundInIdTable, i); +- ++#endif + + /* Flash device information */ + brcmnand_print_device_info(&brcmnand_chips[i], mtd); diff --git a/recipes/linux/linux-bm750-3.1.1/linux_3.1.1_bm750_patch b/recipes/linux/linux-bm750-3.1.1/linux_3.1.1_bm750_patch deleted file mode 100644 index cb33833..0000000 --- a/recipes/linux/linux-bm750-3.1.1/linux_3.1.1_bm750_patch +++ /dev/null @@ -1,181 +0,0 @@ -diff --git a/arch/mips/brcmstb/board.c b/arch/mips/brcmstb/board.c -index ab1cb65..2875cf5 100644 ---- a/arch/mips/brcmstb/board.c -+++ b/arch/mips/brcmstb/board.c -@@ -311,7 +311,7 @@ void __init board_pinmux_setup(void) - PINMUX(7, gpio_035, 1); /* UARTB RX */ - PINMUX(7, gpio_038, 1); /* UARTC TX */ - PINMUX(7, gpio_039, 1); /* UARTC RX */ -- -+#if 0 - PINMUX(9, gpio_054, 3); /* MII */ - PINMUX(9, gpio_055, 3); - PINMUX(9, gpio_056, 3); -@@ -330,6 +330,7 @@ void __init board_pinmux_setup(void) - PINMUX(10, gpio_070, 3); - PINMUX(10, gpio_071, 3); - PINMUX(10, gpio_072, 3); -+#endif - - #elif defined(CONFIG_BCM7340) - -@@ -718,15 +719,13 @@ void __init board_get_ram_size(unsigned long *dram0_mb, unsigned long *dram1_mb) - - static struct mtd_partition fixed_partition_map[] = { - /* name offset size */ -- { name: "rootfs", offset: 0, size:0x1F200000 /* DEFAULT_ROOTFS_SIZE*/ }, /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */ -- { name: "kernel", offset: 0x1F200000, size: 4<<20 }, -- { name: "boot", offset: 0x1F600000, size: 4<<20 }, -- { name: "splash", offset: 0x1FA00000, size: 2<<20 }, -- { name: "cfe", offset: 0x1FC00000, size: 1<<20 }, -- { name: "mac", offset: 0x1FD00000, size: 1<<19 }, -- { name: "env", offset: 0x1FD80000, size: 1<<19 }, -- { name: "nvm", offset: 0x1FE00000, size: 1<<20 }, -- { name: "data", offset: 0x20000000, size: 0x1FC00000 }, -+ { name: "rootfs", offset: 0, size: (128-4-2-3-1)<<20 }, /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */ -+ { name: "kernel", offset: 0x07600000, size: 4<<20 }, -+ { name: "boot", offset: 0x07a00000, size: 2<<20 }, -+ { name: "cfe", offset: 0x07C00000, size: 1<<20 }, -+ { name: "mac", offset: 0x07D00000, size: 1<<19 }, -+ { name: "env", offset: 0x07D80000, size: 1<<19 }, -+ { name: "nvm", offset: 0x07E00000, size: 1<<20 }, - /* BBT 1MB not mountable by anyone */ - /* { name: "data", offset: 0x20000000, size: 0 },*/ - /* Add 1 extra place-holder partition for splash, and a safety guard element */ -diff --git a/drivers/mtd/brcmnand/brcmnand_base.c b/drivers/mtd/brcmnand/brcmnand_base.c -index 37ac88c..c5bcfd1 100644 ---- a/drivers/mtd/brcmnand/brcmnand_base.c -+++ b/drivers/mtd/brcmnand/brcmnand_base.c -@@ -226,8 +226,8 @@ static brcmnand_chip_Id brcmnand_chips[] = { - .options = NAND_USE_FLASH_BBT, /* Use BBT on flash */ - .idOptions = 0, - //| NAND_COMPLEX_OOB_WRITE /* Write data together with OOB for write_oob */ -- .timing1 = 0, //00070000, -- .timing2 = 0, -+ .timing1 = 0x4232222D, -+ .timing2 = 0x00000D94, - .nop=8, - .ctrlVersion = 0, /* THT Verified on data-sheet 7/10/08: Allows 4 on main and 4 on OOB */ - }, -@@ -7553,10 +7553,7 @@ brcmnand_decode_config(struct brcmnand_chip* chip, uint32_t nand_config) - chip->blockSize = 2048 << 10; - break; - #endif -- case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_256KB: -- chip->blockSize = 256 << 10; -- break; -- case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_512KB: -+ case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_512KB: - chip->blockSize = 512 << 10; - break; - case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_8KB: -@@ -7772,7 +7769,7 @@ is_ecc_strong(int registerEcc, int requiredEcc) - } - - -- -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - static void - brcmnand_set_acccontrol(struct brcmnand_chip * chip , unsigned int chipSelect, - uint32_t pageSize, uint16_t oobSizePerPage, int reqEcc, int codeWorkSize, int nbrBitsPerCell) -@@ -7928,7 +7925,7 @@ PRINTK("%s: gAccControl[CS=%d]=%08x, ACC=%08lx\n", - #endif - } - } -- -+#endif - - static void - brcmnand_read_id(struct mtd_info *mtd, unsigned int chipSelect, unsigned long* dev_id) -@@ -8005,6 +8002,7 @@ printk("After: NandSelect=%08x, nandConfig=%08x\n", nandSelect, nandConfig); - } - - -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - /* - * Type-1 ID string, called from brcmnand_probe with the following condition - * if ((brcmnand_chips[i].idOptions & BRCMNAND_ID_HAS_BYTE4) && -@@ -8202,7 +8200,9 @@ PRINTK("nandConfigChipSize = %04x\n", nandConfigChipSize); - - return nand_config; - } -+#endif - -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - - /* - * Type-2 ID string, called from brcmnand_probe with the following condition -@@ -8372,8 +8372,9 @@ PRINTK("Required ECC level = %d, devIdExt=%08x, eccShift=%02x, sector Size=%d\n" - - return nand_config; - } -+#endif - -- -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - /* - * Type-2 ID string, called from brcmnand_probe with the following condition - * if ((brcmnand_chips[i].idOptions & BRCMNAND_ID_EXT_BYTES_TYPE2) == -@@ -8519,6 +8520,7 @@ PRINTK("Updating Config Reg on CS%1d: Block & Page Size: After: %08x\n", chip->c - - return nand_config; - } -+#endif - - - #if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_4_0 -@@ -9074,7 +9076,7 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) - for (i=0; i < BRCMNAND_MAX_CHIPS; i++) { - if (brcmnand_dev_id == brcmnand_chips[i].chipId - && brcmnand_maf_id == brcmnand_chips[i].mafId) { -- -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - /* No ambiguity in ID#3,4,5 */ - if (brcmnand_chips[i].chipId345[0] == 0x0 - && brcmnand_chips[i].chipId345[1] == 0x0 -@@ -9113,6 +9115,15 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) - } - /* Else not match */ - } -+#else -+ if (brcmnand_chips[i].chipId345[0] == 0x0 -+ && brcmnand_chips[i].chipId345[1] == 0x0 -+ && brcmnand_chips[i].chipId345[2] == 0x0) { -+ foundInIdTable = 1; -+ break; -+ } -+ -+#endif - } - } - -@@ -9312,7 +9323,7 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) - printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, chip->reqEccLevel, chip->eccSectorSize); - } - } -- -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - /* ID not in table, and no CONFIG REG was passed at command line */ - else if (!skipIdLookup && !foundInIdTable) { - uint32_t acc; -@@ -9339,6 +9350,7 @@ printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, c - printk("Spare Area Size = %dB/512B\n", chip->eccOobSize); - - } -+#endif - } - - /* -@@ -9355,10 +9367,11 @@ printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, c - // Also works for dummy entries, but no adjustments possible - brcmnand_adjust_timings(chip, &brcmnand_chips[i]); - -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - // Adjust perchip NAND ACC CONTROL - // updateInternalData = not ONFI .or. not in ID table - brcmnand_adjust_acccontrol(chip, isONFI, foundInIdTable, i); -- -+#endif - - /* Flash device information */ - brcmnand_print_device_info(&brcmnand_chips[i], mtd); diff --git a/recipes/linux/linux-bm750_3.1.1.bb b/recipes/linux/linux-bm750_3.1.1.bb index e5141a9..92482e8 100644 --- a/recipes/linux/linux-bm750_3.1.1.bb +++ b/recipes/linux/linux-bm750_3.1.1.bb @@ -1,8 +1,8 @@ require linux-vuplus-3.1.1.inc -PR = "r1" +PR = "r2" SRC_URI += "\ - file://linux_3.1.1_bm750_patch;patch=1;pnum=1 \ + file://linux_3.1.1_bm750.patch;patch=1;pnum=1 \ " diff --git a/recipes/linux/linux-vuplus-3.1.1.inc b/recipes/linux/linux-vuplus-3.1.1.inc index 96f956c..4e75ad6 100644 --- a/recipes/linux/linux-vuplus-3.1.1.inc +++ b/recipes/linux/linux-vuplus-3.1.1.inc @@ -2,11 +2,11 @@ CRIPTION = "Linux kernel for vuplus" LICENSE = "GPL" KV = "3.1.1" -SRCREV = "" +SRCREV = "r2" MODULE = "linux-3.1.1" -SRC_URI += "http://archive.vuplus.com/download/kernel/linux-${KV}.tar.bz2 \ +SRC_URI += "http://archive.vuplus.com/download/kernel/linux-${KV}_${SRCREV}.tar.bz2 \ file://fix_cpu_proc.patch;patch=1;pnum=1 \ file://${MACHINE}_defconfig \ " diff --git a/recipes/linux/linux-vusolo-3.1.1/linux_3.1.1_vusolo.patch b/recipes/linux/linux-vusolo-3.1.1/linux_3.1.1_vusolo.patch new file mode 100644 index 0000000..e62c4f1 --- /dev/null +++ b/recipes/linux/linux-vusolo-3.1.1/linux_3.1.1_vusolo.patch @@ -0,0 +1,164 @@ +diff --git a/arch/mips/brcmstb/board.c b/arch/mips/brcmstb/board.c +index ab1cb65..f25c74b 100644 +--- a/arch/mips/brcmstb/board.c ++++ b/arch/mips/brcmstb/board.c +@@ -718,15 +718,13 @@ void __init board_get_ram_size(unsigned long *dram0_mb, unsigned long *dram1_mb) + + static struct mtd_partition fixed_partition_map[] = { + /* name offset size */ +- { name: "rootfs", offset: 0, size:0x1F200000 /* DEFAULT_ROOTFS_SIZE*/ }, /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */ +- { name: "kernel", offset: 0x1F200000, size: 4<<20 }, +- { name: "boot", offset: 0x1F600000, size: 4<<20 }, +- { name: "splash", offset: 0x1FA00000, size: 2<<20 }, +- { name: "cfe", offset: 0x1FC00000, size: 1<<20 }, +- { name: "mac", offset: 0x1FD00000, size: 1<<19 }, +- { name: "env", offset: 0x1FD80000, size: 1<<19 }, +- { name: "nvm", offset: 0x1FE00000, size: 1<<20 }, +- { name: "data", offset: 0x20000000, size: 0x1FC00000 }, ++ { name: "rootfs", offset: 0, size: (128-4-4-3-1)<<20 }, /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */ ++ { name: "kernel", offset: 0x07400000, size: 4<<20 }, ++ { name: "boot", offset: 0x07800000, size: 4<<20 }, ++ { name: "cfe", offset: 0x07C00000, size: 1<<20 }, ++ { name: "mac", offset: 0x07D00000, size: 1<<19 }, ++ { name: "env", offset: 0x07D80000, size: 1<<19 }, ++ { name: "nvm", offset: 0x07E00000, size: 1<<20 }, + /* BBT 1MB not mountable by anyone */ + /* { name: "data", offset: 0x20000000, size: 0 },*/ + /* Add 1 extra place-holder partition for splash, and a safety guard element */ +diff --git a/drivers/mtd/brcmnand/brcmnand_base.c b/drivers/mtd/brcmnand/brcmnand_base.c +index 22035af..b54bc29 100644 +--- a/drivers/mtd/brcmnand/brcmnand_base.c ++++ b/drivers/mtd/brcmnand/brcmnand_base.c +@@ -226,8 +226,8 @@ static brcmnand_chip_Id brcmnand_chips[] = { + .options = NAND_USE_FLASH_BBT, /* Use BBT on flash */ + .idOptions = 0, + //| NAND_COMPLEX_OOB_WRITE /* Write data together with OOB for write_oob */ +- .timing1 = 0, //00070000, +- .timing2 = 0, ++ .timing1 = 0x4232222D, ++ .timing2 = 0x00000D94, + .nop=8, + .ctrlVersion = 0, /* THT Verified on data-sheet 7/10/08: Allows 4 on main and 4 on OOB */ + }, +@@ -7553,10 +7553,7 @@ brcmnand_decode_config(struct brcmnand_chip* chip, uint32_t nand_config) + chip->blockSize = 2048 << 10; + break; + #endif +- case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_256KB: +- chip->blockSize = 256 << 10; +- break; +- case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_512KB: ++ case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_512KB: + chip->blockSize = 512 << 10; + break; + case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_8KB: +@@ -7772,7 +7769,7 @@ is_ecc_strong(int registerEcc, int requiredEcc) + } + + +- ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + static void + brcmnand_set_acccontrol(struct brcmnand_chip * chip , unsigned int chipSelect, + uint32_t pageSize, uint16_t oobSizePerPage, int reqEcc, int codeWorkSize, int nbrBitsPerCell) +@@ -7928,7 +7925,7 @@ PRINTK("%s: gAccControl[CS=%d]=%08x, ACC=%08lx\n", + #endif + } + } +- ++#endif + + static void + brcmnand_read_id(struct mtd_info *mtd, unsigned int chipSelect, unsigned long* dev_id) +@@ -8005,6 +8002,7 @@ printk("After: NandSelect=%08x, nandConfig=%08x\n", nandSelect, nandConfig); + } + + ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + /* + * Type-1 ID string, called from brcmnand_probe with the following condition + * if ((brcmnand_chips[i].idOptions & BRCMNAND_ID_HAS_BYTE4) && +@@ -8202,7 +8200,9 @@ PRINTK("nandConfigChipSize = %04x\n", nandConfigChipSize); + + return nand_config; + } ++#endif + ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + + /* + * Type-2 ID string, called from brcmnand_probe with the following condition +@@ -8372,8 +8372,9 @@ PRINTK("Required ECC level = %d, devIdExt=%08x, eccShift=%02x, sector Size=%d\n" + + return nand_config; + } ++#endif + +- ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + /* + * Type-2 ID string, called from brcmnand_probe with the following condition + * if ((brcmnand_chips[i].idOptions & BRCMNAND_ID_EXT_BYTES_TYPE2) == +@@ -8519,6 +8520,7 @@ PRINTK("Updating Config Reg on CS%1d: Block & Page Size: After: %08x\n", chip->c + + return nand_config; + } ++#endif + + + #if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_4_0 +@@ -9074,7 +9076,7 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) + for (i=0; i < BRCMNAND_MAX_CHIPS; i++) { + if (brcmnand_dev_id == brcmnand_chips[i].chipId + && brcmnand_maf_id == brcmnand_chips[i].mafId) { +- ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + /* No ambiguity in ID#3,4,5 */ + if (brcmnand_chips[i].chipId345[0] == 0x0 + && brcmnand_chips[i].chipId345[1] == 0x0 +@@ -9113,6 +9115,15 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) + } + /* Else not match */ + } ++#else ++ if (brcmnand_chips[i].chipId345[0] == 0x0 ++ && brcmnand_chips[i].chipId345[1] == 0x0 ++ && brcmnand_chips[i].chipId345[2] == 0x0) { ++ foundInIdTable = 1; ++ break; ++ } ++ ++#endif + } + } + +@@ -9312,7 +9323,7 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) + printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, chip->reqEccLevel, chip->eccSectorSize); + } + } +- ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + /* ID not in table, and no CONFIG REG was passed at command line */ + else if (!skipIdLookup && !foundInIdTable) { + uint32_t acc; +@@ -9339,6 +9350,7 @@ printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, c + printk("Spare Area Size = %dB/512B\n", chip->eccOobSize); + + } ++#endif + } + + /* +@@ -9355,10 +9367,11 @@ printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, c + // Also works for dummy entries, but no adjustments possible + brcmnand_adjust_timings(chip, &brcmnand_chips[i]); + ++#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 + // Adjust perchip NAND ACC CONTROL + // updateInternalData = not ONFI .or. not in ID table + brcmnand_adjust_acccontrol(chip, isONFI, foundInIdTable, i); +- ++#endif + + /* Flash device information */ + brcmnand_print_device_info(&brcmnand_chips[i], mtd); diff --git a/recipes/linux/linux-vusolo-3.1.1/linux_3.1.1_vusolo_patch b/recipes/linux/linux-vusolo-3.1.1/linux_3.1.1_vusolo_patch deleted file mode 100644 index 7cc0917..0000000 --- a/recipes/linux/linux-vusolo-3.1.1/linux_3.1.1_vusolo_patch +++ /dev/null @@ -1,164 +0,0 @@ -diff --git a/arch/mips/brcmstb/board.c b/arch/mips/brcmstb/board.c -index ab1cb65..f25c74b 100644 ---- a/arch/mips/brcmstb/board.c -+++ b/arch/mips/brcmstb/board.c -@@ -718,15 +718,13 @@ void __init board_get_ram_size(unsigned long *dram0_mb, unsigned long *dram1_mb) - - static struct mtd_partition fixed_partition_map[] = { - /* name offset size */ -- { name: "rootfs", offset: 0, size:0x1F200000 /* DEFAULT_ROOTFS_SIZE*/ }, /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */ -- { name: "kernel", offset: 0x1F200000, size: 4<<20 }, -- { name: "boot", offset: 0x1F600000, size: 4<<20 }, -- { name: "splash", offset: 0x1FA00000, size: 2<<20 }, -- { name: "cfe", offset: 0x1FC00000, size: 1<<20 }, -- { name: "mac", offset: 0x1FD00000, size: 1<<19 }, -- { name: "env", offset: 0x1FD80000, size: 1<<19 }, -- { name: "nvm", offset: 0x1FE00000, size: 1<<20 }, -- { name: "data", offset: 0x20000000, size: 0x1FC00000 }, -+ { name: "rootfs", offset: 0, size: (128-4-4-3-1)<<20 }, /* rootfs is total nand size - 6 M Bytes. referr to cfe. bcm97335_devs.c */ -+ { name: "kernel", offset: 0x07400000, size: 4<<20 }, -+ { name: "boot", offset: 0x07800000, size: 4<<20 }, -+ { name: "cfe", offset: 0x07C00000, size: 1<<20 }, -+ { name: "mac", offset: 0x07D00000, size: 1<<19 }, -+ { name: "env", offset: 0x07D80000, size: 1<<19 }, -+ { name: "nvm", offset: 0x07E00000, size: 1<<20 }, - /* BBT 1MB not mountable by anyone */ - /* { name: "data", offset: 0x20000000, size: 0 },*/ - /* Add 1 extra place-holder partition for splash, and a safety guard element */ -diff --git a/drivers/mtd/brcmnand/brcmnand_base.c b/drivers/mtd/brcmnand/brcmnand_base.c -index 37ac88c..c5bcfd1 100644 ---- a/drivers/mtd/brcmnand/brcmnand_base.c -+++ b/drivers/mtd/brcmnand/brcmnand_base.c -@@ -226,8 +226,8 @@ static brcmnand_chip_Id brcmnand_chips[] = { - .options = NAND_USE_FLASH_BBT, /* Use BBT on flash */ - .idOptions = 0, - //| NAND_COMPLEX_OOB_WRITE /* Write data together with OOB for write_oob */ -- .timing1 = 0, //00070000, -- .timing2 = 0, -+ .timing1 = 0x4232222D, -+ .timing2 = 0x00000D94, - .nop=8, - .ctrlVersion = 0, /* THT Verified on data-sheet 7/10/08: Allows 4 on main and 4 on OOB */ - }, -@@ -7553,10 +7553,7 @@ brcmnand_decode_config(struct brcmnand_chip* chip, uint32_t nand_config) - chip->blockSize = 2048 << 10; - break; - #endif -- case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_256KB: -- chip->blockSize = 256 << 10; -- break; -- case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_512KB: -+ case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_512KB: - chip->blockSize = 512 << 10; - break; - case BCHP_NAND_CONFIG_BLOCK_SIZE_BK_SIZE_8KB: -@@ -7772,7 +7769,7 @@ is_ecc_strong(int registerEcc, int requiredEcc) - } - - -- -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - static void - brcmnand_set_acccontrol(struct brcmnand_chip * chip , unsigned int chipSelect, - uint32_t pageSize, uint16_t oobSizePerPage, int reqEcc, int codeWorkSize, int nbrBitsPerCell) -@@ -7928,7 +7925,7 @@ PRINTK("%s: gAccControl[CS=%d]=%08x, ACC=%08lx\n", - #endif - } - } -- -+#endif - - static void - brcmnand_read_id(struct mtd_info *mtd, unsigned int chipSelect, unsigned long* dev_id) -@@ -8005,6 +8002,7 @@ printk("After: NandSelect=%08x, nandConfig=%08x\n", nandSelect, nandConfig); - } - - -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - /* - * Type-1 ID string, called from brcmnand_probe with the following condition - * if ((brcmnand_chips[i].idOptions & BRCMNAND_ID_HAS_BYTE4) && -@@ -8202,7 +8200,9 @@ PRINTK("nandConfigChipSize = %04x\n", nandConfigChipSize); - - return nand_config; - } -+#endif - -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - - /* - * Type-2 ID string, called from brcmnand_probe with the following condition -@@ -8372,8 +8372,9 @@ PRINTK("Required ECC level = %d, devIdExt=%08x, eccShift=%02x, sector Size=%d\n" - - return nand_config; - } -+#endif - -- -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - /* - * Type-2 ID string, called from brcmnand_probe with the following condition - * if ((brcmnand_chips[i].idOptions & BRCMNAND_ID_EXT_BYTES_TYPE2) == -@@ -8519,6 +8520,7 @@ PRINTK("Updating Config Reg on CS%1d: Block & Page Size: After: %08x\n", chip->c - - return nand_config; - } -+#endif - - - #if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_4_0 -@@ -9074,7 +9076,7 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) - for (i=0; i < BRCMNAND_MAX_CHIPS; i++) { - if (brcmnand_dev_id == brcmnand_chips[i].chipId - && brcmnand_maf_id == brcmnand_chips[i].mafId) { -- -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - /* No ambiguity in ID#3,4,5 */ - if (brcmnand_chips[i].chipId345[0] == 0x0 - && brcmnand_chips[i].chipId345[1] == 0x0 -@@ -9113,6 +9115,15 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) - } - /* Else not match */ - } -+#else -+ if (brcmnand_chips[i].chipId345[0] == 0x0 -+ && brcmnand_chips[i].chipId345[1] == 0x0 -+ && brcmnand_chips[i].chipId345[2] == 0x0) { -+ foundInIdTable = 1; -+ break; -+ } -+ -+#endif - } - } - -@@ -9312,7 +9323,7 @@ static int brcmnand_probe(struct mtd_info *mtd, unsigned int chipSelect) - printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, chip->reqEccLevel, chip->eccSectorSize); - } - } -- -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - /* ID not in table, and no CONFIG REG was passed at command line */ - else if (!skipIdLookup && !foundInIdTable) { - uint32_t acc; -@@ -9339,6 +9350,7 @@ printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, c - printk("Spare Area Size = %dB/512B\n", chip->eccOobSize); - - } -+#endif - } - - /* -@@ -9355,10 +9367,11 @@ printk("%s: Ecc level set to %d, sectorSize=%d from ID table\n", __FUNCTION__, c - // Also works for dummy entries, but no adjustments possible - brcmnand_adjust_timings(chip, &brcmnand_chips[i]); - -+#if CONFIG_MTD_BRCMNAND_VERSION >= CONFIG_MTD_BRCMNAND_VERS_3_0 - // Adjust perchip NAND ACC CONTROL - // updateInternalData = not ONFI .or. not in ID table - brcmnand_adjust_acccontrol(chip, isONFI, foundInIdTable, i); -- -+#endif - - /* Flash device information */ - brcmnand_print_device_info(&brcmnand_chips[i], mtd); diff --git a/recipes/linux/linux-vusolo-3.1.1/vusolo_defconfig b/recipes/linux/linux-vusolo-3.1.1/vusolo_defconfig index 163bf68..27fa984 100644 --- a/recipes/linux/linux-vusolo-3.1.1/vusolo_defconfig +++ b/recipes/linux/linux-vusolo-3.1.1/vusolo_defconfig @@ -2323,7 +2323,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_FS_WBUF_VERIFY is not set diff --git a/recipes/linux/linux-vusolo_3.1.1.bb b/recipes/linux/linux-vusolo_3.1.1.bb index c605883..bc58d44 100644 --- a/recipes/linux/linux-vusolo_3.1.1.bb +++ b/recipes/linux/linux-vusolo_3.1.1.bb @@ -1,8 +1,8 @@ require linux-vuplus-3.1.1.inc -PR = "r1" +PR = "r2" SRC_URI += "\ - file://linux_3.1.1_vusolo_patch;patch=1;pnum=1 \ + file://linux_3.1.1_vusolo.patch;patch=1;pnum=1 \ " diff --git a/recipes/linux/linux-vuultimo-3.1.1/vuultimo_defconfig b/recipes/linux/linux-vuultimo-3.1.1/vuultimo_defconfig index c6cc804..cf569ca 100644 --- a/recipes/linux/linux-vuultimo-3.1.1/vuultimo_defconfig +++ b/recipes/linux/linux-vuultimo-3.1.1/vuultimo_defconfig @@ -2348,7 +2348,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_FS_WBUF_VERIFY is not set diff --git a/recipes/linux/linux-vuultimo_3.1.1.bb b/recipes/linux/linux-vuultimo_3.1.1.bb index 6dbcda4..90ec268 100644 --- a/recipes/linux/linux-vuultimo_3.1.1.bb +++ b/recipes/linux/linux-vuultimo_3.1.1.bb @@ -1,6 +1,6 @@ require linux-vuplus-3.1.1.inc -PR = "r1" +PR = "r2" SRC_URI += "\ " diff --git a/recipes/linux/linux-vuuno-3.1.1/linux_3.1.1_vuuno.patch b/recipes/linux/linux-vuuno-3.1.1/linux_3.1.1_vuuno.patch index ab06096..8f4f8c8 100644 --- a/recipes/linux/linux-vuuno-3.1.1/linux_3.1.1_vuuno.patch +++ b/recipes/linux/linux-vuuno-3.1.1/linux_3.1.1_vuuno.patch @@ -27,7 +27,7 @@ index ab1cb65..4845952 100644 /* { name: "data", offset: 0x20000000, size: 0 },*/ /* Add 1 extra place-holder partition for splash, and a safety guard element */ diff --git a/drivers/mtd/brcmnand/brcmnand_base.c b/drivers/mtd/brcmnand/brcmnand_base.c -index 37ac88c..80b6fab 100644 +index 22035af..ca32167 100644 --- a/drivers/mtd/brcmnand/brcmnand_base.c +++ b/drivers/mtd/brcmnand/brcmnand_base.c @@ -226,8 +226,8 @@ static brcmnand_chip_Id brcmnand_chips[] = { diff --git a/recipes/linux/linux-vuuno-3.1.1/vuuno_defconfig b/recipes/linux/linux-vuuno-3.1.1/vuuno_defconfig index 64faad3..29a6280 100644 --- a/recipes/linux/linux-vuuno-3.1.1/vuuno_defconfig +++ b/recipes/linux/linux-vuuno-3.1.1/vuuno_defconfig @@ -2348,7 +2348,7 @@ CONFIG_MISC_FILESYSTEMS=y # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_JFFS2_FS=m +CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y # CONFIG_JFFS2_FS_WBUF_VERIFY is not set diff --git a/recipes/linux/linux-vuuno_3.1.1.bb b/recipes/linux/linux-vuuno_3.1.1.bb index 965e496..ced0578 100644 --- a/recipes/linux/linux-vuuno_3.1.1.bb +++ b/recipes/linux/linux-vuuno_3.1.1.bb @@ -1,6 +1,6 @@ require linux-vuplus-3.1.1.inc -PR = "r1" +PR = "r2" SRC_URI += "\ file://linux_3.1.1_vuuno.patch;patch=1;pnum=1 \ diff --git a/recipes/vuplus/vuplus-bootlogo.bb b/recipes/vuplus/vuplus-bootlogo.bb index 24daa0b..ac1d055 100644 --- a/recipes/vuplus/vuplus-bootlogo.bb +++ b/recipes/vuplus/vuplus-bootlogo.bb @@ -7,8 +7,9 @@ IMAGES_VERSION = "1" BINARY_VERSION = "7" PV = "${BINARY_VERSION}.${IMAGES_VERSION}" -PR = "r4" +PR = "r5" +KERNEL_VERSION = "${@base_contains('PREFERRED_VERSION_linux-${MACHINE}', '2.6.18', '2.6.18', '3.1.1', d)}" SRC_URI = "file://bootlogo.mvi file://backdrop.mvi file://bootlogo_wait.mvi file://switchoff.mvi" SRC_URI_append_vuuno = " file://splash_cfe_auto.bin" @@ -47,19 +48,27 @@ do_install_vuultimo() { } pkg_preinst() { - [ -d /proc/stb ] && mount -o rw,remount /boot + if [ "${KERNEL_VERSION}" = "3.1.1" ]; then + [ -d /proc/stb ] && mount -o rw,remount /boot + fi } pkg_postinst() { - [ -d /proc/stb ] && mount -o ro,remount /boot + if [ "${KERNEL_VERSION}" = "3.1.1" ]; then + [ -d /proc/stb ] && mount -o ro,remount /boot + fi } pkg_prerm() { - [ -d /proc/stb ] && mount -o rw,remount /boot + if [ "${KERNEL_VERSION}" = "3.1.1" ]; then + [ -d /proc/stb ] && mount -o rw,remount /boot + fi } pkg_postrm() { - [ -d /proc/stb ] && mount -o ro,remount /boot + if [ "${KERNEL_VERSION}" = "3.1.1" ]; then + [ -d /proc/stb ] && mount -o ro,remount /boot + fi } PACKAGE_ARCH := "${MACHINE_ARCH}"