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) --- .../PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct | Bin 0 -> 8192 bytes .../u-boot/files/tegra124/apalis-tk1.img.cfg | 22 +++++++++++++++++++++ recipes-bsp/u-boot/files/tegra124/fw_env.config | 15 ++++++++++++++ .../PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct | Bin 8192 -> 0 bytes .../u-boot/files/tegra124m/apalis-tk1.img.cfg | 22 --------------------- recipes-bsp/u-boot/files/tegra124m/fw_env.config | 15 -------------- .../u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb | 4 ---- recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb | 11 ----------- 8 files changed, 37 insertions(+), 52 deletions(-) create mode 100644 recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct create mode 100644 recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg create mode 100644 recipes-bsp/u-boot/files/tegra124/fw_env.config delete mode 100644 recipes-bsp/u-boot/files/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct delete mode 100644 recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg delete mode 100644 recipes-bsp/u-boot/files/tegra124m/fw_env.config (limited to 'recipes-bsp/u-boot') diff --git a/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct b/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct new file mode 100644 index 0000000..556a40e Binary files /dev/null and b/recipes-bsp/u-boot/files/tegra124/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct differ diff --git a/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg b/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg new file mode 100644 index 0000000..b9d203c --- /dev/null +++ b/recipes-bsp/u-boot/files/tegra124/apalis-tk1.img.cfg @@ -0,0 +1,22 @@ +# Copyright (C) 2016 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 = 0x00400001; +Bctcopy = 1; +Bctfile = PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct; +BootLoader = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete; diff --git a/recipes-bsp/u-boot/files/tegra124/fw_env.config b/recipes-bsp/u-boot/files/tegra124/fw_env.config new file mode 100644 index 0000000..5941da2 --- /dev/null +++ b/recipes-bsp/u-boot/files/tegra124/fw_env.config @@ -0,0 +1,15 @@ +# 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. + +# Apalis TK1 +# 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/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct b/recipes-bsp/u-boot/files/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct deleted file mode 100644 index 556a40e..0000000 Binary files a/recipes-bsp/u-boot/files/tegra124m/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct and /dev/null differ diff --git a/recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg b/recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg deleted file mode 100644 index b9d203c..0000000 --- a/recipes-bsp/u-boot/files/tegra124m/apalis-tk1.img.cfg +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2016 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 = 0x00400001; -Bctcopy = 1; -Bctfile = PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct; -BootLoader = u-boot-dtb-tegra.bin,0x80108000,0x80108000,Complete; diff --git a/recipes-bsp/u-boot/files/tegra124m/fw_env.config b/recipes-bsp/u-boot/files/tegra124m/fw_env.config deleted file mode 100644 index 5941da2..0000000 --- a/recipes-bsp/u-boot/files/tegra124m/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. - -# Apalis TK1 -# 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-tk1_2019.07.bb b/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb index f968dbf..af6c461 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-fw-utils-tk1_2019.07.bb @@ -43,10 +43,6 @@ do_install_append_tegra124() { install_unlock_emmc } -do_install_append_tegra124m() { - install_unlock_emmc -} - 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-tk1_2019.07.bb b/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb index 9d156b0..5385b20 100644 --- a/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb +++ b/recipes-bsp/u-boot/u-boot-toradex-tk1_2019.07.bb @@ -4,7 +4,6 @@ require recipes-bsp/u-boot/u-boot-toradex-initial-env.inc DEPENDS += "bc-native dtc-native" DEPENDS_append_apalis-tk1 = " cbootimage-native" -DEPENDS_append_apalis-tk1-mainline = " cbootimage-native" COMPATIBLE_MACHINE = "(apalis-tk1)" @@ -12,10 +11,6 @@ SRC_URI_append_apalis-tk1 = " \ file://apalis-tk1.img.cfg \ file://PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct \ " -SRC_URI_append_apalis-tk1-mainline = " \ - file://apalis-tk1.img.cfg \ - file://PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct \ -" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -25,10 +20,4 @@ do_deploy_append_apalis-tk1() { cbootimage -s tegra124 ${WORKDIR}/apalis-tk1.img.cfg apalis-tk1.img rm PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct } -do_deploy_append_apalis-tk1-mainline() { - cd ${DEPLOYDIR} - cp ${WORKDIR}/PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct . - cbootimage -s tegra124 ${WORKDIR}/apalis-tk1.img.cfg apalis-tk1.img - rm PM375_Hynix_2GB_H5TC4G63AFR_RDA_924MHz.bct -} -- cgit v1.2.3