diff options
| author | Gabe Black <gabeblack@google.com> | 2013-09-29 03:02:55 -0700 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-08-22 22:23:11 +0200 |
| commit | 8b685398a74065d832fe2a3dfcfb313f0f4f11c3 (patch) | |
| tree | eb01a01843aad059fb4221563fac25fa78e7d109 /src/arch/armv7/bootblock_simple.c | |
| parent | bc349b81e97350b13d7d70c400e46d0bb8e4d1aa (diff) | |
ARM: Overhaul the ARM Makefile.
The ARM Makefile was copied from x86 and then modified, and as a result it
was carrying a lot of baggage. On top of that, the extra complication made it
inflexible, and we need a lot of flexiblity in order to support the fact that
the Tegra124 starts on an ARMv4 coprocessor instead of one of the ARMv7 main
CPUs.
Change-Id: Ia6ddc27619bdb51e152ad0c628ad6f3037c103ce
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://chromium-review.googlesource.com/171017
Reviewed-by: Ronald Minnich <rminnich@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit 512d942788336c8d52470135b43ee4e6a1c95f6c)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6709
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Diffstat (limited to 'src/arch/armv7/bootblock_simple.c')
| -rw-r--r-- | src/arch/armv7/bootblock_simple.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/arch/armv7/bootblock_simple.c b/src/arch/armv7/bootblock_simple.c index bc3ef53ae5..bcd83b8c36 100644 --- a/src/arch/armv7/bootblock_simple.c +++ b/src/arch/armv7/bootblock_simple.c @@ -19,16 +19,14 @@ * MA 02110-1301 USA */ -#include <bootblock_common.h> #include <arch/cache.h> #include <arch/hlt.h> #include <arch/stages.h> +#include <bootblock_common.h> #include <cbfs.h> #include <console/console.h> #include <smp/node.h> -#include "stages.c" - void main(void) { const char *stage_name = "fallback/romstage"; @@ -51,10 +49,8 @@ void main(void) sctlr |= SCTLR_Z | SCTLR_I; write_sctlr(sctlr); - if (boot_cpu()) { - bootblock_cpu_init(); - bootblock_mainboard_init(); - } + bootblock_cpu_init(); + bootblock_mainboard_init(); #if CONFIG_BOOTBLOCK_CONSOLE console_init(); |