diff options
70 files changed, 11 insertions, 3852 deletions
@@ -2,8 +2,7 @@ OpenEmbedded/Yocto BSP Layer for Toradex Modules Based on NVIDIA SoCs ===================================================================== This layer provides support for ARM based Toradex computer on modules (COM) -featuring NVIDIA T20, T30, and TK1 SoCs for use with OpenEmbedded -and/or Yocto. +featuring NVIDIA TK1 SoCs for use with OpenEmbedded and/or Yocto. For more information on available Toradex COMs please visit: https://www.toradex.com/computer-on-modules diff --git a/conf/machine/apalis-t30.conf b/conf/machine/apalis-t30.conf deleted file mode 100644 index 16887a7..0000000 --- a/conf/machine/apalis-t30.conf +++ /dev/null @@ -1,42 +0,0 @@ -#@TYPE: Machine -#@NAME: apalis_t30 -#@DESCRIPTION: Toradex Apalis T30 - -require conf/machine/include/tegra-base.inc - -SOC_FAMILY = "tegra:tegra3" - -UBOOT_MACHINE = "apalis_t30_defconfig" -UBOOT_ENTRYPOINT = "0x82008000" -UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" - -# The payload offsets are given in number of 512 byte blocks. -OFFSET_BOOTROM_PAYLOAD = "0" - -TEZI_DISTRO_BOOT_SCRIPTS = "boot.scr" -TEZI_ROOT_FSTYPE = "ext3" -TEZI_UBOOT_BINARY_EMMC = "apalis_t30.img" - -# require u-boot-dtb-tegra.bin to be used -UBOOT_IMAGE = "u-boot-dtb-tegra-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_BINARY = "u-boot-dtb-tegra.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_SUFFIX}" - -PREFERRED_PROVIDER_lxde-icon-theme_apalis-t30 = "lxde-icon-theme" -PREFERRED_PROVIDER_lxsession-lite_apalis-t30 = "lxsession" -PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom" -PREFERRED_PROVIDER_psplash-support = "psplash-angstrom" - -MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " -EXTRA_IMAGEDEPENDS += "u-boot" - -# used by sysvinit_2 -SERIAL_CONSOLE = "115200 ttyS0" -IMAGE_CLASSES += "image_type_tezi" -IMAGE_FSTYPES += "teziimg" - -TORADEX_PRODUCT_IDS = "0025 0026 0031" -TORADEX_FLASH_TYPE = "emmc" - -DEFAULTTUNE = "armv7athf-neon" -require conf/machine/include/tune-cortexa9.inc diff --git a/conf/machine/colibri-t20.conf b/conf/machine/colibri-t20.conf deleted file mode 100644 index fd603b7..0000000 --- a/conf/machine/colibri-t20.conf +++ /dev/null @@ -1,32 +0,0 @@ -#@TYPE: Machine -#@NAME: colibri_t20 -#@DESCRIPTION: Toradex Colibri T20 - -require conf/machine/include/tegra-base.inc - -SOC_FAMILY = "tegra:tegra2" - -KERNEL_IMAGETYPE = "zImage" - -# U-Boot expects the kernel directly in /boot of the rootfs -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "kernel-image" - -UBOOT_MACHINE = "colibri_t20_defconfig" -UBOOT_ENTRYPOINT = "0x00008000" - -PREFERRED_PROVIDER_lxde-icon-theme_colibri-t20 = "lxde-icon-theme" -PREFERRED_PROVIDER_lxsession-lite_colibri-t20 = "lxsession" -PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom" -PREFERRED_PROVIDER_psplash-support = "psplash-angstrom" - -MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" -EXTRA_IMAGEDEPENDS += "u-boot" - -# used by sysvinit_2 -SERIAL_CONSOLE = "115200 ttyS0" - -# T20 does not have neon -DEFAULTTUNE = "armv7athf" -#choose a specific vfp, or we end up with the default vfpv2 optimization -TUNE_CCARGS += "-mfpu=vfpv3-d16" -require conf/machine/include/tune-cortexa9.inc diff --git a/conf/machine/colibri-t30.conf b/conf/machine/colibri-t30.conf deleted file mode 100644 index 043b0f0..0000000 --- a/conf/machine/colibri-t30.conf +++ /dev/null @@ -1,26 +0,0 @@ -#@TYPE: Machine -#@NAME: colibri_t30 -#@DESCRIPTION: Toradex Colibri T30 - -require conf/machine/include/tegra-base.inc - -SOC_FAMILY = "tegra:tegra3" - -UBOOT_MACHINE = "colibri_t30_defconfig" -UBOOT_ENTRYPOINT = "0x82008000" -UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" - -PREFERRED_PROVIDER_lxde-icon-theme_colibri-t30 = "lxde-icon-theme" -PREFERRED_PROVIDER_lxsession-lite_colibri-t30 = "lxsession" -PREFERRED_PROVIDER_virtual/psplash = "psplash-angstrom" -PREFERRED_PROVIDER_psplash-support = "psplash-angstrom" - -MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g" -EXTRA_IMAGEDEPENDS += "u-boot" - -# used by sysvinit_2 -SERIAL_CONSOLE = "115200 ttyS0" - -# meta-angstrom/conf/distro/include/arm-defaults.inc -DEFAULTTUNE = "armv7athf-neon" -require conf/machine/include/tune-cortexa9.inc diff --git a/conf/machine/include/tegra-base.inc b/conf/machine/include/tegra-base.inc deleted file mode 100644 index 50272f6..0000000 --- a/conf/machine/include/tegra-base.inc +++ /dev/null @@ -1,53 +0,0 @@ -# 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/kernel = "linux-toradex" -KERNEL_IMAGETYPE = "zImage" - -# wic support -SOC_DEFAULT_IMAGE_FSTYPES = "wic.gz tar.xz" -IMAGE_FSTYPES = "${SOC_DEFAULT_IMAGE_FSTYPES}" - -IMAGE_BOOT_FILES ?= " \ - ${KERNEL_IMAGETYPE} \ -" -WKS_FILE_DEPENDS ?= " \ - virtual/bootloader \ - \ - e2fsprogs-native \ - bmap-tools-native \ -" - -SOC_DEFAULT_WKS_FILE ?= "imx-uboot-bootpart.wks" -SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks" -WKS_FILE ?= "sdimage-bootpart-tegra.wks" -WIC_CREATE_EXTRA_ARGS_append = " --no-fstab-update" - -# The kernel lives in a seperate FAT or UBI partition, don't deploy it in /boot -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" - -PREFERRED_PROVIDER_u-boot = "u-boot-toradex" -PREFERRED_PROVIDER_virtual/bootloader = "u-boot-toradex" - -# require u-boot-dtb-tegra.bin to be used -UBOOT_IMAGE = "u-boot-dtb-tegra-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}" -UBOOT_BINARY = "u-boot-dtb-tegra.${UBOOT_SUFFIX}" -UBOOT_SYMLINK = "u-boot-dtb-tegra-${MACHINE}.${UBOOT_SUFFIX}" - -PREFERRED_PROVIDER_virtual/mesa = "mesa" -PREFERRED_PROVIDER_virtual/egl = "tdx-nv-binaries" -PREFERRED_PROVIDER_virtual/libgles1 = "tdx-nv-binaries" -PREFERRED_PROVIDER_virtual/libgles2 = "tdx-nv-binaries" - -# Install NV binaries which contains tegra X-Server drivers when X11 is chosen -MACHINE_EXTRA_RRECOMMENDS_append_tegra = " ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'tdx-nv-binaries', '', d)}" diff --git a/lxde-layer/recipes-lxde/lxterminal/files/0001-lxterminal.c-fix-garbled-titlebar.patch b/lxde-layer/recipes-lxde/lxterminal/files/0001-lxterminal.c-fix-garbled-titlebar.patch deleted file mode 100644 index 491e7ea..0000000 --- a/lxde-layer/recipes-lxde/lxterminal/files/0001-lxterminal.c-fix-garbled-titlebar.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a2632fc3cb1096b1add5238d6b4fb090a7427273 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Wed, 25 Jan 2017 14:48:42 +0100 -Subject: [PATCH] lxterminal.c: fix garbled titlebar - -With the T20/T30 X driver the titlebar and window boarder is not drawn at all -but filled with random pixels or painted with a random copy of some other -screen area. - -Fix this by falling back to a working gdk function if the more complex one -fails due to an unsupported feature. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - src/lxterminal.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/lxterminal.c b/src/lxterminal.c -index c218aa7..3d56ba2 100644 ---- a/src/lxterminal.c -+++ b/src/lxterminal.c -@@ -1477,12 +1477,15 @@ LXTerminal * lxterminal_initialize(LXTermWindow * lxtermwin, CommandArguments * - /* Try to get an RGBA visual (colormap) and assign it to the new window. */ - #if GTK_CHECK_VERSION (2, 90, 8) - GdkVisual *visual = gdk_screen_get_rgba_visual(gtk_widget_get_screen(GTK_WIDGET(terminal->window))); -+ if (visual != NULL) { -+ visual = gdk_screen_get_system_visual(gtk_widget_get_screen(GTK_WIDGET(terminal->window))); -+ } - if (visual != NULL) - { - gtk_widget_set_visual(terminal->window, visual); - } - #else -- GdkColormap *colormap = gdk_screen_get_rgba_colormap(gtk_widget_get_screen(GTK_WIDGET(terminal->window))); -+ GdkColormap *colormap = gdk_colormap_get_system(); - if (colormap != NULL) - { - gtk_widget_set_colormap(terminal->window, colormap); --- -2.5.5 - diff --git a/lxde-layer/recipes-lxde/lxterminal/lxterminal_%.bbappend b/lxde-layer/recipes-lxde/lxterminal/lxterminal_%.bbappend deleted file mode 100644 index da44c99..0000000 --- a/lxde-layer/recipes-lxde/lxterminal/lxterminal_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += " file://0001-lxterminal.c-fix-garbled-titlebar.patch" diff --git a/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend b/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend index cc6d7e6..392aa84 100644 --- a/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend +++ b/openembedded-layer/recipes-benchmark/glmark2/glmark2_%.bbappend @@ -1,7 +1,3 @@ -# T20/T30: build it only for OpenGL ES on top of X11 -PACKAGECONFIG_tegra = "x11-gles2" -PACKAGE_ARCH_tegra = "${MACHINE_ARCH}" - # TK1: build it only for OpenGL & OpenGL ES on top of X11 PACKAGECONFIG_tegra124 = "x11-gl x11-gles2" PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" diff --git a/recipes-bsp/alsa-state/alsa-state/apalis-t30/asound.state b/recipes-bsp/alsa-state/alsa-state/apalis-t30/asound.state deleted file mode 100644 index 2ef9ce4..0000000 --- a/recipes-bsp/alsa-state/alsa-state/apalis-t30/asound.state +++ /dev/null @@ -1,143 +0,0 @@ -state.apalist30sgtl50 { - control.1 { - iface MIXER - name 'PCM Playback Volume' - value.0 126 - value.1 126 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 192' - } - } - control.2 { - iface MIXER - name 'Capture Volume' - value.0 12 - value.1 12 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 15' - } - } - control.3 { - iface MIXER - name 'Capture Attenuate Switch (-6dB)' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.4 { - iface MIXER - name 'Capture ZC Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.5 { - iface MIXER - name 'Headphone Playback Volume' - value.0 127 - value.1 127 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 127' - dbmin -5150 - dbmax 1200 - dbvalue.0 1200 - dbvalue.1 1200 - } - } - control.6 { - iface MIXER - name 'Headphone Playback ZC Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.7 { - iface MIXER - name 'Mic Volume' - value 2 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 3' - dbmin 0 - dbmax 4000 - dbvalue.0 3000 - } - } - control.8 { - iface MIXER - name 'Headphone Mux' - value DAC - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 DAC - item.1 LINE_IN - } - } - control.9 { - iface MIXER - name 'Capture Mux' - value MIC_IN - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 MIC_IN - item.1 LINE_IN - } - } - control.10 { - iface MIXER - name 'AVP alsa device select' - value 1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 6' - } - } - control.11 { - iface MIXER - name 'AVP DMA channel id' - value -1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 32' - } - } - control.12 { - iface MIXER - name 'AVP DMA address' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - -1' - } - } -} diff --git a/recipes-bsp/alsa-state/alsa-state/colibri-t20/asound.state b/recipes-bsp/alsa-state/alsa-state/colibri-t20/asound.state deleted file mode 100644 index 7d61d15..0000000 --- a/recipes-bsp/alsa-state/alsa-state/colibri-t20/asound.state +++ /dev/null @@ -1,922 +0,0 @@ -state.colibrit20wm971 { - control.1 { - iface MIXER - name 'Speaker Playback Volume' - value.0 24 - value.1 24 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - } - } - control.2 { - iface MIXER - name 'Speaker Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.3 { - iface MIXER - name 'Headphone Playback Volume' - value.0 24 - value.1 24 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - } - } - control.4 { - iface MIXER - name 'Headphone Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.5 { - iface MIXER - name 'PCM Playback Volume' - value.0 24 - value.1 24 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - } - } - control.6 { - iface MIXER - name 'Speaker Playback ZC Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.7 { - iface MIXER - name 'Speaker Playback Invert Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.8 { - iface MIXER - name 'Headphone Playback ZC Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.9 { - iface MIXER - name 'Mono Playback ZC Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.10 { - iface MIXER - name 'Mono Playback Volume' - value 24 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 31' - } - } - control.11 { - iface MIXER - name 'Mono Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.12 { - iface MIXER - name 'ALC Target Volume' - value 11 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.13 { - iface MIXER - name 'ALC Hold Time' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.14 { - iface MIXER - name 'ALC Decay Time' - value 3 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.15 { - iface MIXER - name 'ALC Attack Time' - value 2 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.16 { - iface MIXER - name 'ALC Function' - value None - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 None - item.1 Left - item.2 Right - item.3 Stereo - } - } - control.17 { - iface MIXER - name 'ALC Max Volume' - value 7 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.18 { - iface MIXER - name 'ALC ZC Timeout' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 3' - } - } - control.19 { - iface MIXER - name 'ALC ZC Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.20 { - iface MIXER - name 'ALC NG Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.21 { - iface MIXER - name 'ALC NG Type' - value 'Constant Gain' - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 'Constant Gain' - item.1 Mute - } - } - control.22 { - iface MIXER - name 'ALC NG Threshold' - value 31 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 31' - } - } - control.23 { - iface MIXER - name 'Mic Headphone Volume' - value 4 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.24 { - iface MIXER - name 'ALC Headphone Volume' - value 5 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.25 { - iface MIXER - name 'Out3 Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.26 { - iface MIXER - name 'Out3 ZC Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.27 { - iface MIXER - name 'Out3 Volume' - value 31 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 31' - } - } - control.28 { - iface MIXER - name 'PCBeep Bypass Headphone Volume' - value 5 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.29 { - iface MIXER - name 'PCBeep Bypass Speaker Volume' - value 5 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.30 { - iface MIXER - name 'PCBeep Bypass Phone Volume' - value 5 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.31 { - iface MIXER - name 'Aux Playback Headphone Volume' - value 5 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.32 { - iface MIXER - name 'Aux Playback Speaker Volume' - value 5 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.33 { - iface MIXER - name 'Aux Playback Phone Volume' - value 5 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 7' - } - } - control.34 { - iface MIXER - name 'Phone Volume' - value 7 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.35 { - iface MIXER - name 'Line Capture Volume' - value.0 23 - value.1 23 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 31' - } - } - control.36 { - iface MIXER - name 'Capture 20dB Boost Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.37 { - iface MIXER - name 'Capture to Phone 20dB Boost Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.38 { - iface MIXER - name '3D Upper Cut-off Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.39 { - iface MIXER - name '3D Lower Cut-off Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.40 { - iface MIXER - name '3D Playback Volume' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.41 { - iface MIXER - name 'Bass Control' - value 'Linear Control' - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 'Linear Control' - item.1 'Adaptive Boost' - } - } - control.42 { - iface MIXER - name 'Bass Cut-off Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.43 { - iface MIXER - name 'Tone Cut-off Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.44 { - iface MIXER - name 'Playback Attenuate (-6dB) Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.45 { - iface MIXER - name 'Bass Volume' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.46 { - iface MIXER - name 'Treble Volume' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 15' - } - } - control.47 { - iface MIXER - name 'Capture ADC Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.48 { - iface MIXER - name 'Capture Volume Steps' - value.0 '+1.5dB Steps' - value.1 '+1.5dB Steps' - comment { - access 'read write' - type ENUMERATED - count 2 - item.0 '+1.5dB Steps' - item.1 '+0.75dB Steps' - } - } - control.49 { - iface MIXER - name 'Capture Volume' - value.0 48 - value.1 48 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 63' - } - } - control.50 { - iface MIXER - name 'Capture ZC Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.51 { - iface MIXER - name 'Mic 1 Volume' - value 23 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 31' - } - } - control.52 { - iface MIXER - name 'Mic 2 Volume' - value 23 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 31' - } - } - control.53 { - iface MIXER - name 'Mic 20dB Boost Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.54 { - iface MIXER - name 'Speaker Mixer PCBeep Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.55 { - iface MIXER - name 'Speaker Mixer Aux Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.56 { - iface MIXER - name 'Speaker Mixer Phone Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.57 { - iface MIXER - name 'Speaker Mixer Line Bypass Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.58 { - iface MIXER - name 'Speaker Mixer PCM Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.59 { - iface MIXER - name 'Phone Mixer PCBeep Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.60 { - iface MIXER - name 'Phone Mixer Aux Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.61 { - iface MIXER - name 'Phone Mixer Line Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.62 { - iface MIXER - name 'Phone Mixer PCM Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.63 { - iface MIXER - name 'Phone Mixer Mic 1 Sidetone Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.64 { - iface MIXER - name 'Phone Mixer Mic 2 Sidetone Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.65 { - iface MIXER - name 'Right HP Mixer PCBeep Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.66 { - iface MIXER - name 'Right HP Mixer Aux Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.67 { - iface MIXER - name 'Right HP Mixer Phone Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.68 { - iface MIXER - name 'Right HP Mixer Line Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.69 { - iface MIXER - name 'Right HP Mixer PCM Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.70 { - iface MIXER - name 'Right HP Mixer Mic Sidetone Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.71 { - iface MIXER - name 'Left HP Mixer PCBeep Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.72 { - iface MIXER - name 'Left HP Mixer Aux Playback Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.73 { - iface MIXER - name 'Left HP Mixer Phone Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.74 { - iface MIXER - name 'Left HP Mixer Line Bypass Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.75 { - iface MIXER - name 'Left HP Mixer PCM Playback Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.76 { - iface MIXER - name 'Left HP Mixer Mic Sidetone Switch' - value false - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.77 { - iface MIXER - name 'Differential Source' - value Mic - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Mic - item.1 Line - } - } - control.78 { - iface MIXER - name 'Mic Select Source' - value 'Mic 1' - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 'Mic 1' - item.1 Differential - item.2 'Mic 2' - item.3 Stereo - } - } - control.79 { - iface MIXER - name 'Right Capture Select' - value Mic - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Mic - item.1 NC - item.2 NC - item.3 'Speaker Mixer' - item.4 Line - item.5 'Headphone Mixer' - item.6 'Phone Mixer' - item.7 Phone - } - } - control.80 { - iface MIXER - name 'Left Capture Select' - value Mic - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Mic - item.1 NC - item.2 NC - item.3 'Speaker Mixer' - item.4 Line - item.5 'Headphone Mixer' - item.6 'Phone Mixer' - item.7 Phone - } - } - control.81 { - iface MIXER - name 'Capture Phone Mux' - value Mute - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Stereo - item.1 Left - item.2 Right - item.3 Mute - } - } - control.82 { - iface MIXER - name 'Speaker Mux' - value 'Speaker Mix' - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 'Speaker Mix' - item.1 'Headphone Mix' - } - } - control.83 { - iface MIXER - name 'Out3 Mux' - value Left - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Left - item.1 VREF - item.2 'Left + Right' - item.3 Mono - } - } - control.84 { - iface MIXER - name 'ALC Sidetone Mux' - value None - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 Stereo - item.1 Left - item.2 Right - item.3 None - } - } -} diff --git a/recipes-bsp/alsa-state/alsa-state/colibri-t30/asound.state b/recipes-bsp/alsa-state/alsa-state/colibri-t30/asound.state deleted file mode 100644 index 8bb82e8..0000000 --- a/recipes-bsp/alsa-state/alsa-state/colibri-t30/asound.state +++ /dev/null @@ -1,143 +0,0 @@ -state.colibrit30sgtl5 { - control.1 { - iface MIXER - name 'PCM Playback Volume' - value.0 126 - value.1 126 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 192' - } - } - control.2 { - iface MIXER - name 'Capture Volume' - value.0 12 - value.1 12 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 15' - } - } - control.3 { - iface MIXER - name 'Capture Attenuate Switch (-6dB)' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.4 { - iface MIXER - name 'Capture ZC Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.5 { - iface MIXER - name 'Headphone Playback Volume' - value.0 127 - value.1 127 - comment { - access 'read write' - type INTEGER - count 2 - range '0 - 127' - dbmin -5150 - dbmax 1200 - dbvalue.0 1200 - dbvalue.1 1200 - } - } - control.6 { - iface MIXER - name 'Headphone Playback ZC Switch' - value true - comment { - access 'read write' - type BOOLEAN - count 1 - } - } - control.7 { - iface MIXER - name 'Mic Volume' - value 2 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 3' - dbmin 0 - dbmax 4000 - dbvalue.0 3000 - } - } - control.8 { - iface MIXER - name 'Headphone Mux' - value DAC - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 DAC - item.1 LINE_IN - } - } - control.9 { - iface MIXER - name 'Capture Mux' - value MIC_IN - comment { - access 'read write' - type ENUMERATED - count 1 - item.0 MIC_IN - item.1 LINE_IN - } - } - control.10 { - iface MIXER - name 'AVP alsa device select' - value 1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 6' - } - } - control.11 { - iface MIXER - name 'AVP DMA channel id' - value -1 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - 32' - } - } - control.12 { - iface MIXER - name 'AVP DMA address' - value 0 - comment { - access 'read write' - type INTEGER - count 1 - range '0 - -1' - } - } -} diff --git a/recipes-bsp/lvds-ctrl/files/lvds-dual-channel.sh b/recipes-bsp/lvds-ctrl/files/lvds-dual-channel.sh deleted file mode 100644 index 851f5bb..0000000 --- a/recipes-bsp/lvds-ctrl/files/lvds-dual-channel.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -#enable the parallel RGB to LVDS controller in dual channel mode - -echo low > /sys/class/gpio/gpio216/direction -echo high > /sys/class/gpio/gpio219/direction -echo high > /sys/class/gpio/gpio222/direction -echo high > /sys/class/gpio/gpio223/direction -echo high > /sys/class/gpio/gpio226/direction -echo high > /sys/class/gpio/gpio225/direction -echo high > /sys/class/gpio/gpio221/direction -echo high > /sys/class/gpio/gpio220/direction diff --git a/recipes-bsp/lvds-ctrl/files/lvds-single-channel-24bit-mode2.sh b/recipes-bsp/lvds-ctrl/files/lvds-single-channel-24bit-mode2.sh deleted file mode 100644 index a4e5312..0000000 --- a/recipes-bsp/lvds-ctrl/files/lvds-single-channel-24bit-mode2.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -#enable the parallel RGB to LVDS controller in single channel mode - -echo high > /sys/class/gpio/gpio216/direction -echo low > /sys/class/gpio/gpio219/direction -echo high > /sys/class/gpio/gpio222/direction -echo low > /sys/class/gpio/gpio223/direction -echo high > /sys/class/gpio/gpio226/direction -echo high > /sys/class/gpio/gpio225/direction -echo high > /sys/class/gpio/gpio221/direction -echo high > /sys/class/gpio/gpio220/direction diff --git a/recipes-bsp/lvds-ctrl/files/lvds-single-channel.sh b/recipes-bsp/lvds-ctrl/files/lvds-single-channel.sh deleted file mode 100644 index fa5084c..0000000 --- a/recipes-bsp/lvds-ctrl/files/lvds-single-channel.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh -#enable the parallel RGB to LVDS controller in single channel mode - -echo high > /sys/class/gpio/gpio216/direction -echo high > /sys/class/gpio/gpio219/direction -echo high > /sys/class/gpio/gpio222/direction -echo high > /sys/class/gpio/gpio223/direction -echo high > /sys/class/gpio/gpio226/direction -echo high > /sys/class/gpio/gpio225/direction -echo high > /sys/class/gpio/gpio221/direction -echo high > /sys/class/gpio/gpio220/direction diff --git a/recipes-bsp/lvds-ctrl/lvds-ctrl_1.0.bb b/recipes-bsp/lvds-ctrl/lvds-ctrl_1.0.bb deleted file mode 100644 index 3e81a4e..0000000 --- a/recipes-bsp/lvds-ctrl/lvds-ctrl_1.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Scripts to enable the LVDS converter on Apalis T30" -LICENSE = "PD" - -SRC_URI = " \ - file://lvds-dual-channel.sh \ - file://lvds-single-channel.sh \ - file://lvds-single-channel-24bit-mode2.sh \ - file://COPYING \ -" - -LIC_FILES_CHKSUM = "file://${WORKDIR}/COPYING;md5=1c3a7fb45253c11c74434676d84fe7dd" - -do_install () { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/*.sh ${D}/${bindir} -} - -pkg_postinst_ontarget_${PN}() { - mkdir -p ${sysconfdir}/xdg/lxsession/LXDE - echo "${bindir}/lvds-single-channel-24bit-mode2.sh" >> ${sysconfdir}/xdg/lxsession/LXDE/autostart -} - -pkg_postrm_${PN}() { - sed -i lvds-single-channel-24bit-mode2.sh/d ${sysconfdir}/xdg/lxsession/LXDE/autostart || true -} diff --git a/recipes-bsp/tdx-nv-binaries/files/0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch b/recipes-bsp/tdx-nv-binaries/files/0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch deleted file mode 100644 index 9228251..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b677a9f2d252c8ed4754917ff120589e225adf7e Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Wed, 3 Jan 2018 13:54:04 +0100 -Subject: [PATCH] egl: Add EGL_PLATFORM_X11_KHR alias to EGL_PLATFORM_X11_EXT - -New EGL code uses EGL_PLATFORM_X11_KHR (for example glmark2) and the -value is the same, so we can provide an alias for it instead of -patching every code using it. - -Upstream-Status: Pending - -(Adapted from meta-freescale, commit e1d249bb067aa6c472367cff1e77ba2ddbc8303f) - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - EGL/eglext.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/EGL/eglext.h b/EGL/eglext.h -index 80b539a..eb349c2 100644 ---- a/EGL/eglext.h -+++ b/EGL/eglext.h -@@ -445,6 +445,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT (EGLDisplay dpy, - #ifndef EGL_EXT_platform_x11 - #define EGL_EXT_platform_x11 1 - #define EGL_PLATFORM_X11_EXT 0x31D5 -+#define EGL_PLATFORM_X11_KHR EGL_PLATFORM_X11_EXT - #define EGL_PLATFORM_X11_SCREEN_EXT 0x31D6 - #endif /* EGL_EXT_platform_x11 */ - --- -2.13.6 - diff --git a/recipes-bsp/tdx-nv-binaries/files/aplay.desktop b/recipes-bsp/tdx-nv-binaries/files/aplay.desktop deleted file mode 100644 index ead86f3..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/aplay.desktop +++ /dev/null @@ -1,5 +0,0 @@ -[Desktop Entry] -Type=Application -Name=aplay -Exec=aplay %f -NoDisplay=true diff --git a/recipes-bsp/tdx-nv-binaries/files/egl.pc b/recipes-bsp/tdx-nv-binaries/files/egl.pc deleted file mode 100644 index 3af7eec..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/egl.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: egl -Description: EGL implementation -Version: 1 -Cflags: -I${includedir}/EGL -Libs: -L${libdir} -lEGL diff --git a/recipes-bsp/tdx-nv-binaries/files/eglplatform.h b/recipes-bsp/tdx-nv-binaries/files/eglplatform.h deleted file mode 100644 index 72b5f2d..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/eglplatform.h +++ /dev/null @@ -1,147 +0,0 @@ -#ifndef __eglplatform_h_ -#define __eglplatform_h_ - -/* -** Copyright (c) 2007-2009 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -/* Platform-specific types and definitions for egl.h - * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ - * - * Adopters may modify khrplatform.h and this file to suit their platform. - * You are encouraged to submit all modifications to the Khronos group so that - * they can be included in future versions of this file. Please submit changes - * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) - * by filing a bug against product "EGL" component "Registry". - */ - -#include <KHR/khrplatform.h> - -/* Macros used in EGL function prototype declarations. - * - * EGL functions should be prototyped as: - * - * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); - * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); - * - * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h - */ - -#ifndef EGLAPI -#define EGLAPI KHRONOS_APICALL -#endif - -#ifndef EGLAPIENTRY -#define EGLAPIENTRY KHRONOS_APIENTRY -#endif -#define EGLAPIENTRYP EGLAPIENTRY* - -/* The types NativeDisplayType, NativeWindowType, and NativePixmapType - * are aliases of window-system-dependent types, such as X Display * or - * Windows Device Context. They must be defined in platform-specific - * code below. The EGL-prefixed versions of Native*Type are the same - * types, renamed in EGL 1.3 so all types in the API start with "EGL". - * - * Khronos STRONGLY RECOMMENDS that you use the default definitions - * provided below, since these changes affect both binary and source - * portability of applications using EGL running on different EGL - * implementations. - */ - -#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN 1 -#endif -#include <windows.h> - -typedef HDC EGLNativeDisplayType; -typedef HBITMAP EGLNativePixmapType; -typedef HWND EGLNativeWindowType; - -#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ - -typedef int EGLNativeDisplayType; -typedef void *EGLNativeWindowType; -typedef void *EGLNativePixmapType; - -#elif defined(WL_EGL_PLATFORM) - -typedef struct wl_display *EGLNativeDisplayType; -typedef struct wl_egl_pixmap *EGLNativePixmapType; -typedef struct wl_egl_window *EGLNativeWindowType; - -#elif defined(__GBM__) - -typedef struct gbm_device *EGLNativeDisplayType; -typedef struct gbm_bo *EGLNativePixmapType; -typedef void *EGLNativeWindowType; - -#elif defined(ANDROID) /* Android */ - -struct ANativeWindow; -struct egl_native_pixmap_t; - -typedef struct ANativeWindow *EGLNativeWindowType; -typedef struct egl_native_pixmap_t *EGLNativePixmapType; -typedef void *EGLNativeDisplayType; - -#elif defined(__unix__) - -/* don't include the X headers here, some define clash with Qt5 symbols */ -#if 1 - -typedef struct _XDisplay *EGLNativeDisplayType; -typedef unsigned long EGLNativePixmapType; -typedef unsigned long EGLNativeWindowType; - -#else - -/* X11 (tentative) */ -#include <X11/Xlib.h> -#include <X11/Xutil.h> - -typedef Display *EGLNativeDisplayType; -typedef Pixmap EGLNativePixmapType; -typedef Window EGLNativeWindowType; - -#endif /* MESA_EGL_NO_X11_HEADERS */ - -#else -#error "Platform not recognized" -#endif - -/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ -typedef EGLNativeDisplayType NativeDisplayType; -typedef EGLNativePixmapType NativePixmapType; -typedef EGLNativeWindowType NativeWindowType; - - -/* Define EGLint. This must be a signed integral type large enough to contain - * all legal attribute names and values passed into and out of EGL, whether - * their type is boolean, bitmask, enumerant (symbolic constant), integer, - * handle, or other. While in general a 32-bit integer will suffice, if - * handles are 64 bit types, then EGLint should be defined as a signed 64-bit - * integer type. - */ -typedef khronos_int32_t EGLint; - -#endif /* __eglplatform_h */ diff --git a/recipes-bsp/tdx-nv-binaries/files/gles.pc b/recipes-bsp/tdx-nv-binaries/files/gles.pc deleted file mode 100644 index 91387c9..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/gles.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: glesv2 -Description: OpenGL ES 1.1 implementation -Version: 1.1 -Cflags: -I${includedir}/GLES -Libs: -L${libdir} -lGLESv1_CM diff --git a/recipes-bsp/tdx-nv-binaries/files/glesv2.pc b/recipes-bsp/tdx-nv-binaries/files/glesv2.pc deleted file mode 100644 index 0a2e7b1..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/glesv2.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: glesv2 -Description: OpenGL ES 2 implementation -Version: 2 -Cflags: -I${includedir}/GLES2 -Libs: -L${libdir} -lGLESv2 diff --git a/recipes-bsp/tdx-nv-binaries/files/khronos_headers.tgz b/recipes-bsp/tdx-nv-binaries/files/khronos_headers.tgz Binary files differdeleted file mode 100644 index 5eb5db7..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/khronos_headers.tgz +++ /dev/null diff --git a/recipes-bsp/tdx-nv-binaries/files/mimeapps.list b/recipes-bsp/tdx-nv-binaries/files/mimeapps.list deleted file mode 100644 index 6a513dc..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/mimeapps.list +++ /dev/null @@ -1,10 +0,0 @@ -[Added Associations] -video/mpeg=nvgstplayer.desktop; -video/x-msvideo=nvgstplayer.desktop; -video/mp4=nvgstplayer.desktop; -video/quicktime=nvgstplayer.desktop; -video/x-ms-wmv=nvgstplayer.desktop; -video/x-matroska=cd nvgstplayer.desktop; -audio/mpeg=nvgstplayer.desktop; -audio/basic=aplay.desktop; -audio/x-wav=aplay.desktop; diff --git a/recipes-bsp/tdx-nv-binaries/files/nvgstplayer.desktop b/recipes-bsp/tdx-nv-binaries/files/nvgstplayer.desktop deleted file mode 100644 index f85659c..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/nvgstplayer.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Type=Application -Name=nvgstplayer -Exec=nvgstplayer --uri %u -Terminal=true -NoDisplay=true diff --git a/recipes-bsp/tdx-nv-binaries/files/nvsamples-hardfp.patch b/recipes-bsp/tdx-nv-binaries/files/nvsamples-hardfp.patch Binary files differdeleted file mode 100644 index 43376d7..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/nvsamples-hardfp.patch +++ /dev/null diff --git a/recipes-bsp/tdx-nv-binaries/files/nvsamples-no-binary-shaders.patch b/recipes-bsp/tdx-nv-binaries/files/nvsamples-no-binary-shaders.patch deleted file mode 100644 index 73b27a1..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/nvsamples-no-binary-shaders.patch +++ /dev/null @@ -1,93 +0,0 @@ -diff -Naur nvsamples.orig/make/nvdefs.mk nvsamples/make/nvdefs.mk ---- nvsamples.orig/make/nvdefs.mk 2012-09-10 19:16:45.299731097 +0200 -+++ nvsamples/make/nvdefs.mk 2012-09-24 19:41:40.659811178 +0200 -@@ -86,7 +86,8 @@ - - NV_CGDIR = $(NV_TOPDIR)/utils/Cg - HEXIFY = $(NV_CGDIR)/hexify.pl --CGC = $(NV_CGDIR)/$(NV_HOST_OSTYPE)/cgc -quiet -+#prevent binary shaders, the L4T OpenGL drivers do not support them -+#CGC = $(NV_CGDIR)/$(NV_HOST_OSTYPE)/cgc -quiet - SHADER_FIX = $(NV_CGDIR)/$(NV_HOST_OSTYPE)/shaderfix - CGC_CG = $(CGC) - CGC_GLSL = $(CGC) -ogles -@@ -124,3 +127,10 @@ - $(CGC_CG_FRG) -o $*.tmp $< - $(SHADER_FIX) -o $@ $*.tmp - rm -rf $*.tmp -+ -+#deploy source shaders in headerfiles -+%.hglslv: %.glslv -+ $(HEXIFY) $< $@ -+ -+%.hglslf: %.glslf -+ $(HEXIFY) $< $@ - -diff -Naur nvsamples.orig/samples/opengles2/bubble/shaders.c nvsamples/samples/opengles2/bubble/shaders.c ---- nvsamples.orig/samples/opengles2/bubble/shaders.c 2011-05-04 13:36:25.000000000 +0200 -+++ nvsamples/samples/opengles2/bubble/shaders.c 2012-10-16 14:17:57.593654157 +0200 -@@ -88,16 +88,16 @@ - // Otherwise, load and compile the shader sources - prog_bubble = - NvGl2DemoLoadShaderSources( -- "bubble_vert.glslv", "bubble_frag.glslf", GL_FALSE); -+ "shaders/bubble_vert.glslv", "shaders/bubble_frag.glslf", GL_FALSE); - prog_mesh = - NvGl2DemoLoadShaderSources( -- "mesh_vert.glslv", "mesh_frag.glslf", GL_FALSE); -+ "shaders/mesh_vert.glslv", "shaders/mesh_frag.glslf", GL_FALSE); - prog_cube = - NvGl2DemoLoadShaderSources( -- "envCube_vert.glslv", "envCube_frag.glslf", GL_FALSE); -+ "shaders/envCube_vert.glslv", "shaders/envCube_frag.glslf", GL_FALSE); - prog_mouse = - NvGl2DemoLoadShaderSources( -- "mouse_vert.glslv", "mouse_frag.glslf", GL_FALSE); -+ "shaders/mouse_vert.glslv", "shaders/mouse_frag.glslf", GL_FALSE); - # endif - - success = prog_bubble && prog_mesh && prog_cube && prog_mouse; -diff -Naur nvsamples.orig/samples/opengles2/ctree/shaders.c nvsamples/samples/opengles2/ctree/shaders.c ---- nvsamples.orig/samples/opengles2/ctree/shaders.c 2011-05-04 13:36:26.000000000 +0200 -+++ nvsamples/samples/opengles2/ctree/shaders.c 2012-10-16 14:17:16.193651084 +0200 -@@ -130,22 +130,22 @@ - // Otherwise, load and compile the shader sources - prog_solids = - NvGl2DemoLoadShaderSources( -- "lighting_vert.glslv", "solids_frag.glslf", GL_FALSE); -+ "shaders/lighting_vert.glslv", "shaders/solids_frag.glslf", GL_FALSE); - prog_leaves = - NvGl2DemoLoadShaderSources( -- "lighting_vert.glslv", "leaves_frag.glslf", GL_FALSE); -+ "shaders/lighting_vert.glslv", "shaders/leaves_frag.glslf", GL_FALSE); - prog_simplecol = - NvGl2DemoLoadShaderSources( -- "simplecol_vert.glslv", "simplecol_frag.glslf", GL_FALSE); -+ "shaders/simplecol_vert.glslv", "shaders/simplecol_frag.glslf", GL_FALSE); - prog_simpletex = - NvGl2DemoLoadShaderSources( -- "simpletex_vert.glslv", "simpletex_frag.glslf", GL_FALSE); -+ "shaders/simpletex_vert.glslv", "shaders/simpletex_frag.glslf", GL_FALSE); - prog_overlaycol = - NvGl2DemoLoadShaderSources( -- "overlaycol_vert.glslv", "overlaycol_frag.glslf", GL_FALSE); -+ "shaders/overlaycol_vert.glslv", "shaders/overlaycol_frag.glslf", GL_FALSE); - prog_overlaytex = - NvGl2DemoLoadShaderSources( -- "overlaytex_vert.glslv", "overlaytex_frag.glslf", GL_FALSE); -+ "shaders/overlaytex_vert.glslv", "shaders/overlaytex_frag.glslf", GL_FALSE); - # endif - success = prog_solids && prog_leaves - && prog_simplecol && prog_simpletex -diff -Naur nvsamples.orig/samples/opengles2/gears/gears.c nvsamples/samples/opengles2/gears/gears.c ---- nvsamples.orig/samples/opengles2/gears/gears.c 2011-05-04 13:36:27.000000000 +0200 -+++ nvsamples/samples/opengles2/gears/gears.c 2012-10-16 14:14:51.433680786 +0200 -@@ -393,7 +393,7 @@ - // Otherwise, load and compile the shader source - gearShaderProgram = - NvGl2DemoLoadShaderSources( -- "gears_vert.glslv", "gears_frag.glslf", GL_FALSE); -+ "shaders/gears_vert.glslv", "shaders/gears_frag.glslf", GL_FALSE); - # endif - - // Use the program we just loaded diff --git a/recipes-bsp/tdx-nv-binaries/files/nvsamples-oe.patch b/recipes-bsp/tdx-nv-binaries/files/nvsamples-oe.patch deleted file mode 100644 index 5b8e137..0000000 --- a/recipes-bsp/tdx-nv-binaries/files/nvsamples-oe.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Naur nvsamples-1.0-r0.orig/nvsamples/make/nvdefs.mk nvsamples-1.0-r0/nvsamples/make/nvdefs.mk ---- nvsamples/make/nvdefs.mk.orig 2011-12-07 10:22:49.000000000 +0100 -+++ nvsamples/make/nvdefs.mk 2012-07-07 12:37:13.000000000 +0200 -@@ -1,4 +1,4 @@ --NV_TOPDIR = $(HOME)/nvsamples -+NV_TOPDIR = $(WORKDIR)/nvsamples - NV_PLATFORM_DIR = $(NV_TOPDIR) - NV_KERNDIR = $(NV_TOPDIR)/../kernel - -@@ -42,17 +42,13 @@ - NV_PLATFORM_CPPFLAGS += -DKD - endif - --NV_PLATFORM_LDFLAGS = -+NV_PLATFORM_LDFLAGS = -L/usr/X11R6.4/lib -lX11 -lICE -lSM - - NV_PLATFORM_SDK_INC_DIR = $(NV_TOPDIR)/include - NV_PLATFORM_SDK_LIB_DIR = $(NV_TOPDIR)/lib-target --ROOTFS_LIB_DIR = $(NV_TOPDIR)/../T20_LinuxImageV1.0Beta4/rootfs/usr/lib - - NV_PLATFORM_SDK_INC = -I$(NV_PLATFORM_SDK_INC_DIR) --NV_PLATFORM_SDK_LIB = -L$(NV_PLATFORM_SDK_LIB_DIR) \ -- -L$(ROOTFS_LIB_DIR) \ -- -Xlinker -rpath-link \ -- -Xlinker $(ROOTFS_LIB_DIR) -+NV_PLATFORM_SDK_LIB = -L$(NV_PLATFORM_SDK_LIB_DIR) - NV_PLATFORM_OPT = -Os -O2 - NV_PLATFORM_MATHLIB = -lm - NV_PLATFORM_THREADLIB = -lpthread -@@ -80,13 +76,13 @@ - - # compiler utilities - --CROSSBIN = $(NV_TOPDIR)/../arm-2009q3/bin/arm-none-linux-gnueabi- --CC = $(CROSSBIN)gcc --CXX = $(CROSSBIN)g++ --LD = $(CROSSBIN)gcc --AR = $(CROSSBIN)ar --RANLIB = $(CROSSBIN)ranlib --STRIP = $(CROSSBIN)strip -+CROSSBIN = arm-angstrom-linux-gnueabi- -+CC ?= $(CROSSBIN)gcc -+CXX ?= $(CROSSBIN)g++ -+LD = $(CC) -+AR ?= $(CROSSBIN)ar -+RANLIB ?= $(CROSSBIN)ranlib -+STRIP ?= $(CROSSBIN)strip - - NV_CGDIR = $(NV_TOPDIR)/utils/Cg - HEXIFY = $(NV_CGDIR)/hexify.pl diff --git a/recipes-bsp/tdx-nv-binaries/nvsamples.bb b/recipes-bsp/tdx-nv-binaries/nvsamples.bb deleted file mode 100644 index 493ec8f..0000000 --- a/recipes-bsp/tdx-nv-binaries/nvsamples.bb +++ /dev/null @@ -1,59 +0,0 @@ -SECTION = "graphical/utils" -SUMMARY = "Nvidia samples for OpenGL ES, OpenGL ES headers" -LICENSE = "CLOSED" -DEPENDS = "tdx-nv-binaries virtual/libx11 libsm libice" - -PR = "r1" - -PARALLEL_MAKE = "" - -SRC_URI = " \ - http://developer.toradex.com/files/toradex-dev/uploads/media/Colibri/Linux/Samples/nvsamples.tar.bz2 \ - file://nvsamples-oe.patch \ - file://nvsamples-no-binary-shaders.patch \ - file://nvsamples-hardfp.patch \ -" - -S = "${WORKDIR}/nvsamples" - -SRC_URI[md5sum] = "240b0beb0056dde2e6ac1538dc8b6684" -SRC_URI[sha256sum] = "2638beea80fd85fdc5f9443e6959c210e275e627f662266cd404ce7c68b0806d" - -#no gnu_hash in NVIDIA binaries, skip QA for this package -INSANE_SKIP_${PN} = "dev-so ldflags" - -FILES_${PN} += " \ - /home/root/textures/* \ - /home/root/shaders/* \ -" - -do_compile () { - cd ${S}/samples/tools/nvtexfont2 - oe_runmake clean - oe_runmake WORKDIR=${WORKDIR} - ln -sf ../samples/tools/nvtexfont2/libnvtexfont2.a ${S}/lib-target/ - - cd ${S}/samples/tools/nvgl2demo_common - oe_runmake clean - oe_runmake WORKDIR=${WORKDIR} - ln -sf ../samples/tools/nvgl2demo_common/libnvgl2demo_common.a ${S}/lib-target/ - - cd ${S}/samples/opengles2 - oe_runmake clean - oe_runmake WORKDIR=${WORKDIR} -} - -do_install () { - # install the sample code - install -d ${D}${bindir} - install -d ${D}/home/root/textures - install -d ${D}/home/root/shaders - install -m 0755 ${S}/samples/opengles2/ctree/ctree ${D}${bindir} - install -m 0644 ${S}/samples/opengles2/ctree/textures/* ${D}/home/root/textures - install -m 0644 ${S}/samples/opengles2/ctree/*.glsl? ${D}/home/root/shaders - install -m 0755 ${S}/samples/opengles2/bubble/bubble ${D}${bindir} - install -m 0644 ${S}/samples/opengles2/bubble/textures/* ${D}/home/root/textures - install -m 0644 ${S}/samples/opengles2/bubble/*.glsl? ${D}/home/root/shaders - install -m 0755 ${S}/samples/opengles2/gears/gears ${D}${bindir} - install -m 0644 ${S}/samples/opengles2/gears/*.glsl? ${D}/home/root/shaders -} diff --git a/recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb b/recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb deleted file mode 100644 index 15ea303..0000000 --- a/recipes-bsp/tdx-nv-binaries/tdx-nv-binaries.bb +++ /dev/null @@ -1,194 +0,0 @@ -SUMMARY = "binary files from Nvidia along with their configuration" -LICENSE = "CLOSED & SGI & Khronos" -PR = "r19" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(tegra)" - -PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2" -DEPENDS = "gstreamer gst-plugins-base libpcre virtual/xserver virtual/libx11 libxdamage libxext libxfixes" -RDEPENDS_${PN}-nv-gstapps = "libpcre libpcreposix" - -# the khronos headers are taken from here: https://www.khronos.org/registry/khronos_headers.tgz -# this tarball changes from time to time breaking the receipe, thus it is provided with the recipe -SRC_COMMON = " \ - file://aplay.desktop \ - file://egl.pc \ - file://eglplatform.h \ - file://gles.pc \ - file://glesv2.pc \ - file://khronos_headers.tgz \ - file://mimeapps.list \ - file://nvgstplayer.desktop \ - https://www.khronos.org/registry/omxil/api/1.1.2/OpenMAX_IL_1_1_2_Header.zip;name=openmax-h;unpack=no \ - file://0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch;apply=no \ -" - -SRC_URI_tegra2 = " \ - http://developer.download.nvidia.com/mobile/tegra/l4t/r16.5.0/ventana_release_armhf/Tegra20_Linux-codecs_R16.5_armhf.tbz2;name=t20codecs \ - http://developer.download.nvidia.com/mobile/tegra/l4t/r16.5.0/ventana_release_armhf/Tegra20_Linux_R16.5_armhf.tbz2;name=t20drivers \ - ${SRC_COMMON} \ -" - -SRC_URI_tegra3 = " \ - http://developer.download.nvidia.com/mobile/tegra/l4t/r16.5.0/cardhu_release_armhf/Tegra30_Linux-codecs_R16.5_armhf.tbz2;name=t30codecs \ - http://developer.download.nvidia.com/mobile/tegra/l4t/r16.5.0/cardhu_release_armhf/Tegra30_Linux_R16.5_armhf.tbz2;name=t30drivers \ - http://developer.toradex.com/files/toradex-dev/uploads/media/Colibri/Linux/Extra/libgstomx.so;name=libgstomx \ - ${SRC_COMMON} \ -" - -SRC_URI[openmax-h.md5sum] = "402a7600397c341895cfecbbe1f4e028" -SRC_URI[openmax-h.sha256sum] = "e7159c88185df60a0dbb28583815067c31285a1f1d4652f6752a7329ccb534d1" - -SRC_URI[t20codecs.md5sum] = "03da7451b755094c61dade6250f1ad0a" -SRC_URI[t20codecs.sha256sum] = "0c5fe818d5e0bdc83c24b7cb0db4f87705244258bfe1925d0a0a0698e3bf712b" -SRC_URI[t20drivers.md5sum] = "5252b747668c14376b3f82d08debad2c" -SRC_URI[t20drivers.sha256sum] = "02b7a83b29cec59cf275b98f0de0fc87a24ffa25593af6af729cd2e881c41587" - -SRC_URI[t30codecs.md5sum] = "03a0b726f18a26ed379c62b83119e497" -SRC_URI[t30codecs.sha256sum] = "640df86c47d0dd6cbfc15eff49ee146a964c2a0362fe52ee6880c84e08b7a98b" -SRC_URI[t30drivers.md5sum] = "8759be1c7b93511cf70939df28b8af51" -SRC_URI[t30drivers.sha256sum] = "2288ad9ce30239975208cbd5fd896791c9d37d87ca8d30b51f04bacc74835427" -SRC_URI[libgstomx.md5sum] = "faa6ee38fb1b7aba7c6c7f98f6b2cedd" -SRC_URI[libgstomx.sha256sum] = "844c2f3ecb8498a9b287c2b2bc6184de75c2cf7d76f64f0a7749e76e1a37a1dc" - - -# xserver-xorg driver ABI version to be used by the symlink, must match the required ABI version from the used xserver -XSERVER_DRIVER_ABI_REQUIRED = "14" - -LIC_FILES_CHKSUM = " \ - file://../khronos_headers/GLES2/gl2.h;beginline=8;endline=29;md5=c0e8cc16602f8077310fb00bbf128ef6 \ - file://${WORKDIR}/Linux_for_Tegra/nv_tegra/LICENSE;md5=d88b0db2ba7f6dfe70852c64b2fce6ce \ - file://${WORKDIR}/Tegra_Software_License_Agreement-Tegra-Linux-codecs.txt;md5=47cc79e762df48980a032c610cfc172f \ - file://${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps/LICENSE.gst-openmax;md5=a7d467726825e72551082b781a94d09d \ -" - -PACKAGES = "${PN}-dbg ${PN}-restricted-codecs ${PN}-nv-gstapps ${PN} ${PN}-dev" - -FILES_${PN}-dbg += " \ - /usr/lib/gstreamer-0.10/.debug \ -" -FILES_${PN} += " \ - ${sysconfdir}/X11/def* \ - ${sysconfdir}/X11/xorg.conf.* \ - ${sysconfdir}/init/* \ - ${sysconfdir}/udev/rules.d/* \ - ${sysconfdir}/init/nv* \ - ${sysconfdir}/init/wpa* \ - /lib/firmware/* \ - /usr/lib/lib* \ - /usr/lib/xorg/* \ - /usr/lib/gstreamer*/* \ - /home/root/.local/share/applications/* \ -" -FILES_${PN}-restricted-codecs += " \ - /lib/firmware/*.axf \ -" -FILES_${PN}-nv-gstapps += " \ - /usr/bin/* \ - /usr/lib/libpcre* \ - /usr/share/doc/nv_gstapps/* \ -" - -#no gnu_hash in NVIDIA binaries, skip QA ldflags -#we have symlinks ending in .so, skip QA dev-so -#the qa check is not able to follow the libpcre symlink, skip QA file-rdeps -#inhibit warnings about files being stripped -INSANE_SKIP_${PN} = "dev-so ldflags already-stripped textrel" -INSANE_SKIP_${PN}-nv-gstapps = "dev-so ldflags already-stripped textrel file-rdeps" - -do_patch () { - mkdir -p OpenMAX/il - unzip -o -d OpenMAX/il OpenMAX_IL_1_1_2_Header.zip - cd ${WORKDIR}/khronos_headers - patch -p 1 < ${WORKDIR}/0001-egl-Add-EGL_PLATFORM_X11_KHR-alias-to-EGL_PLATFORM_X.patch -} - -do_compile () { - #unpack the different packages - #nvidia drivers - mkdir -p nvidia_drivers - tar -C nvidia_drivers -xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nvidia_drivers.tbz2 - tar -C nvidia_drivers -xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/config.tbz2 - - #nvidia sample gstreamer apps - mkdir -p nvgstapps/usr/share/doc/nv_gstapps - tar -C nvgstapps -xjf ${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps/nvgstapps.tbz2 - cp ${WORKDIR}/Linux_for_Tegra/nv_tegra/nv_sample_apps/nv*.txt nvgstapps/usr/share/doc/nv_gstapps/ - - #restricted codecs - mkdir -p restricted_codecs - tar -C restricted_codecs -xjf ${WORKDIR}/restricted_codecs.tbz2 -} - -do_install () { - #nvidia_driver - install -d ${D}/usr/lib/xorg/modules/drivers ${D}/home/root/.local/share/applications/ - install -d ${D}/lib/firmware/ - install -d ${D}/${sysconfdir}/X11 ${D}/${sysconfdir}/init ${D}/${sysconfdir}/udev/rules.d - install -m 0644 nvidia_drivers/${sysconfdir}/X11/xorg.conf ${D}/${sysconfdir}/X11/xorg.conf.nvidia - install -m 0755 nvidia_drivers/${sysconfdir}/init/* ${D}/${sysconfdir}/init/ - install -m 0644 nvidia_drivers/${sysconfdir}/udev/rules.d/* ${D}/${sysconfdir}/udev/rules.d/ - install -m 0644 nvidia_drivers/${sysconfdir}/nv* ${D}/${sysconfdir}/ - install -m 0644 nvidia_drivers/${sysconfdir}/wpa_supplicant.conf ${D}/${sysconfdir}/wpa_supplicant.conf.nvidia - install -m 0644 nvidia_drivers/lib/firmware/* ${D}/lib/firmware/ - install -m 0644 nvidia_drivers/usr/lib/*.so ${D}/usr/lib/ - install -m 0644 nvidia_drivers/usr/lib/*.so.? ${D}/usr/lib/ - rm ${D}/usr/lib/libjpeg.so - install -m 0644 nvidia_drivers/usr/lib/xorg/modules/drivers/* ${D}/usr/lib/xorg/modules/drivers/ - ln -s tegra_drv.abi${XSERVER_DRIVER_ABI_REQUIRED}.so ${D}/usr/lib/xorg/modules/drivers/tegra_drv.so - # create symlink to the shared libs for development, *.so -> *.so.x - export LIBNAME=`ls ${D}/usr/lib/libGLESv2.so.?` - export LIBNAME=`basename $LIBNAME` - ln -s $LIBNAME ${D}/usr/lib/libGLESv2.so - export LIBNAME=`ls ${D}/usr/lib/libEGL.so.?` - export LIBNAME=`basename $LIBNAME` - ln -s $LIBNAME ${D}/usr/lib/libEGL.so - export LIBNAME=`ls ${D}/usr/lib/libGLESv1_CM.so.?` - export LIBNAME=`basename $LIBNAME` - ln -s $LIBNAME ${D}/usr/lib/libGLESv1_CM.so - - #nvidia sample gstreamer apps - install -d ${D}/usr/bin ${D}/usr/lib/gstreamer-0.10 ${D}/usr/share/doc/nv_gstapps - install -d ${D}/usr/lib/xorg/modules/drivers ${D}/home/root/.local/share/applications/ - install -m 0755 nvgstapps/usr/bin/* ${D}/usr/bin/ - install -m 0644 nvgstapps/usr/lib/gstreamer-0.10/*.so ${D}/usr/lib/gstreamer-0.10/ - install -m 0644 nvgstapps/usr/share/doc/nv_gstapps/* ${D}/usr/share/doc/nv_gstapps/ - install -m 0644 ${WORKDIR}/*.desktop ${D}/home/root/.local/share/applications/ - install -m 0644 ${WORKDIR}/mimeapps.list ${D}//home/root/.local/share/applications/ - ln -s libpcre.so.1 ${D}/usr/lib/libpcre.so.3 - ln -s libpcreposix.so.0 ${D}/usr/lib/libpcreposix.so.3 - - #nvidia restricted codecs - install -d ${D}/lib/firmware/ - install -m 0644 restricted_codecs/lib/firmware/* ${D}/lib/firmware/ - - #khronos headers for EGL/GLES/GLES2/OpenMax - for dir in EGL GLES GLES2 KD KHR - do - install -d ${D}${includedir}/$dir - install -m 0644 ${WORKDIR}/khronos_headers/$dir/* ${D}${includedir}/$dir - done - - #Override eglplatform.h that khronos provide. - install -m 0644 ${WORKDIR}/eglplatform.h ${D}${includedir}/EGL/ - - dir="OpenMAX/il" - install -d ${D}${includedir}/$dir - install -m 0644 ${WORKDIR}/$dir/* ${D}${includedir}/$dir - - install -d ${D}/usr/lib/pkgconfig - install -m 0644 ${WORKDIR}/*.pc ${D}/usr/lib/pkgconfig/ -} - -do_install_append_tegra3 () { - #OpenMAX-IL implementation library, evaluation version with fix to validate input frame rate - install -m 0644 ${WORKDIR}/libgstomx.so ${D}/usr/lib/gstreamer-0.10/ -} - -# Add the ABI dependency at package generation time, as otherwise bitbake will -# attempt to find a provider for it (and fail) when it does the parse. -python populate_packages_prepend() { - pn = d.getVar("PN", True) - d.appendVar("RDEPENDS_" + pn, " xorg-abi-video-${XSERVER_DRIVER_ABI_REQUIRED}") -} diff --git a/recipes-bsp/tegrastats/files/Tegrastats-gtk.desktop b/recipes-bsp/tegrastats/files/Tegrastats-gtk.desktop deleted file mode 100755 index 5424c2a..0000000 --- a/recipes-bsp/tegrastats/files/Tegrastats-gtk.desktop +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env xdg-open - -[Desktop Entry] -Version=1.0 -Type=Application -Terminal=false -Icon[C]=gnome-monitor.png -Exec=/usr/bin/tegrastats-gtk -Name[C]=Tegrastats-gtk -Name=Tegrastats-gtk -Icon=gnome-monitor.png diff --git a/recipes-bsp/tegrastats/files/apalis-tk1/tegrastats b/recipes-bsp/tegrastats/files/apalis-tk1/tegrastats Binary files differdeleted file mode 100755 index 22a42cf..0000000 --- a/recipes-bsp/tegrastats/files/apalis-tk1/tegrastats +++ /dev/null diff --git a/recipes-bsp/tegrastats/files/tegrastats b/recipes-bsp/tegrastats/files/tegrastats Binary files differindex 5f76593..22a42cf 100755 --- a/recipes-bsp/tegrastats/files/tegrastats +++ b/recipes-bsp/tegrastats/files/tegrastats diff --git a/recipes-bsp/tegrastats/files/tegrastats-gtk b/recipes-bsp/tegrastats/files/tegrastats-gtk Binary files differdeleted file mode 100755 index 53d250d..0000000 --- a/recipes-bsp/tegrastats/files/tegrastats-gtk +++ /dev/null diff --git a/recipes-bsp/tegrastats/tegrastats.bb b/recipes-bsp/tegrastats/tegrastats.bb index 0718a5d..d1bc364 100644 --- a/recipes-bsp/tegrastats/tegrastats.bb +++ b/recipes-bsp/tegrastats/tegrastats.bb @@ -1,35 +1,21 @@ SUMMARY = "NVIDIAS tegrastats" -DESCRIPTION = "NVIDIAS tegrastats in a commandline version and one with output to a gtk title bar, gives information about cpu use" +DESCRIPTION = "NVIDIAS tegrastats gives information about cpu use for TK1" LICENSE = "CLOSED" PR = "r3" -SRC_URI = " \ - file://tegrastats \ - file://tegrastats-gtk \ - file://Tegrastats-gtk.desktop \ -" +SRC_URI = "file://tegrastats" S = "${WORKDIR}" -PACKAGES_prepend = "${PN}-gtk " - # Inhibit warnings about files being stripped. # Inhibit warnings about missing DEPENDS, Files are provided in binary form" INSANE_SKIP_${PN} = "already-stripped build-deps file-rdeps ldflags" -INSANE_SKIP_${PN}-gtk = "already-stripped build-deps file-rdeps" - do_install() { - install -d ${D}${bindir}/ ${D}/home/root/Desktop/ + install -d ${D}${bindir} install -m 0755 ${S}/tegrastats* ${D}${bindir}/ - install -m 0755 ${S}/Tegrastats-gtk.desktop ${D}/home/root/Desktop/ } -FILES_${PN}-gtk = " \ - ${bindir}/tegrastats-gtk \ - /home/root/Desktop/Tegra* \ -" - FILES_${PN} = "${bindir}/tegrastats" - -PACKAGE_ARCH_tegra124 = "${MACHINE_ARCH}" +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "tegra124" diff --git a/recipes-bsp/u-boot/files/apalis-t30/Apalis_T30_2GB_800Mhz.bct b/recipes-bsp/u-boot/files/apalis-t30/Apalis_T30_2GB_800Mhz.bct Binary files differdeleted file mode 100644 index f228cd2..0000000 --- a/recipes-bsp/u-boot/files/apalis-t30/Apalis_T30_2GB_800Mhz.bct +++ /dev/null diff --git a/recipes-bsp/u-boot/files/apalis-t30/apalis_t30.img.cfg b/recipes-bsp/u-boot/files/apalis-t30/apalis_t30.img.cfg deleted file mode 100644 index 6fbdc0d..0000000 --- a/recipes-bsp/u-boot/files/apalis-t30/apalis_t30.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2014 Toradex, Inc. -# -# This software is provided 'as-is', without any express or implied -# warranty. In no event will the authors be held liable for any damages -# arising from the use of this software. -# -# Permission is granted to anyone to use this software for any purpose, -# including commercial applications, and to alter it and redistribute it -# freely, subject to the following restrictions: -# -# 1. The origin of this software must not be misrepresented; you must not -# claim that you wrote the original software. If you use this software -# in a product, an acknowledgment in the product documentation would be -# appreciated but is not required. -# 2. Altered source versions must be plainly marked as such, and must not be -# misrepresented as being the original software. -# 3. This notice may not be removed or altered from any source distribution. - -Version = 0x00020001; -Bctcopy = 1; -Bctfile = Apalis_T30_2GB_800Mhz.bct; -BootLoader = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete; diff --git a/recipes-bsp/u-boot/files/apalis-t30/fw_env.config b/recipes-bsp/u-boot/files/apalis-t30/fw_env.config deleted file mode 100644 index d2be4ee..0000000 --- a/recipes-bsp/u-boot/files/apalis-t30/fw_env.config +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Device offset must be prefixed with 0x to be parsed as a hexadecimal value. -# On a block device a negative offset is treated as a backwards offset from the -# end of the device/partition, rather than a forwards offset from the start. - -# Colibri T30/Apalis T30 -# U-Boot environment is stored at the end of the first eMMC boot partition -# hence use a negative value. The environment is just in front of the config -# block which occupies the last sector (hence -0x200) - -# Block device name Device offset Env. size -/dev/mmcblk0boot0 -0x2200 0x2000 - diff --git a/recipes-bsp/u-boot/files/tegra2/fw_env.config b/recipes-bsp/u-boot/files/tegra2/fw_env.config deleted file mode 100644 index 9d00835..0000000 --- a/recipes-bsp/u-boot/files/tegra2/fw_env.config +++ /dev/null @@ -1,11 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Notice, that the "Number of sectors" is not required on NOR and SPI-dataflash. -# Futhermore, if the Flash sector size is ommitted, this value is assumed to -# be the same as the Environment size, which is valid for NOR and SPI-dataflash - -# MTD device name Device offset Env. size Flash sector size Number of sectors -#Colibri T20: flash sector size depends on module type and version -#/dev/mtd3 0x00000000 0x00001000 0x00040000 1 - diff --git a/recipes-bsp/u-boot/files/tegra3/fw_env.config b/recipes-bsp/u-boot/files/tegra3/fw_env.config deleted file mode 100644 index d2be4ee..0000000 --- a/recipes-bsp/u-boot/files/tegra3/fw_env.config +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for fw_(printenv/setenv) utility. -# Up to two entries are valid, in this case the redundant -# environment sector is assumed present. -# Device offset must be prefixed with 0x to be parsed as a hexadecimal value. -# On a block device a negative offset is treated as a backwards offset from the -# end of the device/partition, rather than a forwards offset from the start. - -# Colibri T30/Apalis T30 -# U-Boot environment is stored at the end of the first eMMC boot partition -# hence use a negative value. The environment is just in front of the config -# block which occupies the last sector (hence -0x200) - -# Block device name Device offset Env. size -/dev/mmcblk0boot0 -0x2200 0x2000 - diff --git a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb index 5dba294..56caa08 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils_git.bb @@ -9,12 +9,7 @@ DEPENDS = "mtd-utils" include conf/tdx_version.conf inherit tegra-u-boot-localversion -COMPATIBLE_MACHINE = "(apalis-t30|apalis-tk1|colibri-t20|colibri-t30)" - -DEFAULT_PREFERENCE_apalis-t30 = "1" -DEFAULT_PREFERENCE_apalis-tk1 = "1" -DEFAULT_PREFERENCE_colibri-t20 = "1" -DEFAULT_PREFERENCE_colibri-t30 = "1" +COMPATIBLE_MACHINE = "(apalis-tk1)" FILESPATHPKG =. "git:" @@ -59,10 +54,6 @@ install_unlock_emmc() { install -m 0644 ${WORKDIR}/fw_unlock_mmc.sh ${D}${sysconfdir}/profile.d/fw_unlock_mmc.sh } -do_install_append_tegra3() { - install_unlock_emmc -} - do_install_append_tegra124() { install_unlock_emmc } @@ -71,10 +62,6 @@ do_install_append_tegra124m() { install_unlock_emmc } -pkg_postinst_ontarget_${PN}_colibri-t20 () { - grep u-boot-env /proc/mtd | awk '{print "/dev/" substr($1,0,4) " 0x00000000 0x00010000 0x" $3 " 1" >> "/etc/fw_env.config" }' -} - do_install_class-cross () { install -d ${D}${bindir_cross} install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv diff --git a/recipes-bsp/u-boot/u-boot-toradex_git.bb b/recipes-bsp/u-boot/u-boot-toradex_git.bb index 798c395..9237c6a 100644 --- a/recipes-bsp/u-boot/u-boot-toradex_git.bb +++ b/recipes-bsp/u-boot/u-boot-toradex_git.bb @@ -5,19 +5,13 @@ inherit tegra-u-boot-localversion PROVIDES = "u-boot virtual/bootloader" DEPENDS += "dtc-native" -DEPENDS_append_apalis-t30 = " cbootimage-native" DEPENDS_append_apalis-tk1 = " cbootimage-native" DEPENDS_append_apalis-tk1-mainline = " cbootimage-native" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" -COMPATIBLE_MACHINE = "(apalis-t30|apalis-tk1|colibri-t20|colibri-t30)" - -DEFAULT_PREFERENCE_apalis-t30 = "1" -DEFAULT_PREFERENCE_apalis-tk1 = "1" -DEFAULT_PREFERENCE_colibri-t20 = "1" -DEFAULT_PREFERENCE_colibri-t30 = "1" +COMPATIBLE_MACHINE = "(apalis-tk1)" FILESPATHPKG =. "git:" S = "${WORKDIR}/git" @@ -30,10 +24,7 @@ SRC_URI = " \ git://git.toradex.com/u-boot-toradex.git;protocol=git;branch=${SRCBRANCH} \ file://0001-libfdt-move-headers-to-linux-libfdt.h-and-linux-libf.patch \ " -SRC_URI_append_apalis-t30 = " \ - file://apalis_t30.img.cfg \ - file://Apalis_T30_2GB_800Mhz.bct \ -" + SRC_URI_append_apalis-tk1 = " \ file://apalis-tk1.img.cfg \ file://PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct \ @@ -48,12 +39,6 @@ PR = "${TDX_VER_ITEM}" PACKAGE_ARCH = "${MACHINE_ARCH}" -do_deploy_append_apalis-t30() { - cd ${DEPLOYDIR} - cp ${WORKDIR}/Apalis_T30_2GB_800Mhz.bct . - cbootimage -s tegra30 ${WORKDIR}/apalis_t30.img.cfg apalis_t30.img - rm Apalis_T30_2GB_800Mhz.bct -} do_deploy_append_apalis-tk1() { cd ${DEPLOYDIR} cp ${WORKDIR}/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct . diff --git a/recipes-core/glibc/glibc-2.25/0001-linux-minimum-version-set-to-3.1.10.patch b/recipes-core/glibc/glibc-2.25/0001-linux-minimum-version-set-to-3.1.10.patch deleted file mode 100644 index 028f0c6..0000000 --- a/recipes-core/glibc/glibc-2.25/0001-linux-minimum-version-set-to-3.1.10.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 68bc2dbe4ee91ee48bbd398bbbfcae01a9bda7ff Mon Sep 17 00:00:00 2001 -From: Max Krummenacher <max.krummenacher@toradex.com> -Date: Mon, 19 Dec 2016 16:57:51 +0100 -Subject: [PATCH] linux minimum version: set to 3.1.10 - -This allows using glibc 2.24 with the older 3.1.10 L4T kernel. - -Set the minimum allowed kernel version to 3.1.10. -The only conditional which got removed from 2.23 to 2.24 is for kernels -> 3.0.0 -__ASSUME_FUTEX_LOCK_PI with commit f5c77f78ec03363d5e550c4996deb75ee3f2e32a -The code mentioned in the commit which makes the conditional unneeded is -also part of the L4T kernel. - -Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> ---- - sysdeps/unix/sysv/linux/configure | 2 +- - sysdeps/unix/sysv/linux/configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure -index cace758..cacb9e7 100644 ---- a/sysdeps/unix/sysv/linux/configure -+++ b/sysdeps/unix/sysv/linux/configure -@@ -51,7 +51,7 @@ fi - # set arch_minimum_kernel already, let that override our defaults here. - # Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde - # if appropriate too. --test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.2.0 -+test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.1.10 - if test -n "$minimum_kernel"; then - - user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`)) -diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac -index 13abda0..b7df956 100644 ---- a/sysdeps/unix/sysv/linux/configure.ac -+++ b/sysdeps/unix/sysv/linux/configure.ac -@@ -33,7 +33,7 @@ fi - # set arch_minimum_kernel already, let that override our defaults here. - # Note that we presume such a fragment has set libc_cv_gcc_unwind_find_fde - # if appropriate too. --test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.2.0 -+test -n "$arch_minimum_kernel" || arch_minimum_kernel=3.1.10 - if test -n "$minimum_kernel"; then - changequote(,) - user_version=$((`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`)) --- -2.5.5 - diff --git a/recipes-core/glibc/glibc_2.%.bbappend b/recipes-core/glibc/glibc_2.%.bbappend deleted file mode 100644 index 34b6c98..0000000 --- a/recipes-core/glibc/glibc_2.%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/glibc-2.25:" -SRC_URI_append = " file://0001-linux-minimum-version-set-to-3.1.10.patch" -OLDEST_KERNEL = "3.1.10" diff --git a/recipes-core/hdmi-hotplug/files/apalis-tk1/hdmi.sh b/recipes-core/hdmi-hotplug/files/apalis-tk1/hdmi.sh deleted file mode 100644 index 43c5459..0000000 --- a/recipes-core/hdmi-hotplug/files/apalis-tk1/hdmi.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -export XAUTHORITY=/home/root/.Xauthority -export DISPLAY=:0.0 -DISPLAY=:0.0 xrandr --output HDMI-0 --auto --primary --output LVDS-0 --auto --right-of HDMI-0 -lxpanelctl restart diff --git a/recipes-core/hdmi-hotplug/files/hdmi.sh b/recipes-core/hdmi-hotplug/files/hdmi.sh index 6a3a6dc..43c5459 100644 --- a/recipes-core/hdmi-hotplug/files/hdmi.sh +++ b/recipes-core/hdmi-hotplug/files/hdmi.sh @@ -2,5 +2,5 @@ export XAUTHORITY=/home/root/.Xauthority export DISPLAY=:0.0 -DISPLAY=:0.0 xrandr --output HDMI-1 --auto +DISPLAY=:0.0 xrandr --output HDMI-0 --auto --primary --output LVDS-0 --auto --right-of HDMI-0 lxpanelctl restart diff --git a/recipes-core/nv-conf/files/nv-conf.service b/recipes-core/nv-conf/files/nv-conf.service deleted file mode 100644 index 3226c6b..0000000 --- a/recipes-core/nv-conf/files/nv-conf.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=Enable NVIDIA T30 CPU Hot-Plugging -DefaultDependencies=no -After=sysinit.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/nv-conf.sh - -[Install] -WantedBy=sysinit.target diff --git a/recipes-core/nv-conf/files/nv-conf.sh b/recipes-core/nv-conf/files/nv-conf.sh deleted file mode 100644 index 3b34257..0000000 --- a/recipes-core/nv-conf/files/nv-conf.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# NVIDIA specific init script - -# power state -if [ -e /sys/power/state ]; then - chmod 0666 /sys/power/state -fi - -# turn off low-power core migration for now -if [ -e /sys/module/cpu_tegra3/parameters/no_lp ] ; then - echo Y > /sys/module/cpu_tegra3/parameters/no_lp -fi - -# enable CPU hot-plugging -if [ -e /sys/module/cpu_tegra3/parameters/auto_hotplug ] ; then - echo 1 > /sys/module/cpu_tegra3/parameters/auto_hotplug -fi - -# lp2 idle state -if [ -e /sys/module/cpuidle/parameters/lp2_in_idle ] ; then - echo "Y" > /sys/module/cpuidle/parameters/lp2_in_idle -fi - -exit 0 diff --git a/recipes-core/nv-conf/nv-conf-systemd.bb b/recipes-core/nv-conf/nv-conf-systemd.bb deleted file mode 100644 index 735ca0f..0000000 --- a/recipes-core/nv-conf/nv-conf-systemd.bb +++ /dev/null @@ -1,31 +0,0 @@ -SECTION = "sysinit" -SUMMARY = "NVIDIA T30 CPU hot-plug configuration and startup" -# The license is meant for this recipe and the files it installs. -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -PR = "r1" - -inherit allarch systemd - -SRC_URI = " \ - file://nv-conf.sh \ - file://nv-conf.service \ -" - -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${WORKDIR}/nv-conf.sh ${D}/${bindir}/ - - install -d ${D}${systemd_unitdir}/system/ - install -m 0644 ${WORKDIR}/nv-conf.service ${D}${systemd_unitdir}/system -} - -FILES_${PN} += " \ - ${systemd_unitdir}/system \ -" - -NATIVE_SYSTEMD_SUPPORT = "1" -SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "nv-conf.service" - diff --git a/recipes-gnome/gtk+/gtk+3_3.%.bbappend b/recipes-gnome/gtk+/gtk+3_3.%.bbappend deleted file mode 100644 index 2e6c889..0000000 --- a/recipes-gnome/gtk+/gtk+3_3.%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# The tegras don't have a wayland backend, make sure it does not get enabled. -# Otherwise we get configure error, 'No package 'wayland-egl' found' -PACKAGECONFIG_remove_tegra = "wayland" -PACKAGE_ARCH_tegra = "${MACHINE_ARCH}"
\ No newline at end of file diff --git a/recipes-graphics/mesa/mesa/apalis-tk1/0001-pkg-config-files-add-tegra-paths.patch b/recipes-graphics/mesa/mesa/0001-pkg-config-files-add-tegra-paths.patch index 0637c7f..0637c7f 100644 --- a/recipes-graphics/mesa/mesa/apalis-tk1/0001-pkg-config-files-add-tegra-paths.patch +++ b/recipes-graphics/mesa/mesa/0001-pkg-config-files-add-tegra-paths.patch diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend index 39d1dd6..25c177b 100644 --- a/recipes-graphics/mesa/mesa_%.bbappend +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -1,14 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -# tegra2, tegra3 -# we use binary only EGL, GL ES1, GL ES2 drivers (package tdx-nv-binaries) -# adapted from meta-fsl-arm/recipes-graphics/mesa/ -PACKAGECONFIG_remove_tegra = "egl gles" - -PROVIDES_remove_tegra = "virtual/libgles1 virtual/libgles2 virtual/egl" - -PACKAGE_ARCH_tegra = "${MACHINE_ARCH}" - ##### # tegra tk1 diff --git a/recipes-graphics/xorg-xserver/files/crash-hack.patch b/recipes-graphics/xorg-xserver/files/crash-hack.patch deleted file mode 100644 index 0053a10..0000000 --- a/recipes-graphics/xorg-xserver/files/crash-hack.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xorg-server-1.11.2/miext/damage/damage.c~ 2011-04-24 06:54:03.000000000 +0200 -+++ xorg-server-1.11.2/miext/damage/damage.c 2012-07-27 12:12:00.012473812 +0200 -@@ -596,6 +596,8 @@ - ScreenPtr pScreen = pDst->pDrawable->pScreen; - PictureScreenPtr ps = GetPictureScreen(pScreen); - damageScrPriv(pScreen); -+ //ugly hack, the xserver crashes when gtk programs use some fancy font rendering, this prevents this -+ maskFormat = 0; - - if (checkPictureDamage (pDst)) - { diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/apalis-t30/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/apalis-t30/xorg.conf deleted file mode 100644 index fbe1f98..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/apalis-t30/xorg.conf +++ /dev/null @@ -1,135 +0,0 @@ -# This is an optimised configuration for Xorg on the Toradex Tegra based Apalis -# and Colibri modules -# -# In order to disable unused monitor outputs, apply the Option "Ignore" "true" -# (in the monitor section). By defining a particular resolution one can choose -# a preferred mode for all monitors. However, this mode is only used if the -# monitor reports it as being supported (via EDID on DVI-D aka HDMI). -# - -# Please refer to the xorg.conf man page for more configuration -# options provided by the X server, including display-related options -# provided by RandR 1.2 and higher. - -# Disable extensions not useful on Tegra. -Section "Module" - Disable "dri" - Disable "dri2" - Disable "glx" - SubSection "extmod" - Option "omit xfree86-dga" - EndSubSection -EndSection - -Section "Device" - Identifier "Tegra" - Driver "tegra" - -# VirtualDesktop indicates which virtual desktops should be used by X. -# X will use the specified virtual desktop *and* the next one. In -# order for an external app to share a display with the X server, it -# needs to use the same virtual desktop. Valid values are integers 0 -# (default) or 1. - -# Option "VirtualDesktop" "1" - -# OverlayDepth is a 32-bit integer which is used to control overlay -# stacking order. The overlay with the lowest depth is in front of -# all others. This value has meaning only when multiple overlays are -# present on a display. - -# Option "OverlayDepth" "255" - -# OverlayCombineMode determines how the X overlay is combined with the -# overlay behind it during scanout. Available modes are: Opaque -# (default), SourceAlphaBlend, and PremultSourceAlphaBlend. This -# value has meaning only when an external process has created a -# display which is behind the X server. - -# Option "OverlayCombineMode" "PremultSourceAlphaBlend" - -# ARGBHWCursor controls whether the X driver uses an overlay to -# display 32-bit "true-color" cursors, or whether such cursors are -# emulated in software. Valid values are "true" (default) to enable -# hardware cursors, and "false" to disable them. - - Option "ARGBHWCursor" "false" - -# Use monitor section with identifier, enables explicit disabling - Option "Monitor-LVDS-1" "LVDS" - Option "Monitor-HDMI-1" "HDMI" -EndSection - -Section "ServerFlags" - - Option "DefaultServerLayout" "Default Layout" -# Set the basic blanking screen saver timeout in minutes. 0 to disable. - - Option "blank time" "0" - -# Set the DPMS timeouts. These are set here because they are global -# rather than screen-specific. These settings alone don't enable DPMS. -# It is enabled per-screen (or per-monitor), and even then only when -# the driver supports it. - - Option "standby time" "0" - Option "suspend time" "0" - Option "off time" "0" -EndSection - -Section "Monitor" - - Identifier "HDMI" - Option "Ignore" "false" - Option "DPMS" "off" - -# Default orientation -# Option "AboveOf" "LVDS" -# Option "Position" "0 0" - -# Explicitly choose a Resolution (check xrandr for available modes) -# Option "PreferredMode" "1280x720" - -EndSection - -Section "Monitor" - - Identifier "LVDS" - Option "Ignore" "false" - Option "DPMS" "off" - -# Note: It is not possible to use explicit modes here as the mode is inherited -# from the Linux framebuffer -# Check Framebuffer documentation: -# http://developer.toradex.com/knowledge-base/framebuffer-(linux) - -EndSection - -Section "Screen" -# NVIDIA uses only one screen, even in dual head mode -# the gluing logic is in the device section - - Identifier "Common Screen" - Device "Tegra" - -# This is the primary monitor - Monitor "LVDS" - - DefaultDepth 16 - -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - - Screen "Common Screen" -EndSection - -Section "InputClass" - - Identifier "Fusion 7/10" - Driver "evdev" - MatchProduct "fusion_F0710A" - MatchDevicePath "/dev/input/event*" - -EndSection diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/colibri-t20/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/colibri-t20/xorg.conf deleted file mode 100644 index fbe1f98..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/colibri-t20/xorg.conf +++ /dev/null @@ -1,135 +0,0 @@ -# This is an optimised configuration for Xorg on the Toradex Tegra based Apalis -# and Colibri modules -# -# In order to disable unused monitor outputs, apply the Option "Ignore" "true" -# (in the monitor section). By defining a particular resolution one can choose -# a preferred mode for all monitors. However, this mode is only used if the -# monitor reports it as being supported (via EDID on DVI-D aka HDMI). -# - -# Please refer to the xorg.conf man page for more configuration -# options provided by the X server, including display-related options -# provided by RandR 1.2 and higher. - -# Disable extensions not useful on Tegra. -Section "Module" - Disable "dri" - Disable "dri2" - Disable "glx" - SubSection "extmod" - Option "omit xfree86-dga" - EndSubSection -EndSection - -Section "Device" - Identifier "Tegra" - Driver "tegra" - -# VirtualDesktop indicates which virtual desktops should be used by X. -# X will use the specified virtual desktop *and* the next one. In -# order for an external app to share a display with the X server, it -# needs to use the same virtual desktop. Valid values are integers 0 -# (default) or 1. - -# Option "VirtualDesktop" "1" - -# OverlayDepth is a 32-bit integer which is used to control overlay -# stacking order. The overlay with the lowest depth is in front of -# all others. This value has meaning only when multiple overlays are -# present on a display. - -# Option "OverlayDepth" "255" - -# OverlayCombineMode determines how the X overlay is combined with the -# overlay behind it during scanout. Available modes are: Opaque -# (default), SourceAlphaBlend, and PremultSourceAlphaBlend. This -# value has meaning only when an external process has created a -# display which is behind the X server. - -# Option "OverlayCombineMode" "PremultSourceAlphaBlend" - -# ARGBHWCursor controls whether the X driver uses an overlay to -# display 32-bit "true-color" cursors, or whether such cursors are -# emulated in software. Valid values are "true" (default) to enable -# hardware cursors, and "false" to disable them. - - Option "ARGBHWCursor" "false" - -# Use monitor section with identifier, enables explicit disabling - Option "Monitor-LVDS-1" "LVDS" - Option "Monitor-HDMI-1" "HDMI" -EndSection - -Section "ServerFlags" - - Option "DefaultServerLayout" "Default Layout" -# Set the basic blanking screen saver timeout in minutes. 0 to disable. - - Option "blank time" "0" - -# Set the DPMS timeouts. These are set here because they are global -# rather than screen-specific. These settings alone don't enable DPMS. -# It is enabled per-screen (or per-monitor), and even then only when -# the driver supports it. - - Option "standby time" "0" - Option "suspend time" "0" - Option "off time" "0" -EndSection - -Section "Monitor" - - Identifier "HDMI" - Option "Ignore" "false" - Option "DPMS" "off" - -# Default orientation -# Option "AboveOf" "LVDS" -# Option "Position" "0 0" - -# Explicitly choose a Resolution (check xrandr for available modes) -# Option "PreferredMode" "1280x720" - -EndSection - -Section "Monitor" - - Identifier "LVDS" - Option "Ignore" "false" - Option "DPMS" "off" - -# Note: It is not possible to use explicit modes here as the mode is inherited -# from the Linux framebuffer -# Check Framebuffer documentation: -# http://developer.toradex.com/knowledge-base/framebuffer-(linux) - -EndSection - -Section "Screen" -# NVIDIA uses only one screen, even in dual head mode -# the gluing logic is in the device section - - Identifier "Common Screen" - Device "Tegra" - -# This is the primary monitor - Monitor "LVDS" - - DefaultDepth 16 - -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - - Screen "Common Screen" -EndSection - -Section "InputClass" - - Identifier "Fusion 7/10" - Driver "evdev" - MatchProduct "fusion_F0710A" - MatchDevicePath "/dev/input/event*" - -EndSection diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/colibri-t30/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/colibri-t30/xorg.conf deleted file mode 100644 index fbe1f98..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/colibri-t30/xorg.conf +++ /dev/null @@ -1,135 +0,0 @@ -# This is an optimised configuration for Xorg on the Toradex Tegra based Apalis -# and Colibri modules -# -# In order to disable unused monitor outputs, apply the Option "Ignore" "true" -# (in the monitor section). By defining a particular resolution one can choose -# a preferred mode for all monitors. However, this mode is only used if the -# monitor reports it as being supported (via EDID on DVI-D aka HDMI). -# - -# Please refer to the xorg.conf man page for more configuration -# options provided by the X server, including display-related options -# provided by RandR 1.2 and higher. - -# Disable extensions not useful on Tegra. -Section "Module" - Disable "dri" - Disable "dri2" - Disable "glx" - SubSection "extmod" - Option "omit xfree86-dga" - EndSubSection -EndSection - -Section "Device" - Identifier "Tegra" - Driver "tegra" - -# VirtualDesktop indicates which virtual desktops should be used by X. -# X will use the specified virtual desktop *and* the next one. In -# order for an external app to share a display with the X server, it -# needs to use the same virtual desktop. Valid values are integers 0 -# (default) or 1. - -# Option "VirtualDesktop" "1" - -# OverlayDepth is a 32-bit integer which is used to control overlay -# stacking order. The overlay with the lowest depth is in front of -# all others. This value has meaning only when multiple overlays are -# present on a display. - -# Option "OverlayDepth" "255" - -# OverlayCombineMode determines how the X overlay is combined with the -# overlay behind it during scanout. Available modes are: Opaque -# (default), SourceAlphaBlend, and PremultSourceAlphaBlend. This -# value has meaning only when an external process has created a -# display which is behind the X server. - -# Option "OverlayCombineMode" "PremultSourceAlphaBlend" - -# ARGBHWCursor controls whether the X driver uses an overlay to -# display 32-bit "true-color" cursors, or whether such cursors are -# emulated in software. Valid values are "true" (default) to enable -# hardware cursors, and "false" to disable them. - - Option "ARGBHWCursor" "false" - -# Use monitor section with identifier, enables explicit disabling - Option "Monitor-LVDS-1" "LVDS" - Option "Monitor-HDMI-1" "HDMI" -EndSection - -Section "ServerFlags" - - Option "DefaultServerLayout" "Default Layout" -# Set the basic blanking screen saver timeout in minutes. 0 to disable. - - Option "blank time" "0" - -# Set the DPMS timeouts. These are set here because they are global -# rather than screen-specific. These settings alone don't enable DPMS. -# It is enabled per-screen (or per-monitor), and even then only when -# the driver supports it. - - Option "standby time" "0" - Option "suspend time" "0" - Option "off time" "0" -EndSection - -Section "Monitor" - - Identifier "HDMI" - Option "Ignore" "false" - Option "DPMS" "off" - -# Default orientation -# Option "AboveOf" "LVDS" -# Option "Position" "0 0" - -# Explicitly choose a Resolution (check xrandr for available modes) -# Option "PreferredMode" "1280x720" - -EndSection - -Section "Monitor" - - Identifier "LVDS" - Option "Ignore" "false" - Option "DPMS" "off" - -# Note: It is not possible to use explicit modes here as the mode is inherited -# from the Linux framebuffer -# Check Framebuffer documentation: -# http://developer.toradex.com/knowledge-base/framebuffer-(linux) - -EndSection - -Section "Screen" -# NVIDIA uses only one screen, even in dual head mode -# the gluing logic is in the device section - - Identifier "Common Screen" - Device "Tegra" - -# This is the primary monitor - Monitor "LVDS" - - DefaultDepth 16 - -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - - Screen "Common Screen" -EndSection - -Section "InputClass" - - Identifier "Fusion 7/10" - Driver "evdev" - MatchProduct "fusion_F0710A" - MatchDevicePath "/dev/input/event*" - -EndSection diff --git a/recipes-graphics/xorg-xserver/xserver-xorg-1.14.7.inc b/recipes-graphics/xorg-xserver/xserver-xorg-1.14.7.inc deleted file mode 100644 index 6b46d9f..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg-1.14.7.inc +++ /dev/null @@ -1,163 +0,0 @@ -SUMMARY = "The X.Org X server" -HOMEPAGE = "http://www.x.org" -SECTION = "x11/base" -LICENSE = "MIT-X" -LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13" - -# xf86-*-* packages depend on an X server built with the xfree86 DDX -# so we have a virtual to represent that: -# deprecated, we should use virtual/xserver instead -PROVIDES = "virtual/xserver-xf86" - -# Other packages tend to just care that there is *an* X server: -PROVIDES += "virtual/xserver" - -PE = "2" -INC_PR = "r8" - -XORG_PN = "xorg-server" -SRC_URI = " \ - ${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ - file://macro_tweak.patch \ -" - -S = "${WORKDIR}/${XORG_PN}-${PV}" - -inherit autotools pkgconfig - -inherit distro_features_check -REQUIRED_DISTRO_FEATURES = "x11" - -PROTO_DEPS = "xorgproto" -LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt nettle" -DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" - -# Split out some modules and extensions from the main package -# These aren't needed for basic operations and only take up space: -# 32.0k libdri.so -# 91.0k libexa.so -# 336.0k libglx.so -# 1360k libint10.so -# 180.0k libwfb.so -# 320.0k libxaa.so -# 124.0k libxf1bpp.so -# 84.0k libxf4bpp.so -# librecord.so -# libextmod.so -# libdbe.so - -PACKAGES =+ "${PN}-security-policy \ - ${PN}-sdl \ - ${PN}-fbdev \ - ${PN}-xvfb \ - ${PN}-utils \ - ${PN}-xephyr \ - ${PN}-multimedia-modules \ - ${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-glx \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - ${PN}-module-libint10 \ - ${PN}-module-libafb \ - ${PN}-module-libwfb \ - ${PN}-module-libmfb \ - ${PN}-module-libcfb \ - ${PN}-module-exa \ - ${PN}-module-xaa \ - ${PN}-module-libxf1bpp \ - ${PN}-module-libxf4bpp" - -RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" -RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" - -FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" -FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" -FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" -FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ - ${libdir}/xorg/modules/*/.debug \ - ${libdir}/xorg/modules/*/*/.debug \ - " -FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" -FILES_${PN}-sdl = "${bindir}/Xsdl" -FILES_${PN}-fbdev = "${bindir}/Xfbdev" -FILES_${PN}-xvfb = "${bindir}/Xvfb" -FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" -FILES_${PN}-xephyr = "${bindir}/Xephyr" -FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" -FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" -FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" -FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so" -FILES_${PN}-extension-record = "${libdir}/xorg/modules/extensions/librecord.so" -FILES_${PN}-extension-extmod = "${libdir}/xorg/modules/extensions/libextmod.so" -FILES_${PN}-extension-dbe = "${libdir}/xorg/modules/extensions/libdbe.so" -FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so" -FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so" -FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so" -FILES_${PN}-module-libmfb = "${libdir}/xorg/modules/libmfb.so" -FILES_${PN}-module-libcfb = "${libdir}/xorg/modules/libcfb.so" -FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so" -FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so" -FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so" -FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so" - -EXTRA_OECONF += "--with-fop=no \ - --without-xmlto \ - --with-pic \ - --disable-static \ - --disable-xinerama \ - --disable-record \ - --disable-dmx \ - --disable-xnest \ - --enable-xvfb \ - --enable-composite \ - --without-dtrace \ - --with-int10=x86emu \ - --sysconfdir=/etc/X11 \ - --localstatedir=/var \ - --with-xkb-output=/var/lib/xkb \ - ac_cv_file__usr_share_sgml_X11_defs_ent=no \ -" - -PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" -PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xorgproto virtual/mesa xorgproto" -PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,xorgproto" -PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,xorgproto virtual/libgl virtual/libx11" - -# for T20/T30 we don't want xinerama -PACKAGECONFIG_remove = "xinerama" - -do_install_append () { - # Its assumed base-files creates this for us - rmdir ${D}${localstatedir}/log/ -} - -# Add runtime provides for the ABI versions of the video and input subsystems, -# so that drivers can depend on the relevant version. -python populate_packages_prepend() { - import subprocess - - # Set PKG_CONFIG_PATH so pkg-config looks at the .pc files that are going - # into the new package, not the staged ones. - newenv = dict(os.environ) - newenv["PKG_CONFIG_PATH"] = d.expand("${PKGD}${libdir}/pkgconfig/") - - def get_abi(name): - abis = { - "video": "abi_videodrv", - "input": "abi_xinput" - } - p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name], - shell=True, env=newenv, stdout=subprocess.PIPE) - stdout, stderr = p.communicate() - output = stdout.decode("utf-8").split(".")[0] - mlprefix = d.getVar('MLPREFIX', True) or '' - return "%sxorg-abi-%s-%s" % (mlprefix, name, output) - - pn = d.getVar("PN", True) - d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) - d.appendVar("RPROVIDES_" + pn, " " + get_abi("video")) -} diff --git a/recipes-graphics/xorg-xserver/xserver-xorg-1.14.7/Revert_Use_new_pixman_glyph_cache_t_API_that_will_be_in_pixman0.28.0.patch b/recipes-graphics/xorg-xserver/xserver-xorg-1.14.7/Revert_Use_new_pixman_glyph_cache_t_API_that_will_be_in_pixman0.28.0.patch deleted file mode 100644 index 8c7c0ca..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg-1.14.7/Revert_Use_new_pixman_glyph_cache_t_API_that_will_be_in_pixman0.28.0.patch +++ /dev/null @@ -1,268 +0,0 @@ -This patch has issues with the tegra xdriver: -Some text, i.e the lxpanel clock, lxterminal terminal content is not visible. -Tested with libpixman 0.29.2, 0.30.0 -Revert: -From 9cbcb5bd6a5360a128d15b77a02d8d3351f74366 Mon Sep 17 00:00:00 2001 -From: Søren Sandmann Pedersen <ssp@redhat.com> -Date: Wed, 30 May 2012 09:19:08 +0000 -Subject: Use new pixman_glyph_cache_t API that will be in pixman 0.28.0 - -This new API allows glyphs to be cached in a data structure in pixman, -and entire glyph strings to be composited in one go. - -Also bump pixman dependency to 0.27.2. - -Results from the cairo peformance test suite running against Xvfb with -a screen size of 1680x1050@32bpp: - -Speedups -======== - xlib firefox-talos-gfx 12416.63 -> 3603.93 3.45x speedup -██▌ - xlib xfce4-terminal-a1 1727.57 -> 1048.85: 1.65x speedup -▋ - xlib evolution 1370.49 -> 869.34: 1.58x speedup -▋ - xlib gnome-terminal-vim 1832.83 -> 1251.94: 1.46x speedup -▌ - xlib poppler 1519.70 -> 1204.05: 1.26x speedup -▎ - xlib firefox-planet-gnome 6982.55 -> 5598.16: 1.25x speedup -▎ - xlib ocitysmap 1142.77 -> 1071.53: 1.07x speedup -▏ - -No slowdowns were reported. - -Results of x11perf -aa10text: - -Before: - - 8000000 reps @ 0.0007 msec (1450000.0/sec) - 8000000 reps @ 0.0007 msec (1460000.0/sec) - 8000000 reps @ 0.0007 msec (1460000.0/sec) - 8000000 reps @ 0.0007 msec (1470000.0/sec) - 8000000 reps @ 0.0007 msec (1480000.0/sec) - 40000000 trep @ 0.0007 msec (1460000.0/sec) - -After: - - 32000000 reps @ 0.0002 msec (4910000.0/sec) - 32000000 reps @ 0.0002 msec (4830000.0/sec) - 32000000 reps @ 0.0002 msec (4890000.0/sec) - 32000000 reps @ 0.0002 msec (4830000.0/sec) - 32000000 reps @ 0.0002 msec (4900000.0/sec) - 160000000 trep @ 0.0002 msec (4870000.0/sec) - -Version 2: Destroy the glyph cache at server regen time - -Acked-by: Aaron Plattner <aplattner@nvidia.com> -Reviewed-by: Keith Packard <keithp@keithp.com> -Signed-off-by: Soren Sandmann <ssp@redhat.com> - -diff -Naur xorg-server-1.14.0.orig/configure.ac xorg-server-1.14.0/configure.ac ---- xorg-server-1.14.0.orig/configure.ac 2013-07-20 00:33:38.501103192 +0200 -+++ xorg-server-1.14.0/configure.ac 2013-07-21 10:31:15.420487572 +0200 -@@ -807,7 +807,7 @@ - LIBUDEV="libudev >= 143" - LIBSELINUX="libselinux >= 2.0.86" - LIBDBUS="dbus-1 >= 1.0" --LIBPIXMAN="pixman-1 >= 0.27.2" -+LIBPIXMAN="pixman-1 >= 0.21.8" - - dnl Pixman is always required, but we separate it out so we can link - dnl specific modules against it -diff -Naur xorg-server-1.14.0.orig/fb/fb.h xorg-server-1.14.0/fb/fb.h ---- xorg-server-1.14.0.orig/fb/fb.h 2012-10-27 03:04:34.000000000 +0200 -+++ xorg-server-1.14.0/fb/fb.h 2013-07-21 10:31:15.421487572 +0200 -@@ -1344,9 +1344,6 @@ - extern _X_EXPORT Bool - fbPictureInit(ScreenPtr pScreen, PictFormatPtr formats, int nformats); - --extern _X_EXPORT void --fbDestroyGlyphCache(void); -- - /* - * fbpixmap.c - */ -diff -Naur xorg-server-1.14.0.orig/fb/fbpict.c xorg-server-1.14.0/fb/fbpict.c ---- xorg-server-1.14.0.orig/fb/fbpict.c 2012-10-27 03:04:34.000000000 +0200 -+++ xorg-server-1.14.0/fb/fbpict.c 2013-07-21 10:31:15.421487572 +0200 -@@ -70,156 +70,6 @@ - free_pixman_pict(pDst, dest); - } - --static pixman_glyph_cache_t *glyphCache; -- --void --fbDestroyGlyphCache(void) --{ -- if (glyphCache) -- { -- pixman_glyph_cache_destroy (glyphCache); -- glyphCache = NULL; -- } --} -- --static void --fbUnrealizeGlyph(ScreenPtr pScreen, -- GlyphPtr pGlyph) --{ -- if (glyphCache) -- pixman_glyph_cache_remove (glyphCache, pGlyph, NULL); --} -- --static void --fbGlyphs(CARD8 op, -- PicturePtr pSrc, -- PicturePtr pDst, -- PictFormatPtr maskFormat, -- INT16 xSrc, -- INT16 ySrc, int nlist, -- GlyphListPtr list, -- GlyphPtr *glyphs) --{ --#define N_STACK_GLYPHS 512 -- ScreenPtr pScreen = pDst->pDrawable->pScreen; -- pixman_glyph_t stack_glyphs[N_STACK_GLYPHS]; -- pixman_glyph_t *pglyphs = stack_glyphs; -- pixman_image_t *srcImage, *dstImage; -- int srcXoff, srcYoff, dstXoff, dstYoff; -- GlyphPtr glyph; -- int n_glyphs; -- int x, y; -- int i, n; -- int xDst = list->xOff, yDst = list->yOff; -- -- miCompositeSourceValidate(pSrc); -- -- n_glyphs = 0; -- for (i = 0; i < nlist; ++i) -- n_glyphs += list[i].len; -- -- if (!glyphCache) -- glyphCache = pixman_glyph_cache_create(); -- -- pixman_glyph_cache_freeze (glyphCache); -- -- if (n_glyphs > N_STACK_GLYPHS) { -- if (!(pglyphs = malloc (n_glyphs * sizeof (pixman_glyph_t)))) -- goto out; -- } -- -- i = 0; -- x = y = 0; -- while (nlist--) { -- x += list->xOff; -- y += list->yOff; -- n = list->len; -- while (n--) { -- const void *g; -- -- glyph = *glyphs++; -- -- if (!(g = pixman_glyph_cache_lookup (glyphCache, glyph, NULL))) { -- pixman_image_t *glyphImage; -- PicturePtr pPicture; -- int xoff, yoff; -- -- pPicture = GetGlyphPicture(glyph, pScreen); -- if (!pPicture) { -- n_glyphs--; -- goto next; -- } -- -- if (!(glyphImage = image_from_pict(pPicture, FALSE, &xoff, &yoff))) -- goto out; -- -- g = pixman_glyph_cache_insert(glyphCache, glyph, NULL, -- glyph->info.x, -- glyph->info.y, -- glyphImage); -- -- free_pixman_pict(pPicture, glyphImage); -- -- if (!g) -- goto out; -- } -- -- pglyphs[i].x = x; -- pglyphs[i].y = y; -- pglyphs[i].glyph = g; -- i++; -- -- next: -- x += glyph->info.xOff; -- y += glyph->info.yOff; -- } -- list++; -- } -- -- if (!(srcImage = image_from_pict(pSrc, FALSE, &srcXoff, &srcYoff))) -- goto out; -- -- if (!(dstImage = image_from_pict(pDst, TRUE, &dstXoff, &dstYoff))) -- goto out_free_src; -- -- if (maskFormat) { -- pixman_format_code_t format; -- pixman_box32_t extents; -- int x, y; -- -- format = maskFormat->format | (maskFormat->depth << 24); -- -- pixman_glyph_get_extents(glyphCache, n_glyphs, pglyphs, &extents); -- -- x = extents.x1; -- y = extents.y1; -- -- pixman_composite_glyphs(op, srcImage, dstImage, format, -- xSrc + srcXoff + xDst, ySrc + srcYoff + yDst, -- x, y, -- x + dstXoff, y + dstYoff, -- extents.x2 - extents.x1, -- extents.y2 - extents.y1, -- glyphCache, n_glyphs, pglyphs); -- } -- else { -- pixman_composite_glyphs_no_mask(op, srcImage, dstImage, -- xSrc + srcXoff - xDst, ySrc + srcYoff - yDst, -- dstXoff, dstYoff, -- glyphCache, n_glyphs, pglyphs); -- } -- -- free_pixman_pict(pDst, dstImage); -- --out_free_src: -- free_pixman_pict(pSrc, srcImage); -- --out: -- pixman_glyph_cache_thaw(glyphCache); -- if (pglyphs != stack_glyphs) -- free(pglyphs); --} -- - static pixman_image_t * - create_solid_fill_image(PicturePtr pict) - { -@@ -507,8 +357,7 @@ - return FALSE; - ps = GetPictureScreen(pScreen); - ps->Composite = fbComposite; -- ps->Glyphs = fbGlyphs; -- ps->UnrealizeGlyph = fbUnrealizeGlyph; -+ ps->Glyphs = miGlyphs; - ps->CompositeRects = miCompositeRects; - ps->RasterizeTrapezoid = fbRasterizeTrapezoid; - ps->Trapezoids = fbTrapezoids; -diff -Naur xorg-server-1.14.0.orig/fb/fbscreen.c xorg-server-1.14.0/fb/fbscreen.c ---- xorg-server-1.14.0.orig/fb/fbscreen.c 2012-10-27 03:04:34.000000000 +0200 -+++ xorg-server-1.14.0/fb/fbscreen.c 2013-07-21 10:31:15.421487572 +0200 -@@ -32,7 +32,6 @@ - int d; - DepthPtr depths = pScreen->allowedDepths; - -- fbDestroyGlyphCache(); - for (d = 0; d < pScreen->numDepths; d++) - free(depths[d].vids); - free(depths); diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch b/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch deleted file mode 100644 index 9c9f595..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch +++ /dev/null @@ -1,48 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 -From: Egbert Eich <eich@freedesktop.org> -Date: Tue, 3 Mar 2015 16:27:05 +0100 -Subject: symbols: Fix sdksyms.sh to cope with gcc5 - -Gcc5 adds additional lines stating line numbers before and -after __attribute__() which need to be skipped. - -Signed-off-by: Egbert Eich <eich@freedesktop.org> -Tested-by: Daniel Stone <daniels@collabora.com> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh -index 2305073..05ac410 100755 ---- a/hw/xfree86/sdksyms.sh -+++ b/hw/xfree86/sdksyms.sh -@@ -350,13 +350,25 @@ BEGIN { - if (sdk) { - n = 3; - -+ # skip line numbers GCC 5 adds before __attribute__ -+ while ($n == "" || $0 ~ /^# [0-9]+ "/) { -+ getline; -+ n = 1; -+ } -+ - # skip attribute, if any - while ($n ~ /^(__attribute__|__global)/ || - # skip modifiers, if any - $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || - # skip pointer -- $n ~ /^[a-zA-Z0-9_]*\*$/) -+ $n ~ /^[a-zA-Z0-9_]*\*$/) { - n++; -+ # skip line numbers GCC 5 adds after __attribute__ -+ while ($n == "" || $0 ~ /^# [0-9]+ "/) { -+ getline; -+ n = 1; -+ } -+ } - - # type specifier may not be set, as in - # extern _X_EXPORT unsigned name(...) --- -cgit v0.10.2 diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch b/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch deleted file mode 100644 index 045e24a..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/aarch64.patch +++ /dev/null @@ -1,35 +0,0 @@ -Subject: Add AArch64 support to xserver-xorg -Author: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> - -lnx_video.c parts are not existing in 1.14 branch. - -Xserver was checked in AArch64 fastmodel (commercial one with graphics support). - -http://patchwork.freedesktop.org/patch/12785/ - -Upstream-Status: Pending - ---- - include/servermd.h | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - ---- xorg-server-1.13.1.orig/include/servermd.h -+++ xorg-server-1.13.1/include/servermd.h -@@ -243,10 +243,17 @@ SOFTWARE. - #define BITMAP_BIT_ORDER LSBFirst - #define GLYPHPADBYTES 4 - /* ???? */ - #endif /* AMD64 */ - -+#if defined(__aarch64__) || defined(aarch64) || defined(__aarch64) -+#define IMAGE_BYTE_ORDER MSBFirst -+#define BITMAP_BIT_ORDER MSBFirst -+#define GLYPHPADBYTES 4 -+/* ???? */ -+#endif /* AArch64 */ -+ - #if defined(SVR4) && (defined(__i386__) || defined(__i386) ) || \ - defined(__alpha__) || defined(__alpha) || \ - defined(__i386__) || \ - defined(__s390x__) || defined(__s390__) - diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch deleted file mode 100644 index 2f98bb8..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff --git a/configure.ac b/configure.ac -index b3b752c..600500b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, - dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross - dnl compiling, assume default font path uses standard FONTROOTDIR directories. - DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" --if test "$cross_compiling" != yes; then -- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], -- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], -- [case $host_os in -+ case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; -- esac]) --fi -+ esac - AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), - [ FONTPATH="$withval" ], - [ FONTPATH="${DEFAULT_FONT_PATH}" ]) diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch b/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch deleted file mode 100644 index 2f62972..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/fix_open_max_preprocessor_error.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Index: git/os/osdep.h -=================================================================== ---- git.orig/os/osdep.h 2008-10-07 18:38:21.000000000 +0100 -+++ git/os/osdep.h 2008-10-07 18:39:36.000000000 +0100 -@@ -92,7 +92,7 @@ - * like sysconf(_SC_OPEN_MAX) is not supported. - */ - --#if OPEN_MAX <= 256 -+#if 0 - #define MAXSOCKS (OPEN_MAX - 1) - #else - #define MAXSOCKS 256 diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch deleted file mode 100644 index dcae0b5..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch +++ /dev/null @@ -1,25 +0,0 @@ -This is the revised version of files/macro_tweak.patch for -xorg-server 1.8.99.904 and newer. - -Upstream-Status: Pending - -Signed-off-by: Yu Ke <ke.yu@intel.com> - -diff --git a/xorg-server.m4 b/xorg-server.m4 -index bdecf62..040fdb8 100644 ---- a/xorg-server.m4 -+++ b/xorg-server.m4 -@@ -28,10 +28,12 @@ dnl - # Checks for the MACRO define in xorg-server.h (from the sdk). If it - # is defined, then add the given PROTO to $REQUIRED_MODULES. - -+m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) -+ - AC_DEFUN([XORG_DRIVER_CHECK_EXT],[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS -I`$PKG_CONFIG --variable=sdkdir xorg-server`" -+ CFLAGS="$CFLAGS -I$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=sdkdir xorg-server`" - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #include "xorg-server.h" - #if !defined $1 diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch b/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch deleted file mode 100644 index 168368e..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch +++ /dev/null @@ -1,29 +0,0 @@ -on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well -so we end up with incompatible conversion errors - -This patch choses the right values for mips64 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h -=================================================================== ---- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300 -+++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200 -@@ -101,6 +101,7 @@ - #if defined(NO_INLINE) || defined(DO_PROTOTYPES) - #if !defined(__arm__) - #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ -+ && !defined(__mips64) \ - && !(defined(__alpha__) && defined(linux)) \ - && !(defined(__ia64__) && defined(linux)) \ - -@@ -721,7 +722,7 @@ - } - - #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) --#ifdef __arm32__ -+#if defined (__arm32__) || defined (__mips64) - #define PORT_SIZE long - #else - #define PORT_SIZE short diff --git a/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch b/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch deleted file mode 100644 index 7c61530..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg/xorg-CVE-2013-6424.patch +++ /dev/null @@ -1,31 +0,0 @@ -This patch comes from: -http://lists.x.org/archives/xorg-devel/2013-October/037996.html - -Upstream-Status: Backport - -Signed-off-by: Baogen shang <baogen.shang@windriver.com> -diff -Naur xorg-server-1.14.0-orig/exa/exa_render.c xorg-server-1.14.0/exa/exa_render.c ---- xorg-server-1.14.0-orig/exa/exa_render.c 2014-02-27 14:32:38.000000000 +0800 -+++ xorg-server-1.14.0/exa/exa_render.c 2014-02-27 15:46:59.000000000 +0800 -@@ -1141,7 +1141,8 @@ - - exaPrepareAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - for (; ntrap; ntrap--, traps++) -- (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); -+ if (xTrapezoidValid(traps)) -+ (*ps->RasterizeTrapezoid) (pPicture, traps, -bounds.x1, -bounds.y1); - exaFinishAccess(pPicture->pDrawable, EXA_PREPARE_DEST); - - xRel = bounds.x1 + xSrc - xDst; -diff -Naur xorg-server-1.14.0-orig/render/picture.h xorg-server-1.14.0/render/picture.h ---- xorg-server-1.14.0-orig/render/picture.h 2014-02-27 14:32:26.000000000 +0800 -+++ xorg-server-1.14.0/render/picture.h 2014-02-27 15:48:13.000000000 +0800 -@@ -211,7 +211,7 @@ - /* whether 't' is a well defined not obviously empty trapezoid */ - #define xTrapezoidValid(t) ((t)->left.p1.y != (t)->left.p2.y && \ - (t)->right.p1.y != (t)->right.p2.y && \ -- (int) ((t)->bottom - (t)->top) > 0) -+ ((t)->bottom > (t)->top)) - - /* - * Standard NTSC luminance conversions: diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb b/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb deleted file mode 100644 index d7ffd7b..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.14.7.bb +++ /dev/null @@ -1,56 +0,0 @@ -require recipes-graphics/xorg-xserver/xserver-xorg-1.14.7.inc - -COMPATIBLE_MACHINE = "(tegra2|tegra3)" - -LIC_FILES_CHKSUM = "file://COPYING;md5=bc098b9774ed096943f6c37b5beeef13" - -# Misc build failure for master HEAD -SRC_URI += "\ - file://crosscompile.patch \ - file://fix_open_max_preprocessor_error.patch \ - file://mips64-compiler.patch \ - file://aarch64.patch \ - file://xorg-CVE-2013-6424.patch \ - file://0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch \ -" -SRC_URI_append_tegra = " file://Revert_Use_new_pixman_glyph_cache_t_API_that_will_be_in_pixman0.28.0.patch" - -SRC_URI[md5sum] = "0c285a813a6c3291c88d5a2b710aecb1" -SRC_URI[sha256sum] = "fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f" - -# HACK: during do_rootfs opkg takes the latest and greatest available -# in any feed, e.g. one built for another machine without prefered version -# rather than what PREFERRED_VERSION puts in the MACHINE_ARCH feed -# so we set the recipe epoch here. Thus for our architecture we're -# always latest and greatest. -PE_tegra = "99" -PROVIDES_${PN} = "virtual/xserver" - -PACKAGE_ARCH_tegra = "${MACHINE_ARCH}" - -# These extensions are now integrated into the server, so declare the migration -# path for in-place upgrades. - -RREPLACES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RPROVIDES_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " -RCONFLICTS_${PN} = "${PN}-extension-dri \ - ${PN}-extension-dri2 \ - ${PN}-extension-record \ - ${PN}-extension-extmod \ - ${PN}-extension-dbe \ - " - -# provided by xf86-input-evdev_2.10.0 -do_install_append () { - rm -f ${D}/usr/share/X11/xorg.conf.d/10-evdev.conf -}
\ No newline at end of file diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend index 2c5dd09..e33bf18 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_1.20%.bbappend @@ -5,4 +5,4 @@ PACKAGE_ARCH_tegra124m = "${MACHINE_ARCH}" COMPATIBLE_MACHINE_tegra124m = "(apalis-tk1-mainline)" -PACKAGECONFIG_tegra124m ?= "dri2 dri3 xshmfence glamor xwayland udev ${XORG_CRYPTO} " +PACKAGECONFIG_tegra124m ?= "dri2 dri3 xshmfence glamor glx xwayland udev ${XORG_CRYPTO} " diff --git a/recipes-kernel/linux/files/full-hd.patch b/recipes-kernel/linux/files/full-hd.patch deleted file mode 100644 index 41eab7d..0000000 --- a/recipes-kernel/linux/files/full-hd.patch +++ /dev/null @@ -1,203 +0,0 @@ -diff --git a/arch/arm/mach-tegra/board-apalis_t30-panel.c b/arch/arm/mach-tegra/board-apalis_t30-panel.c -index f8f0672..5d4af1f 100644 ---- a/arch/arm/mach-tegra/board-apalis_t30-panel.c -+++ b/arch/arm/mach-tegra/board-apalis_t30-panel.c -@@ -260,6 +260,7 @@ static struct tegra_dc_mode apalis_t30_panel_modes[] = { - .v_front_porch = 10, /* lower_margin */ - }, - #else /* TEGRA_FB_VGA */ -+#if 0 - { - /* 800x480@60 (e.g. EDT ET070080DH6) */ - .pclk = 32460000, -@@ -410,6 +411,7 @@ static struct tegra_dc_mode apalis_t30_panel_modes[] = { - .v_front_porch = 1, - //high active vertical sync polarity - }, -+#endif - { - /* LG LP156WF1 15.6 inch full HD dual channel LVDS panel */ - .pclk = 138500000, -@@ -503,8 +505,8 @@ static struct tegra_fb_data apalis_t30_fb_data = { - .xres = 640, - .yres = 480, - #else /* TEGRA_FB_VGA */ -- .xres = 800, -- .yres = 480, -+ .xres = 1920, -+ .yres = 1080, - #endif /* TEGRA_FB_VGA */ - .bits_per_pixel = 16, - .flags = TEGRA_FB_FLIP_ON_PROBE, -@@ -512,8 +514,8 @@ static struct tegra_fb_data apalis_t30_fb_data = { - - static struct tegra_fb_data apalis_t30_hdmi_fb_data = { - .win = 0, -- .xres = 640, -- .yres = 480, -+ .xres = 1920, -+ .yres = 1080, - .bits_per_pixel = 16, - .flags = TEGRA_FB_FLIP_ON_PROBE, - }; -diff --git a/arch/arm/mach-tegra/board-apalis_t30.h b/arch/arm/mach-tegra/board-apalis_t30.h -index 38a86f6..e12ee96 100644 ---- a/arch/arm/mach-tegra/board-apalis_t30.h -+++ b/arch/arm/mach-tegra/board-apalis_t30.h -@@ -125,7 +125,7 @@ - #define TDIODE_OFFSET (10000) /* in millicelsius */ - - /* Run framebuffer in VGA mode */ --#define TEGRA_FB_VGA -+//#define TEGRA_FB_VGA - - int apalis_t30_regulator_init(void); - int apalis_t30_suspend_init(void); -diff --git a/arch/arm/mach-tegra/board-colibri_t20-panel.c b/arch/arm/mach-tegra/board-colibri_t20-panel.c -index 6d7ec83..f393b3b 100644 ---- a/arch/arm/mach-tegra/board-colibri_t20-panel.c -+++ b/arch/arm/mach-tegra/board-colibri_t20-panel.c -@@ -224,6 +224,7 @@ static struct tegra_dc_mode colibri_t20_panel_modes[] = { - .v_front_porch = 10, /* lower_margin */ - }, - #else /* TEGRA_FB_VGA */ -+#if 0 - #ifndef CONFIG_ANDROID - { - /* 800x480@60 (e.g. EDT ET070080DH6) */ -@@ -355,6 +356,7 @@ static struct tegra_dc_mode colibri_t20_panel_modes[] = { - .v_front_porch = 1, - //high active vertical sync polarity - }, -+#endif - { - /* 1920x1080p 59.94/60hz EIA/CEA-861-B Format 16 */ - .pclk = 144000000, -@@ -439,8 +441,8 @@ static struct tegra_fb_data colibri_t20_fb_data = { - .yres = 480, - #else /* TEGRA_FB_VGA */ - #ifndef CONFIG_ANDROID -- .xres = 800, -- .yres = 480, -+ .xres = 1920, -+ .yres = 1080, - #else /* CONFIG_ANDROID */ - .xres = 1280, - .yres = 720, -@@ -452,8 +454,8 @@ static struct tegra_fb_data colibri_t20_fb_data = { - - static struct tegra_fb_data colibri_t20_hdmi_fb_data = { - .win = 0, -- .xres = 640, -- .yres = 480, -+ .xres = 1920, -+ .yres = 1080, - .bits_per_pixel = 16, - .flags = TEGRA_FB_FLIP_ON_PROBE, - }; -@@ -461,15 +463,15 @@ static struct tegra_fb_data colibri_t20_hdmi_fb_data = { - static struct tegra_dc_out_pin colibri_t20_dc_out_pins[] = { - { - .name = TEGRA_DC_OUT_PIN_H_SYNC, -- .pol = TEGRA_DC_OUT_PIN_POL_LOW, -+ .pol = TEGRA_DC_OUT_PIN_POL_HIGH, - }, - { - .name = TEGRA_DC_OUT_PIN_V_SYNC, -- .pol = TEGRA_DC_OUT_PIN_POL_LOW, -+ .pol = TEGRA_DC_OUT_PIN_POL_HIGH, - }, - { - .name = TEGRA_DC_OUT_PIN_PIXEL_CLOCK, -- .pol = TEGRA_DC_OUT_PIN_POL_LOW, -+ .pol = TEGRA_DC_OUT_PIN_POL_HIGH, - }, - }; - -diff --git a/arch/arm/mach-tegra/board-colibri_t20.h b/arch/arm/mach-tegra/board-colibri_t20.h -index b6b5e6a..8e82626 100644 ---- a/arch/arm/mach-tegra/board-colibri_t20.h -+++ b/arch/arm/mach-tegra/board-colibri_t20.h -@@ -41,7 +41,7 @@ - - /* Run framebuffer in VGA mode */ - #ifndef CONFIG_ANDROID --#define TEGRA_FB_VGA -+//#define TEGRA_FB_VGA - #endif - - int colibri_t20_emc_init(void); -diff --git a/arch/arm/mach-tegra/board-colibri_t30-panel.c b/arch/arm/mach-tegra/board-colibri_t30-panel.c -index ee74874..c08241e 100644 ---- a/arch/arm/mach-tegra/board-colibri_t30-panel.c -+++ b/arch/arm/mach-tegra/board-colibri_t30-panel.c -@@ -263,6 +263,7 @@ static struct tegra_dc_mode colibri_t30_panel_modes[] = { - .v_front_porch = 10, /* lower_margin */ - }, - #else /* TEGRA_FB_VGA */ -+#if 0 - { - /* 800x480@60 (e.g. EDT ET070080DH6) */ - .pclk = 32460000, -@@ -400,6 +401,7 @@ static struct tegra_dc_mode colibri_t30_panel_modes[] = { - .v_front_porch = 1, - //high active vertical sync polarity - }, -+#endif - { - /* 1920x1080p 59.94/60hz EIA/CEA-861-B Format 16 */ - .pclk = 148500000, -@@ -480,8 +482,8 @@ static struct tegra_fb_data colibri_t30_fb_data = { - .xres = 640, - .yres = 480, - #else /* TEGRA_FB_VGA */ -- .xres = 800, -- .yres = 480, -+ .xres = 1920, -+ .yres = 1080, - #endif /* TEGRA_FB_VGA */ - .bits_per_pixel = 16, - .flags = TEGRA_FB_FLIP_ON_PROBE, -@@ -489,8 +491,8 @@ static struct tegra_fb_data colibri_t30_fb_data = { - - static struct tegra_fb_data colibri_t30_hdmi_fb_data = { - .win = 0, -- .xres = 640, -- .yres = 480, -+ .xres = 1920, -+ .yres = 1080, - .bits_per_pixel = 16, - .flags = TEGRA_FB_FLIP_ON_PROBE, - }; -@@ -498,15 +500,15 @@ static struct tegra_fb_data colibri_t30_hdmi_fb_data = { - static struct tegra_dc_out_pin colibri_t30_dc_out_pins[] = { - { - .name = TEGRA_DC_OUT_PIN_H_SYNC, -- .pol = TEGRA_DC_OUT_PIN_POL_LOW, -+ .pol = TEGRA_DC_OUT_PIN_POL_HIGH, - }, - { - .name = TEGRA_DC_OUT_PIN_V_SYNC, -- .pol = TEGRA_DC_OUT_PIN_POL_LOW, -+ .pol = TEGRA_DC_OUT_PIN_POL_HIGH, - }, - { - .name = TEGRA_DC_OUT_PIN_PIXEL_CLOCK, -- .pol = TEGRA_DC_OUT_PIN_POL_LOW, -+ .pol = TEGRA_DC_OUT_PIN_POL_HIGH, - }, - }; - -diff --git a/arch/arm/mach-tegra/board-colibri_t30.h b/arch/arm/mach-tegra/board-colibri_t30.h -index 745d2a4..a243175 100644 ---- a/arch/arm/mach-tegra/board-colibri_t30.h -+++ b/arch/arm/mach-tegra/board-colibri_t30.h -@@ -68,7 +68,7 @@ - #define TDIODE_OFFSET (10000) /* in millicelsius */ - - /* Run framebuffer in VGA mode */ --#define TEGRA_FB_VGA -+//#define TEGRA_FB_VGA - - int colibri_t30_regulator_init(void); - int colibri_t30_suspend_init(void); diff --git a/recipes-kernel/linux/linux-toradex.inc b/recipes-kernel/linux/linux-toradex.inc deleted file mode 100644 index be5249e..0000000 --- a/recipes-kernel/linux/linux-toradex.inc +++ /dev/null @@ -1,110 +0,0 @@ -SUMMARY = "Linux Kernel for Toradex Tegra based modules" -SECTION = "kernel" -LICENSE = "GPLv2" - -LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7" - -inherit kernel siteinfo - -# Try to build & install perf -#require recipes-kernel/linux/linux-tools.inc - -RPSRC = "http://www.rpsys.net/openzaurus/patches/archive" - -# Enable OABI compat for people stuck with obsolete userspace -# ARM_KEEP_OABI ?= "1" - -# Quirk for udev greater or equal 141 -UDEV_GE_141 ?= "0" - -# Kernel bootlogo is distro-specific (default is OE logo). -# Logo resolution (qvga, vga, ...) is machine-specific. -LOGO_SIZE ?= "." - -# Support for binary device tree generation - -FILES_${KERNEL_PACKAGE_NAME}-devicetree = "/boot/devicetree*" - -#KERNEL_DEVICETREE to be specified from machine configuration - -KERNEL_DEVICETREE_FLAGS = "-R 8 -S 0x3000" - -CORTEXA8FIXUP ?= "yes" - -python __anonymous () { - - import bb - - devicetree = d.getVar('KERNEL_DEVICETREE', True) or '' - if devicetree: - depends = d.getVar("DEPENDS", True) - d.setVar("DEPENDS", "%s dtc-native" % depends) - packages = d.getVar("PACKAGES", True) - d.setVar("PACKAGES", "%s kernel-devicetree" % packages) -} - -do_configure_append() { - if test -e scripts/Makefile.fwinst ; then - sed -i -e "s:-m0644:-m 0644:g" scripts/Makefile.fwinst - fi -} - -# bitbake.conf only prepends PARALLEL make in tasks called do_compile, which isn't the case for compile_modules -# So explicitly enable it for that in here -EXTRA_OEMAKE = "${PARALLEL_MAKE} " - -do_uboot_mkimage_prepend() { - mkdir arch/${ARCH}/boot/ || true -} - -do_install_append() { - oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}/src/linux-${KERNEL_VERSION} ARCH=$ARCH -} - -PACKAGES =+ "kernel-headers" -FILES_kernel-headers = "${exec_prefix}/src/linux*" - -do_devicetree_image() { - if test -n "${KERNEL_DEVICETREE}" ; then - dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree ${KERNEL_DEVICETREE} - install -d ${D}/boot - install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION} - install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 devicetree ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.dtb - cd ${DEPLOY_DIR_IMAGE} - rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.dtb - fi -} - -do_devicetree_image_tegra124() { -} - -addtask devicetree_image after do_install before do_package do_deploy - -pkg_postinst_kernel-devicetree () { - cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/devicetree devicetree devicetree-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true -} - -pkg_postrm_kernel-devicetree () { - cd /${KERNEL_IMAGEDEST}; update-alternatives --remove devicetree devicetree-${KERNEL_VERSION} || true -} - -# Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled -python () { - try: - defconfig = bb.fetch2.localpath('file://defconfig', d) - except bb.fetch2.FetchError: - return - - try: - configfile = open(defconfig) - except IOError: - return - - if 'CONFIG_KERNEL_LZO=y\n' in configfile.readlines(): - depends = d.getVar('DEPENDS', False) - d.setVar('DEPENDS', depends + ' lzop-native') -} diff --git a/recipes-kernel/linux/linux-toradex_git.bb b/recipes-kernel/linux/linux-toradex_git.bb deleted file mode 100644 index fb54a50..0000000 --- a/recipes-kernel/linux/linux-toradex_git.bb +++ /dev/null @@ -1,69 +0,0 @@ -inherit kernel -require recipes-kernel/linux/linux-toradex.inc -include conf/tdx_version.conf - -LINUX_VERSION ?= "3.1.10" - -LOCALVERSION = "-${PR}" -PR = "${TDX_VER_ITEM}" - -SRCREV = "841700f8a2eaeda184b0fcdd14711f6b2c62990c" -SRCREV_use-head-next = "${AUTOREV}" - -PV = "${LINUX_VERSION}+gitr${SRCPV}" -S = "${WORKDIR}/git" -SRCBRANCH = "tegra" -SRCBRANCH_use-head-next = "tegra-next" -SRC_URI = "git://git.toradex.com/linux-toradex.git;protocol=git;branch=${SRCBRANCH}" - -COMPATIBLE_MACHINE = "(apalis-t30|colibri-pxa|colibri-t20|colibri-t30)" - -# One possibiltiy for changes to the defconfig: -config_script () { -# #example change to the .config -# #sets CONFIG_TEGRA_CAMERA unconditionally to 'y' -# sed -i -e /CONFIG_TEGRA_CAMERA/d ${B}/.config -# echo "CONFIG_TEGRA_CAMERA=y" >> ${B}/.config - echo "dummy" > /dev/null -} - -do_configure_prepend () { - #use the defconfig provided in the kernel source tree - #assume its called ${MACHINE}_defconfig, but with '_' instead of '-' - DEFCONFIG="`echo ${MACHINE} | sed -e 's/\-/\_/g' -e 's/$/_defconfig/'`" - - cd ${S} - export KBUILD_OUTPUT=${B} - oe_runmake $DEFCONFIG - - #maybe change some configuration - config_script - - #Add Toradex BSP Version as LOCALVERSION - sed -i -e /CONFIG_LOCALVERSION/d ${B}/.config - echo "CONFIG_LOCALVERSION=\"${LOCALVERSION}\"" >> ${B}/.config - - #Add GIT revision to the local version - head=`git --git-dir=${S}/.git rev-parse --verify --short HEAD 2> /dev/null` - printf "%s%s" +g $head > ${S}/.scmversion - - cd - > /dev/null -} - -do_uboot_mkimage_prepend () { - cd ${B} -} - -# glibc 2.24 set the oldest kernel to 3.2.0, however the downstream L4T 3.1.10 -# kernel provides all needed interfaces, so override the check_oldest_kernel to -# disable the warning -python check_oldest_kernel() { - oldest_kernel = d.getVar('OLDEST_KERNEL', True) - kernel_version = "3.2.0" - tclibc = d.getVar('TCLIBC', True) - if tclibc == 'glibc': - kernel_version = kernel_version.split('-', 1)[0] - if oldest_kernel and kernel_version: - if bb.utils.vercmp_string(kernel_version, oldest_kernel) < 0: - bb.warn('%s: OLDEST_KERNEL is "%s" but the version of the kernel you are building is "%s" - therefore %s as built may not be compatible with this kernel. Either set OLDEST_KERNEL to an older version, or build a newer kernel.' %(d.getVar('PN', True), oldest_kernel, kernel_version, tclibc)) -} diff --git a/recipes-kernel/perf/perf.bbappend b/recipes-kernel/perf/perf.bbappend index fea9271..dc60ab3 100644 --- a/recipes-kernel/perf/perf.bbappend +++ b/recipes-kernel/perf/perf.bbappend @@ -9,5 +9,3 @@ PERF_SRC_LEGACY_TEGRAS = "Makefile \ tools \ " PERF_SRC_apalis-tk1 = "${PERF_SRC_LEGACY_TEGRAS}" -PERF_SRC_apalis-t30 = "${PERF_SRC_LEGACY_TEGRAS}" -PERF_SRC_colibri-t30 = "${PERF_SRC_LEGACY_TEGRAS}" |