mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ian Abbott <abbotti@mev.co.uk>
To: barebox@lists.infradead.org
Cc: Ian Abbott <abbotti@mev.co.uk>
Subject: [PATCH] scripts: socfpga_get_sequencer: Update file paths and include paths
Date: Fri, 16 Jun 2023 16:50:42 +0100	[thread overview]
Message-ID: <20230616155042.37958-1-abbotti@mev.co.uk> (raw)

Commit ac1404f77491 ("ARM: socfpga: Move mach header files to
include/mach/socfpga") moved socfpga specific mach header files to
"include/mach/socfpga" and changed the `#include` directives in the
source code accordingly.  Update the `socfpga_get_sequencer` script to
deal with those changes.

Fixes: ac1404f77491 ("ARM: socfpga: Move mach header files to include/mach/socfpga")
Signed-off-by: Ian Abbott <abbotti@mev.co.uk>
---
 scripts/socfpga_get_sequencer | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/socfpga_get_sequencer b/scripts/socfpga_get_sequencer
index 5405bfa6ba..d21791eee9 100755
--- a/scripts/socfpga_get_sequencer
+++ b/scripts/socfpga_get_sequencer
@@ -43,7 +43,7 @@ copy_source() {
 
 	echo "	Fixing include paths..."
 	# Fix include pathes
-	sed -i 's/#include <sdram.h>/#include <mach\/cyclone5-sdram.h>/g' $tgt
+	sed -i 's/#include <sdram.h>/#include <mach\/socfpga\/cyclone5-sdram.h>/g' $tgt
 	sed -i 's/#include "sequencer_auto.h"//g' $tgt
 	sed -i 's/#include "sequencer.h"/#include "cyclone5-sequencer.h"/g' $tgt
 
@@ -54,7 +54,7 @@ copy_source() {
 	sed -i 's/[ \t]\+$//' $tgt
 
 	echo "  Running coccinelle cleanups..."
-	spatch -sp_file scripts/coccinelle/misc/altera_sequencer.cocci -in_place arch/arm/mach-socfpga/include/mach
+	spatch -sp_file scripts/coccinelle/misc/altera_sequencer.cocci -in_place include/mach/socfpga
 
 	echo "  Cleanup header..."
 	sed -i 's/^static void rw_mgr_mem_calibrate_eye_diag_aid(void);$//g' $tgt
@@ -65,20 +65,20 @@ copy_source() {
 	sed -i 's/^static void rw_mgr_decr_vfifo_auto(uint32_t grp);$//g' $tgt
 }
 
-copy_source ${ubootsrc}/board/altera/socfpga/sdram/sequencer.c arch/arm/mach-socfpga/include/mach/cyclone5-sequencer.c
-sed -i 's/static int sdram_calibration(void)/static int socfpga_mem_calibration(void)/g' arch/arm/mach-socfpga/include/mach/cyclone5-sequencer.c
+copy_source ${ubootsrc}/board/altera/socfpga/sdram/sequencer.c include/mach/socfpga/cyclone5-sequencer.c
+sed -i 's/static int sdram_calibration(void)/static int socfpga_mem_calibration(void)/g' include/mach/socfpga/cyclone5-sequencer.c
 
-copy_source ${ubootsrc}/board/altera/socfpga/sdram/sequencer.h arch/arm/mach-socfpga/include/mach/cyclone5-sequencer.h
-copy_source ${ubootsrc}/board/altera/socfpga/sdram/tclrpt.h arch/arm/mach-socfpga/include/mach/tclrpt.h
-copy_source ${ubootsrc}/board/altera/socfpga/sdram/sdram_io.h arch/arm/mach-socfpga/include/mach/sdram_io.h
-cat <<'EOF' >> arch/arm/mach-socfpga/include/mach/sdram_io.h
+copy_source ${ubootsrc}/board/altera/socfpga/sdram/sequencer.h include/mach/socfpga/cyclone5-sequencer.h
+copy_source ${ubootsrc}/board/altera/socfpga/sdram/tclrpt.h include/mach/socfpga/tclrpt.h
+copy_source ${ubootsrc}/board/altera/socfpga/sdram/sdram_io.h include/mach/socfpga/sdram_io.h
+cat <<'EOF' >> include/mach/socfpga/sdram_io.h
 	#define write_register(BASE, OFFSET, DATA) \
 		writel(DATA, ((BASE) + (OFFSET)))
 	#define read_register(BASE, OFFSET) \
 		readl((BASE) + (OFFSET))
 	#define HPS_SDR_BASE 0xffc20000
 EOF
-copy_source ${ubootsrc}/board/altera/socfpga/sdram/system.h arch/arm/mach-socfpga/include/mach/system.h
+copy_source ${ubootsrc}/board/altera/socfpga/sdram/system.h include/mach/socfpga/system.h
 
 echo "DONE"
 
-- 
2.39.2




             reply	other threads:[~2023-06-16 15:52 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-16 15:50 Ian Abbott [this message]
2023-06-21  7:57 ` Sascha Hauer

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=20230616155042.37958-1-abbotti@mev.co.uk \
    --to=abbotti@mev.co.uk \
    --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