summaryrefslogtreecommitdiff
path: root/src/mainboard/google
diff options
context:
space:
mode:
authorFrans Hendriks <fhendriks@eltan.com>2019-06-06 10:07:17 +0200
committerArthur Heymans <arthur@aheymans.xyz>2019-06-12 07:47:13 +0000
commit4e0ec592553fd94e14a239eeb05ba9ccb668b814 (patch)
tree98ed71b9de6a9ca044fbc88284e74aeeff63ded7 /src/mainboard/google
parentba50e4885fd68579ec76a149d28b0b9605381d7e (diff)
{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>
Diffstat (limited to 'src/mainboard/google')
-rw-r--r--src/mainboard/google/cyan/Makefile.inc3
-rw-r--r--src/mainboard/google/cyan/com_init.c4
2 files changed, 4 insertions, 3 deletions
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;