Commit 1d9c7cf1 authored by Oleg Dzhimiev's avatar Oleg Dzhimiev

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

parents c9a7e532 49ebc478
...@@ -202,17 +202,6 @@ ...@@ -202,17 +202,6 @@
"compr_irq_0", "compr_irq_1", "compr_irq_2", "compr_irq_3"; "compr_irq_0", "compr_irq_1", "compr_irq_2", "compr_irq_3";
}; };
elphel393_framepars: elphel393-framepars {
compatible = "elphel,elphel393-framepars-1.00";
/* set this to "disable" to disable drivers */
status = "okay";
};
elphel393_sensor: elphel393-sensor {
compatible = "elphel,elphel393-sensor-1.00";
/* set this to "disable" to disable drivers */
status = "okay";
};
elphel393_sensor_i2c: elphel393-sensor-i2c@0 { elphel393_sensor_i2c: elphel393-sensor-i2c@0 {
compatible = "elphel,elphel393-sensor-i2c-1.00"; compatible = "elphel,elphel393-sensor-i2c-1.00";
/* Add known devices: name, slave address (7-bit), number of address bytes, number of data bytes, SCL frequency (kHz) */ /* Add known devices: name, slave address (7-bit), number of address bytes, number of data bytes, SCL frequency (kHz) */
......
...@@ -25,9 +25,13 @@ SRC_URI = "file://.* \ ...@@ -25,9 +25,13 @@ SRC_URI = "file://.* \
file://LICENSE \ file://LICENSE \
" "
FILES_${PN} += "${bindir}/camogm ${sysconfdir}/qt_source"
do_install() { do_install() {
install -d ${D}${bindir} install -d ${D}${bindir}
install -m 0755 ${S}/camogm ${D}${bindir} install -m 0755 ${S}/camogm ${D}${bindir}
install -d ${D}${sysconfdir}
install -m 0644 qt_source ${D}${sysconfdir}/
} }
PACKAGES = " camogm" PACKAGES += " camogm"
...@@ -31,4 +31,5 @@ do_install() { ...@@ -31,4 +31,5 @@ do_install() {
install -m 0755 ${S}/imgsrv ${D}${bindir} install -m 0755 ${S}/imgsrv ${D}${bindir}
} }
PACKAGES = " imgsrv" FILES_${PN} += "${bindir}/imgsrv"
PACKAGES += " imgsrv"
...@@ -31,11 +31,15 @@ IMAGE_INSTALL_append += " python-core \ ...@@ -31,11 +31,15 @@ IMAGE_INSTALL_append += " python-core \
libsjs \ libsjs \
smartmontools \ smartmontools \
libogg \ libogg \
init-elphel393 \
apps-camogm \
apps-imgsrv \
iw \ iw \
wpa-supplicant \ wpa-supplicant \
dhcp-client \ dhcp-client \
linux-firmware-rtl8192cu \ linux-firmware-rtl8192cu \
init-elphel393" init-elphel393 \
"
#kernel-modules #kernel-modules
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment