[oe-commits] org.oe.dreambox merge of '4a263d2133ae25885d741e9df386c260142ef518'
tmbinc commit
oe at amethyst.openembedded.net
Mon Mar 17 08:50:26 UTC 2008
merge of '4a263d2133ae25885d741e9df386c260142ef518'
and '8f37a36412d84be58395029ef05cce6ec0edc289'
Author: tmbinc at openembedded.org
Branch: org.openembedded.dreambox
Revision: 4352b96e406854c75865311633836efeffbb3e0f
ViewMTN: http://monotone.openembedded.org/revision/info/4352b96e406854c75865311633836efeffbb3e0f
Files:
1
packages/perl/files/makedepend-dash.patch
classes/rootfs_ipk.bbclass
packages/perl/perl-native_5.8.7.bb
packages/linux/linux-dm800/linux-2.6.12-dvb-multipid-r4.patch
packages/linux/linux-dm800/linux-2.6.12-fix_serial.patch
packages/linux/linux-dm800/linux-2.6.12-update_dvbapi-r1.patch
packages/linux/linux-dm800/linuxmips-2.6.12-dream-r6.patch
packages/dreambox/dreambox-dvb-modules.bb
packages/enigma2/enigma2-plugins.bb
packages/enigma2/enigma2.bb
packages/images/dreambox-image.bb
packages/initscripts/initscripts-1.0/umountnfs.sh
packages/linux/linux-dm800/dm800_defconfig
packages/linux/linux-dm800/linux-2.6.12-dm800-flash-layout.patch
packages/linux/linux-dm800/linux-2.6.12-set-custom-extraversion.patch
packages/linux/linux-dm800.bb
packages/sysvinit/sysvinit/opendreambox/rcS
Diffs:
#
# mt diff -r4a263d2133ae25885d741e9df386c260142ef518 -r4352b96e406854c75865311633836efeffbb3e0f
#
#
#
# add_file "packages/perl/files/makedepend-dash.patch"
# content [a32ff3bf1b75c57f6ff7ac58b232cc44f2648a27]
#
# patch "classes/rootfs_ipk.bbclass"
# from [be2c3f8e8d1506f600b4860805062a6e76654e9f]
# to [6cfc81713141dff46637f99120bdfc6800b34b8e]
#
# patch "packages/perl/perl-native_5.8.7.bb"
# from [c37c965722c4fc39aaa32f07e5be2746678307b2]
# to [46bd366c882141f4e4b056bbeb3fdae7c94cd387]
#
============================================================
--- packages/perl/files/makedepend-dash.patch a32ff3bf1b75c57f6ff7ac58b232cc44f2648a27
+++ packages/perl/files/makedepend-dash.patch a32ff3bf1b75c57f6ff7ac58b232cc44f2648a27
@@ -0,0 +1,13 @@
+Index: perl-5.8.8/makedepend.SH
+===================================================================
+--- perl-5.8.8.orig/makedepend.SH 2007-05-24 12:06:52.000000000 +1000
++++ perl-5.8.8/makedepend.SH 2007-05-24 12:27:33.000000000 +1000
+@@ -128,7 +128,7 @@
+ *.y) filebase=`basename $file .y` ;;
+ esac
+ case "$file" in
+- */*) finc="-I`echo $file | sed 's#/[^/]*$##`" ;;
++ */*) finc="-I`echo $file | sed 's#/[^/]*$##'`" ;;
+ *) finc= ;;
+ esac
+ $echo "Finding dependencies for $filebase$_o."
============================================================
--- classes/rootfs_ipk.bbclass be2c3f8e8d1506f600b4860805062a6e76654e9f
+++ classes/rootfs_ipk.bbclass 6cfc81713141dff46637f99120bdfc6800b34b8e
@@ -92,10 +92,10 @@ log_check() {
for keyword_die in "Cannot find package" "exit 1" ERR Fail
do
- if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") &>/dev/null
+ if (echo "$lf_txt" | grep -v log_check | grep "$keyword_die") >/dev/null 2>&1
then
echo "log_check: There were error messages in the logfile"
- echo -e "log_check: Matched keyword: [$keyword_die]\n"
+ printf "log_check: Matched keyword: [$keyword_die]\n"
echo "$lf_txt" | grep -v log_check | grep -i "$keyword_die" -C1
echo ""
do_exit=1
============================================================
--- packages/perl/perl-native_5.8.7.bb c37c965722c4fc39aaa32f07e5be2746678307b2
+++ packages/perl/perl-native_5.8.7.bb 46bd366c882141f4e4b056bbeb3fdae7c94cd387
@@ -11,7 +11,8 @@ SRC_URI = "http://ftp.funet.fi/pub/CPAN/
SRC_URI = "http://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
file://Configure-multilib.patch;patch=1 \
- file://host_gcc_4.2_buildfix.patch;patch=1"
+ file://host_gcc_4.2_buildfix.patch;patch=1 \
+ file://makedepend-dash.patch;patch=1"
S = "${WORKDIR}/perl-${PV}"
#perl is not parallel_make safe
#
# mt diff -r8f37a36412d84be58395029ef05cce6ec0edc289 -r4352b96e406854c75865311633836efeffbb3e0f
#
#
#
# delete "packages/linux/linux-dm800/linux-2.6.12-dvb-multipid-r4.patch"
#
# delete "packages/linux/linux-dm800/linux-2.6.12-fix_serial.patch"
#
# delete "packages/linux/linux-dm800/linux-2.6.12-update_dvbapi-r1.patch"
#
# delete "packages/linux/linux-dm800/linuxmips-2.6.12-dream-r6.patch"
#
# patch "packages/dreambox/dreambox-dvb-modules.bb"
# from [8a49c64162a5b12fffbcd56b72085b87eb5b49ad]
# to [bc9f40c8c5bc862e5ba40bc8f93942ccd46e02ec]
#
# patch "packages/enigma2/enigma2-plugins.bb"
# from [18a408c576ac5d4be5c556e53f38a0431eab60ff]
# to [18217c2bfd32adc261269120c21080f185bb2780]
#
# patch "packages/enigma2/enigma2.bb"
# from [b8fee42e5cebdd97a43c8019a3654d84e5ff65db]
# to [853b69c7c3943b839281dcc912bceec2d5475b77]
#
# patch "packages/images/dreambox-image.bb"
# from [a99f1a584703d43630d70475c29c089c6da5a993]
# to [74d6cb9378dc78ad54537d6ad0ad6cea4b89c783]
#
# patch "packages/initscripts/initscripts-1.0/umountnfs.sh"
# from [984268226ea86a5e2f06ca8cec381c806f100bf3]
# to [e18b8087cbf689f2f007338695d10b844ab6cd8f]
#
# patch "packages/linux/linux-dm800/dm800_defconfig"
# from [458b91e98d327364d2ce12d597d004d1c8c5d98d]
# to [c633999e81871ad0873ec551590cc7ae00bbc9c3]
#
# patch "packages/linux/linux-dm800/linux-2.6.12-dm800-flash-layout.patch"
# from [c8aedb8f8a8915f5b1e834d92fcada276c778aa3]
# to [46c8b946025a3387ba7aed0bec993a20550528c4]
#
# patch "packages/linux/linux-dm800/linux-2.6.12-set-custom-extraversion.patch"
# from [be10447a546300143b8b90a6372ebebd5b19f424]
# to [add9a3ef1d04c42ecfa007ce0352280c2d5e6679]
#
# patch "packages/linux/linux-dm800.bb"
# from [8d19809f0dcf14d677845338e8fb532f128c21cf]
# to [5f379748049e24d89630ce582e41bf7b4b07c0f8]
#
# patch "packages/sysvinit/sysvinit/opendreambox/rcS"
# from [411f2097f5824374fe0bc1271f23ce0be330a22f]
# to [9f355a57b2ec2a0751c681a8158fa72b6b459388]
#
============================================================
--- packages/dreambox/dreambox-dvb-modules.bb 8a49c64162a5b12fffbcd56b72085b87eb5b49ad
+++ packages/dreambox/dreambox-dvb-modules.bb bc9f40c8c5bc862e5ba40bc8f93942ccd46e02ec
@@ -21,8 +21,8 @@ PV_dm500plus = "${KV}-20071026"
KV_dm500plus = "2.6.12"
PV_dm500plus = "${KV}-20071026"
-KV_dm800 = "2.6.12-5.0-brcmstb-dm800"
-PV_dm800 = "2.6.12-20080219"
+KV_dm800 = "2.6.12-5.1-brcmstb-dm800"
+PV_dm800 = "${KV}-20080312"
RDEPENDS = "kernel (${KV})"
PR = "r0"
============================================================
--- packages/enigma2/enigma2-plugins.bb 18a408c576ac5d4be5c556e53f38a0431eab60ff
+++ packages/enigma2/enigma2-plugins.bb 18217c2bfd32adc261269120c21080f185bb2780
@@ -1,7 +1,7 @@ MAINTAINER = "Felix Domke <tmbinc at elited
DESCRIPTION = "Additional plugins for Enigma2"
MAINTAINER = "Felix Domke <tmbinc at elitedvb.net>"
-SRCDATE = "20080201"
+SRCDATE = "20080312"
PV = "2.4cvs${SRCDATE}"
SRC_URI = "cvs://anonymous@cvs.schwerkraft.elitedvb.net/cvsroot/enigma2-plugins;module=enigma2-plugins;method=pserver"
============================================================
--- packages/enigma2/enigma2.bb b8fee42e5cebdd97a43c8019a3654d84e5ff65db
+++ packages/enigma2/enigma2.bb 853b69c7c3943b839281dcc912bceec2d5475b77
@@ -33,15 +33,15 @@ PR = "r0"
PN = "enigma2"
PR = "r0"
-SRCDATE = "20070904"
+SRCDATE = "20080313"
REL_MAJOR="2"
-REL_MINOR="3"
+REL_MINOR="4"
PV = "${REL_MAJOR}.${REL_MINOR}cvs${SRCDATE}"
-TAG = "enigma2_rel${REL_MAJOR}${REL_MINOR}"
+#TAG = "enigma2_rel${REL_MAJOR}${REL_MINOR}"
-SRC_URI = "cvs://anonymous@dreamboxupdate.com/cvs;module=enigma2;method=pserver;tag=${TAG};date=${SRCDATE} \
+SRC_URI = "cvs://anonymous@dreamboxupdate.com/cvs;module=enigma2;method=pserver;date=${SRCDATE} \
file://enigma2.sh"
S = "${WORKDIR}/enigma2"
============================================================
--- packages/images/dreambox-image.bb a99f1a584703d43630d70475c29c089c6da5a993
+++ packages/images/dreambox-image.bb 74d6cb9378dc78ad54537d6ad0ad6cea4b89c783
@@ -100,7 +100,7 @@ OPENDREAMBOX_COMMON_MACHINE_dm800 += "${
OPENDREAMBOX_COMMON_MACHINE_D_dm7025 += ""
OPENDREAMBOX_COMMON_MACHINE_dm800 += "${OPENDREAMBOX_V3_ONLY} ${OPENDREAMBOX_EXPERIMENTAL}"
-OPENDREAMBOX_COMMON_MACHINE_R_dm800 += "${OPENDREAMBOX_EXPERIMENTAL_R} enigma2-plugin-systemplugins-videotune"
+OPENDREAMBOX_COMMON_MACHINE_R_dm800 += "${OPENDREAMBOX_EXPERIMENTAL_R} enigma2-plugin-systemplugins-videomode"
OPENDREAMBOX_COMMON_MACHINE_D_dm800 += ""
# collect the stuff into OPENDREAMBOX_COMMON
============================================================
--- packages/initscripts/initscripts-1.0/umountnfs.sh 984268226ea86a5e2f06ca8cec381c806f100bf3
+++ packages/initscripts/initscripts-1.0/umountnfs.sh e18b8087cbf689f2f007338695d10b844ab6cd8f
@@ -17,7 +17,7 @@ do
#
while read device mountpt fstype options
do
- if test "$fstype" = nfs || test "$fstype" = smbfs || test "$fstype" = ncpfs
+ if test "$fstype" = nfs || test "$fstype" = smbfs || test "$fstype" = ncpfs || test "$fstype" = cifs
then
umount -f $mountpt
fi
============================================================
--- packages/linux/linux-dm800/dm800_defconfig 458b91e98d327364d2ce12d597d004d1c8c5d98d
+++ packages/linux/linux-dm800/dm800_defconfig c633999e81871ad0873ec551590cc7ae00bbc9c3
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-5.0-brcmstb-dm800
-# Thu Feb 14 14:42:21 2008
+# Linux kernel version: 2.6.12-5.1-brcmstb-dm800
+# Thu Feb 28 19:09:49 2008
#
CONFIG_MIPS=y
@@ -79,9 +79,11 @@ CONFIG_KMOD=y
# CONFIG_MIPS_BCM7328 is not set
# CONFIG_MIPS_BCM7329 is not set
# CONFIG_MIPS_BCM97456 is not set
-# CONFIG_MIPS_BCM97456B0 is not set
+# CONFIG_MIPS_BCM97456BX is not set
+# CONFIG_MIPS_BCM97456BX_NAND is not set
# CONFIG_MIPS_BCM7400AX is not set
# CONFIG_MIPS_BCM7400BX is not set
+# CONFIG_MIPS_BCM7400BX_NAND is not set
# CONFIG_MIPS_BCM7400AX_NAND is not set
# CONFIG_MIPS_BCM7405AX is not set
# CONFIG_MIPS_BCM97455 is not set
@@ -101,8 +103,10 @@ CONFIG_MIPS_BCM7401CX=y
# CONFIG_MIPS_BCM7402CX is not set
# CONFIG_MIPS_BCM7402CX_NAND is not set
# CONFIG_MIPS_BCM7403AX is not set
+# CONFIG_MIPS_BCM7451AX_SMB is not set
# CONFIG_MIPS_BCM7403AX_NAND is not set
# CONFIG_MIPS_BCM7452AX is not set
+# CONFIG_MIPS_BCM7452AX_NAND is not set
# CONFIG_MIPS_BCM7440AX is not set
# CONFIG_MIPS_BCM7440BX is not set
# CONFIG_MIPS_BCM7440BX_NAND is not set
============================================================
--- packages/linux/linux-dm800/linux-2.6.12-dm800-flash-layout.patch c8aedb8f8a8915f5b1e834d92fcada276c778aa3
+++ packages/linux/linux-dm800/linux-2.6.12-dm800-flash-layout.patch 46c8b946025a3387ba7aed0bec993a20550528c4
@@ -1,20 +1,23 @@
-Index: stblinux-2.6.12/drivers/mtd/brcmnand/bcm7xxx-nand.c
-===================================================================
---- stblinux-2.6.12.orig/drivers/mtd/brcmnand/bcm7xxx-nand.c 2008-01-21 02:01:34.000000000 +0100
-+++ stblinux-2.6.12/drivers/mtd/brcmnand/bcm7xxx-nand.c 2008-01-21 02:01:52.000000000 +0100
-@@ -72,15 +72,27 @@
+diff -Naur stblinux-2.6.12-org/drivers/mtd/brcmnand/bcm7xxx-nand.c stblinux-2.6.12/drivers/mtd/brcmnand/bcm7xxx-nand.c
+--- stblinux-2.6.12-org/drivers/mtd/brcmnand/bcm7xxx-nand.c 2008-02-28 18:40:17.000000000 +0100
++++ stblinux-2.6.12/drivers/mtd/brcmnand/bcm7xxx-nand.c 2008-02-28 18:45:03.000000000 +0100
+@@ -78,19 +78,28 @@
static struct mtd_partition bcm7XXX_nand_parts[] =
{
- { name: "rootfs", offset: 0, size: DEFAULT_ROOTFS_SIZE },
-#ifdef CONFIG_MTD_ECM_PARTITION
-- { name: "ecm", offset: DEFAULT_ROOTFS_SIZE, size: DEFAULT_ECM_SIZE },
+-#define AVAIL1_PART (1)
+-#define OCAP_PART (2)
+- { name: "avail1", offset: DEFAULT_ROOTFS_SIZE, size: DEFAULT_AVAIL1_SIZE },
+- { name: "ocap", offset: DEFAULT_ROOTFS_SIZE+DEFAULT_AVAIL1_SIZE, size: DEFAULT_OCAP_SIZE },
-#endif
-- { name: "kernel", offset: 0x00800000, size: 4*1024*1024 },
-- { name: "cfe", offset: 0x00C00000, size: 2*1024*1024 },
-- { name: "nvm", offset: 0x00E00000, size: 1*1024*1024 },
+- { name: "kernel", offset: 0x00800000, size: 4<<20 },
+- { name: "cfe", offset: 0x00C00000, size: 2<<20 },
+- { name: "nvm", offset: 0x00E00000, size: 1<<20 },
- /* BBT 1MB not mountable by anyone */
- { name: "data", offset: 0x400000000, size: 0 },
+-};
+ /* modified for Dreambox DM800 */
+ {
+ .name = "complete",
@@ -36,13 +39,15 @@ Index: stblinux-2.6.12/drivers/mtd/brcmn
+ .offset = 4*1024*1024,
+ .size = 60*1024*1024
+ },
- };
++ };
struct brcmnand_info {
-@@ -98,52 +110,6 @@
+ struct mtd_info mtd;
+@@ -106,100 +115,6 @@
+ }
//EXPORT_SYMBOL(get_brcmnand_handle);
-
+-
-/*
- * Size and offset are variable, depending on the size of the chip, but
- * cfe_kernel always starts at 1FC0_0000 and is 4MB size.
@@ -54,6 +59,9 @@ Index: stblinux-2.6.12/drivers/mtd/brcmn
- struct mtd_info* mtd = &nandinfo->mtd;
- unsigned long size;
- int i = 0;
+- unsigned int ecm_size = DEFAULT_ECM_SIZE;
+- unsigned int ocap_size = DEFAULT_OCAP_SIZE;
+- unsigned int avail1_size = DEFAULT_AVAIL1_SIZE;
-
- if (mtd->size <= (512<<20)) {
- size = mtd->size; // mtd->size may be different than nandinfo->size
@@ -64,14 +72,40 @@ Index: stblinux-2.6.12/drivers/mtd/brcmn
- size = 512 << 20;
- *numParts = ARRAY_SIZE(bcm7XXX_nand_parts);
- }
+-
+-#ifdef CONFIG_MTD_ECM_PARTITION
+- /* Do not generate AVAIL1 partition if usable flash size is less than 64MB */
+- if (size < (64<<20)) {
+- ecm_size = DEFAULT_OCAP_SIZE;
+- bcm7XXX_nand_parts[AVAIL1_PART].size = avail1_size = 0;
+- (*numParts)--;
+- }
+- else {
+- int factor = size / (64 << 20); // Remember size is capped at 512MB
+-
+- bcm7XXX_nand_parts[OCAP_PART].size = ocap_size = factor*DEFAULT_OCAP_SIZE;
+- bcm7XXX_nand_parts[AVAIL1_PART].size = avail1_size = factor*DEFAULT_AVAIL1_SIZE;
+- ecm_size = ocap_size + avail1_size;
+- }
+-
+-#endif
- nandinfo->parts = bcm7XXX_nand_parts;
-- bcm7XXX_nand_parts[0].size = size - DEFAULT_RESERVED_SIZE - DEFAULT_ECM_SIZE;
+- bcm7XXX_nand_parts[0].size = size - DEFAULT_RESERVED_SIZE - ecm_size;
- bcm7XXX_nand_parts[0].oobsel = &mtd->oobinfo;
-printk("Part[%d] name=%s, size=%x, offset=%x\n", i, bcm7XXX_nand_parts[0].name,
-bcm7XXX_nand_parts[0].size, bcm7XXX_nand_parts[0].offset);
-
- for (i=1; i< ARRAY_SIZE(bcm7XXX_nand_parts) - 1; i++) {
-- bcm7XXX_nand_parts[i].offset += bcm7XXX_nand_parts[0].size - DEFAULT_ROOTFS_SIZE;
+-#ifdef CONFIG_MTD_ECM_PARTITION
+- //if (0 == bcm7XXX_nand_parts[i].size)
+- // continue;
+- /* Skip avail1 if size is less than 64 MB) */
+- if (0 == avail1_size && AVAIL1_PART == i) {
+- bcm7XXX_nand_parts[i].offset = bcm7XXX_nand_parts[i-1].size + bcm7XXX_nand_parts[i-1].offset;
+- continue;
+- }
+-#endif
+- bcm7XXX_nand_parts[i].offset = bcm7XXX_nand_parts[i-1].size + bcm7XXX_nand_parts[i-1].offset;
- // For now every partition uses the same oobinfo
- bcm7XXX_nand_parts[i].oobsel = &mtd->oobinfo;
-printk("Part[%d] name=%s, size=%x, offset=%x\n", i, bcm7XXX_nand_parts[i].name,
@@ -84,42 +118,70 @@ Index: stblinux-2.6.12/drivers/mtd/brcmn
- bcm7XXX_nand_parts[i].offset = 512 << 20;
- bcm7XXX_nand_parts[i].size = mtd->size - (513 << 20);
- bcm7XXX_nand_parts[i].oobsel = &mtd->oobinfo;
+-#ifdef CONFIG_MTD_ECM_PARTITION
+-printk("Part[%d] name=%s, size=%x, offset=%x\n", avail1_size? i: i-1, bcm7XXX_nand_parts[i].name,
+-bcm7XXX_nand_parts[i].size, bcm7XXX_nand_parts[i].offset);
+-#else
-printk("Part[%d] name=%s, size=%x, offset=%x\n", i, bcm7XXX_nand_parts[i].name,
-bcm7XXX_nand_parts[i].size, bcm7XXX_nand_parts[i].offset);
+-#endif
+-
- }
+-
+-#ifdef CONFIG_MTD_ECM_PARTITION
+- /* Shift partitions 1 up if avail1_size is 0 */
+- if (0 == avail1_size) {
+- for (i=AVAIL1_PART; i < *numParts; i++) {
+- bcm7XXX_nand_parts[i].offset = bcm7XXX_nand_parts[i+1].offset;
+- bcm7XXX_nand_parts[i].size = bcm7XXX_nand_parts[i+1].size;
+- }
+- bcm7XXX_nand_parts[*numParts].offset = 0;
+- bcm7XXX_nand_parts[*numParts].size = 0;
+- }
+-#endif
-}
-
static int __devinit brcmnanddrv_probe(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
-@@ -181,10 +147,9 @@
- }
-
- printk(" numchips=%d, size=%08x\n", info->brcmnand.numchips, info->mtd.size);
+@@ -234,14 +149,12 @@
+ if (brcmnand_scan(&info->mtd, MAX_NAND_CS)) {
+ err = -ENXIO;
+ goto out_free_info;
+- }
+-
+- printk(" numchips=%d, size=%08x\n", info->brcmnand.numchips, info->mtd.size);
- brcmnanddrv_setup_mtd_partitions(info, &numParts);
- //printk(" add_mtd_partitions\n");
+-//printk(" add_mtd_partitions\n");
- add_mtd_partitions(&info->mtd, info->parts, numParts);
-//printk(" dev_set_drvdata\n");
+- dev_set_drvdata(&pdev->dev, info);
++ }
++
++ printk(" numchips=%d, size=%08x\n", info->brcmnand.numchips, info->mtd.size);
+ add_mtd_partitions(&info->mtd, bcm7XXX_nand_parts, 4);
+//printk(" dev_set_drvdata\n");
- dev_set_drvdata(&pdev->dev, info);
++ dev_set_drvdata(&pdev->dev, info);
//printk("<-- brcmnanddrv_probe\n");
return 0;
-Index: stblinux-2.6.12/drivers/mtd/brcmnand/brcmnand_base.c
-===================================================================
---- stblinux-2.6.12.orig/drivers/mtd/brcmnand/brcmnand_base.c 2008-01-21 02:01:34.000000000 +0100
-+++ stblinux-2.6.12/drivers/mtd/brcmnand/brcmnand_base.c 2008-01-21 02:01:36.000000000 +0100
-@@ -200,6 +200,13 @@
+
+diff -Naur stblinux-2.6.12-org/drivers/mtd/brcmnand/brcmnand_base.c stblinux-2.6.12/drivers/mtd/brcmnand/brcmnand_base.c
+--- stblinux-2.6.12-org/drivers/mtd/brcmnand/brcmnand_base.c 2008-02-28 18:40:17.000000000 +0100
++++ stblinux-2.6.12/drivers/mtd/brcmnand/brcmnand_base.c 2008-02-28 18:46:02.000000000 +0100
+@@ -296,7 +296,15 @@
.options = NAND_USE_FLASH_BBT,
.timing1 = 0, .timing2 = 0,
},
-+ { /* 8 */
+-
++
++ { /* 20 */
+ .chipId = HYNIX_HY27US08121A,
+ .mafId = FLASHTYPE_HYNIX,
+ .chipIdStr = "Hynix HY27US08121A (dream)",
+ .options = NAND_USE_FLASH_BBT,
+ .timing1 = 0, .timing2 = 0,
+ },
++
+ { /* LAST DUMMY ENTRY */
+ .chipId = 0,
+ .mafId = 0,
- #if 0
- { /* 9 */
- .chipId = SAMSUNG_K9K8G08UOA,
============================================================
--- packages/linux/linux-dm800/linux-2.6.12-set-custom-extraversion.patch be10447a546300143b8b90a6372ebebd5b19f424
+++ packages/linux/linux-dm800/linux-2.6.12-set-custom-extraversion.patch add9a3ef1d04c42ecfa007ce0352280c2d5e6679
@@ -6,8 +6,8 @@ Index: stblinux-2.6.12/Makefile
PATCHLEVEL = 6
SUBLEVEL = 12
# STABLE_VERSION = .2
--EXTRAVERSION =-5.0-brcmstb
-+EXTRAVERSION =-5.0-brcmstb-dm800
+-EXTRAVERSION =-5.1-brcmstb
++EXTRAVERSION =-5.1-brcmstb-dm800
NAME=Woozy Numbat
# *DOCUMENTATION*
============================================================
--- packages/linux/linux-dm800.bb 8d19809f0dcf14d677845338e8fb532f128c21cf
+++ packages/linux/linux-dm800.bb 5f379748049e24d89630ce582e41bf7b4b07c0f8
@@ -3,20 +3,28 @@ PV = "2.6.12"
PN = "linux-dm800"
KV = "2.6.12"
PV = "2.6.12"
-PR = "r2"
+PR = "r3"
# note, the rX in the filename is *NOT* the packet revision - it's the patch revision.
-SRC_URI += "http://sources.dreamboxupdate.com/download/kernel-patches/stblinux-2.6.12-5.0.tar.bz2 \
+SRC_URI += "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
file://dm800_defconfig \
- file://linuxmips-2.6.12-dream-r6.patch;patch=1;pnum=1 \
- file://linux-2.6.12-update_dvbapi-r1.patch;patch=1;pnum=1 \
- file://linux-2.6.12-dvb-multipid-r4.patch;patch=1;pnum=1 \
+ http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-brcm-5.1.patch.bz2;patch=1;pnum=1 \
+ http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-update_dvbapi-r1.patch.bz2;patch=1;pnum=1 \
+ http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-multipid-r4.patch.bz2;patch=1;pnum=1 \
+ http://sources.dreamboxupdate.com/download/kernel-patches/linux-2.6.12-dvb-core-fix-several-locking-problems.patch.bz2;patch=1;pnum=1 \
+ file://linux-2.6.12-dream-misc.patch;patch=1;pnum=1 \
+ file://linux-2.6.12-add-ioprio.patch;patch=1;pnum=1 \
+ file://linux-2.6.12-fix-serial.patch;patch=1;pnum=1 \
+ file://linux-2.6.12-dm800-flash-layout.patch;patch=1;pnum=1 \
file://linux-2.6.12-dream-temp.patch;patch=1;pnum=1 \
file://linux-2.6.12-brcm-mtd-blkdevfs-fix.diff;patch=1;pnum=1 \
- file://linux-2.6.12-dm800-flash-layout.patch%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list