summaryrefslogtreecommitdiff
path: root/polux/linux-2.6.10
diff options
context:
space:
mode:
authorCyril Jourdan2012-09-18 14:14:49 +0200
committerCyril Jourdan2012-09-20 10:25:44 +0200
commite543dee8321a9cd09787bbc29f36ad21f7b8b650 (patch)
tree98d25528f19c1f0ccad090b1449cbe27b10de509 /polux/linux-2.6.10
parente33ca91926dfbf9eafff6b7e7323e04de907005e (diff)
polux/linux: move entry_macro.S to include/asm/arch, refs #3119
This is done to allow to make the file common between polux and cleopatre. This implies the following modifications: - move the file for SPC2XX architectures - arch/arm/kernel/entry-armv.S: modify the dependency towards entry-macro.S - arch/arm/kernel/Makefile: the symbolic link is no more required - arch/arm/Makefile: symbolic link is not to clean anymore
Diffstat (limited to 'polux/linux-2.6.10')
-rw-r--r--polux/linux-2.6.10/arch/arm/Makefile2
-rw-r--r--polux/linux-2.6.10/arch/arm/kernel/Makefile12
-rw-r--r--polux/linux-2.6.10/arch/arm/kernel/entry-armv.S4
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-mse500/entry-macro.S (renamed from polux/linux-2.6.10/arch/arm/mach-mse500/entry-macro.S)0
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-spc2XXc/entry-macro.S (renamed from polux/linux-2.6.10/arch/arm/mach-spc2XXc/entry-macro.S)0
-rw-r--r--polux/linux-2.6.10/include/asm-arm/arch-spc2xx/entry-macro.S (renamed from polux/linux-2.6.10/arch/arm/mach-spc2XX/entry-macro.S)0
6 files changed, 4 insertions, 14 deletions
diff --git a/polux/linux-2.6.10/arch/arm/Makefile b/polux/linux-2.6.10/arch/arm/Makefile
index 39e6e10d13..9ddf6af3cc 100644
--- a/polux/linux-2.6.10/arch/arm/Makefile
+++ b/polux/linux-2.6.10/arch/arm/Makefile
@@ -294,7 +294,7 @@ zinstall install: vmlinux
CLEAN_FILES += include/asm-arm/constants.h* include/asm-arm/mach-types.h \
include/asm-arm/arch include/asm-arm/.arch \
- linux.bin linux arch/arm/kernel/entry-macro.S
+ linux.bin linux
# We use MRPROPER_FILES and CLEAN_FILES now
archclean:
diff --git a/polux/linux-2.6.10/arch/arm/kernel/Makefile b/polux/linux-2.6.10/arch/arm/kernel/Makefile
index 253faa7665..977956ac81 100644
--- a/polux/linux-2.6.10/arch/arm/kernel/Makefile
+++ b/polux/linux-2.6.10/arch/arm/kernel/Makefile
@@ -32,17 +32,7 @@ obj-$(CONFIG_DEBUG_LL) += debug.o
extra-y := $(HEAD) init_task.o vmlinux.lds
# Spell out some dependencies that aren't automatically figured out
-ifeq ($(CONFIG_MMU),y)
- $(obj)/entry-armv.o: $(obj)/entry-header.S include/asm-arm/constants.h
-else
- $(obj)/entry-armv.o: $(obj)/entry-header.S include/asm-arm/constants.h \
- $(MACHINE)entry-macro.S $(obj)/entry-macro.S
- $(obj)/entry-macro.S: $(MACHINE)entry-macro.S
- @echo ' Making $(obj)/entry-macro.S -> $(MACHINE)entry-macro.S symlink'
- @rm -f entry-macro.S
- @ln -sf $(TOPDIR)/$(MACHINE)entry-macro.S $(obj)/entry-macro.S
- @touch $@
-endif
+$(obj)/entry-armv.o: $(obj)/entry-header.S include/asm-arm/constants.h
$(obj)/entry-common.o: $(obj)/entry-header.S include/asm-arm/constants.h \
$(obj)/calls.S
diff --git a/polux/linux-2.6.10/arch/arm/kernel/entry-armv.S b/polux/linux-2.6.10/arch/arm/kernel/entry-armv.S
index 1d8ee34469..f0a6afbf45 100644
--- a/polux/linux-2.6.10/arch/arm/kernel/entry-armv.S
+++ b/polux/linux-2.6.10/arch/arm/kernel/entry-armv.S
@@ -28,13 +28,13 @@
#ifndef CONFIG_MMU
/*
* Load-in the machine dependent Macros from:
- * arch/arm/mach-$(MACHINE)/entry-macro.S
+ * include/asm-arm/arch-$(MACHINE)/entry-macro.S
*
* disable_fiq : disable FIQ
* get_irqnr_and_base : get the irq number(at least), and others.
* irq_prio_table : irq priority table
*/
-#include "entry-macro.S"
+#include <asm/arch/entry-macro.S>
#else /* CONFIG_MMU */
#ifdef IOC_BASE
diff --git a/polux/linux-2.6.10/arch/arm/mach-mse500/entry-macro.S b/polux/linux-2.6.10/include/asm-arm/arch-mse500/entry-macro.S
index 30f0f0d47b..30f0f0d47b 100644
--- a/polux/linux-2.6.10/arch/arm/mach-mse500/entry-macro.S
+++ b/polux/linux-2.6.10/include/asm-arm/arch-mse500/entry-macro.S
diff --git a/polux/linux-2.6.10/arch/arm/mach-spc2XXc/entry-macro.S b/polux/linux-2.6.10/include/asm-arm/arch-spc2XXc/entry-macro.S
index 6c0950b8c0..6c0950b8c0 100644
--- a/polux/linux-2.6.10/arch/arm/mach-spc2XXc/entry-macro.S
+++ b/polux/linux-2.6.10/include/asm-arm/arch-spc2XXc/entry-macro.S
diff --git a/polux/linux-2.6.10/arch/arm/mach-spc2XX/entry-macro.S b/polux/linux-2.6.10/include/asm-arm/arch-spc2xx/entry-macro.S
index c76bd35129..c76bd35129 100644
--- a/polux/linux-2.6.10/arch/arm/mach-spc2XX/entry-macro.S
+++ b/polux/linux-2.6.10/include/asm-arm/arch-spc2xx/entry-macro.S