From 8b097916faa20f04ff4b0147ebcf0331204ec96b Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Fri, 31 Jul 2015 09:31:31 -0600
Subject: [PATCH] x86: Add some missing global_data declarations in files that
use gd
Some files use global_data but don't declare it. Fix this.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
---
arch/x86/cpu/mp_init.c | 2 ++
arch/x86/lib/bootm.c | 2 ++
arch/x86/lib/fsp/fsp_common.c | 2 ++
arch/x86/lib/lpc-uclass.c | 2 ++
arch/x86/lib/pch-uclass.c | 2 ++
drivers/gpio/intel_ich6_gpio.c | 2 ++
6 files changed, 12 insertions(+)
diff --git a/arch/x86/cpu/mp_init.c b/arch/x86/cpu/mp_init.c
index e686b28c9ca..3294a50b760 100644
--- a/arch/x86/cpu/mp_init.c
+++ b/arch/x86/cpu/mp_init.c
@@ -24,6 +24,8 @@
#include <dm/uclass-internal.h>
#include <linux/linkage.h>
+DECLARE_GLOBAL_DATA_PTR;
+
/* Total CPUs include BSP */
static int num_cpus;
diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c
index 86030cf52aa..445ee6e4554 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -22,6 +22,8 @@
#include <asm/arch/timestamp.h>
#endif
+DECLARE_GLOBAL_DATA_PTR;
+
#define COMMAND_LINE_OFFSET 0x9000
/*
diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c
index 5b256324e17..c585710824c 100644
--- a/arch/x86/lib/fsp/fsp_common.c
+++ b/arch/x86/lib/fsp/fsp_common.c
@@ -11,6 +11,8 @@
#include <asm/processor.h>
#include <asm/fsp/fsp_support.h>
+DECLARE_GLOBAL_DATA_PTR;
+
int print_cpuinfo(void)
{
post_code(POST_CPU_INFO);
diff --git a/arch/x86/lib/lpc-uclass.c b/arch/x86/lib/lpc-uclass.c
index 6aeb4d461a9..c6e8f73d225 100644
--- a/arch/x86/lib/lpc-uclass.c
+++ b/arch/x86/lib/lpc-uclass.c
@@ -9,6 +9,8 @@
#include <dm.h>
#include <dm/root.h>
+DECLARE_GLOBAL_DATA_PTR;
+
static int lpc_uclass_post_bind(struct udevice *bus)
{
/*
diff --git a/arch/x86/lib/pch-uclass.c b/arch/x86/lib/pch-uclass.c
index d1082e1a475..20dfa815d20 100644
--- a/arch/x86/lib/pch-uclass.c
+++ b/arch/x86/lib/pch-uclass.c
@@ -9,6 +9,8 @@
#include <dm.h>
#include <dm/root.h>
+DECLARE_GLOBAL_DATA_PTR;
+
static int pch_uclass_post_bind(struct udevice *bus)
{
/*
diff --git a/drivers/gpio/intel_ich6_gpio.c b/drivers/gpio/intel_ich6_gpio.c
index 8a108f3805a..cb408a413e6 100644
--- a/drivers/gpio/intel_ich6_gpio.c
+++ b/drivers/gpio/intel_ich6_gpio.c
@@ -35,6 +35,8 @@
#include <asm/io.h>
#include <asm/pci.h>
+DECLARE_GLOBAL_DATA_PTR;
+
#define GPIO_PER_BANK 32
struct ich6_bank_priv {
--
GitLab