diff options
| author | Renaud Barbier <renaud.barbier@ge.com> | 2013-07-31 10:43:14 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-05 12:09:22 +0200 |
| commit | 2fbd8f1ade7f2321c6a9c31799fbced4c77f796b (patch) | |
| tree | 9aedef623992ed5595fc59900b2dda2faefba769 /arch/ppc | |
| parent | 1f3ac50f527932b4409cf4b3cf84f4be02a65be5 (diff) | |
| download | barebox-2fbd8f1ade7f2321c6a9c31799fbced4c77f796b.tar.gz barebox-2fbd8f1ade7f2321c6a9c31799fbced4c77f796b.tar.xz | |
mpc85xx: remove local bus initialisation
The early initialisation of chip select 0 (boot flash) is removed
from cpu initialisation. This removes the dependency on board
base address definition.
Consequently, cpu_init_f is not called in the start-up code but
added to the init call list as cpu_init_r. Also the file
arch/ppc/mach-mpc85xx/fsl_lbc.c is deleted.
Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/cpu-85xx/start.S | 1 | ||||
| -rw-r--r-- | arch/ppc/include/asm/fsl_lbc.h | 2 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc85xx/Makefile | 1 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc85xx/cpu_init.c | 5 | ||||
| -rw-r--r-- | arch/ppc/mach-mpc85xx/fsl_lbc.c | 17 |
5 files changed, 3 insertions, 23 deletions
diff --git a/arch/ppc/cpu-85xx/start.S b/arch/ppc/cpu-85xx/start.S index c0e5ec0cfc..5bcba5fcc9 100644 --- a/arch/ppc/cpu-85xx/start.S +++ b/arch/ppc/cpu-85xx/start.S @@ -300,7 +300,6 @@ _start_cont: mtmsr r3 isync - bl cpu_init_f bl initdram b relocate_code isync diff --git a/arch/ppc/include/asm/fsl_lbc.h b/arch/ppc/include/asm/fsl_lbc.h index 47205e7ab9..58cd080e50 100644 --- a/arch/ppc/include/asm/fsl_lbc.h +++ b/arch/ppc/include/asm/fsl_lbc.h @@ -44,8 +44,6 @@ #ifndef __ASSEMBLY__ #include <asm/io.h> -extern void fsl_init_early_memctl_regs(void); - /* LBC register offsets. */ #define FSL_LBC_BRX(x) ((x) * 8) /* bank register offsets. */ #define FSL_LBC_ORX(x) (4 + ((x) * 8)) /* option register offset. */ diff --git a/arch/ppc/mach-mpc85xx/Makefile b/arch/ppc/mach-mpc85xx/Makefile index af9be29271..cc412c51da 100644 --- a/arch/ppc/mach-mpc85xx/Makefile +++ b/arch/ppc/mach-mpc85xx/Makefile @@ -1,7 +1,6 @@ obj-y += cpuid.o obj-y += cpu.o obj-y += cpu_init.o -obj-y += fsl_lbc.o obj-y += fsl_law.o obj-y += speed.o obj-y +=time.o diff --git a/arch/ppc/mach-mpc85xx/cpu_init.c b/arch/ppc/mach-mpc85xx/cpu_init.c index ec9763e322..8372b7f0bc 100644 --- a/arch/ppc/mach-mpc85xx/cpu_init.c +++ b/arch/ppc/mach-mpc85xx/cpu_init.c @@ -114,10 +114,11 @@ void cpu_init_early_f(void) e500_init_tlbs(); } -void cpu_init_f(void) +static int cpu_init_r(void) { e500_disable_tlb(14); e500_disable_tlb(15); - fsl_init_early_memctl_regs(); + return 0; } +core_initcall(cpu_init_r); diff --git a/arch/ppc/mach-mpc85xx/fsl_lbc.c b/arch/ppc/mach-mpc85xx/fsl_lbc.c deleted file mode 100644 index ac9ca7402b..0000000000 --- a/arch/ppc/mach-mpc85xx/fsl_lbc.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright 2010-2011 Freescale Semiconductor, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * Version 2 as published by the Free Software Foundation. - */ - -#include <common.h> -#include <asm/fsl_lbc.h> -#include <mach/immap_85xx.h> - -void fsl_init_early_memctl_regs(void) -{ - fsl_set_lbc_br(0, CFG_BR0_PRELIM); - fsl_set_lbc_or(0, CFG_OR0_PRELIM); -} |