From f04aedac271a4fbfd7547b01b7f2273f1f1dd495 Mon Sep 17 00:00:00 2001
From: Elyes HAOUAS <ehaouas@noos.fr>
Date: Fri, 23 Nov 2018 20:05:08 +0100
Subject: [PATCH] {mb/cubieboard,soc/intel/quark}: Remove define
 __SIMPLE_DEVICE__

Remove the __SIMPLE_DEVICE__ define from files used only in romstage.
This is not required since romstage always defines __SIMPLE_DEVICE__.

Change-Id: I8db1b15c9186536c9b8a6b5d667fa5a11af1bad2
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/29821
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/mainboard/cubietech/cubieboard/romstage.c | 1 -
 src/soc/intel/quark/romstage/car.c            | 1 -
 src/soc/intel/quark/romstage/fsp1_1.c         | 1 -
 src/soc/intel/quark/romstage/romstage.c       | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/mainboard/cubietech/cubieboard/romstage.c b/src/mainboard/cubietech/cubieboard/romstage.c
index 665eb9d7c1..f13dbf4387 100644
--- a/src/mainboard/cubietech/cubieboard/romstage.c
+++ b/src/mainboard/cubietech/cubieboard/romstage.c
@@ -29,7 +29,6 @@
 #include <cpu/allwinner/a10/gpio.h>
 #include <cpu/allwinner/a10/twi.h>
 #include <program_loading.h>
-#define __SIMPLE_DEVICE__
 #include <device/device.h>
 #include <drivers/xpowers/axp209/axp209.h>
 #include <drivers/xpowers/axp209/chip.h>
diff --git a/src/soc/intel/quark/romstage/car.c b/src/soc/intel/quark/romstage/car.c
index 781349cf6d..9f052a31ec 100644
--- a/src/soc/intel/quark/romstage/car.c
+++ b/src/soc/intel/quark/romstage/car.c
@@ -13,7 +13,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#define __SIMPLE_DEVICE__
 
 #include <console/console.h>
 #include <fsp/util.h>
diff --git a/src/soc/intel/quark/romstage/fsp1_1.c b/src/soc/intel/quark/romstage/fsp1_1.c
index 6ce2079256..d5c5f19b4e 100644
--- a/src/soc/intel/quark/romstage/fsp1_1.c
+++ b/src/soc/intel/quark/romstage/fsp1_1.c
@@ -13,7 +13,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#define __SIMPLE_DEVICE__
 
 #include <arch/early_variables.h>
 #include <console/console.h>
diff --git a/src/soc/intel/quark/romstage/romstage.c b/src/soc/intel/quark/romstage/romstage.c
index c5f59c6325..f2a280effb 100644
--- a/src/soc/intel/quark/romstage/romstage.c
+++ b/src/soc/intel/quark/romstage/romstage.c
@@ -13,7 +13,6 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  */
-#define __SIMPLE_DEVICE__
 
 #include <arch/early_variables.h>
 #include <cbfs.h>