Change in coreboot[4.11_branch]: northbridge/amd/amdfam10: remove C include of inline_helper.c

[Michał Żygowski (Code Review)]

Michał Żygowski has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48465 )

Change subject: northbridge/amd/amdfam10: remove C include of inline_helper.c
......................................................................

northbridge/amd/amdfam10: remove C include of inline_helper.c

Change-Id: I5ecd809e9597304ee4b0ff043e1d32abb4eca65e
Signed-off-by: Michał Żygowski 
---
M src/northbridge/amd/amdfam10/amdfam10.h
M src/northbridge/amd/amdfam10/amdfam10_util.c
D src/northbridge/amd/amdfam10/inline_helper.c
3 files changed, 21 insertions(+), 33 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/48465/1

diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h
index ad8d013..b5446b2 100644
--- a/src/northbridge/amd/amdfam10/amdfam10.h
+++ b/src/northbridge/amd/amdfam10/amdfam10.h
@@ -18,10 +18,10 @@
 #define AMDFAM10_H

#include <stdint.h>
+#include <arch/cpu.h>
 #include <device/device.h>
 #include "early_ht.h"

-#include "inline_helper.c"
 struct DCTStatStruc;
 struct MCTStatStruc;

@@ -1022,4 +1022,6 @@
    				    struct acpi_rsdp *rsdp);
 void northbridge_acpi_write_vars(struct device *device);

+uint8_t is_fam15h(void);
+
 #endif /* AMDFAM10_H */
diff --git a/src/northbridge/amd/amdfam10/amdfam10_util.c b/src/northbridge/amd/amdfam10/amdfam10_util.c
index 3e8c2fb..cdc7044 100644
--- a/src/northbridge/amd/amdfam10/amdfam10_util.c
+++ b/src/northbridge/amd/amdfam10/amdfam10_util.c
@@ -18,8 +18,25 @@
 #include <console/console.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
-#include "raminit.h"
 #include <northbridge/amd/amdmct/amddefs.h>
+#include <northbridge/amd/amdfam10/amdfam10.h>
+
+#include "raminit.h"
+
+uint8_t is_fam15h(void)
+{
+	uint8_t fam15h = 0;
+	uint32_t family;
+
+	family = cpuid_eax(0x80000001);
+	family = ((family & 0xf00000) >> 16) | ((family & 0xf00) >> 8);
+
+	if (family >= 0x6f)
+		/* Family 15h or later */
+		fam15h = 1;
+
+	return fam15h;
+}

#ifndef __SIMPLE_DEVICE__
 u32 Get_NB32(u32 dev, u32 reg)
diff --git a/src/northbridge/amd/amdfam10/inline_helper.c b/src/northbridge/amd/amdfam10/inline_helper.c
deleted file mode 100644
index 7f26031..0000000
--- a/src/northbridge/amd/amdfam10/inline_helper.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2016 Damien Zammit 
- *
- * 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.
- */
-
-#include <arch/cpu.h>
-
-static inline uint8_t is_fam15h(void)
-{
-	uint8_t fam15h = 0;
-	uint32_t family;
-
-	family = cpuid_eax(0x80000001);
-	family = ((family & 0xf00000) >> 16) | ((family & 0xf00) >> 8);
-
-	if (family >= 0x6f)
-		/* Family 15h or later */
-		fam15h = 1;
-
-	return fam15h;
-}

[Michał Żygowski (Code Review)]

Michał Żygowski has uploaded a new patch set (#2). ( https://review.coreboot.org/c/coreboot/+/48465 )

Change subject: northbridge/amd/amdfam10: remove C include of inline_helper.c
......................................................................

northbridge/amd/amdfam10: remove C include of inline_helper.c

TEST=build test the KGPE-D16

Change-Id: I5ecd809e9597304ee4b0ff043e1d32abb4eca65e
Signed-off-by: Michał Żygowski 
---
M src/northbridge/amd/amdfam10/amdfam10.h
M src/northbridge/amd/amdfam10/amdfam10_util.c
D src/northbridge/amd/amdfam10/inline_helper.c
3 files changed, 21 insertions(+), 33 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/48465/2

[Michał Żygowski (Code Review)]

Hello build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/48465

to look at the new patch set (#3).

Change subject: northbridge/amd/amdfam10: remove C include of inline_helper.c
......................................................................

northbridge/amd/amdfam10: remove C include of inline_helper.c

TEST=build test the KGPE-D16

Change-Id: I5ecd809e9597304ee4b0ff043e1d32abb4eca65e
Signed-off-by: Michał Żygowski 
---
M src/northbridge/amd/amdfam10/amdfam10.h
M src/northbridge/amd/amdfam10/amdfam10_util.c
D src/northbridge/amd/amdfam10/inline_helper.c
M src/northbridge/amd/amdmct/mct_ddr3/mct_d.c
4 files changed, 22 insertions(+), 34 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/65/48465/3

[Michał Żygowski (Code Review)]

Michał Żygowski has abandoned this change. ( https://review.coreboot.org/c/coreboot/+/48465 )

Change subject: northbridge/amd/amdfam10: remove C include of inline_helper.c
......................................................................

Abandoned