Commit 0d681d7d authored by Nick Conroy's avatar Nick Conroy
Browse files

Merge branch 'revA/expansion-cards' into 'master'

Rev a/expansion cards

See merge request vesta/meta-vesta!116
parents e3fb646c 05f21045
......@@ -20,7 +20,10 @@ KERNEL_DEVICETREE += "vesta-200.dtb"
KERNEL_DEVICETREE += "vesta-300.dtb"
KERNEL_DEVICETREE += "vesta-400.dtb"
KERNEL_DEVICETREE += "vesta-500.dtb"
KERNEL_DEVICETREE += "310-00110-0003.dtb 310-00121-0001.dtb 310-00110-0005.dtb 310-00121-0003.dtb 310-00110-0006.dtb 310-00125-0002.dtb"
KERNEL_DEVICETREE += "310-00110-0003.dtb 310-00110-0005.dtb 310-00110-0006.dtb 310-00110-000A.dtb"
KERNEL_DEVICETREE += "310-00121-0001.dtb 310-00121-0003.dtb 310-00121-000A.dtb"
KERNEL_DEVICETREE += "310-00125-0002.dtb 310-00125-000A.dtb"
PREFERRED_PROVIDER_u-boot = "u-boot-vesta"
PREFERRED_VERSION_u-boot = "2016.03"
PREFERRED_PROVIDER_kernel-module-qcacld = "kernel-module-qcacld_2.3.3"
......
......@@ -3,86 +3,98 @@ RDEPENDS_kernel-base = ""
#Vesta specific files
SRC_URI += "file://defconfig \
file://device-tree/vesta-100.dts \
file://device-tree/vesta-100-mfg.dts \
file://device-tree/vesta-200.dts \
file://device-tree/vesta-200-mfg.dts \
file://device-tree/vesta-300.dts \
file://device-tree/vesta-300-mfg.dts \
file://device-tree/vesta-400.dts \
file://device-tree/vesta-400-mfg.dts \
file://device-tree/vesta-500.dts \
file://device-tree/vesta-500-mfg.dts \
file://device-tree/vesta-64M-nor.dts \
file://device-tree/vesta-64M-nor-mfg.dts \
file://device-tree/vesta-rad-mfg.dts \
file://device-tree/vesta-rad-test-mfg.dts \
file://device-tree/vesta-rad.dts \
file://device-tree/vesta-rad-test.dts \
file://device-tree/vesta.dtsi \
file://device-tree/310-00110-0003.dts \
file://device-tree/310-00110-0005.dts \
file://device-tree/310-00110-0006.dts \
file://device-tree/310-00121-0001.dts \
file://device-tree/310-00121-0003.dts \
file://device-tree/310-00125-0002.dts \
file://device-tree/vesta-mfg.dtsi \
file://patches/0001-QCA6234-driver.patch \
file://patches/0001-bluebourne.patch \
file://patches/0001-Added-Quectel.patch \
file://patches/0001-nor-flash-fix.patch \
file://patches/0001-overlay-manager.patch \
file://patches/0001-backports-to-support-qcacld-v2.3.3-9377-driver.patch \
file://patches/0001-Added-fix-for-spansion-flash-chip.patch \
file://patches/0001-Add-HCI_IBS-protocol-to-kernel.patch \
file://patches/0001-Fixes-to-compile-with-4.1-kernel.patch \
file://device-tree/vesta-100.dts \
file://device-tree/vesta-100-mfg.dts \
file://device-tree/vesta-200.dts \
file://device-tree/vesta-200-mfg.dts \
file://device-tree/vesta-300.dts \
file://device-tree/vesta-300-mfg.dts \
file://device-tree/vesta-400.dts \
file://device-tree/vesta-400-mfg.dts \
file://device-tree/vesta-500.dts \
file://device-tree/vesta-500-mfg.dts \
file://device-tree/vesta-64M-nor.dts \
file://device-tree/vesta-64M-nor-mfg.dts \
file://device-tree/vesta-rad-mfg.dts \
file://device-tree/vesta-rad-test-mfg.dts \
file://device-tree/vesta-rad.dts \
file://device-tree/vesta-rad-test.dts \
file://device-tree/vesta.dtsi \
file://device-tree/310-00110-0003.dts \
file://device-tree/310-00110-0005.dts \
file://device-tree/310-00110-0006.dts \
file://device-tree/310-00110-000A.dts \
file://device-tree/310-00121-0001.dts \
file://device-tree/310-00121-0003.dts \
file://device-tree/310-00121-000A.dts \
file://device-tree/310-00125-0002.dts \
file://device-tree/310-00125-000A.dts \
file://device-tree/vesta-mfg.dtsi \
file://patches/0001-QCA6234-driver.patch \
file://patches/0001-bluebourne.patch \
file://patches/0001-Added-Quectel.patch \
file://patches/0001-nor-flash-fix.patch \
file://patches/0001-overlay-manager.patch \
file://patches/0001-backports-to-support-qcacld-v2.3.3-9377-driver.patch \
file://patches/0001-Added-fix-for-spansion-flash-chip.patch \
file://patches/0001-Add-HCI_IBS-protocol-to-kernel.patch \
file://patches/0001-Fixes-to-compile-with-4.1-kernel.patch \
"
S = "${WORKDIR}/git"
do_configure_append() {
# Add device-tree sources
cp ${WORKDIR}/device-tree/vesta.dtsi ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-mfg.dtsi ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-100.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-100-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-200.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-200-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-300.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-300-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-400.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-400-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-500.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-500-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-64M-nor.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-64M-nor-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad-test-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad-test.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00110-0003.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00110-0005.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00110-0006.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00121-0001.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00121-0003.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00125-0002.dts ${S}/arch/${ARCH}/boot/dts
# Add device-tree sources
cp ${WORKDIR}/device-tree/vesta.dtsi ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-mfg.dtsi ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-100.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-100-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-200.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-200-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-300.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-300-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-400.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-400-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-500.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-500-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-64M-nor.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-64M-nor-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad-test-mfg.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/vesta-rad-test.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00110-0003.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00110-0005.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00110-0006.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00110-000A.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00121-0001.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00121-0003.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00121-000A.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00125-0002.dts ${S}/arch/${ARCH}/boot/dts
cp ${WORKDIR}/device-tree/310-00125-000A.dts ${S}/arch/${ARCH}/boot/dts
}
do_install_append() {
install -d ${D}${base_libdir}/firmware/overlays
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00110-0003.dtb ${D}${base_libdir}/firmware/overlays/310-00110-0003.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00110-0005.dtb ${D}${base_libdir}/firmware/overlays/310-00110-0005.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00110-0006.dtb ${D}${base_libdir}/firmware/overlays/310-00110-0006.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00121-0001.dtb ${D}${base_libdir}/firmware/overlays/310-00121-0001.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00121-0003.dtb ${D}${base_libdir}/firmware/overlays/310-00121-0003.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00125-0002.dtb ${D}${base_libdir}/firmware/overlays/310-00125-0002.dtbo
install -d ${D}${base_libdir}/firmware/overlays
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00110-0003.dtb ${D}${base_libdir}/firmware/overlays/310-00110-0003.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00110-0005.dtb ${D}${base_libdir}/firmware/overlays/310-00110-0005.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00110-0006.dtb ${D}${base_libdir}/firmware/overlays/310-00110-0006.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00110-000A.dtb ${D}${base_libdir}/firmware/overlays/310-00110-000A.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00121-0001.dtb ${D}${base_libdir}/firmware/overlays/310-00121-0001.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00121-0003.dtb ${D}${base_libdir}/firmware/overlays/310-00121-0003.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00121-000A.dtb ${D}${base_libdir}/firmware/overlays/310-00121-000A.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00125-0002.dtb ${D}${base_libdir}/firmware/overlays/310-00125-0002.dtbo
install -m 755 ${B}/arch/${ARCH}/boot/dts/310-00125-000A.dtb ${D}${base_libdir}/firmware/overlays/310-00125-000A.dtbo
}
FILES_kernel-base += " \
${base_libdir}/firmware/overlays/310-00110-0003.dtbo \
${base_libdir}/firmware/overlays/310-00110-0005.dtbo \
${base_libdir}/firmware/overlays/310-00110-0006.dtbo \
${base_libdir}/firmware/overlays/310-00110-000A.dtbo \
${base_libdir}/firmware/overlays/310-00121-0001.dtbo \
${base_libdir}/firmware/overlays/310-00121-0003.dtbo \
${base_libdir}/firmware/overlays/310-00121-000A.dtbo \
${base_libdir}/firmware/overlays/310-00125-0002.dtbo \
${base_libdir}/firmware/overlays/310-00125-000A.dtbo \
"
/dts-v1/;
/plugin/;
/ {
compatible = "rigado,vesta";
/* identification */
part-number = "310-00110";
version = "000A";
fragment@0 {
target = <&verizon_cellmdm>;
__overlay__ {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_vz_cellmdm>;
};
};
fragment@1 {
target = <&uart7>;
__overlay__ {
status = "okay";
};
};
};
/dts-v1/;
/plugin/;
/ {
compatible = "rigado,vesta";
/* identification */
part-number = "310-00121";
version = "000A";
fragment@0 {
target = <&gemalto_cellmdm>;
__overlay__ {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gemalto_cellmdm>;
};
};
fragment@1 {
target = <&uart7>;
__overlay__ {
status = "okay";
};
};
};
/dts-v1/;
/plugin/;
/ {
compatible = "rigado,vesta";
/* identification */
part-number = "310-00125";
version = "000A";
fragment@0 {
target = <&tau_board>;
__overlay__ {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_tau80>;
};
};
fragment@1 {
target = <&uart4>;
__overlay__ {
status = "okay";
};
};
fragment@2 {
target = <&uart5>;
__overlay__ {
status = "okay";
};
};
fragment@3 {
target = <&uart7>;
__overlay__ {
status = "okay";
};
};
fragment@4 {
target = <&uart8>;
__overlay__ {
status = "okay";
};
};
fragment@5 {
target = <&adc1>;
__overlay__ {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_adc1>;
status = "okay";
};
};
};
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