From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Ahmad Fatoum Date: Fri, 24 Apr 2020 19:17:20 +0200 Message-Id: <20200424171726.8330-1-a.fatoum@pengutronix.de> MIME-Version: 1.0 Subject: [DistroKit] [PATCH 1/7] ptxdist: migrate 2020.03.0 -> 2020.04.0 with defaults List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: distrokit-bounces@pengutronix.de Sender: "DistroKit" To: distrokit@pengutronix.de Cc: Ahmad Fatoum With this release, the TF-A rule went upstream in revised form, so it's dropped as part of the migration. Signed-off-by: Ahmad Fatoum --- configs/platform-mips/platformconfig | 4 +- configs/platform-rpi/platformconfig | 4 +- configs/platform-v7a/platformconfig | 4 +- configs/platform-v8a/platformconfig | 4 +- configs/ptxconfig | 20 +++- rules/tf-a.in | 140 --------------------------- rules/tf-a.make | 122 ----------------------- 7 files changed, 23 insertions(+), 275 deletions(-) delete mode 100644 rules/tf-a.in delete mode 100644 rules/tf-a.make diff --git a/configs/platform-mips/platformconfig b/configs/platform-mips/platformconfig index 51f9a1520316..0922a48321d2 100644 --- a/configs/platform-mips/platformconfig +++ b/configs/platform-mips/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2020.03.0 +# PTXdist 2020.04.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="mips" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2020.03.0" +PTXCONF_PLATFORMCONFIG_VERSION="2020.04.0" # # architecture diff --git a/configs/platform-rpi/platformconfig b/configs/platform-rpi/platformconfig index 62b22519276c..91c923224c40 100644 --- a/configs/platform-rpi/platformconfig +++ b/configs/platform-rpi/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2020.03.0 +# PTXdist 2020.04.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="rpi" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2020.03.0" +PTXCONF_PLATFORMCONFIG_VERSION="2020.04.0" # # architecture diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig index 7904ea58315e..6060f65076c5 100644 --- a/configs/platform-v7a/platformconfig +++ b/configs/platform-v7a/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2020.03.0 +# PTXdist 2020.04.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v7a" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2020.03.0" +PTXCONF_PLATFORMCONFIG_VERSION="2020.04.0" # # architecture diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig index ace1250d66bd..81f9e05be483 100644 --- a/configs/platform-v8a/platformconfig +++ b/configs/platform-v8a/platformconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2020.03.0 +# PTXdist 2020.04.0 # PTXCONF__platformconfig_MAGIC__=y @@ -19,7 +19,7 @@ PTXCONF_PLATFORM="v8a" PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_PLATFORMCONFIG_VERSION="2020.03.0" +PTXCONF_PLATFORMCONFIG_VERSION="2020.04.0" # # architecture diff --git a/configs/ptxconfig b/configs/ptxconfig index 822a3b59bb9f..54c65e1f139f 100644 --- a/configs/ptxconfig +++ b/configs/ptxconfig @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# PTXdist 2020.03.0 +# PTXdist 2020.04.0 # PTXCONF_DATAPARTITION=y @@ -65,7 +65,7 @@ PTXCONF_BSP=y PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y PTXCONF_VIRTUAL=y -PTXCONF_CONFIGFILE_VERSION="2020.03.0" +PTXCONF_CONFIGFILE_VERSION="2020.04.0" PTXCONF__ptxconfig_MAGIC__=y # @@ -83,6 +83,7 @@ PTXCONF__ptxconfig_MAGIC__=y # Host Tools # # PTXCONF_HOST_DFU_UTIL is not set +# PTXCONF_HOST_MFGTOOLS is not set # PTXCONF_HOST_OPENOCD is not set PTXCONF_HOST_QEMU=y PTXCONF_HOST_QEMU_SYS=y @@ -1472,6 +1473,10 @@ PTXCONF_UTIL_LINUX_NG_HWCLOCK=y # # BusyBox' login is selected! # + +# +# BusyBox' sulogin is selected! +# # PTXCONF_WATCHDOG is not set # @@ -1571,6 +1576,8 @@ PTXCONF_UTIL_LINUX_NG_HWCLOCK=y # PTXCONF_CLASSPATH is not set # PTXCONF_FRODO is not set # PTXCONF_JAMVM is not set +# PTXCONF_NODEJS is not set +# PTXCONF_NODEJS_PACKAGES is not set # # Networking Tools @@ -1615,6 +1622,7 @@ PTXCONF_IPROUTE2=y # PTXCONF_IPROUTE2_ARPD is not set # PTXCONF_IPROUTE2_BRIDGE is not set # PTXCONF_IPROUTE2_CTSTAT is not set +# PTXCONF_IPROUTE2_DEVLINK is not set # PTXCONF_IPROUTE2_GENL is not set PTXCONF_IPROUTE2_IP=y # PTXCONF_IPROUTE2_IFCFG is not set @@ -1637,7 +1645,6 @@ PTXCONF_IPROUTE2_IP=y # PTXCONF_IW is not set # PTXCONF_JSON_DBUS_BRIDGE is not set # PTXCONF_LIBCGI is not set -# PTXCONF_LIBCGIC is not set # PTXCONF_LIBCGICC is not set # PTXCONF_LIBCOAP is not set # PTXCONF_LIBCURL is not set @@ -1739,6 +1746,7 @@ PTXCONF_OPENSSL=y # PTXCONF_SIMPLERPL is not set # PTXCONF_SMCROUTE is not set # PTXCONF_SOCAT is not set +# PTXCONF_SPAWN_FCGI is not set # PTXCONF_STRONGSWAN is not set # PTXCONF_STUNNEL is not set # PTXCONF_TCPDUMP is not set @@ -1824,6 +1832,7 @@ PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4=y # PTXCONF_LOGROTATE is not set # PTXCONF_LVM2 is not set # PTXCONF_MMC_UTILS is not set +# PTXCONF_NCDU is not set # PTXCONF_OPKG is not set # PTXCONF_QUOTA_TOOLS is not set # PTXCONF_SAMBA is not set @@ -1843,9 +1852,11 @@ PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4=y # PTXCONF_CKERMIT is not set # PTXCONF_EFAX is not set # PTXCONF_HEIRLOOM_MAILX is not set +# PTXCONF_IMX_UUC is not set # PTXCONF_LIBSOCKETCAN is not set # PTXCONF_LRZSZ is not set # PTXCONF_MGETTY is not set +# PTXCONF_OPEN62541 is not set # PTXCONF_OPENCT is not set # PTXCONF_OPENSC is not set # PTXCONF_PCSC_LITE is not set @@ -1886,7 +1897,6 @@ PTXCONF_E2FSPROGS_INSTALL_MKFS_EXT4=y # PTXCONF_DB is not set PTXCONF_EXPAT=y # PTXCONF_FLEX is not set -# PTXCONF_GETTEXT is not set # PTXCONF_GFLAGS is not set # PTXCONF_GPGME is not set # PTXCONF_GPSD is not set @@ -1994,6 +2004,7 @@ PTXCONF_LIBUUID=y # PTXCONF_LXC is not set PTXCONF_LZ4=y # PTXCONF_LZ4_TOOLS is not set +# PTXCONF_MBEDTLS is not set PTXCONF_NCURSES=y # @@ -2200,7 +2211,6 @@ PTXCONF_DBUS_SYSTEMD_UNIT=y # # framebuffer # -# PTXCONF_FBGRAB is not set # PTXCONF_FBSET is not set # PTXCONF_FBTERM is not set # PTXCONF_FBTEST is not set diff --git a/rules/tf-a.in b/rules/tf-a.in deleted file mode 100644 index 3cddf7907960..000000000000 --- a/rules/tf-a.in +++ /dev/null @@ -1,140 +0,0 @@ -## SECTION=bootloader - -menuconfig TF_A - select BOOTLOADER - prompt "ARM Trusted Firmware-A " - depends on ARCH_ARM || ARCH_ARM64 - bool - -if TF_A - -config TF_A_VERSION - string - default "v2.2" - prompt "TF-A version" - help - Enter the TF-A git commit-ish you want to build. Usually a tagged - release like "v2.2" - -config TF_A_MD5 - string - default "bb300e5a62c911e189c80d935d497a4b" - prompt "TF-A source md5" - -config TF_A_ARCH_STRING - string - default "aarch32" if ARCH_ARM - default "aarch64" if ARCH_ARM64 - -choice - prompt "TF-A Architecture" - default TF_A_ARM_ARCH_MAJOR_7 if ARCH_ARM - default TF_A_ARM_ARCH_MAJOR_8 if ARCH_ARM64 - help - Architecture version major number - - config TF_A_ARM_ARCH_MAJOR_7 - depends on ARCH_ARM - prompt "ARMv7" - bool - - config TF_A_ARM_ARCH_MAJOR_8_32_BIT - depends on ARCH_ARM - prompt "ARMv8 32-bit" - bool - - config TF_A_ARM_ARCH_MAJOR_8 - depends on ARCH_ARM64 - prompt "ARMv8" - bool - -endchoice - -config TF_A_ARM_ARCH_MAJOR - int - default 7 if TF_A_ARM_ARCH_MAJOR_7 - default 8 if TF_A_ARM_ARCH_MAJOR_8_32_BIT - default 8 if TF_A_ARM_ARCH_MAJOR_8 - - -config TF_A_PLATFORM - string - prompt "TF-A target platform" - help - The TF-A target platform. - -config TF_A_ARM_ARCH_MINOR - depends on TF_A_ARM_ARCH_MAJOR_8 || TF_A_ARM_ARCH_MAJOR_8_32_BIT - int - default 0 - prompt "TF-A target ARMv8.MINOR version" - help - The minor version of the ARMv8 architecture targeted. Defaults to 0. - -config TF_A_EXTRA_ARGS - string - prompt "TF-A extra build arguments" - help - Extra platform-specific build arguments to pass to the TF-A build - process, e.g. DTB_FILE_NAME= for the stm32mp1 - -config TF_A_ARTIFACTS - string - prompt "TF-A artifact file names" - help - A space-separated list of glob patterns of artifacts to copy from the - build directory. - All file names are relative to the appropriate TF-A platform build - directory. - -comment "Payloads" - -choice - prompt "BL32 Payload" - default TF_A_BL32_NONE - help - payload for BL32 (Secure World OS) - - config TF_A_BL32_NONE - prompt "None" - bool - - config TF_A_BL32_SP_MIN - depends on ARCH_ARM - prompt "sp_min" - bool - - config TF_A_BL32_TSP - depends on ARCH_ARM64 - prompt "Test Secure Payload" - bool - -endchoice - -if TF_A_BL32_TSP -choice TF_A_BL32_TSP_RAM_LOCATION - prompt "TSP location" - default TF_A_BL32_TSP_RAM_LOCATION_TSRAM - - config TF_A_BL32_TSP_RAM_LOCATION_TSRAM - prompt "Trusted SRAM" - bool - - config TF_A_BL32_TSP_RAM_LOCATION_TDRAM - prompt "Trusted DRAM (if available)" - bool - - config TF_A_BL32_TSP_RAM_LOCATION_DRAM - prompt "Secure DRAM region (configured by TrustZone controller)" - bool -endchoice - -config TF_A_BL32_TSP_RAM_LOCATION_STRING - string - default "tsram" if TF_A_BL32_TSP_RAM_LOCATION_TSRAM - default "tdram" if TF_A_BL32_TSP_RAM_LOCATION_TDRAM - default "dram" if TF_A_BL32_TSP_RAM_LOCATION_DRAM - -endif - -endif diff --git a/rules/tf-a.make b/rules/tf-a.make deleted file mode 100644 index 3ba5ca275050..000000000000 --- a/rules/tf-a.make +++ /dev/null @@ -1,122 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2018 by Rouven Czerwinski -# 2019 by Ahmad Fatoum -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_TF_A) += tf-a - -# -# Paths and names -# -TF_A_VERSION := $(call remove_quotes,$(PTXCONF_TF_A_VERSION)) -TF_A_MD5 := $(call remove_quotes,$(PTXCONF_TF_A_MD5)) -TF_A := tf-a-$(TF_A_VERSION) -TF_A_SUFFIX := tar.gz -TF_A_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_VERSION).$(TF_A_SUFFIX) -TF_A_SOURCE := $(SRCDIR)/$(TF_A).$(TF_A_SUFFIX) -TF_A_DIR := $(BUILDDIR)/$(TF_A) -TF_A_LICENSE := BSD-3-Clause AND BSD-2-Clause \ - AND (GPL-2.0-or-later OR BSD-2-Clause) \ - AND (NCSA OR MIT) \ - AND Zlib \ - AND (GPL-2.0-or-later OR BSD-3-Clause) - -# ---------------------------------------------------------------------------- -# Prepare -# ---------------------------------------------------------------------------- - -TF_A_WRAPPER_BLACKLIST := \ - TARGET_HARDEN_RELRO \ - TARGET_HARDEN_BINDNOW \ - TARGET_HARDEN_PIE \ - TARGET_DEBUG \ - TARGET_BUILD_ID - -TF_A_RELEASE := 1 - -TF_A_PATH := PATH=$(CROSS_PATH) -TF_A_MAKE_OPT := \ - CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ - HOSTCC=$(HOSTCC) \ - PLAT=$(PTXCONF_TF_A_PLATFORM) \ - DEBUG=$(if $(filter 1,$(TF_A_RELEASE)),0,1) \ - ARCH=$(PTXCONF_TF_A_ARCH_STRING) \ - ARM_ARCH_MAJOR=$(PTXCONF_TF_A_ARM_ARCH_MAJOR) \ - BUILD_STRING=$(PTXCONF_TF_A_VERSION) \ - $(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS)) \ - all - -ifdef PTXCONF_TF_A_BL32_TSP -TF_A_MAKE_OPT += ARM_TSP_RAM_LOCATION=$(PTXCONF_TF_A_BL32_TSP_RAM_LOCATION_STRING) -endif -ifdef PTXCONF_TF_A_ARM_ARCH_MINOR -TF_A_MAKE_OPT += ARM_ARCH_MINOR=$(PTXCONF_TF_A_ARM_ARCH_MINOR) -endif -ifdef PTXCONF_TF_A_BL32_SP_MIN -TF_A_MAKE_OPT += AARCH32_SP=sp_min -endif - -ifdef PTXCONF_TF_A -ifeq ($(PTXCONF_TF_A_ARTIFACTS),) -$(error TF_A_ARTIFACTS is empty. nothing to install.) -endif -endif - -TF_A_CONF_TOOL := NO - -$(STATEDIR)/tf-a.prepare: - @$(call targetinfo) - @rm -rf $(TF_A_DIR)/build/ - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -TF_A_MAKE_ENV := $(CROSS_ENV) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -TF_A_BUILD_OUTPUT_DIR := $(TF_A_DIR)/build/$(call remove_quotes, \ - $(PTXCONF_TF_A_PLATFORM))/$(if $(filter 1,$(TF_A_RELEASE)),release,debug) -TF_A_ARTIFACTS_SRC = $(wildcard $(addprefix $(TF_A_BUILD_OUTPUT_DIR)/, \ - $(call remove_quotes,$(PTXCONF_TF_A_ARTIFACTS)))) -TF_A_ARTIFACTS_DEST = $(subst $(TF_A_BUILD_OUTPUT_DIR)/,,$(TF_A_ARTIFACTS_SRC)) - -$(STATEDIR)/tf-a.install: - @$(call targetinfo) - @$(foreach artifact, $(TF_A_ARTIFACTS_SRC), \ - install -v -D -m 644 $(artifact) \ - $(TF_A_PKGDIR)/usr/lib/firmware/$(notdir $(artifact))$(ptx/nl)) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/tf-a.targetinstall: - @$(call targetinfo) - @$(foreach artifact, $(TF_A_ARTIFACTS_SRC), \ - install -v -D -m 644 $(artifact) \ - $(IMAGEDIR)/$(notdir $(artifact))$(ptx/nl)) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Clean -# ---------------------------------------------------------------------------- - -$(STATEDIR)/tf-a.clean: - @$(call targetinfo) - @rm -f $(addprefix $(IMAGEDIR)/, $(TF_A_ARTIFACTS_DEST)) - @$(call clean_pkg, TF_A) - -# vim: syntax=make -- 2.26.1 _______________________________________________ DistroKit mailing list DistroKit@pengutronix.de