From 2436bda11dbb5839325708e306fd0872a0f90674 Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Fri, 17 Apr 2015 23:02:22 -0700 Subject: cpu: get rid of socket source code None of the sockets has actual configuration options, so the source for them is only cosmetical boilerplate. Hence, drop it. This reduces the sockets to be selectors for certain CPU types, which will be dropped in future commits, and mainboards will select their CPUs directly rather than through an additional layer of indirection (sockets) Change-Id: I0f52a65838875a73531ef8c92a171bb1a35be96e Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/9797 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- src/cpu/amd/socket_754/Makefile.inc | 1 - src/cpu/amd/socket_754/socket_754.c | 6 ------ src/cpu/amd/socket_939/Makefile.inc | 1 - src/cpu/amd/socket_939/socket_939.c | 5 ----- src/cpu/amd/socket_940/Makefile.inc | 1 - src/cpu/amd/socket_940/socket_940.c | 5 ----- src/cpu/amd/socket_AM2/Makefile.inc | 1 - src/cpu/amd/socket_AM2/socket_AM2.c | 5 ----- src/cpu/amd/socket_AM2r2/Makefile.inc | 1 - src/cpu/amd/socket_AM2r2/socket_AM2r2.c | 24 ------------------------ src/cpu/amd/socket_AM3/Makefile.inc | 1 - src/cpu/amd/socket_AM3/socket_AM3.c | 24 ------------------------ src/cpu/amd/socket_ASB2/Makefile.inc | 1 - src/cpu/amd/socket_ASB2/socket_ASB2.c | 24 ------------------------ src/cpu/amd/socket_C32/Makefile.inc | 1 - src/cpu/amd/socket_C32/socket_C32.c | 24 ------------------------ src/cpu/amd/socket_F/Makefile.inc | 1 - src/cpu/amd/socket_F/socket_F.c | 5 ----- src/cpu/amd/socket_F_1207/Makefile.inc | 1 - src/cpu/amd/socket_F_1207/socket_F_1207.c | 24 ------------------------ src/cpu/amd/socket_S1G1/Makefile.inc | 1 - src/cpu/amd/socket_S1G1/socket_S1G1.c | 5 ----- 22 files changed, 162 deletions(-) delete mode 100644 src/cpu/amd/socket_754/socket_754.c delete mode 100644 src/cpu/amd/socket_939/socket_939.c delete mode 100644 src/cpu/amd/socket_940/socket_940.c delete mode 100644 src/cpu/amd/socket_AM2/socket_AM2.c delete mode 100644 src/cpu/amd/socket_AM2r2/socket_AM2r2.c delete mode 100644 src/cpu/amd/socket_AM3/socket_AM3.c delete mode 100644 src/cpu/amd/socket_ASB2/socket_ASB2.c delete mode 100644 src/cpu/amd/socket_C32/socket_C32.c delete mode 100644 src/cpu/amd/socket_F/socket_F.c delete mode 100644 src/cpu/amd/socket_F_1207/socket_F_1207.c delete mode 100644 src/cpu/amd/socket_S1G1/socket_S1G1.c (limited to 'src/cpu/amd') diff --git a/src/cpu/amd/socket_754/Makefile.inc b/src/cpu/amd/socket_754/Makefile.inc index b4e8a67cca..264fd6ca8b 100644 --- a/src/cpu/amd/socket_754/Makefile.inc +++ b/src/cpu/amd/socket_754/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_754.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_754/socket_754.c b/src/cpu/amd/socket_754/socket_754.c deleted file mode 100644 index f75c1ec59a..0000000000 --- a/src/cpu/amd/socket_754/socket_754.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - - -struct chip_operations cpu_amd_socket_754_ops = { - CHIP_NAME("Socket 754 CPU") -}; diff --git a/src/cpu/amd/socket_939/Makefile.inc b/src/cpu/amd/socket_939/Makefile.inc index b494b8ac61..264fd6ca8b 100644 --- a/src/cpu/amd/socket_939/Makefile.inc +++ b/src/cpu/amd/socket_939/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_939.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_939/socket_939.c b/src/cpu/amd/socket_939/socket_939.c deleted file mode 100644 index a44a8a6452..0000000000 --- a/src/cpu/amd/socket_939/socket_939.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -struct chip_operations cpu_amd_socket_939_ops = { - CHIP_NAME("Socket 939 CPU") -}; diff --git a/src/cpu/amd/socket_940/Makefile.inc b/src/cpu/amd/socket_940/Makefile.inc index a760efd8f7..264fd6ca8b 100644 --- a/src/cpu/amd/socket_940/Makefile.inc +++ b/src/cpu/amd/socket_940/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_940.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_940/socket_940.c b/src/cpu/amd/socket_940/socket_940.c deleted file mode 100644 index 872f0406e2..0000000000 --- a/src/cpu/amd/socket_940/socket_940.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -struct chip_operations cpu_amd_socket_940_ops = { - CHIP_NAME("Socket 940 CPU") -}; diff --git a/src/cpu/amd/socket_AM2/Makefile.inc b/src/cpu/amd/socket_AM2/Makefile.inc index 0edd1c7d38..264fd6ca8b 100644 --- a/src/cpu/amd/socket_AM2/Makefile.inc +++ b/src/cpu/amd/socket_AM2/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_AM2.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_AM2/socket_AM2.c b/src/cpu/amd/socket_AM2/socket_AM2.c deleted file mode 100644 index 60378abad7..0000000000 --- a/src/cpu/amd/socket_AM2/socket_AM2.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -struct chip_operations cpu_amd_socket_AM2_ops = { - CHIP_NAME("Socket AM2 CPU") -}; diff --git a/src/cpu/amd/socket_AM2r2/Makefile.inc b/src/cpu/amd/socket_AM2r2/Makefile.inc index 1c2b683b6a..327e4a159c 100644 --- a/src/cpu/amd/socket_AM2r2/Makefile.inc +++ b/src/cpu/amd/socket_AM2r2/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_AM2r2.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_AM2r2/socket_AM2r2.c b/src/cpu/amd/socket_AM2r2/socket_AM2r2.c deleted file mode 100644 index ffdcab576f..0000000000 --- a/src/cpu/amd/socket_AM2r2/socket_AM2r2.c +++ /dev/null @@ -1,24 +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 - */ - -#include - -struct chip_operations cpu_amd_socket_AM2r2_ops = { - CHIP_NAME("socket AM2r2") -}; diff --git a/src/cpu/amd/socket_AM3/Makefile.inc b/src/cpu/amd/socket_AM3/Makefile.inc index fce22aae1b..327e4a159c 100644 --- a/src/cpu/amd/socket_AM3/Makefile.inc +++ b/src/cpu/amd/socket_AM3/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_AM3.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_AM3/socket_AM3.c b/src/cpu/amd/socket_AM3/socket_AM3.c deleted file mode 100644 index 5d3eeac400..0000000000 --- a/src/cpu/amd/socket_AM3/socket_AM3.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2010 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 - */ - -#include - -struct chip_operations cpu_amd_socket_AM3_ops = { - CHIP_NAME("socket AM3") -}; diff --git a/src/cpu/amd/socket_ASB2/Makefile.inc b/src/cpu/amd/socket_ASB2/Makefile.inc index 216b75bce6..327e4a159c 100644 --- a/src/cpu/amd/socket_ASB2/Makefile.inc +++ b/src/cpu/amd/socket_ASB2/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_ASB2.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_ASB2/socket_ASB2.c b/src/cpu/amd/socket_ASB2/socket_ASB2.c deleted file mode 100644 index 300f4690dc..0000000000 --- a/src/cpu/amd/socket_ASB2/socket_ASB2.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2010 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 - */ - -#include - -struct chip_operations cpu_amd_socket_ASB2_ops = { - CHIP_NAME("socket ASB2") -}; diff --git a/src/cpu/amd/socket_C32/Makefile.inc b/src/cpu/amd/socket_C32/Makefile.inc index 8ce43fb485..327e4a159c 100644 --- a/src/cpu/amd/socket_C32/Makefile.inc +++ b/src/cpu/amd/socket_C32/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_C32.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_C32/socket_C32.c b/src/cpu/amd/socket_C32/socket_C32.c deleted file mode 100644 index 62083e0eb3..0000000000 --- a/src/cpu/amd/socket_C32/socket_C32.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2010 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 - */ - -#include - -struct chip_operations cpu_amd_socket_C32_ops = { - CHIP_NAME("socket C32") -}; diff --git a/src/cpu/amd/socket_F/Makefile.inc b/src/cpu/amd/socket_F/Makefile.inc index 630caa975c..264fd6ca8b 100644 --- a/src/cpu/amd/socket_F/Makefile.inc +++ b/src/cpu/amd/socket_F/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_F.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_F/socket_F.c b/src/cpu/amd/socket_F/socket_F.c deleted file mode 100644 index 80c3e35a47..0000000000 --- a/src/cpu/amd/socket_F/socket_F.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -struct chip_operations cpu_amd_socket_F_ops = { - CHIP_NAME("Socket F CPU") -}; diff --git a/src/cpu/amd/socket_F_1207/Makefile.inc b/src/cpu/amd/socket_F_1207/Makefile.inc index e44982f5d3..8c5ff3db89 100644 --- a/src/cpu/amd/socket_F_1207/Makefile.inc +++ b/src/cpu/amd/socket_F_1207/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_F_1207.c subdirs-y += ../model_10xxx subdirs-y += ../quadcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_F_1207/socket_F_1207.c b/src/cpu/amd/socket_F_1207/socket_F_1207.c deleted file mode 100644 index f90680d519..0000000000 --- a/src/cpu/amd/socket_F_1207/socket_F_1207.c +++ /dev/null @@ -1,24 +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 - */ - -#include - -struct chip_operations cpu_amd_socket_F_1207_ops = { - CHIP_NAME("socket F_1207") -}; diff --git a/src/cpu/amd/socket_S1G1/Makefile.inc b/src/cpu/amd/socket_S1G1/Makefile.inc index d68f8a10e1..5ad59cd8cf 100644 --- a/src/cpu/amd/socket_S1G1/Makefile.inc +++ b/src/cpu/amd/socket_S1G1/Makefile.inc @@ -1,4 +1,3 @@ -ramstage-y += socket_S1G1.c subdirs-y += ../model_fxx subdirs-y += ../dualcore subdirs-y += ../mtrr diff --git a/src/cpu/amd/socket_S1G1/socket_S1G1.c b/src/cpu/amd/socket_S1G1/socket_S1G1.c deleted file mode 100644 index 0b9702c8da..0000000000 --- a/src/cpu/amd/socket_S1G1/socket_S1G1.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -struct chip_operations cpu_amd_socket_S1G1_ops = { - CHIP_NAME("Socket S1G1 CPU") -}; -- cgit v1.2.3