7 files changed, 3 insertions, 94 deletions
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
deleted 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 .