diff options
Diffstat (limited to 'configs/platform-v7a/rules')
29 files changed, 247 insertions, 725 deletions
diff --git a/configs/platform-v7a/rules/barebox-at91.make b/configs/platform-v7a/rules/barebox-at91.make index 8bb8b1d..fe426e4 100644 --- a/configs/platform-v7a/rules/barebox-at91.make +++ b/configs/platform-v7a/rules/barebox-at91.make @@ -14,43 +14,46 @@ PACKAGES-$(PTXCONF_BAREBOX_AT91) += barebox-at91 # # Paths and names # -BAREBOX_AT91_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) +BAREBOX_AT91_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) BAREBOX_AT91_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) -BAREBOX_AT91 := barebox-$(BAREBOX_AT91_VERSION) -BAREBOX_AT91_SUFFIX := tar.bz2 -BAREBOX_AT91_DIR := $(BUILDDIR)/barebox-at91-$(BAREBOX_AT91_VERSION) -BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config) -BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) -BAREBOX_AT91_LICENSE := GPL-2.0 +BAREBOX_AT91 := barebox-at91-$(BAREBOX_AT91_VERSION) +BAREBOX_AT91_SUFFIX := tar.bz2 BAREBOX_AT91_URL := $(call barebox-url, BAREBOX_AT91) -BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91).$(BAREBOX_AT91_SUFFIX) +BAREBOX_AT91_PATCHES := barebox-$(BAREBOX_AT91_VERSION) +BAREBOX_AT91_SOURCE := $(SRCDIR)/$(BAREBOX_AT91_PATCHES).$(BAREBOX_AT91_SUFFIX) +BAREBOX_AT91_DIR := $(BUILDDIR)/$(BAREBOX_AT91) +BAREBOX_AT91_BUILD_DIR := $(BAREBOX_AT91_DIR)-build +BAREBOX_AT91_CONFIG := $(call ptx/in-platformconfigdir, barebox-at91.config) +BAREBOX_AT91_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) +BAREBOX_AT91_LICENSE := GPL-2.0-only +BAREBOX_AT91_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- +# use host pkg-config for host tools +BAREBOX_AT91_PATH := PATH=$(HOST_PATH) + BAREBOX_AT91_WRAPPER_BLACKLIST := \ - TARGET_HARDEN_RELRO \ - TARGET_HARDEN_BINDNOW \ - TARGET_HARDEN_PIE \ - TARGET_DEBUG \ - TARGET_BUILD_ID + $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) -BAREBOX_AT91_CONF_ENV := KCONFIG_NOTIMESTAMP=1 BAREBOX_AT91_CONF_OPT := \ + -C $(BAREBOX_AT91_DIR) \ + O=$(BAREBOX_AT91_BUILD_DIR) \ BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ $(call barebox-opts, BAREBOX_AT91) -BAREBOX_AT91_MAKE_ENV := $(BAREBOX_AT91_CONF_ENV) BAREBOX_AT91_MAKE_OPT := $(BAREBOX_AT91_CONF_OPT) BAREBOX_AT91_IMAGES := \ + images/barebox-wifx-l1.img \ images/barebox-sama5d27-som1-ek.img \ images/barebox-sama5d27-som1-ek-xload-mmc.img \ images/barebox-groboards-sama5d27-giantboard.img \ images/barebox-groboards-sama5d27-giantboard-xload-mmc.img -BAREBOX_AT91_IMAGES := $(addprefix $(BAREBOX_AT91_DIR)/,$(BAREBOX_AT91_IMAGES)) +BAREBOX_AT91_IMAGES := $(addprefix $(BAREBOX_AT91_BUILD_DIR)/,$(BAREBOX_AT91_IMAGES)) ifdef PTXCONF_BAREBOX_AT91 $(BAREBOX_AT91_CONFIG): @@ -65,10 +68,10 @@ endif $(STATEDIR)/barebox-at91.prepare: $(BAREBOX_AT91_CONFIG) @$(call targetinfo) - @rm -f "$(BAREBOX_AT91_DIR)/.ptxdist-defaultenv" - @ln -s "$(call ptx/in-platformconfigdir, barebox-at91-defaultenv)" \ - "$(BAREBOX_AT91_DIR)/.ptxdist-defaultenv" @$(call world/prepare, BAREBOX_AT91) + @rm -f "$(BAREBOX_AT91_BUILD_DIR)/.ptxdist-defaultenv" + @ln -s "$(call ptx/in-platformconfigdir, barebox-at91-defaultenv)" \ + "$(BAREBOX_AT91_BUILD_DIR)/.ptxdist-defaultenv" @$(call touch) # ---------------------------------------------------------------------------- @@ -98,7 +101,7 @@ $(STATEDIR)/barebox-at91.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX_AT91) @$(foreach image, $(BAREBOX_AT91_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))-at91;) + rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) # ---------------------------------------------------------------------------- # oldconfig / menuconfig diff --git a/configs/platform-v7a/rules/barebox-rpi2.make b/configs/platform-v7a/rules/barebox-rpi2.make index 17f7a33..ea2f18f 100644 --- a/configs/platform-v7a/rules/barebox-rpi2.make +++ b/configs/platform-v7a/rules/barebox-rpi2.make @@ -46,8 +46,7 @@ BAREBOX_RPI2_CONF_OPT := \ BAREBOX_RPI2_MAKE_OPT := $(BAREBOX_RPI2_CONF_OPT) -BAREBOX_RPI2_IMAGES := images/barebox-raspberry-pi-2.img images/barebox-raspberry-pi-3.img images/barebox-raspberry-pi-cm3.img -BAREBOX_RPI2_IMAGES := $(addprefix $(BAREBOX_RPI2_BUILD_DIR)/,$(BAREBOX_RPI2_IMAGES)) +BAREBOX_RPI2_DTB_DIR := $(BAREBOX_RPI2_BUILD_DIR)/arch/arm/dts ifdef PTXCONF_BAREBOX_RPI2 $(BAREBOX_RPI2_CONFIG): @@ -82,9 +81,11 @@ $(STATEDIR)/barebox-rpi2.install: $(STATEDIR)/barebox-rpi2.targetinstall: @$(call targetinfo) - @$(foreach image, $(BAREBOX_RPI2_IMAGES), \ + @$(foreach dtb, $(wildcard $(BAREBOX_RPI2_DTB_DIR)/*.dtb), \ install -m 644 \ - $(image) $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) + $(dtb) $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl)) + @install -m 644 $(BAREBOX_RPI2_BUILD_DIR)/images/barebox-raspberry-pi.img \ + $(IMAGEDIR)/barebox-raspberry-pi.img @$(call touch) # ---------------------------------------------------------------------------- @@ -94,8 +95,9 @@ $(STATEDIR)/barebox-rpi2.targetinstall: $(STATEDIR)/barebox-rpi2.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX_RPI2) - @$(foreach image, $(BAREBOX_RPI2_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) + @$(foreach dtb, $(wildcard $(BAREBOX_RPI2_DTB_DIR)/*.dtb), \ + rm -fv $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl)) + @rm -fv $(IMAGEDIR)/barebox-dt-2nd-rpi.img # ---------------------------------------------------------------------------- # oldconfig / menuconfig diff --git a/configs/platform-v7a/rules/barebox-stm32mp.make b/configs/platform-v7a/rules/barebox-stm32mp.make index 17548fa..e39d7c1 100644 --- a/configs/platform-v7a/rules/barebox-stm32mp.make +++ b/configs/platform-v7a/rules/barebox-stm32mp.make @@ -16,40 +16,46 @@ PACKAGES-$(PTXCONF_BAREBOX_STM32MP) += barebox-stm32mp # BAREBOX_STM32MP_VERSION := $(call ptx/config-version, PTXCONF_BAREBOX_COMMON) BAREBOX_STM32MP_MD5 := $(call ptx/config-md5, PTXCONF_BAREBOX_COMMON) -BAREBOX_STM32MP := barebox-$(BAREBOX_STM32MP_VERSION) +BAREBOX_STM32MP := barebox-stm32mp-$(BAREBOX_STM32MP_VERSION) BAREBOX_STM32MP_SUFFIX := tar.bz2 -BAREBOX_STM32MP_DIR := $(BUILDDIR)/barebox-stm32mp-$(BAREBOX_STM32MP_VERSION) +BAREBOX_STM32MP_URL := $(call barebox-url, BAREBOX_STM32MP) +BAREBOX_STM32MP_PATCHES := barebox-$(BAREBOX_STM32MP_VERSION) +BAREBOX_STM32MP_SOURCE := $(SRCDIR)/$(BAREBOX_STM32MP_PATCHES).$(BAREBOX_STM32MP_SUFFIX) +BAREBOX_STM32MP_DIR := $(BUILDDIR)/$(BAREBOX_STM32MP) +BAREBOX_STM32MP_BUILD_DIR := $(BAREBOX_STM32MP_DIR)-build BAREBOX_STM32MP_CONFIG := $(call ptx/in-platformconfigdir, barebox-stm32mp.config) BAREBOX_STM32MP_REF_CONFIG := $(call ptx/in-platformconfigdir, barebox.config) BAREBOX_STM32MP_LICENSE := GPL-2.0 -BAREBOX_STM32MP_URL := $(call barebox-url, BAREBOX_STM32MP) -BAREBOX_STM32MP_SOURCE := $(SRCDIR)/$(BAREBOX_STM32MP).$(BAREBOX_STM32MP_SUFFIX) +BAREBOX_STM32MP_BUILD_OOT := KEEP # ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- BAREBOX_STM32MP_WRAPPER_BLACKLIST := \ - TARGET_HARDEN_RELRO \ - TARGET_HARDEN_BINDNOW \ - TARGET_HARDEN_PIE \ - TARGET_DEBUG \ - TARGET_BUILD_ID + $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) BAREBOX_STM32MP_CONF_ENV := KCONFIG_NOTIMESTAMP=1 BAREBOX_STM32MP_CONF_OPT := \ + -C $(BAREBOX_STM32MP_DIR) \ + O=$(BAREBOX_STM32MP_BUILD_DIR) \ BUILDSYSTEM_VERSION=$(PTXDIST_VCS_VERSION) \ $(call barebox-opts, BAREBOX_STM32MP) -BAREBOX_STM32MP_MAKE_ENV := $(BAREBOX_STM32MP_CONF_ENV) BAREBOX_STM32MP_MAKE_OPT := $(BAREBOX_STM32MP_CONF_OPT) BAREBOX_STM32MP_IMAGES := \ - images/barebox-stm32mp15xx-dkx.img \ - images/barebox-stm32mp15x-ev1.img \ - images/barebox-stm32mp157c-lxa-mc1.img + images/barebox-stm32mp-generic-bl33.img + +BAREBOX_STM32MP_FIP_DTBS := \ + stm32mp157c-dk2.dtb \ + stm32mp157c-ev1.dtb \ + stm32mp157c-lxa-mc1.dtb \ + stm32mp135f-dk.dtb -BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_DIR)/,$(BAREBOX_STM32MP_IMAGES)) +BAREBOX_STM32MP_IMAGES := $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/,$(BAREBOX_STM32MP_IMAGES)) +BAREBOX_STM32MP_FIP_DTBS := \ + $(addprefix $(BAREBOX_STM32MP_BUILD_DIR)/arch/arm/dts/,$(BAREBOX_STM32MP_FIP_DTBS)) ifdef PTXCONF_BAREBOX_STM32MP $(BAREBOX_STM32MP_CONFIG): @@ -64,10 +70,10 @@ endif $(STATEDIR)/barebox-stm32mp.prepare: $(BAREBOX_STM32MP_CONFIG) @$(call targetinfo) - @rm -f "$(BAREBOX_STM32MP_DIR)/.ptxdist-defaultenv" - @ln -s "$(call ptx/in-platformconfigdir, barebox-stm32mp-defaultenv)" \ - "$(BAREBOX_STM32MP_DIR)/.ptxdist-defaultenv" @$(call world/prepare, BAREBOX_STM32MP) + @rm -f "$(BAREBOX_STM32MP_BUILD_DIR)/.ptxdist-defaultenv" + @ln -s "$(call ptx/in-platformconfigdir, barebox-stm32mp-defaultenv)" \ + "$(BAREBOX_STM32MP_BUILD_DIR)/.ptxdist-defaultenv" @$(call touch) # ---------------------------------------------------------------------------- @@ -87,6 +93,9 @@ $(STATEDIR)/barebox-stm32mp.targetinstall: @$(foreach image, $(BAREBOX_STM32MP_IMAGES), \ install -m 644 \ $(image) $(IMAGEDIR)/$(notdir $(image));) + @$(foreach dtb, $(BAREBOX_STM32MP_FIP_DTBS), \ + install -m 644 \ + $(dtb) $(IMAGEDIR)/$(notdir $(dtb))-bb;) @$(call touch) # ---------------------------------------------------------------------------- @@ -97,7 +106,9 @@ $(STATEDIR)/barebox-stm32mp.clean: @$(call targetinfo) @$(call clean_pkg, BAREBOX_STM32MP) @$(foreach image, $(BAREBOX_STM32MP_IMAGES), \ - rm -fv $(IMAGEDIR)/$(notdir $(image))-stm32mp;) + rm -fv $(IMAGEDIR)/$(notdir $(image))$(ptx/nl)) + @$(foreach dtb, $(BAREBOX_STM32MP_FIP_DTBS), \ + rm -fv $(IMAGEDIR)/$(notdir $(dtb))-bb$(ptx/nl)) # ---------------------------------------------------------------------------- # oldconfig / menuconfig diff --git a/configs/platform-v7a/rules/blspec-boneblack.make b/configs/platform-v7a/rules/blspec-boneblack.make deleted file mode 100644 index 1a09ba9..0000000 --- a/configs/platform-v7a/rules/blspec-boneblack.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2016 by Michael Grzeschik <mgr@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_BONEBLACK) += blspec-boneblack - -BLSPEC_BONEBLACK_VERSION := 4.6 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-boneblack.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-boneblack) - @$(call install_fixup,blspec-boneblack,PRIORITY,optional) - @$(call install_fixup,blspec-boneblack,SECTION,base) - @$(call install_fixup,blspec-boneblack,AUTHOR,"Michael Grzeschik <mgr@pengutronix.de>") - @$(call install_fixup,blspec-boneblack,DESCRIPTION,missing) - - @$(call install_alternative, blspec-boneblack, 0, 0, 0644, \ - /loader/entries/boneblack.conf) - - @$(call install_finish,blspec-boneblack) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-bonewhite.make b/configs/platform-v7a/rules/blspec-bonewhite.make deleted file mode 100644 index 3c4566b..0000000 --- a/configs/platform-v7a/rules/blspec-bonewhite.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2016 by Michael Grzeschik <mgr@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_BONEWHITE) += blspec-bonewhite - -BLSPEC_BONEWHITE_VERSION := 4.6 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-bonewhite.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-bonewhite) - @$(call install_fixup,blspec-bonewhite,PRIORITY,optional) - @$(call install_fixup,blspec-bonewhite,SECTION,base) - @$(call install_fixup,blspec-bonewhite,AUTHOR,"Michael Grzeschik <mgr@pengutronix.de>") - @$(call install_fixup,blspec-bonewhite,DESCRIPTION,missing) - - @$(call install_alternative, blspec-bonewhite, 0, 0, 0644, \ - /loader/entries/bonewhite.conf) - - @$(call install_finish,blspec-bonewhite) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-lxa-mc1.make b/configs/platform-v7a/rules/blspec-lxa-mc1.make deleted file mode 100644 index 62cafb3..0000000 --- a/configs/platform-v7a/rules/blspec-lxa-mc1.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2020 by Ahmad Fatoum <a.fatoum@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_LXA_MC1) += blspec-lxa-mc1 - -BLSPEC_LXA_MC1_VERSION := 5.4 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-lxa-mc1.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-lxa-mc1) - @$(call install_fixup,blspec-lxa-mc1,PRIORITY,optional) - @$(call install_fixup,blspec-lxa-mc1,SECTION,base) - @$(call install_fixup,blspec-lxa-mc1,AUTHOR,"Ahmad Fatoum <a.fatoum@pengutronix.de>") - @$(call install_fixup,blspec-lxa-mc1,DESCRIPTION,missing) - - @$(call install_alternative, blspec-lxa-mc1, 0, 0, 0644, \ - /loader/entries/lxa-mc1.conf) - - @$(call install_finish,blspec-lxa-mc1) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-nitrogen6max.make b/configs/platform-v7a/rules/blspec-nitrogen6max.make deleted file mode 100644 index 6fb6466..0000000 --- a/configs/platform-v7a/rules/blspec-nitrogen6max.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2019 by Michael Olbrich <m.olbrich@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_NITROGEN6MAX) += blspec-nitrogen6max - -BLSPEC_NITROGEN6MAX_VERSION := 5.3 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-nitrogen6max.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-nitrogen6max) - @$(call install_fixup,blspec-nitrogen6max,PRIORITY,optional) - @$(call install_fixup,blspec-nitrogen6max,SECTION,base) - @$(call install_fixup,blspec-nitrogen6max,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>") - @$(call install_fixup,blspec-nitrogen6max,DESCRIPTION,missing) - - @$(call install_alternative, blspec-nitrogen6max, 0, 0, 0644, \ - /loader/entries/nitrogen6max.conf) - - @$(call install_finish,blspec-nitrogen6max) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-nitrogen6x.make b/configs/platform-v7a/rules/blspec-nitrogen6x.make deleted file mode 100644 index 7ecc7d7..0000000 --- a/configs/platform-v7a/rules/blspec-nitrogen6x.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2017 by Roland Hieber <r.hieber@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_NITROGEN6X) += blspec-nitrogen6x - -BLSPEC_NITROGEN6X_VERSION := 4.12 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-nitrogen6x.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-nitrogen6x) - @$(call install_fixup,blspec-nitrogen6x,PRIORITY,optional) - @$(call install_fixup,blspec-nitrogen6x,SECTION,base) - @$(call install_fixup,blspec-nitrogen6x,AUTHOR,"Roland Hieber <r.hieber@pengutronix.de>") - @$(call install_fixup,blspec-nitrogen6x,DESCRIPTION,missing) - - @$(call install_alternative, blspec-nitrogen6x, 0, 0, 0644, \ - /loader/entries/nitrogen6x.conf) - - @$(call install_finish,blspec-nitrogen6x) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-riotboard.make b/configs/platform-v7a/rules/blspec-riotboard.make deleted file mode 100644 index 9a100e7..0000000 --- a/configs/platform-v7a/rules/blspec-riotboard.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2017 by Rouven Czerwinski <r.czerwinski@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_RIOTBOARD) += blspec-riotboard - -BLSPEC_RIOTBOARD_VERSION := 4.11 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-riotboard.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-riotboard) - @$(call install_fixup,blspec-riotboard,PRIORITY,optional) - @$(call install_fixup,blspec-riotboard,SECTION,base) - @$(call install_fixup,blspec-riotboard,AUTHOR,"Rouven Czerwinski <r.czerwinski@pengutronix.de>") - @$(call install_fixup,blspec-riotboard,DESCRIPTION,missing) - - @$(call install_alternative, blspec-riotboard, 0, 0, 0644, \ - /loader/entries/riotboard.conf) - - @$(call install_finish,blspec-riotboard) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-rpi2.make b/configs/platform-v7a/rules/blspec-rpi2.make deleted file mode 100644 index f043afd..0000000 --- a/configs/platform-v7a/rules/blspec-rpi2.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2016 by Alexander Aring <aar@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_RPI2) += blspec-rpi2 - -BLSPEC_RPI2_VERSION := 4.6 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-rpi2.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-rpi2) - @$(call install_fixup,blspec-rpi2,PRIORITY,optional) - @$(call install_fixup,blspec-rpi2,SECTION,base) - @$(call install_fixup,blspec-rpi2,AUTHOR,"Alexander Aring <aar@pengutronix.de>") - @$(call install_fixup,blspec-rpi2,DESCRIPTION,missing) - - @$(call install_alternative, blspec-rpi2, 0, 0, 0644, \ - /loader/entries/rpi2.conf) - - @$(call install_finish,blspec-rpi2) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-rpi3.make b/configs/platform-v7a/rules/blspec-rpi3.make deleted file mode 100644 index 6614d94..0000000 --- a/configs/platform-v7a/rules/blspec-rpi3.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2018 by Rouven Czerwinski <r.czerwinski@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_RPI3) += blspec-rpi3 - -BLSPEC_RPI3_VERSION := 4.6 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-rpi3.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-rpi3) - @$(call install_fixup,blspec-rpi3,PRIORITY,optional) - @$(call install_fixup,blspec-rpi3,SECTION,base) - @$(call install_fixup,blspec-rpi3,AUTHOR,"Rouven Czerwinski <r.czerwinski@pengutronix.de>") - @$(call install_fixup,blspec-rpi3,DESCRIPTION,missing) - - @$(call install_alternative, blspec-rpi3, 0, 0, 0644, \ - /loader/entries/rpi3.conf) - - @$(call install_finish,blspec-rpi3) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-rpicm3.make b/configs/platform-v7a/rules/blspec-rpicm3.make deleted file mode 100644 index 4908a8b..0000000 --- a/configs/platform-v7a/rules/blspec-rpicm3.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2021 by Uwe Kleine-König <u.kleine-koenig@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_RPICM3) += blspec-rpicm3 - -BLSPEC_RPICM3_VERSION := 4.6 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-rpicm3.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-rpicm3) - @$(call install_fixup,blspec-rpicm3,PRIORITY,optional) - @$(call install_fixup,blspec-rpicm3,SECTION,base) - @$(call install_fixup,blspec-rpicm3,AUTHOR,"Uwe Kleine-König <u.kleine-koenig@pengutronix.de>") - @$(call install_fixup,blspec-rpicm3,DESCRIPTION,missing) - - @$(call install_alternative, blspec-rpicm3, 0, 0, 0644, \ - /loader/entries/rpicm3.conf) - - @$(call install_finish,blspec-rpicm3) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-sabrelite.make b/configs/platform-v7a/rules/blspec-sabrelite.make deleted file mode 100644 index 493b4e8..0000000 --- a/configs/platform-v7a/rules/blspec-sabrelite.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_SABRELITE) += blspec-sabrelite - -BLSPEC_SABRELITE_VERSION := 4.11 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-sabrelite.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-sabrelite) - @$(call install_fixup,blspec-sabrelite,PRIORITY,optional) - @$(call install_fixup,blspec-sabrelite,SECTION,base) - @$(call install_fixup,blspec-sabrelite,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>") - @$(call install_fixup,blspec-sabrelite,DESCRIPTION,missing) - - @$(call install_alternative, blspec-sabrelite, 0, 0, 0644, \ - /loader/entries/sabrelite.conf) - - @$(call install_finish,blspec-sabrelite) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-sama5d27-giantboard.make b/configs/platform-v7a/rules/blspec-sama5d27-giantboard.make deleted file mode 100644 index d944d91..0000000 --- a/configs/platform-v7a/rules/blspec-sama5d27-giantboard.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2020 by Ahmad Fatoum <a.fatoum@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_SAMA5D27_GIANTBOARD) += blspec-sama5d27-giantboard - -BLSPEC_SAMA5D27_GIANTBOARD_VERSION := 5.8 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-sama5d27-giantboard.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-sama5d27-giantboard) - @$(call install_fixup,blspec-sama5d27-giantboard,PRIORITY,optional) - @$(call install_fixup,blspec-sama5d27-giantboard,SECTION,base) - @$(call install_fixup,blspec-sama5d27-giantboard,AUTHOR,"Ahmad Fatoum <afa@pengutronix.de>") - @$(call install_fixup,blspec-sama5d27-giantboard,DESCRIPTION,missing) - - @$(call install_alternative, blspec-sama5d27-giantboard, 0, 0, 0644, \ - /loader/entries/sama5d27-giantboard.conf) - - @$(call install_finish,blspec-sama5d27-giantboard) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-sama5d27-som1-ek.make b/configs/platform-v7a/rules/blspec-sama5d27-som1-ek.make deleted file mode 100644 index 1c84bc7..0000000 --- a/configs/platform-v7a/rules/blspec-sama5d27-som1-ek.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2020 by Ahmad Fatoum <a.fatoum@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_SAMA5D27_SOM1_EK) += blspec-sama5d27-som1-ek - -BLSPEC_SAMA5D27_SOM1_EK_VERSION := 5.8 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-sama5d27-som1-ek.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-sama5d27-som1-ek) - @$(call install_fixup,blspec-sama5d27-som1-ek,PRIORITY,optional) - @$(call install_fixup,blspec-sama5d27-som1-ek,SECTION,base) - @$(call install_fixup,blspec-sama5d27-som1-ek,AUTHOR,"Ahmad Fatoum <afa@pengutronix.de>") - @$(call install_fixup,blspec-sama5d27-som1-ek,DESCRIPTION,missing) - - @$(call install_alternative, blspec-sama5d27-som1-ek, 0, 0, 0644, \ - /loader/entries/sama5d27-som1-ek.conf) - - @$(call install_finish,blspec-sama5d27-som1-ek) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-stm32mp157c-dk2.make b/configs/platform-v7a/rules/blspec-stm32mp157c-dk2.make deleted file mode 100644 index e057fa9..0000000 --- a/configs/platform-v7a/rules/blspec-stm32mp157c-dk2.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_STM32MP157C_DK2) += blspec-stm32mp157c-dk2 - -BLSPEC_STM32MP157C_DK2_VERSION := 4.11 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-stm32mp157c-dk2.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-stm32mp157c-dk2) - @$(call install_fixup,blspec-stm32mp157c-dk2,PRIORITY,optional) - @$(call install_fixup,blspec-stm32mp157c-dk2,SECTION,base) - @$(call install_fixup,blspec-stm32mp157c-dk2,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>") - @$(call install_fixup,blspec-stm32mp157c-dk2,DESCRIPTION,missing) - - @$(call install_alternative, blspec-stm32mp157c-dk2, 0, 0, 0644, \ - /loader/entries/stm32mp157c-dk2.conf) - - @$(call install_finish,blspec-stm32mp157c-dk2) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-stm32mp157c-ev1.make b/configs/platform-v7a/rules/blspec-stm32mp157c-ev1.make deleted file mode 100644 index 6c3f1ee..0000000 --- a/configs/platform-v7a/rules/blspec-stm32mp157c-ev1.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_STM32MP157C_EV1) += blspec-stm32mp157c-ev1 - -BLSPEC_STM32MP157C_EV1_VERSION := 5.13 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-stm32mp157c-ev1.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-stm32mp157c-ev1) - @$(call install_fixup,blspec-stm32mp157c-ev1,PRIORITY,optional) - @$(call install_fixup,blspec-stm32mp157c-ev1,SECTION,base) - @$(call install_fixup,blspec-stm32mp157c-ev1,AUTHOR,"Sascha Hauer <s.hauer@pengutronix.de>") - @$(call install_fixup,blspec-stm32mp157c-ev1,DESCRIPTION,missing) - - @$(call install_alternative, blspec-stm32mp157c-ev1, 0, 0, 0644, \ - /loader/entries/stm32mp157c-ev1.conf) - - @$(call install_finish,blspec-stm32mp157c-ev1) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-udoo-neo.make b/configs/platform-v7a/rules/blspec-udoo-neo.make deleted file mode 100644 index ffcc8c9..0000000 --- a/configs/platform-v7a/rules/blspec-udoo-neo.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2017 by Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_UDOO_NEO) += blspec-udoo-neo - -BLSPEC_UDOO_NEO_VERSION := 4.11 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-udoo-neo.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-udoo-neo) - @$(call install_fixup,blspec-udoo-neo,PRIORITY,optional) - @$(call install_fixup,blspec-udoo-neo,SECTION,base) - @$(call install_fixup,blspec-udoo-neo,AUTHOR,"Uwe Kleine-Koenig <u.kleine-koenig@pengutronix.de>") - @$(call install_fixup,blspec-udoo-neo,DESCRIPTION,missing) - - @$(call install_alternative, blspec-udoo-neo, 0, 0, 0644, \ - /loader/entries/udoo-neo.conf) - - @$(call install_finish,blspec-udoo-neo) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/blspec-vexpress.make b/configs/platform-v7a/rules/blspec-vexpress.make deleted file mode 100644 index 5471a83..0000000 --- a/configs/platform-v7a/rules/blspec-vexpress.make +++ /dev/null @@ -1,36 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2017 by Chris Fiege <c.fiege@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -PACKAGES-$(PTXCONF_BLSPEC_VEXPRESS) += blspec-vexpress - -BLSPEC_VEXPRESS_VERSION := 4.11 - -# ---------------------------------------------------------------------------- -# Target-Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/blspec-vexpress.targetinstall: - @$(call targetinfo) - - @$(call install_init, blspec-vexpress) - @$(call install_fixup,blspec-vexpress,PRIORITY,optional) - @$(call install_fixup,blspec-vexpress,SECTION,base) - @$(call install_fixup,blspec-vexpress,AUTHOR,"Chris Fiege <c.fiege@pengutronix.de>") - @$(call install_fixup,blspec-vexpress,DESCRIPTION,missing) - - @$(call install_alternative, blspec-vexpress, 0, 0, 0644, \ - /loader/entries/vexpress.conf) - - @$(call install_finish,blspec-vexpress) - - @$(call touch) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/image-lxa-mc1.make b/configs/platform-v7a/rules/image-lxa-mc1.make index 058a9d1..333a5f6 100644 --- a/configs/platform-v7a/rules/image-lxa-mc1.make +++ b/configs/platform-v7a/rules/image-lxa-mc1.make @@ -11,9 +11,7 @@ # IMAGE_PACKAGES-$(PTXCONF_IMAGE_LXA_MC1) += image-lxa-mc1 -IMAGE_LXA_MC1_ENV := \ - STM32MP_BOARD_FSBL=stm32mp157c-lxa-mc1 \ - STM32MP_BOARD_SSBL=stm32mp157c-lxa-mc1 +IMAGE_LXA_MC1_ENV := STM32MP_BOARD=stm32mp157c-lxa-mc1 # # Paths and names diff --git a/configs/platform-v7a/rules/image-rpi2.make b/configs/platform-v7a/rules/image-rpi2.make index 8e192e4..22f1158 100644 --- a/configs/platform-v7a/rules/image-rpi2.make +++ b/configs/platform-v7a/rules/image-rpi2.make @@ -16,10 +16,10 @@ IMAGE_PACKAGES-$(PTXCONF_IMAGE_RPI2) += image-rpi2 # IMAGE_RPI2 := image-rpi2 IMAGE_RPI2_DIR := $(BUILDDIR)/$(IMAGE_RPI2) -IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi2.hdimg +IMAGE_RPI2_IMAGE := $(IMAGEDIR)/rpi.hdimg IMAGE_RPI2_FILES := $(IMAGEDIR)/root.tgz IMAGE_RPI2_CONFIG := rpi2.config -IMAGE_RPI2_DATA_DIR := $(call ptx/in-platformconfigdir, rpi-firmware) +IMAGE_RPI2_DATA_DIR := $(call ptx/in-path, PTXDIST_PATH, rpi-firmware) IMAGE_RPI2_DATA := \ $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.bin) \ $(wildcard $(IMAGE_RPI2_DATA_DIR)/*.elf) \ diff --git a/configs/platform-v7a/rules/image-rpi3.make b/configs/platform-v7a/rules/image-rpi3.make deleted file mode 100644 index 5c56c3a..0000000 --- a/configs/platform-v7a/rules/image-rpi3.make +++ /dev/null @@ -1,46 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -IMAGE_PACKAGES-$(PTXCONF_IMAGE_RPI3) += image-rpi3 - -# -# Paths and names -# -IMAGE_RPI3 := image-rpi3 -IMAGE_RPI3_DIR := $(BUILDDIR)/$(IMAGE_RPI3) -IMAGE_RPI3_IMAGE := $(IMAGEDIR)/rpi3.hdimg -IMAGE_RPI3_FILES := $(IMAGEDIR)/root.tgz -IMAGE_RPI3_CONFIG := rpi3.config -IMAGE_RPI3_DATA_DIR := $(call ptx/in-platformconfigdir, rpi-firmware) -IMAGE_RPI3_DATA := \ - $(wildcard $(IMAGE_RPI3_DATA_DIR)/*.bin) \ - $(wildcard $(IMAGE_RPI3_DATA_DIR)/*.elf) \ - $(wildcard $(IMAGE_RPI3_DATA_DIR)/*.dat) \ - $(wildcard $(IMAGE_RPI3_DATA_DIR)/*.dtb) \ - $(wildcard $(IMAGE_RPI3_DATA_DIR)/config.txt) - -# ---------------------------------------------------------------------------- -# Image -# ---------------------------------------------------------------------------- - -define squote_and_comma -$(subst $(ptx/def/space),$(comma) ,$(addsuffix $(ptx/def/squote),$(addprefix $(ptx/def/squote),$(1)))) -endef - -IMAGE_RPI3_ENV := \ - FIRMWARE_RPI3="$(call squote_and_comma,$(IMAGE_RPI3_DATA))" - -$(IMAGE_RPI3_IMAGE): - @$(call targetinfo) - @$(call image/genimage, IMAGE_RPI3) - @$(call finish) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/image-rpicm3.make b/configs/platform-v7a/rules/image-rpicm3.make deleted file mode 100644 index 81cdd26..0000000 --- a/configs/platform-v7a/rules/image-rpicm3.make +++ /dev/null @@ -1,46 +0,0 @@ -# -*-makefile-*- -# -# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de> -# -# For further information about the PTXdist project and license conditions -# see the README file. -# - -# -# We provide this package -# -IMAGE_PACKAGES-$(PTXCONF_IMAGE_RPICM3) += image-rpicm3 - -# -# Paths and names -# -IMAGE_RPICM3 := image-rpicm3 -IMAGE_RPICM3_DIR := $(BUILDDIR)/$(IMAGE_RPICM3) -IMAGE_RPICM3_IMAGE := $(IMAGEDIR)/rpicm3.hdimg -IMAGE_RPICM3_FILES := $(IMAGEDIR)/root.tgz -IMAGE_RPICM3_CONFIG := rpicm3.config -IMAGE_RPICM3_DATA_DIR := $(call ptx/in-platformconfigdir, rpi-firmware) -IMAGE_RPICM3_DATA := \ - $(wildcard $(IMAGE_RPICM3_DATA_DIR)/*.bin) \ - $(wildcard $(IMAGE_RPICM3_DATA_DIR)/*.elf) \ - $(wildcard $(IMAGE_RPICM3_DATA_DIR)/*.dat) \ - $(wildcard $(IMAGE_RPICM3_DATA_DIR)/*.dtb) \ - $(wildcard $(IMAGE_RPICM3_DATA_DIR)/config.txt) - -# ---------------------------------------------------------------------------- -# Image -# ---------------------------------------------------------------------------- - -define squote_and_comma -$(subst $(ptx/def/space),$(comma) ,$(addsuffix $(ptx/def/squote),$(addprefix $(ptx/def/squote),$(1)))) -endef - -IMAGE_RPICM3_ENV := \ - FIRMWARE_RPI3="$(call squote_and_comma,$(IMAGE_RPICM3_DATA))" - -$(IMAGE_RPICM3_IMAGE): - @$(call targetinfo) - @$(call image/genimage, IMAGE_RPICM3) - @$(call finish) - -# vim: syntax=make diff --git a/configs/platform-v7a/rules/image-stm32mp135f-dk.make b/configs/platform-v7a/rules/image-stm32mp135f-dk.make new file mode 100644 index 0000000..c7fefb2 --- /dev/null +++ b/configs/platform-v7a/rules/image-stm32mp135f-dk.make @@ -0,0 +1,34 @@ +# -*-makefile-*- +# +# Copyright (C) 2017 by Sascha Hauer <s.hauer@pengutronix.de> +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +IMAGE_PACKAGES-$(PTXCONF_IMAGE_STM32MP135F_DK) += image-stm32mp135f-dk + +IMAGE_STM32MP135F_DK_ENV := STM32MP_BOARD=stm32mp135f-dk + +# +# Paths and names +# +IMAGE_STM32MP135F_DK := image-stm32mp135f-dk +IMAGE_STM32MP135F_DK_DIR := $(BUILDDIR)/$(IMAGE_STM32MP135F_DK) +IMAGE_STM32MP135F_DK_IMAGE := $(IMAGEDIR)/stm32mp135f-dk.hdimg +IMAGE_STM32MP135F_DK_FILES := $(IMAGEDIR)/root.tgz +IMAGE_STM32MP135F_DK_CONFIG := stm32mp-optee.config + +# ---------------------------------------------------------------------------- +# Image +# ---------------------------------------------------------------------------- + +$(IMAGE_STM32MP135F_DK_IMAGE): + @$(call targetinfo) + @$(call image/genimage, IMAGE_STM32MP135F_DK) + @$(call finish) + +# vim: syntax=make diff --git a/configs/platform-v7a/rules/image-stm32mp157c-dk2.make b/configs/platform-v7a/rules/image-stm32mp157c-dk2.make index 7c0f442..fb14c7a 100644 --- a/configs/platform-v7a/rules/image-stm32mp157c-dk2.make +++ b/configs/platform-v7a/rules/image-stm32mp157c-dk2.make @@ -11,9 +11,7 @@ # IMAGE_PACKAGES-$(PTXCONF_IMAGE_STM32MP157C_DK2) += image-stm32mp157c-dk2 -IMAGE_STM32MP157C_DK2_ENV := \ - STM32MP_BOARD_FSBL=stm32mp157c-dk2 \ - STM32MP_BOARD_SSBL=stm32mp15xx-dkx +IMAGE_STM32MP157C_DK2_ENV := STM32MP_BOARD=stm32mp157c-dk2 # # Paths and names diff --git a/configs/platform-v7a/rules/image-stm32mp157c-ev1.make b/configs/platform-v7a/rules/image-stm32mp157c-ev1.make index 862ea5a..297b0f6 100644 --- a/configs/platform-v7a/rules/image-stm32mp157c-ev1.make +++ b/configs/platform-v7a/rules/image-stm32mp157c-ev1.make @@ -11,9 +11,7 @@ # IMAGE_PACKAGES-$(PTXCONF_IMAGE_STM32MP157C_EV1) += image-stm32mp157c-ev1 -IMAGE_STM32MP157C_EV1_ENV := \ - STM32MP_BOARD_FSBL=stm32mp157c-ev1 \ - STM32MP_BOARD_SSBL=stm32mp15x-ev1 +IMAGE_STM32MP157C_EV1_ENV := STM32MP_BOARD=stm32mp157c-ev1 # # Paths and names diff --git a/configs/platform-v7a/rules/image-vexpress-nor.make b/configs/platform-v7a/rules/image-vexpress-nor.make index 8d97b1b..e10223b 100644 --- a/configs/platform-v7a/rules/image-vexpress-nor.make +++ b/configs/platform-v7a/rules/image-vexpress-nor.make @@ -9,12 +9,12 @@ # # We provide this package # -IMAGE_PACKAGES-$(PTXCONF_IMAGE_VEXPRESS_NOR) += image-flash +IMAGE_PACKAGES-$(PTXCONF_IMAGE_VEXPRESS_NOR) += image-vexpress-nor # # Paths and names # -IMAGE_VEXPRESS_NOR := image-flash +IMAGE_VEXPRESS_NOR := image-vexpress-nor IMAGE_VEXPRESS_NOR_DIR := $(BUILDDIR)/$(IMAGE_VEXPRESS_NOR) IMAGE_VEXPRESS_NOR_IMAGE := $(IMAGEDIR)/vexpress.norimg IMAGE_VEXPRESS_NOR_CONFIG := vexpress-nor.config diff --git a/configs/platform-v7a/rules/image-wifx-l1-sd.make b/configs/platform-v7a/rules/image-wifx-l1-sd.make new file mode 100644 index 0000000..3b92a6e --- /dev/null +++ b/configs/platform-v7a/rules/image-wifx-l1-sd.make @@ -0,0 +1,36 @@ +# -*-makefile-*- +# +# Copyright (C) 2020 by Ahmad Fatoum <a.fatoum@pengutronix.de> +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +IMAGE_PACKAGES-$(PTXCONF_IMAGE_WIFX_L1_SD) += image-wifx-l1-sd + +# +# Paths and names +# +IMAGE_WIFX_L1_SD := image-wifx-l1-sd +IMAGE_WIFX_L1_SD_DIR := $(BUILDDIR)/$(IMAGE_WIFX_L1_SD) +IMAGE_WIFX_L1_SD_IMAGE := $(IMAGEDIR)/wifx-l1.hdimg +IMAGE_WIFX_L1_SD_FILES := $(IMAGEDIR)/root.tgz +IMAGE_WIFX_L1_SD_CONFIG := at91-sd.config + +# ---------------------------------------------------------------------------- +# Image +# ---------------------------------------------------------------------------- + +IMAGE_WIFX_L1_SD_ENV := \ + FSBL=at91bootstrap.bin \ + SSBL=barebox-wifx-l1.img + +$(IMAGE_WIFX_L1_SD_IMAGE): + @$(call targetinfo) + @$(call image/genimage, IMAGE_WIFX_L1_SD) + @$(call finish) + +# vim: syntax=make diff --git a/configs/platform-v7a/rules/tf-a-stm32mp13.make b/configs/platform-v7a/rules/tf-a-stm32mp13.make new file mode 100644 index 0000000..36feb25 --- /dev/null +++ b/configs/platform-v7a/rules/tf-a-stm32mp13.make @@ -0,0 +1,110 @@ +# -*-makefile-*- +# +# Copyright (C) 2018 by Rouven Czerwinski <r.czerwinski@pengutronix.de> +# 2019 by Ahmad Fatoum <a.fatoum@pengutronix.de> +# +# For further information about the PTXdist project and license conditions +# see the README file. +# + +# +# We provide this package +# +PACKAGES-$(PTXCONF_TF_A_STM32MP13) += tf-a-stm32mp13 + +# +# Paths and names +# +TF_A_STM32MP13_VERSION := $(call ptx/config-version, PTXCONF_TF_A) +TF_A_STM32MP13_MD5 := $(call ptx/config-md5, PTXCONF_TF_A) +TF_A_STM32MP13 := tf-a-stm32mp13-$(TF_A_STM32MP13_VERSION) +TF_A_STM32MP13_SUFFIX := tar.gz +TF_A_STM32MP13_URL := https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/$(TF_A_STM32MP13_VERSION).$(TF_A_STM32MP13_SUFFIX) +TF_A_STM32MP13_SOURCE := $(SRCDIR)/$(TF_A_STM32MP13).$(TF_A_STM32MP13_SUFFIX) +TF_A_STM32MP13_DIR := $(BUILDDIR)/$(TF_A_STM32MP13) +TF_A_STM32MP13_BUILDDIR := $(TF_A_STM32MP13_DIR)/build +TF_A_STM32MP13_BUILD_OOT := YES +TF_A_STM32MP13_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_STM32MP13_PLATFORMS := stm32mp1 +TF_A_STM32MP13_ARTIFACTS := tf-a-*.stm32 fdts/*-fw-config.dtb + +TF_A_STM32MP13_WRAPPER_BLACKLIST := \ + $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) + +TF_A_STM32MP13_PATH := PATH=$(CROSS_PATH) +TF_A_STM32MP13_MAKE_OPT := \ + -C $(TF_A_STM32MP13_DIR) \ + CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ + HOSTCC=$(HOSTCC) \ + ARCH=aarch32 \ + ARM_ARCH_MAJOR=7 \ + BUILD_STRING=$(TF_A_STM32MP13_VERSION) \ + DTB_FILE_NAME='stm32mp135f-dk.dtb' \ + STM32MP_EMMC=1 STM32MP_SDMMC=1 \ + STM32MP_RAW_NAND=1 STM32MP_SPI_NAND=1 STM32MP_SPI_NOR=1 \ + STM32MP_USB_PROGRAMMER=1 \ + AARCH32_SP=optee \ + all + +TF_A_STM32MP13_CONF_TOOL := NO + +# ---------------------------------------------------------------------------- +# Compile +# ---------------------------------------------------------------------------- + +TF_A_STM32MP13_MAKE_ENV := $(CROSS_ENV) + +$(STATEDIR)/tf-a-stm32mp13.compile: + @$(call targetinfo) + + @$(foreach plat, $(TF_A_STM32MP13_PLATFORMS), \ + $(call compile, TF_A_STM32MP13, \ + $(TF_A_STM32MP13_MAKE_OPT) PLAT=$(plat))$(ptx/nl)) + + @$(call touch) + +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- + +tf-a-stm32mp13/inst_plat = $(foreach artifact, \ + $(foreach pattern, $(TF_A_STM32MP13_ARTIFACTS), \ + $(wildcard $(TF_A_STM32MP13_BUILDDIR)/$(1)/$(if $(filter DEBUG=1,TF_A_STM32MP13_MAKE_OPT),debug,release)/$(pattern))), \ + install -v -D -m 644 $(artifact) \ + $(2)/$(1)-$(notdir $(artifact))$(ptx/nl)) + +tf-a-stm32mp13/inst_bins = $(foreach plat, $(TF_A_STM32MP13_PLATFORMS), $(call tf-a-stm32mp13/inst_plat,$(plat),$(1))) + +$(STATEDIR)/tf-a-stm32mp13.install: + @$(call targetinfo) + @$(call tf-a-stm32mp13/inst_bins,$(TF_A_STM32MP13_PKGDIR)/usr/lib/firmware) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Target-Install +# ---------------------------------------------------------------------------- + +$(STATEDIR)/tf-a-stm32mp13.targetinstall: + @$(call targetinfo) + @$(call tf-a-stm32mp13/inst_bins,$(IMAGEDIR)) + @$(call touch) + +# ---------------------------------------------------------------------------- +# Clean +# ---------------------------------------------------------------------------- + +$(STATEDIR)/tf-a-stm32mp13.clean: + @$(call targetinfo) + @rm -vf $(addprefix $(IMAGEDIR)/, $(notdir $(TF_A_STM32MP13_ARTIFACTS_SRC))) + @$(call clean_pkg, TF_A_STM32MP13) + +# vim: syntax=make |