On Fri, Jun 16, 2023 at 04:50:42PM +0100, Ian Abbott wrote:
> 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 <[email protected]>
> ---
> scripts/socfpga_get_sequencer | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
Applied, thanks
Sascha
>
> 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
>
>
>
--
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 |
