diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2010-03-11 12:45:29 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2010-03-11 12:45:29 +0100 |
| commit | 82311ec3960366b2f9e31c69f9eaa09cd0d12891 (patch) | |
| tree | 515d351bf0c9c71112190f117c2503a600a87a2e | |
| parent | cad405defe04d0d338480bd761e72215b31b3def (diff) | |
| parent | b35a5e4e5768d62fe7d8cdf97410e4925c9c81b2 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | recipes/busybox/files/hipox/syslog.conf | 9 | ||||
| -rw-r--r-- | recipes/linux/linux-2.6.24/hipox/hipox.patch | 28 | ||||
| -rw-r--r-- | recipes/udev/udev-141/hipox/default | 4 |
3 files changed, 36 insertions, 5 deletions
diff --git a/recipes/busybox/files/hipox/syslog.conf b/recipes/busybox/files/hipox/syslog.conf new file mode 100644 index 0000000000..b45cd459d4 --- /dev/null +++ b/recipes/busybox/files/hipox/syslog.conf @@ -0,0 +1,9 @@ +DESTINATION="file" # log destinations (buffer file remote) +MARKINT=20 # interval between --mark-- entries [min] +REDUCE=no # reduced-size logging +BUFFERSIZE=64 # buffer: size of circular buffer [kByte] +LOGFILE=/var/log/messages # file: where to log +ROTATESIZE=64 # file: rotate log if grown beyond X [kByte] (busybox 1.2+) +ROTATEGENS=1 # file: keep X generations of rotated logs (busybox 1.2+) +REMOTE=loghost:514 # remote: where to log +FOREGROUND=no # run in foreground (don't use!) diff --git a/recipes/linux/linux-2.6.24/hipox/hipox.patch b/recipes/linux/linux-2.6.24/hipox/hipox.patch index cd944e797a..c99ef516b4 100644 --- a/recipes/linux/linux-2.6.24/hipox/hipox.patch +++ b/recipes/linux/linux-2.6.24/hipox/hipox.patch @@ -32006,10 +32006,10 @@ diff -Nurd linux-2.6.24.4/drivers/ata/ox800sata.c linux-2.6.24/drivers/ata/ox800 +EXPORT_SYMBOL( hipoxsata_RAID_faults ); +EXPORT_SYMBOL( hipoxsata_get_port_no ); +EXPORT_SYMBOL( hipoxsata_LBA_schemes_compatible ); -diff -Nurd linux-2.6.24.4/drivers/ata/ox810sata.c linux-2.6.24/drivers/ata/ox810sata.c ---- linux-2.6.24.4/drivers/ata/ox810sata.c 1970-01-01 01:00:00.000000000 +0100 -+++ linux-2.6.24/drivers/ata/ox810sata.c 2010-01-14 14:01:15.000000000 +0100 -@@ -0,0 +1,2423 @@ +diff -Nurd linux-2.6.24/drivers/ata/ox810sata.c linux-2.6.24-oxe810/drivers/ata/ox810sata.c +--- linux-2.6.24/drivers/ata/ox810sata.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.6.24-oxe810/drivers/ata/ox810sata.c 2008-06-11 17:50:32.000000000 +0200 +@@ -0,0 +1,2441 @@ +/************************************************************************** + * + * Copyright (c) 2007 Oxford Semiconductor Ltd. @@ -32447,12 +32447,30 @@ diff -Nurd linux-2.6.24.4/drivers/ata/ox810sata.c linux-2.6.24/drivers/ata/ox810 +{ + struct ata_host *host_set = dev_get_drvdata( &(pdev->dev) ); + struct ata_port *ap; -+ unsigned int i; ++ unsigned int i,j; + ++ /* tfm: detach host driver */ ++ ata_host_detach(host_set); ++ + for (i = 0; i < host_set->n_ports; i++) + { ++ struct ata_port *p=NULL; + ap = host_set->ports[i]; + scsi_remove_host( ap->scsi_host ); ++ ++ /* tfm: NULL the static local handle just to be sure. */ ++ for (j=0; j<2; j++) { ++ if (ox810sata_driver.ap[j] == ap) { ++ p = ap; ++ break; ++ } ++ } ++ if (p) { ++ printk(KERN_DEBUG "tfm host at %p: NULLing ap pointer #%d @%p\n", host_set, j, ap); ++ ox810sata_driver.ap[j] = NULL; ++ } else { ++ printk(KERN_ERR "tfm host at %p: orphan ap pointer %p\n", host_set, ap); ++ } + } + + /** @TODO etc. */ diff --git a/recipes/udev/udev-141/hipox/default b/recipes/udev/udev-141/hipox/default new file mode 100644 index 0000000000..d0050b873c --- /dev/null +++ b/recipes/udev/udev-141/hipox/default @@ -0,0 +1,4 @@ +# Default for /etc/init.d/udev + +# Comment this out to disable device cache +#DEVCACHE="/etc/dev.tar" |