All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Jon Mason" <jdmason@kudzu.us>
To: Anders Dellien <anders.dellien@arm.com>
Cc: meta-arm@lists.yoctoproject.org
Subject: Re: [meta-arm] [PATCH] arm-bsp/fvp-base*: move to u-boot 2020.10
Date: Thu, 14 Jan 2021 14:23:18 -0500	[thread overview]
Message-ID: <20210114192317.GE511@kudzu.us> (raw)
In-Reply-To: <20210112123452.12408-1-anders.dellien@arm.com>

On Tue, Jan 12, 2021 at 12:34:52PM +0000, Anders Dellien wrote:
> Move both FVP platforms to u-boot 2020.10
> 
> Change-Id: If94bb5a343e2709574f84283f39d8d227b32d84d
> Signed-off-by: Anders Dellien <anders.dellien@arm.com>
> ---

Pulled into master.

Thanks,
Jon

>  meta-arm-bsp/conf/machine/fvp-common.inc            |  2 +-
>  .../0001-Add-vexpress_aemv8a_aarch32-variant.patch  |  0
>  .../fvp-base}/u-boot_vexpress_fvp.patch             |  0
>  .../recipes-bsp/u-boot/u-boot_2020.07.bbappend      | 11 -----------
>  .../recipes-bsp/u-boot/u-boot_2020.10.bbappend      | 13 +++++++++++++
>  5 files changed, 14 insertions(+), 12 deletions(-)
>  rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot-2020.07 => u-boot-2020.10}/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch (100%)
>  rename meta-arm-bsp/recipes-bsp/u-boot/{u-boot-2020.07/fvp-common => u-boot-2020.10/fvp-base}/u-boot_vexpress_fvp.patch (100%)
>  create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.10.bbappend
> 
> diff --git a/meta-arm-bsp/conf/machine/fvp-common.inc b/meta-arm-bsp/conf/machine/fvp-common.inc
> index 9697de5..cdfb538 100644
> --- a/meta-arm-bsp/conf/machine/fvp-common.inc
> +++ b/meta-arm-bsp/conf/machine/fvp-common.inc
> @@ -31,7 +31,7 @@ SERIAL_CONSOLES = "115200;ttyAMA0"
>  PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
>  PREFERRED_VERSION_linux-yocto ?= "5.4%"
>  
> -PREFERRED_VERSION_u-boot ?= "2020.07"
> +PREFERRED_VERSION_u-boot ?= "2020.10"
>  PREFERRED_VERSION_trusted-firmware-a ?= "2.4%"
>  
>  EXTRA_IMAGEDEPENDS += "virtual/trusted-firmware-a u-boot"
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.10/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch
> similarity index 100%
> rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch
> rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.10/fvp-base-arm32/0001-Add-vexpress_aemv8a_aarch32-variant.patch
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/fvp-common/u-boot_vexpress_fvp.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.10/fvp-base/u-boot_vexpress_fvp.patch
> similarity index 100%
> rename from meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.07/fvp-common/u-boot_vexpress_fvp.patch
> rename to meta-arm-bsp/recipes-bsp/u-boot/u-boot-2020.10/fvp-base/u-boot_vexpress_fvp.patch
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend
> index 30d1db8..add6a78 100644
> --- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.07.bbappend
> @@ -2,7 +2,6 @@
>  
>  THIS_DIR := "${THISDIR}"
>  FILESEXTRAPATHS_prepend = "${THIS_DIR}/${BP}:"
> -FILESEXTRAPATHS_prepend_fvp-base = "${THIS_DIR}/${BP}/fvp-common:"
>  
>  #
>  # Corstone-500 MACHINE
> @@ -11,16 +10,6 @@ SRC_URI_append_corstone500 = " \
>                     file://0001-armv7-adding-generic-timer-access-through-MMIO.patch \
>                     file://0002-board-arm-add-corstone500-board.patch"
>  
> -#
> -# FVP BASE KMACHINE
> -#
> -SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
> -
> -#
> -# FVP BASE ARM32 KMACHINE
> -#
> -SRC_URI_append_fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-variant.patch"
> -
>  #
>  # Juno KMACHINE
>  #
> diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.10.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.10.bbappend
> new file mode 100644
> index 0000000..6067981
> --- /dev/null
> +++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_2020.10.bbappend
> @@ -0,0 +1,13 @@
> +# Machine specific u-boot
> +
> +FILESEXTRAPATHS_prepend := "${THISDIR}/${BP}:"
> +
> +#
> +# FVP BASE
> +#
> +SRC_URI_append_fvp-base = " file://u-boot_vexpress_fvp.patch"
> +
> +#
> +# FVP BASE ARM32
> +#
> +SRC_URI_append_fvp-base-arm32 = " file://0001-Add-vexpress_aemv8a_aarch32-variant.patch"
> -- 
> 2.17.1
> 

> 
> 
> 


      reply	other threads:[~2021-01-14 19:23 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-12 12:34 [PATCH] arm-bsp/fvp-base*: move to u-boot 2020.10 Anders Dellien
2021-01-14 19:23 ` Jon Mason [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210114192317.GE511@kudzu.us \
    --to=jdmason@kudzu.us \
    --cc=anders.dellien@arm.com \
    --cc=meta-arm@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.