On Fri, Jun 16, 2023 at 03:02:11PM +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. However, the files imported by the
> `socfpga_import_preloader` script are still being fixed up with the old
> `#include` directives. Update the fixing up of the include paths in
> the scripts `copy_source()` function to use the new `#include`
> directives.
>
> Fixes: ac1404f77491 ("ARM: socfpga: Move mach header files to include/mach/socfpga")
> Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
> ---
> scripts/socfpga_import_preloader | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Applied, thanks
Sascha
>
> diff --git a/scripts/socfpga_import_preloader b/scripts/socfpga_import_preloader
> index bd54e1b913..4f45a51bab 100755
> --- a/scripts/socfpga_import_preloader
> +++ b/scripts/socfpga_import_preloader
> @@ -101,7 +101,7 @@ copy_source() {
>
> echo " Fixing include pathes..."
> # Fix include pathes
> - sed -i 's/#include <iocsr_config_cyclone5.h>/#include <mach\/cyclone5-scan-manager.h>/g' $tgt
> + sed -i 's/#include <iocsr_config_cyclone5.h>/#include <mach\/socfpga\/cyclone5-scan-manager.h>/g' $tgt
> sed -i 's/#include <pinmux_config.h>/#include <common.h>/g' $tgt
> sed -i 's/#include "sequencer_auto.h"//g' $tgt
> sed -i 's/#include "sequencer_defines.h"//g' $tgt
> --
> 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 |
