mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <sha@pengutronix.de>
To: Ahmad Fatoum <a.fatoum@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: socfpga: fix include after upstream DT reorganization
Date: Mon, 7 Aug 2023 08:43:48 +0200	[thread overview]
Message-ID: <20230807064348.GI26314@pengutronix.de> (raw)
In-Reply-To: <20230804133840.1377376-1-a.fatoum@pengutronix.de>

On Fri, Aug 04, 2023 at 03:38:40PM +0200, Ahmad Fatoum wrote:
> Upstream arm32 device trees are now organized by vendor and optionally SoC
> family. Running:
> 
>   $ rg '[<"]arm/' arch/arm/dts/ | rg '[^:]+:[^/]+/[^/]+[">]'
> 
> shows that there is at least one device tree in the barebox tree, which was
> not fixed up to use the new paths, so fix that one.
> 
> Fixes: 1f2570eb41c8 ("dts: update to v6.5-rc1")
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  arch/arm/dts/socfpga_cyclone5_socdk.dts | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

> 
> diff --git a/arch/arm/dts/socfpga_cyclone5_socdk.dts b/arch/arm/dts/socfpga_cyclone5_socdk.dts
> index 0dfd5ebaed6e..ef1f9af9cf14 100644
> --- a/arch/arm/dts/socfpga_cyclone5_socdk.dts
> +++ b/arch/arm/dts/socfpga_cyclone5_socdk.dts
> @@ -15,7 +15,7 @@
>   * along with this program.  If not, see <http://www.gnu.org/licenses/>.
>   */
>  
> -#include <arm/socfpga_cyclone5_socdk.dts>
> +#include <arm/intel/socfpga/socfpga_cyclone5_socdk.dts>

This one slipped through the cracks because I only fixed up until
MAKEALL was happy and this board is not enabled in any defconfig. I just
sent a patch to enable the remaining SoCFPGA boards in
socfpga_defconfig.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |



      reply	other threads:[~2023-08-07  6:44 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-04 13:38 Ahmad Fatoum
2023-08-07  6:43 ` Sascha Hauer [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=20230807064348.GI26314@pengutronix.de \
    --to=sha@pengutronix.de \
    --cc=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox