From dcf52c87a6ba92c407775cdcd69c0b67193b036e Mon Sep 17 00:00:00 2001
From: Martin Roth <martinroth@google.com>
Date: Mon, 26 Nov 2018 18:40:43 -0700
Subject: vendorcode/cavium: Supply bdk_pop and bdk_dpop definitions

This is an issue found by the new builder image and needs to be fixed
before we can upgrade to the new toolchain version:

In function `bdk_dram_get_size_mbytes':
src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-size.c:198:
undefined reference to `bdk_pop'

In function `bdk_get_num_cores':
/src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-utils.h:164:
undefined reference to `bdk_dpop'

In function `init_octeon3_ddr3_interface':
src/vendorcode/cavium/bdk/libdram/dram-init-ddr3.c:7550:
undefined reference to `bdk_pop'

Change-Id: Ibf71e4556014795bfedceccfe3837dc9deb29ad2
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/c/29851
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
---
 src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-size.c    | 1 +
 src/vendorcode/cavium/bdk/libdram/dram-init-ddr3.c       | 1 +
 src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-utils.h | 1 +
 3 files changed, 3 insertions(+)

(limited to 'src')

diff --git a/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-size.c b/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-size.c
index 8cd4594818..eecb34879c 100644
--- a/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-size.c
+++ b/src/vendorcode/cavium/bdk/libbdk-dram/bdk-dram-size.c
@@ -37,6 +37,7 @@
 * ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 ***********************license end**************************************/
 #include <bdk.h>
+#include <bdk-coreboot.h>
 #include <libbdk-hal/bdk-utils.h>
 
 
diff --git a/src/vendorcode/cavium/bdk/libdram/dram-init-ddr3.c b/src/vendorcode/cavium/bdk/libdram/dram-init-ddr3.c
index 0fcc180da8..3a6d5abb14 100644
--- a/src/vendorcode/cavium/bdk/libdram/dram-init-ddr3.c
+++ b/src/vendorcode/cavium/bdk/libdram/dram-init-ddr3.c
@@ -37,6 +37,7 @@
 * ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 ***********************license end**************************************/
 #include <bdk.h>
+#include <bdk-coreboot.h>
 #include "libbdk-arch/bdk-csrs-l2c_tad.h"
 #include "libbdk-arch/bdk-csrs-mio_fus.h"
 #include "dram-internal.h"
diff --git a/src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-utils.h b/src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-utils.h
index c83658644c..a51ab6b71a 100644
--- a/src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-utils.h
+++ b/src/vendorcode/cavium/include/bdk/libbdk-hal/bdk-utils.h
@@ -39,6 +39,7 @@
 * ARISING OUT OF USE OR PERFORMANCE OF THE SOFTWARE LIES WITH YOU.
 ***********************license end**************************************/
 #include "libbdk-arch/bdk-csrs-rst.h"
+#include <bdk-coreboot.h>
 #include <string.h>
 
 /**
-- 
cgit v1.2.3