* [Buildroot] [PATCH 1/1] boot/arm-trusted-firmware: add target board options [not found] <20220721203307.30488-1-x-shi@ti.com> @ 2022-07-21 20:38 ` Xuanhao Shi via buildroot 2022-07-22 7:55 ` Thomas Petazzoni via buildroot 0 siblings, 1 reply; 5+ messages in thread From: Xuanhao Shi via buildroot @ 2022-07-21 20:38 UTC (permalink / raw) To: buildroot; +Cc: Alden Benedick Agcon, Xuanhao Shi, Sergey Ostrovsky Some platforms such as TI's k3 outputs a TARGET_BOARD directory in their ATF build output paths after PLATFORM. $(@D)/build/<PLATFORM>/ does not contain the debug or release directories for these platforms. They are under $(@D)/build/<PLATFORM>/<TARGET_BOARD>/ Signed-off-by: Xuanhao Shi <x-shi@ti.com> --- boot/arm-trusted-firmware/Config.in | 5 +++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index b1fc03e10b..a9354522b5 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -68,6 +68,11 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM help Target plaform to build for. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD + string "ATF target board" + help + Target board to build for. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH string "Device Tree Source file paths" help diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 998de4b814..30ecb187ae 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -41,18 +41,29 @@ endif ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) +ARM_TRUSTED_FIRMWARE_TARGET_BOARD = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD)) + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/debug +else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug +endif +else +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/release else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release endif +endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ $(if $(BR2_PIC_PIE),CFLAGS="-fno-PIE") \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ - PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) + PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ + TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ $(TARGET_MAKE_ENV) \ -- 2.17.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] boot/arm-trusted-firmware: add target board options 2022-07-21 20:38 ` [Buildroot] [PATCH 1/1] boot/arm-trusted-firmware: add target board options Xuanhao Shi via buildroot @ 2022-07-22 7:55 ` Thomas Petazzoni via buildroot 2022-07-22 13:56 ` Xuanhao Shi via buildroot 2022-07-22 14:33 ` Xuanhao Shi via buildroot 0 siblings, 2 replies; 5+ messages in thread From: Thomas Petazzoni via buildroot @ 2022-07-22 7:55 UTC (permalink / raw) To: Xuanhao Shi via buildroot Cc: Alden Benedick Agcon, Xuanhao Shi, Sergey Ostrovsky Hello, On Thu, 21 Jul 2022 15:38:56 -0500 Xuanhao Shi via buildroot <buildroot@buildroot.org> wrote: > Some platforms such as TI's k3 outputs a TARGET_BOARD directory > in their ATF build output paths after PLATFORM. > $(@D)/build/<PLATFORM>/ does not contain the debug or release > directories for these platforms. > They are under $(@D)/build/<PLATFORM>/<TARGET_BOARD>/ > > Signed-off-by: Xuanhao Shi <x-shi@ti.com> Thanks for your patch. Could you resend it with "git send-email"? Indeed, your e-mail client has mangled the patch, so it cannot be applied. Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] boot/arm-trusted-firmware: add target board options 2022-07-22 7:55 ` Thomas Petazzoni via buildroot @ 2022-07-22 13:56 ` Xuanhao Shi via buildroot 2022-07-22 14:33 ` Xuanhao Shi via buildroot 1 sibling, 0 replies; 5+ messages in thread From: Xuanhao Shi via buildroot @ 2022-07-22 13:56 UTC (permalink / raw) To: buildroot; +Cc: Sergey Matyukevich Some platforms such as TI's k3 outputs a TARGET_BOARD directory in their ATF build output paths after PLATFORM. $(@D)/build/<PLATFORM>/ does not contain the debug or release directories for these platforms. They are under $(@D)/build/<PLATFORM>/<TARGET_BOARD>/ Signed-off-by: Xuanhao Shi <x-shi@ti.com> --- boot/arm-trusted-firmware/Config.in | 5 +++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index b1fc03e10b..a9354522b5 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -68,6 +68,11 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM help Target plaform to build for. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD + string "ATF target board" + help + Target board to build for. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH string "Device Tree Source file paths" help diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 998de4b814..30ecb187ae 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -41,18 +41,29 @@ endif ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) +ARM_TRUSTED_FIRMWARE_TARGET_BOARD = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD)) + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/debug +else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug +endif +else +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/release else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release endif +endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ $(if $(BR2_PIC_PIE),CFLAGS="-fno-PIE") \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ - PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) + PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ + TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ $(TARGET_MAKE_ENV) \ -- 2.17.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] boot/arm-trusted-firmware: add target board options 2022-07-22 7:55 ` Thomas Petazzoni via buildroot 2022-07-22 13:56 ` Xuanhao Shi via buildroot @ 2022-07-22 14:33 ` Xuanhao Shi via buildroot 2022-07-23 15:39 ` Arnout Vandecappelle 1 sibling, 1 reply; 5+ messages in thread From: Xuanhao Shi via buildroot @ 2022-07-22 14:33 UTC (permalink / raw) To: buildroot; +Cc: Sergey Matyukevich This is the second try sending this patch, sorry in advance if it's duplicated. Some platforms such as TI's k3 outputs a TARGET_BOARD directory in their ATF build output paths after PLATFORM. $(@D)/build/<PLATFORM>/ does not contain the debug or release directories for these platforms. They are under $(@D)/build/<PLATFORM>/<TARGET_BOARD>/ Signed-off-by: Xuanhao Shi <x-shi@ti.com> --- boot/arm-trusted-firmware/Config.in | 5 +++++ boot/arm-trusted-firmware/arm-trusted-firmware.mk | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in index b1fc03e10b..a9354522b5 100644 --- a/boot/arm-trusted-firmware/Config.in +++ b/boot/arm-trusted-firmware/Config.in @@ -68,6 +68,11 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM help Target plaform to build for. +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD + string "ATF target board" + help + Target board to build for. + config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH string "Device Tree Source file paths" help diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk index 998de4b814..30ecb187ae 100644 --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk @@ -41,18 +41,29 @@ endif ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) +ARM_TRUSTED_FIRMWARE_TARGET_BOARD = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD)) + ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/debug +else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug +endif +else +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/release else ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release endif +endif ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ $(if $(BR2_PIC_PIE),CFLAGS="-fno-PIE") \ $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ - PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) + PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ + TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ $(TARGET_MAKE_ENV) \ -- 2.17.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/1] boot/arm-trusted-firmware: add target board options 2022-07-22 14:33 ` Xuanhao Shi via buildroot @ 2022-07-23 15:39 ` Arnout Vandecappelle 0 siblings, 0 replies; 5+ messages in thread From: Arnout Vandecappelle @ 2022-07-23 15:39 UTC (permalink / raw) To: Xuanhao Shi, buildroot; +Cc: Sergey Matyukevich On 22/07/2022 16:33, Xuanhao Shi via buildroot wrote: > This is the second try sending this patch, sorry in advance if it's > duplicated. This time it was successful! Comments like this however shouldn't be put here, but under a --- line. That way, they're automatically removed from the log when it's applied to master. Applied to master with that fixed, thanks! Regards, Arnout > > Some platforms such as TI's k3 outputs a TARGET_BOARD directory > in their ATF build output paths after PLATFORM. > $(@D)/build/<PLATFORM>/ does not contain the debug or release > directories for these platforms. > They are under $(@D)/build/<PLATFORM>/<TARGET_BOARD>/ > > Signed-off-by: Xuanhao Shi <x-shi@ti.com> > --- > boot/arm-trusted-firmware/Config.in | 5 +++++ > boot/arm-trusted-firmware/arm-trusted-firmware.mk | 13 ++++++++++++- > 2 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in > index b1fc03e10b..a9354522b5 100644 > --- a/boot/arm-trusted-firmware/Config.in > +++ b/boot/arm-trusted-firmware/Config.in > @@ -68,6 +68,11 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM > help > Target plaform to build for. > > +config BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD > + string "ATF target board" > + help > + Target board to build for. > + > config BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_DTS_PATH > string "Device Tree Source file paths" > help > diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > index 998de4b814..30ecb187ae 100644 > --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk > +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk > @@ -41,18 +41,29 @@ endif > > ARM_TRUSTED_FIRMWARE_PLATFORM = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM)) > > +ARM_TRUSTED_FIRMWARE_TARGET_BOARD = $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_TARGET_BOARD)) > + > ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DEBUG),y) > ARM_TRUSTED_FIRMWARE_MAKE_OPTS += DEBUG=1 > +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) > +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/debug > +else > ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/debug > +endif > +else > +ifneq ($(ARM_TRUSTED_FIRMWARE_TARGET_BOARD),) > +ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD)/release > else > ARM_TRUSTED_FIRMWARE_IMG_DIR = $(@D)/build/$(ARM_TRUSTED_FIRMWARE_PLATFORM)/release > endif > +endif > > ARM_TRUSTED_FIRMWARE_MAKE_OPTS += \ > CROSS_COMPILE="$(TARGET_CROSS)" \ > $(if $(BR2_PIC_PIE),CFLAGS="-fno-PIE") \ > $(call qstrip,$(BR2_TARGET_ARM_TRUSTED_FIRMWARE_ADDITIONAL_VARIABLES)) \ > - PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) > + PLAT=$(ARM_TRUSTED_FIRMWARE_PLATFORM) \ > + TARGET_BOARD=$(ARM_TRUSTED_FIRMWARE_TARGET_BOARD) > > ARM_TRUSTED_FIRMWARE_MAKE_ENV += \ > $(TARGET_MAKE_ENV) \ _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-07-23 15:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20220721203307.30488-1-x-shi@ti.com>
2022-07-21 20:38 ` [Buildroot] [PATCH 1/1] boot/arm-trusted-firmware: add target board options Xuanhao Shi via buildroot
2022-07-22 7:55 ` Thomas Petazzoni via buildroot
2022-07-22 13:56 ` Xuanhao Shi via buildroot
2022-07-22 14:33 ` Xuanhao Shi via buildroot
2022-07-23 15:39 ` Arnout Vandecappelle
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox