aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2016-07-05 17:12:57 +0100
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2016-07-05 17:12:57 +0100
commitf60863d5a7dfbfb23aa366fae7b52d6501b6ae73 (patch)
tree27db014501c057a2b3fa844705f6ddbeb54b635a /conf
parentc26f4516688397a5e32fa0a3d99bf37425b63979 (diff)
parent116b1f1e419b57ccbd1d2ec7bde66e02e6f6cc04 (diff)
downloadmeta-qcom-f60863d5a7dfbfb23aa366fae7b52d6501b6ae73.tar.gz
meta-qcom-f60863d5a7dfbfb23aa366fae7b52d6501b6ae73.tar.bz2
meta-qcom-f60863d5a7dfbfb23aa366fae7b52d6501b6ae73.zip
Merge branch 'jethro' into krogoth
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/dragonboard-410c.conf39
-rw-r--r--conf/machine/ifc6410.conf33
-rw-r--r--conf/machine/include/qcom-apq8016.inc30
-rw-r--r--conf/machine/include/qcom-apq8064.inc28
-rw-r--r--conf/machine/sd-600eval.conf20
5 files changed, 90 insertions, 60 deletions
diff --git a/conf/machine/dragonboard-410c.conf b/conf/machine/dragonboard-410c.conf
index 12bbbf2..04e258d 100644
--- a/conf/machine/dragonboard-410c.conf
+++ b/conf/machine/dragonboard-410c.conf
@@ -2,46 +2,21 @@
#@NAME: dragonboard-410c
#@DESCRIPTION: Machine configuration for the DragonBoard 410c (96boards), with Qualcomm Snapdragon 410 APQ8016.
-require conf/machine/include/arm/arch-armv8.inc
-
-
-XSERVER_OPENGL ?= "xf86-video-freedreno \
- xserver-xorg-module-exa \
- xserver-xorg-extension-glx \
- xserver-xorg-extension-dri \
- "
-
-XSERVER ?= "xserver-xorg \
- xserver-xorg-module-libint10 \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${XSERVER_OPENGL}', 'xf86-video-fbdev', d)} \
- xf86-input-evdev \
- xf86-input-mouse \
- xf86-input-keyboard"
+require conf/machine/include/qcom-apq8016.inc
MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
-PREFERRED_PROVIDER_virtual/egl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt"
-
KERNEL_IMAGETYPE = "Image"
KERNEL_DEVICETREE = "qcom/apq8016-sbc.dtb"
SERIAL_CONSOLE = "115200 ttyMSM0"
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS += " \
- kernel-modules \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wcnss-config wcnss-start', '', d)} \
- ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \
- ${@'firmware-qcom-dragonboard410c' if d.getVar('ACCEPT_EULA_dragonboard-410c', True) == '1' else ''}"
+ kernel-modules \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wcnss-config wcnss-start', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \
+ ${@'firmware-qcom-dragonboard410c' if d.getVar('ACCEPT_EULA_dragonboard-410c', True) == '1' else ''} \
+"
CMDLINE = "console=ttyMSM0,115200n8 root=/dev/mmcblk0p10 rootwait"
-
-# Fastboot expects an ext4 image, which needs to be 4096 aligned
-IMAGE_FSTYPES_append = " ext4.gz"
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-
diff --git a/conf/machine/ifc6410.conf b/conf/machine/ifc6410.conf
index 236b6da..cbed9b8 100644
--- a/conf/machine/ifc6410.conf
+++ b/conf/machine/ifc6410.conf
@@ -2,42 +2,19 @@
#@NAME: ifc6410
#@DESCRIPTION: Machine configuration for the Inforce IFC6410, with Qualcomm Snapdragon 600 APQ8064.
-require conf/machine/include/tune-cortexa8.inc
-
-XSERVER_OPENGL ?= "xf86-video-freedreno \
- xserver-xorg-module-exa \
- xserver-xorg-extension-glx \
- xserver-xorg-extension-dri \
- "
-
-XSERVER = " \
- xserver-xorg \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${XSERVER_OPENGL}', 'xf86-video-fbdev', d)} \
- xf86-input-mouse \
- xf86-input-keyboard \
- xf86-input-evdev \
-"
+require conf/machine/include/qcom-apq8064.inc
# features
MACHINE_FEATURES = "alsa kernel26 screen usb keyboard wifi ext2 ext3"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules \
- ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)}"
-
-PREFERRED_PROVIDER_virtual/egl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
-PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-qcomlt"
+MACHINE_EXTRA_RRECOMMENDS = " \
+ kernel-modules \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
+"
KERNEL_IMAGETYPE = "zImage"
KERNEL_DEVICETREE = "qcom-apq8064-ifc6410.dtb"
SERIAL_CONSOLE = "115200 ttyMSM0"
-# Fastboot expects an ext4 image, which needs to be 4096 aligned
-IMAGE_FSTYPES_append = " ext4.gz"
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-
INHERIT += "qcom-firmware-mount"
diff --git a/conf/machine/include/qcom-apq8016.inc b/conf/machine/include/qcom-apq8016.inc
new file mode 100644
index 0000000..25458be
--- /dev/null
+++ b/conf/machine/include/qcom-apq8016.inc
@@ -0,0 +1,30 @@
+SOC_FAMILY = "apq8016"
+require conf/machine/include/soc-family.inc
+require conf/machine/include/arm/arch-armv8.inc
+
+XSERVER_OPENGL ?= " \
+ xf86-video-freedreno \
+ xserver-xorg-module-exa \
+ xserver-xorg-extension-glx \
+ xserver-xorg-extension-dri \
+"
+
+XSERVER ?= " \
+ xserver-xorg \
+ xserver-xorg-module-libint10 \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${XSERVER_OPENGL}', 'xf86-video-fbdev', d)} \
+ xf86-input-evdev \
+ xf86-input-mouse \
+ xf86-input-keyboard \
+"
+
+PREFERRED_PROVIDER_virtual/egl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-linaro-qcomlt"
+
+# Fastboot expects an ext4 image, which needs to be 4096 aligned
+IMAGE_FSTYPES_append = " ext4.gz"
+IMAGE_ROOTFS_ALIGNMENT = "4096"
diff --git a/conf/machine/include/qcom-apq8064.inc b/conf/machine/include/qcom-apq8064.inc
new file mode 100644
index 0000000..2e7a60d
--- /dev/null
+++ b/conf/machine/include/qcom-apq8064.inc
@@ -0,0 +1,28 @@
+SOC_FAMILY = "apq8064"
+require conf/machine/include/soc-family.inc
+require conf/machine/include/tune-cortexa8.inc
+
+XSERVER_OPENGL ?= "xf86-video-freedreno \
+ xserver-xorg-module-exa \
+ xserver-xorg-extension-glx \
+ xserver-xorg-extension-dri \
+ "
+
+XSERVER = " \
+ xserver-xorg \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${XSERVER_OPENGL}', 'xf86-video-fbdev', d)} \
+ xf86-input-mouse \
+ xf86-input-keyboard \
+ xf86-input-evdev \
+"
+
+PREFERRED_PROVIDER_virtual/egl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_PROVIDER_virtual/kernel = "linux-linaro-qcomlt"
+
+# Fastboot expects an ext4 image, which needs to be 4096 aligned
+IMAGE_FSTYPES_append = " ext4.gz"
+IMAGE_ROOTFS_ALIGNMENT = "4096"
diff --git a/conf/machine/sd-600eval.conf b/conf/machine/sd-600eval.conf
new file mode 100644
index 0000000..18834b3
--- /dev/null
+++ b/conf/machine/sd-600eval.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: SD 600eval
+#@DESCRIPTION: Machine configuration for the Arrow SD 600eval, with Qualcomm Snapdragon 600 APQ8064.
+
+require conf/machine/include/qcom-apq8064.inc
+
+MACHINE_FEATURES = "usbhost usbgadget alsa screen wifi bluetooth ext2"
+
+MACHINE_EXTRA_RRECOMMENDS = " \
+ kernel-modules \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-msm', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wifi', 'wcnss-config wcnss-start', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluez5', 'bluez5-noinst-tools', '', d)} \
+ firmware-qcom-sd-600eval \
+"
+
+KERNEL_IMAGETYPE = "zImage"
+KERNEL_DEVICETREE = "qcom-apq8064-arrow-sd-600eval.dtb"
+
+SERIAL_CONSOLE = "115200 ttyMSM0"