tegra: create tegra-base.inc machine configuration

Consolidate Tegra specific machine configuration in a common
tegra-base.inc file.

4 files changed, 23 insertions, 39 deletions

diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf
index 5149c38..5cc4941 100644
--- a/conf/machine/apalis-t30.conf
+++ b/conf/machine/apalis-t30.conf
@@ -2,8 +2,9 @@
 #@NAME: apalis_t30
 #@DESCRIPTION: Toradex Apalis T30
 
+require conf/machine/include/tegra-base.inc
+
 SOC_FAMILY = "tegra:tegra3"
-require conf/machine/include/soc-family.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 
@@ -16,13 +17,6 @@ UBOOT_ENTRYPOINT = "0x82008000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
 KEEPUIMAGE = ""
 
-PREFERRED_PROVIDER_virtual/xserver_tegra = "xserver-xorg"
-PREFERRED_VERSION_xserver-xorg_tegra = "99:1.14%"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-video-fbdev \
-           xf86-input-keyboard"
 # Only has DVI connector for external screen, name is changing to MACHINE_GUI_CLASS
 GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_GUI_CLASS = "bigscreen"
@@ -32,11 +26,6 @@ PREFERRED_PROVIDER_lxsession-lite_apalis-t30 = "lxsession"
 PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
 PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
 
-PREFERRED_PROVIDER_virtual/mesa = "mesa"
-PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
-PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
-PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
-
 MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci "
 EXTRA_IMAGEDEPENDS += "u-boot"
 
diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf
index 6ce6100..c05d6bb 100644
--- a/conf/machine/colibri-t20.conf
+++ b/conf/machine/colibri-t20.conf
@@ -2,8 +2,9 @@
 #@NAME: colibri_t20
 #@DESCRIPTION: Toradex Colibri T20
 
+require conf/machine/include/tegra-base.inc
+
 SOC_FAMILY = "tegra:tegra2"
-require conf/machine/include/soc-family.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 
@@ -17,13 +18,6 @@ PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex"
 UBOOT_MACHINE = "colibri_t20_defconfig"
 UBOOT_ENTRYPOINT = "0x00008000"
 
-PREFERRED_PROVIDER_virtual/xserver_tegra = "xserver-xorg"
-PREFERRED_VERSION_xserver-xorg_tegra = "99:1.14%"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-video-fbdev \
-           xf86-input-keyboard"
 # Only has DVI connector for external screen, name is changing to MACHINE_GUI_CLASS
 GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_GUI_CLASS = "bigscreen"
@@ -33,11 +27,6 @@ PREFERRED_PROVIDER_lxsession-lite_colibri-t20 = "lxsession"
 PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
 PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
 
-PREFERRED_PROVIDER_virtual/mesa = "mesa"
-PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
-PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
-PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
-
 MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf
index 8d3419f..15eb43b 100644
--- a/conf/machine/colibri-t30.conf
+++ b/conf/machine/colibri-t30.conf
@@ -2,8 +2,9 @@
 #@NAME: colibri_t30
 #@DESCRIPTION: Toradex Colibri T30
 
+require conf/machine/include/tegra-base.inc
+
 SOC_FAMILY = "tegra:tegra3"
-require conf/machine/include/soc-family.inc
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-toradex"
 
@@ -16,13 +17,6 @@ UBOOT_ENTRYPOINT = "0x82008000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
 KEEPUIMAGE = ""
 
-PREFERRED_PROVIDER_virtual/xserver_tegra = "xserver-xorg"
-PREFERRED_VERSION_xserver-xorg_tegra = "99:1.14%"
-XSERVER = "xserver-xorg \
-           xf86-input-evdev \
-           xf86-input-mouse \
-           xf86-video-fbdev \
-           xf86-input-keyboard"
 # Only has DVI connector for external screen, name is changing to MACHINE_GUI_CLASS
 GUI_MACHINE_CLASS = "bigscreen"
 MACHINE_GUI_CLASS = "bigscreen"
@@ -32,11 +26,6 @@ PREFERRED_PROVIDER_lxsession-lite_colibri-t30 = "lxsession"
 PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom"
 PREFERRED_PROVIDER_psplash-support = "psplash-angstrom"
 
-PREFERRED_PROVIDER_virtual/mesa = "mesa"
-PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
-PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
-PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"
-
 MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g"
 EXTRA_IMAGEDEPENDS += "u-boot"
 
diff --git a/conf/machine/include/tegra-base.inc b/conf/machine/include/tegra-base.inc
new file mode 100644
index 0000000..cd45d57
--- /dev/null
+++ b/conf/machine/include/tegra-base.inc
@@ -0,0 +1,17 @@
+# Provides common Tegra SoC settings
+
+require conf/machine/include/soc-family.inc
+
+# Tegra binaries require a specific X-Server binary ABI
+PREFERRED_PROVIDER_virtual/xserver_tegra = "xserver-xorg"
+PREFERRED_VERSION_xserver-xorg_tegra = "99:1.14%"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-video-fbdev \
+           xf86-input-keyboard"
+
+PREFERRED_PROVIDER_virtual/mesa = "mesa"
+PREFERRED_PROVIDER_virtual/egl = "trdx-nv-binaries"
+PREFERRED_PROVIDER_virtual/libgles1 = "trdx-nv-binaries"
+PREFERRED_PROVIDER_virtual/libgles2 = "trdx-nv-binaries"