[coreboot-gerrit] Patch set updated for coreboot: c6473b9 northbridge/amd/agesa: Move to common northbridge.h header
Edward O'Callaghan (eocallaghan@alterapraxis.com)
gerrit at coreboot.org
Fri Nov 21 14:45:16 CET 2014
Edward O'Callaghan (eocallaghan at alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/7532
-gerrit
commit c6473b929d0ccd99a88cce9003c43e463ec0fa52
Author: Edward O'Callaghan <eocallaghan at alterapraxis.com>
Date: Fri Nov 21 00:57:25 2014 +1100
northbridge/amd/agesa: Move to common northbridge.h header
Unify northbridge.h headers into a common header.
Change-Id: I3e8890a34b4729bb0944bd97a3b9576b841d2354
Signed-off-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>
---
src/northbridge/amd/agesa/family10/northbridge.c | 2 +-
src/northbridge/amd/agesa/family10/northbridge.h | 26 ----------------------
src/northbridge/amd/agesa/family12/northbridge.c | 2 +-
src/northbridge/amd/agesa/family12/northbridge.h | 26 ----------------------
src/northbridge/amd/agesa/family14/northbridge.c | 2 +-
src/northbridge/amd/agesa/family14/northbridge.h | 26 ----------------------
src/northbridge/amd/agesa/family15/northbridge.c | 2 +-
src/northbridge/amd/agesa/family15/northbridge.h | 26 ----------------------
src/northbridge/amd/agesa/family15tn/northbridge.c | 2 +-
src/northbridge/amd/agesa/family15tn/northbridge.h | 26 ----------------------
src/northbridge/amd/agesa/family16kb/northbridge.c | 2 +-
src/northbridge/amd/agesa/family16kb/northbridge.h | 26 ----------------------
src/northbridge/amd/agesa/northbridge.h | 26 ++++++++++++++++++++++
13 files changed, 32 insertions(+), 162 deletions(-)
diff --git a/src/northbridge/amd/agesa/family10/northbridge.c b/src/northbridge/amd/agesa/family10/northbridge.c
index b1f0890..6e2a167 100644
--- a/src/northbridge/amd/agesa/family10/northbridge.c
+++ b/src/northbridge/amd/agesa/family10/northbridge.c
@@ -39,7 +39,7 @@
#include <Porting.h>
#include <AGESA.h>
#include <Options.h>
-#include "northbridge.h"
+#include "../northbridge.h"
#include "amdfam10.h"
extern uint32_t agesawrapper_amdinitmid(void);
diff --git a/src/northbridge/amd/agesa/family10/northbridge.h b/src/northbridge/amd/agesa/family10/northbridge.h
deleted file mode 100644
index d5f701c..0000000
--- a/src/northbridge/amd/agesa/family10/northbridge.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 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 NORTHBRIDGE_AMD_AGESA_FAM10_H
-#define NORTHBRIDGE_AMD_AGESA_FAM10_H
-
-static struct device_operations pci_domain_ops;
-static struct device_operations cpu_bus_ops;
-
-#endif /* NORTHBRIDGE_AMD_AGESA_FAM10_H */
diff --git a/src/northbridge/amd/agesa/family12/northbridge.c b/src/northbridge/amd/agesa/family12/northbridge.c
index d1686e0..e16dd33 100644
--- a/src/northbridge/amd/agesa/family12/northbridge.c
+++ b/src/northbridge/amd/agesa/family12/northbridge.c
@@ -33,7 +33,7 @@
#include <cpu/x86/lapic.h>
#include <cpu/amd/mtrr.h>
-#include "northbridge.h"
+#include "../northbridge.h"
#include "sb_cimx.h"
#include "agesawrapper.h"
#include <northbridge/amd/agesa/agesawrapper_call.h>
diff --git a/src/northbridge/amd/agesa/family12/northbridge.h b/src/northbridge/amd/agesa/family12/northbridge.h
deleted file mode 100644
index 301044d..0000000
--- a/src/northbridge/amd/agesa/family12/northbridge.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 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 NORTHBRIDGE_AMD_AGESA_FAM12_H
-#define NORTHBRIDGE_AMD_AGESA_FAM12_H
-
-static struct device_operations pci_domain_ops;
-static struct device_operations cpu_bus_ops;
-
-#endif /* NORTHBRIDGE_AMD_AGESA_FAM12_H */
diff --git a/src/northbridge/amd/agesa/family14/northbridge.c b/src/northbridge/amd/agesa/family14/northbridge.c
index 00294b2..2c36e07 100644
--- a/src/northbridge/amd/agesa/family14/northbridge.c
+++ b/src/northbridge/amd/agesa/family14/northbridge.c
@@ -36,7 +36,7 @@
#include "agesawrapper.h"
#include <northbridge/amd/agesa/agesawrapper_call.h>
-#include "northbridge.h"
+#include "../northbridge.h"
#if CONFIG_AMD_SB_CIMX
#include <sb_cimx.h>
#endif
diff --git a/src/northbridge/amd/agesa/family14/northbridge.h b/src/northbridge/amd/agesa/family14/northbridge.h
deleted file mode 100644
index 0ed0060..0000000
--- a/src/northbridge/amd/agesa/family14/northbridge.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 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 NORTHBRIDGE_AMD_AGESA_FAM14_H
-#define NORTHBRIDGE_AMD_AGESA_FAM14_H
-
-static struct device_operations pci_domain_ops;
-static struct device_operations cpu_bus_ops;
-
-#endif /* NORTHBRIDGE_AMD_AGESA_FAM14_H */
diff --git a/src/northbridge/amd/agesa/family15/northbridge.c b/src/northbridge/amd/agesa/family15/northbridge.c
index aef70f4..35dd374 100644
--- a/src/northbridge/amd/agesa/family15/northbridge.c
+++ b/src/northbridge/amd/agesa/family15/northbridge.c
@@ -41,7 +41,7 @@
#include <cpuRegisters.h>
#include "agesawrapper.h"
#include <northbridge/amd/agesa/agesawrapper_call.h>
-#include "northbridge.h"
+#include "../northbridge.h"
#include "sb_cimx.h"
#define MAX_NODE_NUMS (MAX_NODES * MAX_DIES)
diff --git a/src/northbridge/amd/agesa/family15/northbridge.h b/src/northbridge/amd/agesa/family15/northbridge.h
deleted file mode 100644
index 9c655e6..0000000
--- a/src/northbridge/amd/agesa/family15/northbridge.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 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 NORTHBRIDGE_AMD_AGESA_FAM15_H
-#define NORTHBRIDGE_AMD_AGESA_FAM15_H
-
-static struct device_operations pci_domain_ops;
-static struct device_operations cpu_bus_ops;
-
-#endif /* NORTHBRIDGE_AMD_AGESA_FAM15_H */
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.c b/src/northbridge/amd/agesa/family15tn/northbridge.c
index ce0826a..9575c12 100644
--- a/src/northbridge/amd/agesa/family15tn/northbridge.c
+++ b/src/northbridge/amd/agesa/family15tn/northbridge.c
@@ -42,7 +42,7 @@
#include <cpuRegisters.h>
#include "agesawrapper.h"
#include <northbridge/amd/agesa/agesawrapper_call.h>
-#include "northbridge.h"
+#include "../northbridge.h"
#define MAX_NODE_NUMS (MAX_NODES * MAX_DIES)
diff --git a/src/northbridge/amd/agesa/family15tn/northbridge.h b/src/northbridge/amd/agesa/family15tn/northbridge.h
deleted file mode 100644
index 9c655e6..0000000
--- a/src/northbridge/amd/agesa/family15tn/northbridge.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 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 NORTHBRIDGE_AMD_AGESA_FAM15_H
-#define NORTHBRIDGE_AMD_AGESA_FAM15_H
-
-static struct device_operations pci_domain_ops;
-static struct device_operations cpu_bus_ops;
-
-#endif /* NORTHBRIDGE_AMD_AGESA_FAM15_H */
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.c b/src/northbridge/amd/agesa/family16kb/northbridge.c
index 01eaa20..00ed510 100644
--- a/src/northbridge/amd/agesa/family16kb/northbridge.c
+++ b/src/northbridge/amd/agesa/family16kb/northbridge.c
@@ -42,7 +42,7 @@
#include <cpuRegisters.h>
#include "agesawrapper.h"
#include <northbridge/amd/agesa/agesawrapper_call.h>
-#include "northbridge.h"
+#include "../northbridge.h"
#define MAX_NODE_NUMS (MAX_NODES * MAX_DIES)
diff --git a/src/northbridge/amd/agesa/family16kb/northbridge.h b/src/northbridge/amd/agesa/family16kb/northbridge.h
deleted file mode 100644
index 38501c8..0000000
--- a/src/northbridge/amd/agesa/family16kb/northbridge.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2012 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 NORTHBRIDGE_AMD_AGESA_FAM16_H
-#define NORTHBRIDGE_AMD_AGESA_FAM16_H
-
-static struct device_operations pci_domain_ops;
-static struct device_operations cpu_bus_ops;
-
-#endif /* NORTHBRIDGE_AMD_AGESA_FAM16_H */
diff --git a/src/northbridge/amd/agesa/northbridge.h b/src/northbridge/amd/agesa/northbridge.h
new file mode 100644
index 0000000..86fd6f6
--- /dev/null
+++ b/src/northbridge/amd/agesa/northbridge.h
@@ -0,0 +1,26 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2012 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 NORTHBRIDGE_AMD_AGESA_FAMXX_H
+#define NORTHBRIDGE_AMD_AGESA_FAMXX_H
+
+static struct device_operations pci_domain_ops;
+static struct device_operations cpu_bus_ops;
+
+#endif /* NORTHBRIDGE_AMD_AGESA_FAMXX_H */
More information about the coreboot-gerrit
mailing list