diff options
Diffstat (limited to 'src/southbridge')
| -rw-r--r-- | src/southbridge/nvidia/ck804/early_setup_car.c | 4 | ||||
| -rw-r--r-- | src/southbridge/nvidia/mcp55/early_ctrl.c | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/southbridge/nvidia/ck804/early_setup_car.c b/src/southbridge/nvidia/ck804/early_setup_car.c index 6472abfe68..99e6ba7065 100644 --- a/src/southbridge/nvidia/ck804/early_setup_car.c +++ b/src/southbridge/nvidia/ck804/early_setup_car.c @@ -18,10 +18,8 @@ #include "ck804.h" -#if !IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDK8) /* Someone messed up and snuck in some K8-specific code */ static int set_ht_link_buffer_counts_chain(uint8_t ht_c_num, unsigned vendorid, unsigned val) { return 0; /* stub */}; -#endif static int set_ht_link_ck804(u8 ht_c_num) { @@ -138,7 +136,7 @@ static void ck804_early_setup(unsigned ck804_num, unsigned *busn, CK804_MB_SETUP #endif -#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDFAM10) || (IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDK8) && IS_ENABLED(CONFIG_CPU_AMD_SOCKET_F)) +#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDFAM10) /* * Avoid crash (complete with severe memory corruption!) during initial CAR boot * in ck804_early_setup_x() on Fam10h systems by not touching 0x78. diff --git a/src/southbridge/nvidia/mcp55/early_ctrl.c b/src/southbridge/nvidia/mcp55/early_ctrl.c index cb3e2f0ae5..e91abdff8d 100644 --- a/src/southbridge/nvidia/mcp55/early_ctrl.c +++ b/src/southbridge/nvidia/mcp55/early_ctrl.c @@ -18,11 +18,7 @@ #include <arch/io.h> #include <console/console.h> #include <reset.h> -#if IS_ENABLED(CONFIG_NORTHBRIDGE_AMD_AMDK8) -#include <northbridge/amd/amdk8/amdk8.h> -#else /* CONFIG_NORTHBRIDGE_AMD_AMDFAM10 */ #include <northbridge/amd/amdfam10/amdfam10.h> -#endif #include "mcp55.h" void do_soft_reset(void) |