diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-10-22 23:57:53 +0200 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2008-10-31 23:37:57 +0100 |
| commit | c5ec6fb08d7806cf1a9e4fceed15f5d4a69f885e (patch) | |
| tree | e3a1dca7bb4ea58907c067f592ce45391222ffc4 /arch/cris/arch-v32/kernel/head.S | |
| parent | 0365f707c99bf940a51c2a3ffc19f3ade2f700d4 (diff) | |
| download | op-kernel-dev-c5ec6fb08d7806cf1a9e4fceed15f5d4a69f885e.zip op-kernel-dev-c5ec6fb08d7806cf1a9e4fceed15f5d4a69f885e.tar.gz | |
[CRIS] Remove links from CRIS build
Remove the links to architecture and machine dependent directories
(boot, lib, drivers, arch, mach)
The links were created and used mostly from the arch/cris/Makefile,
so why not dispense with them altogether?
Changed $(ARCH) to "cris" in Makefile, it is easier to read this way.
The CRISv32 head.S common files for the kernel and compressed images
needed to be modified to use ifdefs instead of using the now removed
mach link. Since there are only two versions, this is not a huge loss
in readability.
The link to vmlinux.lds.S is also replaced with a merged version
which uses ifdefs to select the correct layout.
System.map before and after are identical.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/cris/arch-v32/kernel/head.S')
| -rw-r--r-- | arch/cris/arch-v32/kernel/head.S | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/arch/cris/arch-v32/kernel/head.S b/arch/cris/arch-v32/kernel/head.S index f902d87..3db478e 100644 --- a/arch/cris/arch-v32/kernel/head.S +++ b/arch/cris/arch-v32/kernel/head.S @@ -10,8 +10,9 @@ * The macros found in mmu_defs_asm.h uses the ## concatenation operator, so * -traditional must not be used when assembling this file. */ -#include <hwregs/reg_rdwr.h> +#include <linux/autoconf.h> #include <arch/memmap.h> +#include <hwregs/reg_rdwr.h> #include <hwregs/intr_vect.h> #include <hwregs/asm/mmu_defs_asm.h> #include <hwregs/asm/reg_map_asm.h> @@ -217,7 +218,14 @@ _inflash: beq _dram_initialized nop -#include "../mach/dram_init.S" +#if defined CONFIG_ETRAXFS +#include "../mach-fs/dram_init.S" +#elif defined CONFIG_CRIS_MACH_ARTPEC3 +#include "../mach-a3/dram_init.S" +#else +#error Only ETRAXFS and ARTPEC-3 supported! +#endif + _dram_initialized: ;; Copy the text and data section to DRAM. This depends on that the @@ -472,4 +480,10 @@ swapper_pg_dir = 0xc0002000 .section ".init.data", "aw" -#include "../mach/hw_settings.S" +#if defined CONFIG_ETRAXFS +#include "../mach-fs/hw_settings.S" +#elif defined CONFIG_CRIS_MACH_ARTPEC3 +#include "../mach-a3/hw_settings.S" +#else +#error Only ETRAXFS and ARTPEC-3 supported! +#endif |
