diff options
author | Mark Rutland <mark.rutland@arm.com> | 2021-07-26 12:31:08 +0100 |
---|---|---|
committer | Mark Rutland <mark.rutland@arm.com> | 2021-08-02 15:36:52 +0100 |
commit | 9a730aac690fe329dddbb401d66e7c41d57889c2 (patch) | |
tree | 1a851f66fd493b65cba5232de2b6c1905655b236 | |
parent | a68fa4856fb0fb9e1c8cabbb0937fca20cc47cd4 (diff) | |
download | boot-wrapper-aarch64-9a730aac690fe329dddbb401d66e7c41d57889c2.tar.gz |
Move scripts to a `scripts` directory
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.
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Andre Przywara <andre.przywara@arm.com>
-rw-r--r-- | Makefile.am | 20 | ||||
-rwxr-xr-x | scripts/FDT.pm (renamed from FDT.pm) | 0 | ||||
-rwxr-xr-x | scripts/addpsci.pl (renamed from addpsci.pl) | 0 | ||||
-rwxr-xr-x | scripts/findbase.pl (renamed from findbase.pl) | 0 | ||||
-rwxr-xr-x | scripts/findcpuids.pl (renamed from findcpuids.pl) | 0 | ||||
-rwxr-xr-x | scripts/findmem.pl (renamed from findmem.pl) | 0 |
6 files changed, 11 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 8ffb2d6..30804fa 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 := 24000000 -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/addpsci.pl b/scripts/addpsci.pl index 06270ca..06270ca 100755 --- a/addpsci.pl +++ b/scripts/addpsci.pl diff --git a/findbase.pl b/scripts/findbase.pl index 1b6b93e..1b6b93e 100755 --- a/findbase.pl +++ b/scripts/findbase.pl diff --git a/findcpuids.pl b/scripts/findcpuids.pl index 709db69..709db69 100755 --- a/findcpuids.pl +++ b/scripts/findcpuids.pl diff --git a/findmem.pl b/scripts/findmem.pl index ae75a8c..ae75a8c 100755 --- a/findmem.pl +++ b/scripts/findmem.pl |