[boot-wrapper PATCH 06/12] Move scripts to a `scripts` directory
Andre Przywara
andre.przywara at arm.com
Fri Jul 30 08:13:19 PDT 2021
On Thu, 29 Jul 2021 16:20:44 +0100
Mark Rutland <mark.rutland at arm.com> wrote:
> The top-level directory is getting increasingly cluttered. For clarity
> let's move the scripts into their own directory.
>
> There should be no functional change as a result of this patch.
Yes, confirmed to be just renaming/moving. Requires autoreconf -i
though, of course.
Reviewed-by: Andre Przywara <andre.przywara at arm.com>
Cheers,
Andre
>
> Signed-off-by: Mark Rutland <mark.rutland at arm.com>
> ---
> Makefile.am | 20 +++++++++++---------
> FDT.pm => scripts/FDT.pm | 0
> addpsci.pl => scripts/addpsci.pl | 0
> findbase.pl => scripts/findbase.pl | 0
> findcpuids.pl => scripts/findcpuids.pl | 0
> findmem.pl => scripts/findmem.pl | 0
> 6 files changed, 11 insertions(+), 9 deletions(-)
> rename FDT.pm => scripts/FDT.pm (100%)
> rename addpsci.pl => scripts/addpsci.pl (100%)
> rename findbase.pl => scripts/findbase.pl (100%)
> rename findcpuids.pl => scripts/findcpuids.pl (100%)
> rename findmem.pl => scripts/findmem.pl (100%)
>
> diff --git a/Makefile.am b/Makefile.am
> index 8334049..ad13dbc 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -7,13 +7,15 @@
> # Use of this source code is governed by a BSD-style license that can be
> # found in the LICENSE.txt file.
>
> +SCRIPT_DIR := $(top_srcdir)/scripts
> +
> # VE
> -PHYS_OFFSET := $(shell perl -I $(top_srcdir) $(top_srcdir)/findmem.pl $(KERNEL_DTB))
> -UART_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,pl011')
> -SYSREGS_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,vexpress-sysreg' 2> /dev/null)
> +PHYS_OFFSET := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findmem.pl $(KERNEL_DTB))
> +UART_BASE := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findbase.pl $(KERNEL_DTB) 0 'arm,pl011')
> +SYSREGS_BASE := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findbase.pl $(KERNEL_DTB) 0 'arm,vexpress-sysreg' 2> /dev/null)
> CNTFRQ := 0x01800000 # 24Mhz
>
> -CPU_IDS := $(shell perl -I $(top_srcdir) $(top_srcdir)/findcpuids.pl $(KERNEL_DTB))
> +CPU_IDS := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findcpuids.pl $(KERNEL_DTB))
> NR_CPUS := $(shell echo $(CPU_IDS) | tr ',' ' ' | wc -w)
>
> DEFINES = -DCNTFRQ=$(CNTFRQ)
> @@ -51,7 +53,7 @@ PSCI_NODE := psci { \
> cpu_on = <$(PSCI_CPU_ON)>; \
> cpu_off = <$(PSCI_CPU_OFF)>; \
> };
> -CPU_NODES := $(shell perl -I $(top_srcdir) $(top_srcdir)/addpsci.pl $(KERNEL_DTB))
> +CPU_NODES := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/addpsci.pl $(KERNEL_DTB))
> else
> BOOTMETHOD := spin.o
> PSCI_NODE :=
> @@ -59,14 +61,14 @@ CPU_NODES :=
> endif
>
> if GICV3
> -GIC_DIST_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,gic-v3')
> -GIC_RDIST_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 1 'arm,gic-v3')
> +GIC_DIST_BASE := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findbase.pl $(KERNEL_DTB) 0 'arm,gic-v3')
> +GIC_RDIST_BASE := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findbase.pl $(KERNEL_DTB) 1 'arm,gic-v3')
> DEFINES += -DGIC_DIST_BASE=$(GIC_DIST_BASE)
> DEFINES += -DGIC_RDIST_BASE=$(GIC_RDIST_BASE)
> GIC := gic-v3.o
> else
> -GIC_DIST_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 0 'arm,cortex-a15-gic')
> -GIC_CPU_BASE := $(shell perl -I $(top_srcdir) $(top_srcdir)/findbase.pl $(KERNEL_DTB) 1 'arm,cortex-a15-gic')
> +GIC_DIST_BASE := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findbase.pl $(KERNEL_DTB) 0 'arm,cortex-a15-gic')
> +GIC_CPU_BASE := $(shell perl -I $(SCRIPT_DIR) $(SCRIPT_DIR)/findbase.pl $(KERNEL_DTB) 1 'arm,cortex-a15-gic')
> DEFINES += -DGIC_CPU_BASE=$(GIC_CPU_BASE)
> DEFINES += -DGIC_DIST_BASE=$(GIC_DIST_BASE)
> GIC := gic.o
> diff --git a/FDT.pm b/scripts/FDT.pm
> similarity index 100%
> rename from FDT.pm
> rename to scripts/FDT.pm
> diff --git a/addpsci.pl b/scripts/addpsci.pl
> similarity index 100%
> rename from addpsci.pl
> rename to scripts/addpsci.pl
> diff --git a/findbase.pl b/scripts/findbase.pl
> similarity index 100%
> rename from findbase.pl
> rename to scripts/findbase.pl
> diff --git a/findcpuids.pl b/scripts/findcpuids.pl
> similarity index 100%
> rename from findcpuids.pl
> rename to scripts/findcpuids.pl
> diff --git a/findmem.pl b/scripts/findmem.pl
> similarity index 100%
> rename from findmem.pl
> rename to scripts/findmem.pl
More information about the linux-arm-kernel
mailing list