From ab205d9308f3f869432d002412a0b11e28606696 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Fri, 4 Jan 2019 13:45:49 +0100 Subject: apalis/colibri-t20 -t30: drop machines These machines use an old Nvidia provided downstream kernel 3.1.10. They are no longer compatible with more recent sysroot components, e.g. libc, xserver et. al. The maintenance burden to keep the userspace components in their old version becomes simply too high. Keep using the rocko based 2.8 BSP for these machines. Signed-off-by: Max Krummenacher --- conf/machine/apalis-t30.conf | 42 ----------------------------- conf/machine/colibri-t20.conf | 32 ---------------------- conf/machine/colibri-t30.conf | 26 ------------------ conf/machine/include/tegra-base.inc | 53 ------------------------------------- 4 files changed, 153 deletions(-) delete mode 100644 conf/machine/apalis-t30.conf delete mode 100644 conf/machine/colibri-t20.conf delete mode 100644 conf/machine/colibri-t30.conf delete mode 100644 conf/machine/include/tegra-base.inc (limited to 'conf') 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)}" -- cgit v1.2.3