From 6768f39a4b5a5d6d1c2318f632f801fe1c8084cd Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 3 Oct 2009 16:24:58 +0000 Subject: Remove: - CONFIG_CBFS - anything that's conditional on CONFIG_CBFS == 0 - files that were only included for CONFIG_CBFS == 0 In particular: - elfboot - stream boot code - mini-filo and filesystems (depends on stream boot code) After this commit, there is no way to build an image that is not using CBFS anymore. Signed-off-by: Patrick Georgi Acked-by: Myles Watson Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4712 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/cpu/x86/car/copy_and_run.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-) (limited to 'src/cpu/x86/car') diff --git a/src/cpu/x86/car/copy_and_run.c b/src/cpu/x86/car/copy_and_run.c index 7ff63c5e0c..7257c4f6bc 100644 --- a/src/cpu/x86/car/copy_and_run.c +++ b/src/cpu/x86/car/copy_and_run.c @@ -2,7 +2,6 @@ (Written by Patrick Georgi for coresystems GmbH */ -#if CONFIG_CBFS == 1 void cbfs_and_run_core(char*, unsigned ebp); static void copy_and_run(unsigned cpu_reset) @@ -10,32 +9,9 @@ static void copy_and_run(unsigned cpu_reset) if (cpu_reset == 1) cpu_reset = -1; else cpu_reset = 0; -# if CONFIG_USE_FALLBACK_IMAGE == 1 +#if CONFIG_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; - -static void copy_and_run(unsigned cpu_reset) -{ - uint8_t *src, *dst; - unsigned long ilen; - - - src = &_liseg; - dst = &_iseg; - ilen = &_eiseg - dst; - - if (cpu_reset == 1) cpu_reset = -1; - else cpu_reset = 0; - - copy_and_run_core(src, dst, ilen, cpu_reset); -} + cbfs_and_run_core("normal/coreboot_ram", cpu_reset); #endif - +} -- cgit v1.2.3