Commit 06f2151f authored by Oleg Dzhimiev's avatar Oleg Dzhimiev
Browse files

Merge branch 'master' of https://github.com/Elphel/meta-elphel393

parents 416cbd55 589bea70

recipes-core/init-elphel393/files/init_elphel393.sh

+7 −7
Original line number Diff line number Diff line
@@ -40,6 +40,13 @@ echo "start white balance daemon" 


wget -qO- "localhost/parsedit.php?immediate&COMPRESSOR_RUN=2&DAEMON_EN=1&WB_EN=0x1&WB_MASK=0xd&WB_PERIOD=16&WB_WHITELEV=0xfae1&WB_WHITEFRAC=0x028f&WB_SCALE_R=0x10000&WB_SCALE_GB=0x10000&WB_SCALE_B=0x10000&WB_THRESH=500&GAIN_MIN=0x18000&GAIN_MAX=0xfc000&ANA_GAIN_ENABLE=1&GAINR=0x10000&GAING=0x10000&GAINGB=0x10000&GAINB=0x10000" > /dev/null 2>&1



if [ $SATA_EN -eq 1 ]; then

    $PYDIR/x393sata.py

    modprobe ahci_elphel &

    sleep 2

    echo 1 > /sys/devices/soc0/amba@0/80000000.elphel-ahci/load_module

fi



echo "/etc/init_elphel393.sh done"

exit 0
@@ -153,11 +160,4 @@ if [ -f /usr/bin/camogm ]; then 
	camogm -n $CAMOGM_PIPE -p $CAMOGM_PORT &

fi



if [ $SATA_EN -eq 1 ]; then

    $PYDIR/x393sata.py

    modprobe ahci_elphel &

    sleep 2

    echo 1 > /sys/devices/soc0/amba@0/80000000.elphel-ahci/load_module

fi



sync

recipes-kernel/linux/linux-xlnx/ahci.patch

0 → 100644
+10 −0
Original line number Diff line number Diff line 
--- a/drivers/ata/ahci.h	2016-09-13 17:18:35.579259846 -0600

+++ b/drivers/ata/ahci.h	2016-08-01 11:57:06.306630339 -0600

@@ -396,6 +396,7 @@ void ahci_print_info(struct ata_host *ho

 int ahci_host_activate(struct ata_host *host, int irq,

 		       struct scsi_host_template *sht);

 void ahci_error_handler(struct ata_port *ap);

+irqreturn_t ahci_single_irq_intr(int irq, void *dev_instance);

 

 static inline void __iomem *__ahci_port_base(struct ata_host *host,

 					     unsigned int port_no)

recipes-kernel/linux/linux-xlnx/libahci.patch

0 → 100644
+19 −0
Original line number Diff line number Diff line 
--- a/drivers/ata/libahci.c	2016-09-13 17:18:35.579259846 -0600

+++ b/drivers/ata/libahci.c	2016-07-27 20:25:34.217095567 -0600

@@ -1826,7 +1826,7 @@ static irqreturn_t ahci_multi_irqs_intr(

 	return IRQ_WAKE_THREAD;

 }

 

-static irqreturn_t ahci_single_irq_intr(int irq, void *dev_instance)

+irqreturn_t ahci_single_irq_intr(int irq, void *dev_instance)

 {

 	struct ata_host *host = dev_instance;

 	struct ahci_host_priv *hpriv;

@@ -1885,6 +1885,7 @@ static irqreturn_t ahci_single_irq_intr(

 

 	return IRQ_RETVAL(handled);

 }

+EXPORT_SYMBOL_GPL(ahci_single_irq_intr);

 

 unsigned int ahci_qc_issue(struct ata_queued_cmd *qc)

 {

recipes-kernel/linux/linux-xlnx_4.0.bbappend

+2 −0
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ SRC_URI_append += " file://xilinx_emacps.c.patch" 
SRC_URI_append += " file://xilinx_uartps.c.patch"

SRC_URI_append += " file://si5338_vsc330x.patch"

SRC_URI_append += " file://drivers-elphel.patch"

SRC_URI_append += " file://ahci.patch"

SRC_URI_append += " file://libahci.patch"



SRC_URI_append += " file://${MACHINE}.scc"

KERNEL_FEATURES_append = " ${MACHINE}.scc"