From 9a16e3e5a6f5b0dda15343132c271afc89dbd846 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 29 Mar 2010 14:45:36 +0000 Subject: dualcore.h and quadcore.h are almost exactly the same. Only have multicore.h for both of them. Signed-off-by: Stefan Reinauer Acked-by: Stefan Reinauer git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5311 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/include/cpu/amd/dualcore.h | 24 ----------------------- src/include/cpu/amd/multicore.h | 43 +++++++++++++++++++++++++++++++++++++++++ src/include/cpu/amd/quadcore.h | 43 ----------------------------------------- 3 files changed, 43 insertions(+), 67 deletions(-) delete mode 100644 src/include/cpu/amd/dualcore.h create mode 100644 src/include/cpu/amd/multicore.h delete mode 100644 src/include/cpu/amd/quadcore.h (limited to 'src/include/cpu/amd') diff --git a/src/include/cpu/amd/dualcore.h b/src/include/cpu/amd/dualcore.h deleted file mode 100644 index 58cf945aba..0000000000 --- a/src/include/cpu/amd/dualcore.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef CPU_AMD_DUALCORE_H -#define CPU_AMD_DUALCORE_H - -#if defined(__GNUC__) -unsigned int read_nb_cfg_54(void); -#endif - -struct node_core_id { - unsigned nodeid; - unsigned coreid; -}; - -#if defined(__GNUC__) -// it can be used to get unitid and coreid it running only -struct node_core_id get_node_core_id(unsigned int nb_cfg_54); -#endif - -#if !defined(__PRE_RAM__) -struct device; -unsigned get_apicid_base(unsigned ioapic_num); -void amd_sibling_init(struct device *cpu); -#endif - -#endif /* CPU_AMD_DUALCORE_H */ diff --git a/src/include/cpu/amd/multicore.h b/src/include/cpu/amd/multicore.h new file mode 100644 index 0000000000..47328ef80d --- /dev/null +++ b/src/include/cpu/amd/multicore.h @@ -0,0 +1,43 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2007 Advanced Micro Devices, 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 + */ + +#ifndef CPU_AMD_QUADCORE_H +#define CPU_AMD_QUADCORE_H + +#if defined(__GNUC__) +u32 read_nb_cfg_54(void); +#endif + +struct node_core_id { + u32 nodeid; + u32 coreid; +}; + +#if defined(__GNUC__) +// it can be used to get unitid and coreid it running only +struct node_core_id get_node_core_id(u32 nb_cfg_54); +#endif + +#if !defined(__PRE_RAM__) +struct device; +u32 get_apicid_base(u32 ioapic_num); +void amd_sibling_init(struct device *cpu); +#endif + +#endif /* CPU_AMD_QUADCORE_H */ diff --git a/src/include/cpu/amd/quadcore.h b/src/include/cpu/amd/quadcore.h deleted file mode 100644 index 7bf84b4bce..0000000000 --- a/src/include/cpu/amd/quadcore.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 Advanced Micro Devices, 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 - */ - -#ifndef CPU_AMD_QUADCORE_H -#define CPU_AMD_QUADCORE_H - -#if defined(__GNUC__) -unsigned int read_nb_cfg_54(void); -#endif - -struct node_core_id { - u32 nodeid; - u32 coreid; -}; - -#if defined(__GNUC__) -// it can be used to get unitid and coreid it running only -struct node_core_id get_node_core_id(u32 nb_cfg_54); -#endif - -#if !defined(__PRE_RAM__) -struct device; -u32 get_apicid_base(u32 ioapic_num); -void amd_sibling_init(struct device *cpu); -#endif - -#endif /* CPU_AMD_QUADCORE_H */ -- cgit v1.2.3