aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Brucker <jean-philippe.brucker@arm.com>2015-09-16 16:18:05 +0100
committerMark Rutland <mark.rutland@arm.com>2016-06-14 17:49:21 +0100
commit23cc2e03e2d0354a0a61d1f11ac704381475757b (patch)
treeb4c91511f86f6ef85aa3381105ca4d93c53a4fe1
parent972310147bb45d7f0c0530313ac28125fe9b70fe (diff)
downloadboot-wrapper-aarch64-23cc2e03e2d0354a0a61d1f11ac704381475757b.tar.gz
Move all sources to arch-specific folder
This patch moves all assembly to arch/aarch64. Signed-off-by: Jean-Philippe Brucker <jean-philippe.brucker@arm.com> Signed-off-by: Mark Rutland <mark.rutland@arm.com>
-rw-r--r--Makefile.am3
-rw-r--r--arch/aarch64/boot.S (renamed from boot.S)2
-rw-r--r--arch/aarch64/cache.S (renamed from cache.S)2
-rw-r--r--arch/aarch64/common.S (renamed from common.S)2
-rw-r--r--arch/aarch64/gic-v3.S (renamed from gic-v3.S)2
-rw-r--r--arch/aarch64/gic.S (renamed from gic.S)2
-rw-r--r--arch/aarch64/mmu.S (renamed from mmu.S)2
-rw-r--r--arch/aarch64/ns.S (renamed from ns.S)2
-rw-r--r--arch/aarch64/psci.S (renamed from psci.S)2
-rw-r--r--arch/aarch64/spin.S (renamed from spin.S)2
10 files changed, 11 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index c2447ad..eecaa10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ DEFINES += -DSYSREGS_BASE=$(SYSREGS_BASE)
DEFINES += -DUART_BASE=$(UART_BASE)
OFILES =
+ARCH_SRC := arch/aarch64/
if PSCI
BOOTMETHOD := psci.o
@@ -80,7 +81,7 @@ endif
CPPFLAGS += $(INITRD_FLAGS)
-OFILES += boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD)
+OFILES += $(addprefix $(ARCH_SRC),boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD))
all: $(IMAGE)
diff --git a/boot.S b/arch/aarch64/boot.S
index 1a5d0b2..9e3a235 100644
--- a/boot.S
+++ b/arch/aarch64/boot.S
@@ -1,5 +1,5 @@
/*
- * boot.S - simple register setup code for stand-alone Linux booting
+ * arch/aarch64/boot.S - simple register setup code for stand-alone Linux booting
*
* Copyright (C) 2012 ARM Limited. All rights reserved.
*
diff --git a/cache.S b/arch/aarch64/cache.S
index 6ccf578..d8f2336 100644
--- a/cache.S
+++ b/arch/aarch64/cache.S
@@ -1,5 +1,5 @@
/*
- * cache.S - simple cache clean+invalidate code for stand-alone Linux booting
+ * arch/aarch64/cache.S - simple cache clean+invalidate code for stand-alone Linux booting
*
* Copyright (C) 2013 ARM Limited. All rights reserved.
*
diff --git a/common.S b/arch/aarch64/common.S
index 7ddfad0..0abf430 100644
--- a/common.S
+++ b/arch/aarch64/common.S
@@ -1,5 +1,5 @@
/*
- * common.S - common definitions useful for boot code
+ * arch/aarch64/common.S - common definitions useful for boot code
*
* Copyright (C) 2013 ARM Limited. All rights reserved.
*
diff --git a/gic-v3.S b/arch/aarch64/gic-v3.S
index 8233aab..820d76f 100644
--- a/gic-v3.S
+++ b/arch/aarch64/gic-v3.S
@@ -1,5 +1,5 @@
/*
- * gic.S - Secure gic initialisation for stand-alone Linux booting
+ * arch/aarch64/gic-v3.S - Secure gicv3 initialisation for stand-alone Linux booting
*
* Copyright (C) 2013 ARM Limited. All rights reserved.
*
diff --git a/gic.S b/arch/aarch64/gic.S
index e16b64a..5b612bb 100644
--- a/gic.S
+++ b/arch/aarch64/gic.S
@@ -1,5 +1,5 @@
/*
- * gic.S - Secure gic initialisation for stand-alone Linux booting
+ * arch/aarch64/gic.S - Secure gic initialisation for stand-alone Linux booting
*
* Copyright (C) 2013 ARM Limited. All rights reserved.
*
diff --git a/mmu.S b/arch/aarch64/mmu.S
index 207340c..c902867 100644
--- a/mmu.S
+++ b/arch/aarch64/mmu.S
@@ -1,5 +1,5 @@
/*
- * mmu.S - EL3 MMU identity map code to enable the use of exclusives.
+ * arch/aarch64/mmu.S - EL3 MMU identity map code to enable the use of exclusives.
*
* Copyright (C) 2013 ARM Limited. All rights reserved.
*
diff --git a/ns.S b/arch/aarch64/ns.S
index 21b6d45..054dab4 100644
--- a/ns.S
+++ b/arch/aarch64/ns.S
@@ -1,5 +1,5 @@
/*
- * ns.S - code to initialise everything required when first booting non-secure.
+ * arch/aarch64/ns.S - code to initialise everything required when first booting non-secure.
*
* Copyright (C) 2013 ARM Limited. All rights reserved.
*
diff --git a/psci.S b/arch/aarch64/psci.S
index 548a4b8..49a41e8 100644
--- a/psci.S
+++ b/arch/aarch64/psci.S
@@ -1,5 +1,5 @@
/*
- * psci.S - basic PSCI implementation
+ * arch/aarch64/psci.S - basic PSCI implementation
*
* Copyright (C) 2013 ARM Limited. All rights reserved.
*
diff --git a/spin.S b/arch/aarch64/spin.S
index 00f21bf..80d42f3 100644
--- a/spin.S
+++ b/arch/aarch64/spin.S
@@ -1,5 +1,5 @@
/*
- * spin.S - spin-table boot protocol implementation
+ * arch/aarch64/spin.S - spin-table boot protocol implementation
*
* Copyright (C) 2013 ARM Limited. All rights reserved.
*