diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-03 16:24:58 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-10-03 16:24:58 +0000 |
| commit | 6768f39a4b5a5d6d1c2318f632f801fe1c8084cd (patch) | |
| tree | 70ed41597c9cd4d19bec099a8ba403d48cdf4208 /src/cpu/amd/car | |
| parent | 8f3ec7b1a3771a317c2415e2366fa719582f29d1 (diff) | |
| download | coreboot-6768f39a4b5a5d6d1c2318f632f801fe1c8084cd.tar.xz | |
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 <patrick.georgi@coresystems.de>
Acked-by: Myles Watson <mylesgw@gmail.com>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4712 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/amd/car')
| -rw-r--r-- | src/cpu/amd/car/copy_and_run.c | 42 |
1 files changed, 3 insertions, 39 deletions
diff --git a/src/cpu/amd/car/copy_and_run.c b/src/cpu/amd/car/copy_and_run.c index 79cae6bc83..a391ec59b4 100644 --- a/src/cpu/amd/car/copy_and_run.c +++ b/src/cpu/amd/car/copy_and_run.c @@ -3,16 +3,15 @@ 2006/05/02 - stepan: move nrv2b to an extra file. */ -#if CONFIG_CBFS == 1 void cbfs_and_run_core(const char*, unsigned ebp); static void copy_and_run(void) { -# if CONFIG_USE_FALLBACK_IMAGE == 1 +#if CONFIG_USE_FALLBACK_IMAGE == 1 cbfs_and_run_core("fallback/coreboot_ram", 0); -# else +#else cbfs_and_run_core("normal/coreboot_ram", 0); -# endif +#endif } #if CONFIG_AP_CODE_IN_CAR == 1 @@ -26,38 +25,3 @@ static void copy_and_run_ap_code_in_car(unsigned ret_addr) # endif } #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(void) -{ - uint8_t *src, *dst; - unsigned long ilen; - - src = &_liseg; - dst = &_iseg; - ilen = &_eiseg - dst; - - copy_and_run_core(src, dst, ilen, 0); -} - -#if CONFIG_AP_CODE_IN_CAR == 1 - -extern u8 _liseg_apc, _iseg_apc, _eiseg_apc; - -static void copy_and_run_ap_code_in_car(unsigned ret_addr) -{ - uint8_t *src, *dst; - unsigned long ilen; - - src = &_liseg_apc; - dst = &_iseg_apc; - ilen = &_eiseg_apc - dst; - - copy_and_run_core(src, dst, ilen, ret_addr); -} -#endif -#endif |