diff options
| author | Hung-Te Lin <hungte@chromium.org> | 2013-02-04 14:38:03 +0800 |
|---|---|---|
| committer | Ronald G. Minnich <rminnich@gmail.com> | 2013-02-07 06:10:09 +0100 |
| commit | 5f83f6cb7a3f179482db54aaff38f23795dc1acf (patch) | |
| tree | bd94e259d2ae6fab8e4b993d04215b0964d8bf5f /src/arch/armv7/include | |
| parent | c720d8d5d419d8e9128392cd7ab90e3a3fca1d4b (diff) | |
armv7: Clean up arm/snow bootblock build process.
Remove duplicated / testing code and share more driver for bootblock, romstage
and ramstage.
The __PRE_RAM__ is now also defined in bootblock build stage, since bootblock is
executed before RAM is initialized.
Change-Id: I4f5469b1545631eee1cf9f2f5df93cbe3a58268b
Signed-off-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-on: http://review.coreboot.org/2282
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/arch/armv7/include')
| -rw-r--r-- | src/arch/armv7/include/arch/bootblock_exit.h | 26 | ||||
| -rw-r--r-- | src/arch/armv7/include/arch/stages.h | 2 |
2 files changed, 1 insertions, 27 deletions
diff --git a/src/arch/armv7/include/arch/bootblock_exit.h b/src/arch/armv7/include/arch/bootblock_exit.h deleted file mode 100644 index 0a039e195d..0000000000 --- a/src/arch/armv7/include/arch/bootblock_exit.h +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2013 Google Inc - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; version 2 of - * the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA - */ - -/** - * This is a shim that is to be compiled for the instruction set matching - * that of the entry point for the next boot stage (romstage). - */ -void bootblock_exit(unsigned long addr); diff --git a/src/arch/armv7/include/arch/stages.h b/src/arch/armv7/include/arch/stages.h index 215aaa8086..671c02b3dd 100644 --- a/src/arch/armv7/include/arch/stages.h +++ b/src/arch/armv7/include/arch/stages.h @@ -23,6 +23,6 @@ extern void main(void); void stage_entry(void) __attribute__((section(".text.stage_entry.armv7"))); -void stage_exit(unsigned long); +void stage_exit(void *); #endif |