From 4e0ec592553fd94e14a239eeb05ba9ccb668b814 Mon Sep 17 00:00:00 2001
From: Frans Hendriks <fhendriks@eltan.com>
Date: Thu, 6 Jun 2019 10:07:17 +0200
Subject: {drivers,soc/intel/braswell}: Implement C_ENVIRONMENT_BOOTBLOCK
 support

No C_ENVIRONMENT_BOOTBLOCK support for Braswell is available.
Enable support and add required files for the Braswell Bootblock in C.

The next changes are made support C_ENVIRONMENT_BOOTBLOCK:
- Add car_stage_entry() function bootblock-c_entry() functions.
- Specify config DCACHE_BSP_STACK_SIZE and C_ENV_BOOTBLOCK_SIZE.
- Add bootblock_c_entry().
- Move init from car_soc_XXX_console_init() to bootblock_soc_XXX_Init()

Removed the unused cache_as_ram_main() and weak car_XXX_XXX_console_init()

BUG=NA
TEST=Booting Embedded Linux on Facebook FBG-1701
     Building Google Banos

Change-Id: Iab48ad72f1514c93f20d70db5ef4fd8fa2383e8c
Signed-off-by: Frans Hendriks <fhendriks@eltan.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/29662
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
---
 src/mainboard/google/cyan/Makefile.inc  | 3 ++-
 src/mainboard/google/cyan/com_init.c    | 4 ++--
 src/mainboard/intel/strago/Makefile.inc | 3 ++-
 src/mainboard/intel/strago/com_init.c   | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/mainboard')

diff --git a/src/mainboard/google/cyan/Makefile.inc b/src/mainboard/google/cyan/Makefile.inc
index 92b0422279..027c49cc8f 100644
--- a/src/mainboard/google/cyan/Makefile.inc
+++ b/src/mainboard/google/cyan/Makefile.inc
@@ -14,8 +14,9 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-$(CONFIG_ENABLE_BUILTIN_COM1) += com_init.c
+
 romstage-$(CONFIG_CHROMEOS) += chromeos.c
-romstage-$(CONFIG_ENABLE_BUILTIN_COM1) += com_init.c
 romstage-y += spd/spd.c
 
 ramstage-$(CONFIG_CHROMEOS) += chromeos.c
diff --git a/src/mainboard/google/cyan/com_init.c b/src/mainboard/google/cyan/com_init.c
index 44260bb1eb..b08dbce630 100644
--- a/src/mainboard/google/cyan/com_init.c
+++ b/src/mainboard/google/cyan/com_init.c
@@ -14,14 +14,14 @@
  * GNU General Public License for more details.
  */
 
+#include <bootblock_common.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <soc/gpio.h>
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
-#include <soc/romstage.h>
 
-void car_mainboard_pre_console_init(void)
+void bootblock_mainboard_early_init(void)
 {
 	uint32_t reg;
 	uint32_t *pad_config_reg;
diff --git a/src/mainboard/intel/strago/Makefile.inc b/src/mainboard/intel/strago/Makefile.inc
index bbef8b956e..e6f0c9e652 100644
--- a/src/mainboard/intel/strago/Makefile.inc
+++ b/src/mainboard/intel/strago/Makefile.inc
@@ -14,8 +14,9 @@
 ## GNU General Public License for more details.
 ##
 
+bootblock-$(CONFIG_ENABLE_BUILTIN_COM1) += com_init.c
+
 romstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += chromeos.c
-romstage-$(CONFIG_ENABLE_BUILTIN_COM1) += com_init.c
 
 ramstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += chromeos.c
 ramstage-$(CONFIG_MAINBOARD_HAS_CHROMEOS) += ec.c
diff --git a/src/mainboard/intel/strago/com_init.c b/src/mainboard/intel/strago/com_init.c
index b89d65566e..695ea9806b 100644
--- a/src/mainboard/intel/strago/com_init.c
+++ b/src/mainboard/intel/strago/com_init.c
@@ -14,12 +14,12 @@
  * GNU General Public License for more details.
  */
 
+#include <bootblock_common.h>
 #include <device/mmio.h>
 #include <device/pci_ops.h>
 #include <soc/gpio.h>
 #include <soc/lpc.h>
 #include <soc/pci_devs.h>
-#include <soc/romstage.h>
 
 /*
  * return family number and internal pad number in that community
@@ -30,7 +30,7 @@
 
 	/* family number in high byte and inner pad number in lowest byte */
 
-void car_mainboard_pre_console_init(void)
+void bootblock_mainboard_early_init(void)
 {
 	uint32_t reg;
 	uint32_t *pad_config_reg;
-- 
cgit v1.2.3