Drop CONFIG_AP_CODE_IN_CAR
This option has not been enabled on any board and was considered obsolete last time it was touched. If we need the functionality, let's fix this in a generic way instead of a K8 specific way. This was mostly a speedup hack back in the day. Change-Id: Ib1ca248c56a7f6e9d0c986c35d131d5f444de0d8 Signed-off-by: Stefan Reinauer <reinauer@google.com> Reviewed-on: http://review.coreboot.org/3211 Reviewed-by: Ronald G. Minnich <rminnich@gmail.com> Tested-by: build bot (Jenkins)
This commit is contained in:
		
				
					committed by
					
						 Stefan Reinauer
						Stefan Reinauer
					
				
			
			
				
	
			
			
			
						parent
						
							648d16679c
						
					
				
				
					commit
					3949e37834
				
			| @@ -48,9 +48,6 @@ endif | ||||
| ifeq ($(CONFIG_PAYLOAD_FILO),y) | ||||
| COREBOOT_ROM_DEPENDENCIES+=filo | ||||
| endif | ||||
| ifeq ($(CONFIG_AP_CODE_IN_CAR),y) | ||||
| COREBOOT_ROM_DEPENDENCIES+=$(objcbfs)/coreboot_ap.elf | ||||
| endif | ||||
|  | ||||
| extract_nth=$(word $(1), $(subst |, ,$(2))) | ||||
|  | ||||
| @@ -79,10 +76,6 @@ endif | ||||
| $(obj)/coreboot.rom: $(obj)/coreboot.pre $(objcbfs)/coreboot_ram.elf $(CBFSTOOL) $(call strip_quotes,$(COREBOOT_ROM_DEPENDENCIES)) $$(INTERMEDIATE) $$(VBOOT_STUB_ELF) | ||||
| 	@printf "    CBFS       $(subst $(obj)/,,$(@))\n" | ||||
| 	cp $(obj)/coreboot.pre $@.tmp | ||||
| 	if [ -f $(objcbfs)/coreboot_ap.elf ]; \ | ||||
| 	then \ | ||||
| 		$(CBFSTOOL) $@.tmp add-stage -f $(objcbfs)/coreboot_ap.elf -n $(CONFIG_CBFS_PREFIX)/coreboot_ap -c $(CBFS_COMPRESS_FLAG); \ | ||||
| 	fi | ||||
| 	$(CBFSTOOL) $@.tmp add-stage -f $(objcbfs)/coreboot_ram.elf -n $(CONFIG_CBFS_PREFIX)/coreboot_ram -c $(CBFS_COMPRESS_FLAG) | ||||
| ifeq ($(CONFIG_PAYLOAD_NONE),y) | ||||
| 	@printf "    PAYLOAD    none (as specified by user)\n" | ||||
| @@ -187,17 +180,6 @@ else | ||||
| 	$(CC) $(CFLAGS) -nostdlib -r -o $@ -Wl,--wrap,__divdi3 -Wl,--wrap,__udivdi3 -Wl,--wrap,__moddi3 -Wl,--wrap,__umoddi3 -Wl,--start-group $(ramstage-objs) $(LIBGCC_FILE_NAME) -Wl,--end-group | ||||
| endif | ||||
|  | ||||
| ################################################################################ | ||||
| # Ramstage for AP CPU (AMD K8, obsolete?) | ||||
|  | ||||
| $(objcbfs)/coreboot_ap.debug: $(objgenerated)/coreboot_ap.o $(src)/arch/x86/init/ldscript_apc.lb | ||||
| 	@printf "    CC         $(subst $(obj)/,,$(@))\n" | ||||
| 	$(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(src)/arch/x86/init/ldscript_apc.lb $< | ||||
|  | ||||
| $(objgenerated)/coreboot_ap.o: $(src)/mainboard/$(MAINBOARDDIR)/ap_romstage.c $(OPTION_TABLE_H) | ||||
| 	@printf "    CC         $(subst $(obj)/,,$(@))\n" | ||||
| 	$(CC) -MMD $(CFLAGS) -I$(src) -D__PRE_RAM__ -I. -I$(obj) -c $< -o $@ | ||||
|  | ||||
| ################################################################################ | ||||
| # done | ||||
|  | ||||
|   | ||||
| @@ -1,31 +0,0 @@ | ||||
| /* | ||||
|  * This file is part of the coreboot project. | ||||
|  * | ||||
|  * Copyright (C) 2006 Advanced Micro Devices, Inc. | ||||
|  * Copyright (C) 2008-2010 coresystems GmbH | ||||
|  * | ||||
|  * 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 | ||||
|  */ | ||||
|  | ||||
| INCLUDE "ldoptions" | ||||
| SECTIONS | ||||
| { | ||||
|         .apcrom . : { | ||||
|                 _apcrom = .; | ||||
| 		*(.text) | ||||
| 		*(.rodata) | ||||
| 		*(.rodata.*) | ||||
|                 _eapcrom = .; | ||||
|         } | ||||
| } | ||||
| @@ -44,10 +44,3 @@ void asmlinkage copy_and_run(void) | ||||
| { | ||||
| 	cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ram"); | ||||
| } | ||||
|  | ||||
| #if CONFIG_AP_CODE_IN_CAR | ||||
| void asmlinkage copy_and_run_ap_code_in_car(unsigned ret_addr) | ||||
| { | ||||
| 	cbfs_and_run_core(CONFIG_CBFS_PREFIX "/coreboot_ap", ret_addr); | ||||
| } | ||||
| #endif | ||||
|   | ||||
		Reference in New Issue
	
	Block a user