From 677cc78161fe18b5e922f9928b5fc11cad014caa Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 17 May 2020 11:17:39 +0200 Subject: 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 (cherry picked from commit 0bf55088d1f34338dd04f83d6b90b7a72f6867de) --- conf/machine/apalis-tk1-mainline.conf | 87 ----------------------------------- conf/machine/apalis-tk1.conf | 87 +++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 87 deletions(-) delete mode 100644 conf/machine/apalis-tk1-mainline.conf create mode 100644 conf/machine/apalis-tk1.conf (limited to 'conf') diff --git a/conf/machine/apalis-tk1-mainline.conf b/conf/machine/apalis-tk1-mainline.conf deleted file mode 100644 index 16b3383..0000000 --- a/conf/machine/apalis-tk1-mainline.conf +++ /dev/null @@ -1,87 +0,0 @@ -#@TYPE: Machine -#@NAME: Toradex Apalis TK1 Mainline -#@SOC: Tegra K1 -#@DESCRIPTION: Mainline Machine configuration for Toradex Apalis TK1 SOM -#@MAINTAINER: Dominik Sliwa - -MACHINE_NAME = "Apalis-TK1-Mainline" - -require conf/machine/include/soc-family.inc - -SOC_FAMILY = "tegra124m" - -PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-mainline" - -KERNEL_IMAGETYPE = "zImage" -KERNEL_DEFCONFIG = "tegra_defconfig" -KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb" - -MACHINE_BOOT_FILES = "boot.scr" - -# wic support -IMAGE_BOOT_FILES ?= " \ - ${KERNEL_IMAGETYPE} \ - ${KERNEL_DEVICETREE} \ - ${MACHINE_BOOT_FILES} \ -" - -WKS_FILE_DEPENDS ?= " \ - virtual/bootloader \ - u-boot-distro-boot \ - \ - e2fsprogs-native \ - bmap-tools-native \ -" - -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-tk1" -PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils-tk1" -UBOOT_MACHINE = "apalis-tk1_defconfig" -UBOOT_ENTRYPOINT = "0x80008000" -UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" -# The payload offsets are given in number of 512 byte blocks. -OFFSET_BOOTROM_PAYLOAD = "0" -UBOOT_BINARY_TEZI_EMMC = "apalis-tk1.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-tk1-mainline = "lxde-icon-theme" -PREFERRED_PROVIDER_lxsession-lite_apalis-tk1-mainline = "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 \ - " - -MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " -MACHINE_EXTRA_RDEPENDS = "linux-firmware-nvidia tdx-k20-fw" -EXTRA_IMAGEDEPENDS += "virtual/bootloader" - -# used by sysvinit_2 -SERIAL_CONSOLES = "115200;ttyS0" -IMAGE_CLASSES += "image_type_tezi" -IMAGE_FSTYPES += "wic.bmap wic.gz teziimg" - -TORADEX_PRODUCT_IDS = "0034" -TORADEX_FLASH_TYPE = "emmc" - -DEFAULTTUNE = "cortexa15hf-neon" -require conf/machine/include/tune-cortexa15.inc diff --git a/conf/machine/apalis-tk1.conf b/conf/machine/apalis-tk1.conf new file mode 100644 index 0000000..6fbc589 --- /dev/null +++ b/conf/machine/apalis-tk1.conf @@ -0,0 +1,87 @@ +#@TYPE: Machine +#@NAME: Toradex Apalis TK1 +#@SOC: Tegra K1 +#@DESCRIPTION: Toradex Apalis TK1 SOM +#@MAINTAINER: Marcel Ziswiler + +MACHINE_NAME = "Apalis-TK1" + +require conf/machine/include/soc-family.inc + +SOC_FAMILY = "tegra124" + +PREFERRED_PROVIDER_virtual/kernel = "linux-toradex-mainline" + +KERNEL_IMAGETYPE = "zImage" +KERNEL_DEFCONFIG = "tegra_defconfig" +KERNEL_DEVICETREE += "tegra124-apalis-eval.dtb tegra124-apalis-v1.2-eval.dtb" + +MACHINE_BOOT_FILES = "boot.scr" + +# wic support +IMAGE_BOOT_FILES ?= " \ + ${KERNEL_IMAGETYPE} \ + ${KERNEL_DEVICETREE} \ + ${MACHINE_BOOT_FILES} \ +" + +WKS_FILE_DEPENDS ?= " \ + virtual/bootloader \ + u-boot-distro-boot \ + \ + e2fsprogs-native \ + bmap-tools-native \ +" + +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-tk1" +PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-toradex-fw-utils-tk1" +UBOOT_MACHINE = "apalis-tk1_defconfig" +UBOOT_ENTRYPOINT = "0x80008000" +UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}" +# The payload offsets are given in number of 512 byte blocks. +OFFSET_BOOTROM_PAYLOAD = "0" +UBOOT_BINARY_TEZI_EMMC = "apalis-tk1.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-tk1 = "lxde-icon-theme" +PREFERRED_PROVIDER_lxsession-lite_apalis-tk1 = "lxsession" + +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +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 \ +" + +MACHINE_FEATURES = "screen usbgadget usbhost vfat ext2 alsa touchscreen wifi bluetooth 3g pci " +MACHINE_EXTRA_RDEPENDS = "linux-firmware-nvidia tdx-k20-fw" +EXTRA_IMAGEDEPENDS += "virtual/bootloader" + +# used by sysvinit_2 +SERIAL_CONSOLES = "115200;ttyS0" +IMAGE_CLASSES += "image_type_tezi" +IMAGE_FSTYPES += "wic.bmap wic.gz teziimg" + +TORADEX_PRODUCT_IDS = "0034" +TORADEX_FLASH_TYPE = "emmc" + +DEFAULTTUNE = "cortexa15hf-neon" +require conf/machine/include/tune-cortexa15.inc -- cgit v1.2.3