[coreboot-gerrit] Change in coreboot[master]: [WIP]nb/amd/amdfam10/amdfam10.h: Clean up header

[Arthur Heymans (Code Review)]

Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/20974


Change subject: [WIP]nb/amd/amdfam10/amdfam10.h: Clean up header
......................................................................

[WIP]nb/amd/amdfam10/amdfam10.h: Clean up header

Change-Id: I3df97a038cf265423cb7019d1639a3d47d4871f7
Signed-off-by: Arthur Heymans <arthur at aheymans.xyz>
---
M src/mainboard/amd/mahogany_fam10/romstage.c
M src/northbridge/amd/amdfam10/Makefile.inc
M src/northbridge/amd/amdfam10/amdfam10.h
M src/northbridge/amd/amdfam10/inline_helper.c
4 files changed, 6 insertions(+), 9 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/74/20974/1

diff --git a/src/mainboard/amd/mahogany_fam10/romstage.c b/src/mainboard/amd/mahogany_fam10/romstage.c
index 0393822..979ef22 100644
--- a/src/mainboard/amd/mahogany_fam10/romstage.c
+++ b/src/mainboard/amd/mahogany_fam10/romstage.c
@@ -42,6 +42,7 @@
 #include <southbridge/amd/sb700/sb700.h>
 #include <southbridge/amd/sb700/smbus.h>
 #include <northbridge/amd/amdfam10/raminit.h>
+#include <northbridge/amd/amdfam10/early_ht.h>
 #include <northbridge/amd/amdht/ht_wrapper.h>
 #include <cpu/amd/family_10h-family_15h/init_cpus.h>
 #include <arch/early_variables.h>
diff --git a/src/northbridge/amd/amdfam10/Makefile.inc b/src/northbridge/amd/amdfam10/Makefile.inc
index 787f444..04405df 100644
--- a/src/northbridge/amd/amdfam10/Makefile.inc
+++ b/src/northbridge/amd/amdfam10/Makefile.inc
@@ -7,12 +7,13 @@
 
 # Generic ROMSTAGE stuff
 romstage-y += reset_test.c debug.c setup_resource_map.c raminit_sysinfo_in_ram.c
-romstage-y += raminit_amdmct.c pci.c early_ht.c amdfam10_util.c
+romstage-y += raminit_amdmct.c pci.c early_ht.c amdfam10_util.c inline_helper.c
 
 # RAMSTAGE
 ramstage-y += northbridge.c misc_control.c link_control.c nb_control.c
 ramstage-y += amdfam10_util.c ht_config.c get_pci1234.c
 ramstage-$(CONFIG_HAVE_ACPI_TABLES) += acpi.c
+ramstage-y += inline_helper.c
 
 # Enable this if you want to check the values of the PCI routing registers.
 # Call show_all_routes() anywhere amdfam10.h is included.
diff --git a/src/northbridge/amd/amdfam10/amdfam10.h b/src/northbridge/amd/amdfam10/amdfam10.h
index e9f714a..09c382f 100644
--- a/src/northbridge/amd/amdfam10/amdfam10.h
+++ b/src/northbridge/amd/amdfam10/amdfam10.h
@@ -17,13 +17,6 @@
 #ifndef AMDFAM10_H
 #define AMDFAM10_H
 
-#include <inttypes.h>
-#include <compiler.h>
-#include <arch/io.h>
-#include <device/device.h>
-#include "early_ht.h"
-
-#include "inline_helper.c"
 struct DCTStatStruc;
 struct MCTStatStruc;
 
@@ -1028,5 +1021,6 @@
 #endif
 
 void set_sysinfo_in_ram(u32 val);
+uint8_t is_fam15h(void);
 
 #endif /* AMDFAM10_H */
diff --git a/src/northbridge/amd/amdfam10/inline_helper.c b/src/northbridge/amd/amdfam10/inline_helper.c
index 7f26031..1b947ea 100644
--- a/src/northbridge/amd/amdfam10/inline_helper.c
+++ b/src/northbridge/amd/amdfam10/inline_helper.c
@@ -14,8 +14,9 @@
  */
 
 #include <arch/cpu.h>
+#include "amdfam10.h"
 
-static inline uint8_t is_fam15h(void)
+uint8_t is_fam15h(void)
 {
 	uint8_t fam15h = 0;
 	uint32_t family;

-- 
To view, visit https://review.coreboot.org/20974
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3df97a038cf265423cb7019d1639a3d47d4871f7
Gerrit-Change-Number: 20974
Gerrit-PatchSet: 1
Gerrit-Owner: Arthur Heymans <arthur at aheymans.xyz>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170812/3d5a6fb5/attachment.html>