diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2020-05-17 11:17:39 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-06-01 13:44:53 +0200 |
| commit | 677cc78161fe18b5e922f9928b5fc11cad014caa (patch) | |
| tree | 05605acf41dec579d1949aca8a95fbc059783728 /conf | |
| parent | 179e4188a38ccc086f8b23201fa1594ea9ba0c0f (diff) | |
apalis-tk1-mainline: rename machine to apalis-tk1
Rename the apalis-tk1-mainline machine to the now dropped
apalis-tk1 machine name.
Related-to: ELB-2733
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit 0bf55088d1f34338dd04f83d6b90b7a72f6867de)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/apalis-tk1.conf (renamed from conf/machine/apalis-tk1-mainline.conf) | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/conf/machine/apalis-tk1-mainline.conf b/conf/machine/apalis-tk1.conf index 16b3383..6fbc589 100644 --- a/conf/machine/apalis-tk1-mainline.conf +++ b/conf/machine/apalis-tk1.conf @@ -1,14 +1,14 @@ #@TYPE: Machine -#@NAME: Toradex Apalis TK1 Mainline +#@NAME: Toradex Apalis TK1 #@SOC: Tegra K1 -#@DESCRIPTION: Mainline Machine configuration for Toradex Apalis TK1 SOM -#@MAINTAINER: Dominik Sliwa <dominik.sliwa@toradex.com> +#@DESCRIPTION: Toradex Apalis TK1 SOM +#@MAINTAINER: Marcel Ziswiler <marcel.ziswiler@toradex.com> -MACHINE_NAME = "Apalis-TK1-Mainline" +MACHINE_NAME = "Apalis-TK1" require conf/machine/include/soc-family.inc -SOC_FAMILY = "tegra124m" +SOC_FAMILY = "tegra124" PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-mainline" @@ -54,22 +54,22 @@ 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-tk1-mainline = "lxde-icon-theme" -PREFERRED_PROVIDER_lxsession-lite_apalis-tk1-mainline = "lxsession" +PREFERRED_PROVIDER_lxde-icon-theme_apalis-tk1 = "lxde-icon-theme" +PREFERRED_PROVIDER_lxsession-lite_apalis-tk1 = "lxsession" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" -PREFERRED_VERSION_xserver-xorg_tegra124m = "99:1.20%" PREFERRED_PROVIDER_virtual/mesa ?= "mesa" PREFERRED_PROVIDER_virtual/libgl ?= "mesa" GALLIUMDRIVERS_append_armv7a =",nouveau" -XSERVER ?= "xserver-xorg \ - mesa-driver-nouveau \ - xf86-input-evdev \ - xf86-input-keyboard \ - xf86-input-mouse \ - xf86-video-modesetting \ - " +XSERVER ?= " \ + xserver-xorg \ + mesa-driver-nouveau \ + xf86-input-evdev \ + xf86-input-keyboard \ + xf86-input-mouse \ + xf86-video-modesetting \ +" MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " MACHINE_EXTRA_RDEPENDS = "linux-firmware-nvidia tdx-k20-fw" |