summaryrefslogtreecommitdiff
path: root/src/cpu/x86/car
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2009-05-27 14:19:31 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2009-05-27 14:19:31 +0000
commita034dca42cc1638e4917e38b98e7dc6b434f2357 (patch)
tree2050fd887fff8d644260cf0168efc5272ce56d24 /src/cpu/x86/car
parent8341f44f98ad6fe8760d348e7c3cca8f49eb2557 (diff)
downloadcoreboot-a034dca42cc1638e4917e38b98e7dc6b434f2357.tar.xz
Move coreboot_ram and coreboot_apc to CBFS. This allows to
reduce the size of the bootblock (done for kontron/986lcd-m) Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Ronald G. Minnich <rminnich@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4315 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/x86/car')
-rw-r--r--src/cpu/x86/car/copy_and_run.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/src/cpu/x86/car/copy_and_run.c b/src/cpu/x86/car/copy_and_run.c
index 14fe83d667..30b3b7a2f5 100644
--- a/src/cpu/x86/car/copy_and_run.c
+++ b/src/cpu/x86/car/copy_and_run.c
@@ -2,6 +2,22 @@
(Written by Patrick Georgi <patrick.georgi@coresystems.de> for coresystems GmbH
*/
+#if CONFIG_CBFS == 1
+void cbfs_and_run_core(char*, unsigned ebp);
+
+static void copy_and_run(unsigned cpu_reset)
+{
+ if (cpu_reset == 1) cpu_reset = -1;
+ else cpu_reset = 0;
+
+# if USE_FALLBACK_IMAGE == 1
+ cbfs_and_run_core("fallback/coreboot_ram", cpu_reset);
+# else
+ cbfs_and_run_core("normal/coreboot_ram", cpu_reset);
+# endif
+}
+
+#else
void copy_and_run_core(u8 *src, u8 *dst, unsigned long ilen, unsigned ebp);
extern u8 _liseg, _iseg, _eiseg;
@@ -21,3 +37,5 @@ static void copy_and_run(unsigned cpu_reset)
copy_and_run_core(src, dst, ilen, cpu_reset);
}
+#endif
+