summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-07-22 09:34:50 +0300
committerMarshall Dawson <marshalldawson3rd@gmail.com>2019-08-07 21:22:21 +0000
commit9c55ee34acb9007f8152f4ceddea8c44df29ba75 (patch)
tree0b5a53b29941a917ced8f28377a4e1f434c32ebf /src
parenta3cb61a55d70925c622f489f723f70d305bf0411 (diff)
downloadcoreboot-9c55ee34acb9007f8152f4ceddea8c44df29ba75.tar.xz
soc/amd/picasso: Set HAVE_BOOTBLOCK=n
Change-Id: Iaf370e04adb04eb81555a57e81812ebe3339971d Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34478 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/soc/amd/picasso/Kconfig4
-rw-r--r--src/soc/amd/picasso/Makefile.inc7
-rw-r--r--src/soc/amd/picasso/bootblock/bootblock.c19
-rw-r--r--src/soc/amd/picasso/cache_as_ram.S20
4 files changed, 4 insertions, 46 deletions
diff --git a/src/soc/amd/picasso/Kconfig b/src/soc/amd/picasso/Kconfig
index 5ca0c91824..0ba90effe6 100644
--- a/src/soc/amd/picasso/Kconfig
+++ b/src/soc/amd/picasso/Kconfig
@@ -72,6 +72,10 @@ config UDELAY_LAPIC_FIXED_FSB
int
default 200
+config HAVE_BOOTBLOCK
+ bool
+ default n
+
# TODO: Sync these with definitions in PI vendorcode.
# DCACHE_RAM_BASE must equal BSP_STACK_BASE_ADDR.
# DCACHE_RAM_SIZE must equal BSP_STACK_SIZE.
diff --git a/src/soc/amd/picasso/Makefile.inc b/src/soc/amd/picasso/Makefile.inc
index 93a8bbbbf2..7f371928c1 100644
--- a/src/soc/amd/picasso/Makefile.inc
+++ b/src/soc/amd/picasso/Makefile.inc
@@ -37,13 +37,6 @@ subdirs-y += ../../../cpu/x86/mtrr
subdirs-y += ../../../cpu/x86/pae
subdirs-y += ../../../cpu/x86/smm
-# TODO: Make coreboot modifications so bootblock can be removed. This soc
-# also selects C_ENVIRONMENT_BOOTBLOCK to enforce certain codepaths
-# in romstage. As a result, the bootblock build also needs a
-# dummy cache_as_ram.S
-bootblock-y += cache_as_ram.S
-bootblock-y += bootblock/bootblock.c
-
romstage-y += i2c.c
romstage-y += romstage.c
romstage-y += gpio.c
diff --git a/src/soc/amd/picasso/bootblock/bootblock.c b/src/soc/amd/picasso/bootblock/bootblock.c
deleted file mode 100644
index 62e4e1589f..0000000000
--- a/src/soc/amd/picasso/bootblock/bootblock.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#include <bootblock_common.h>
-
-asmlinkage void bootblock_c_entry(uint64_t base_timestamp)
-{
- /* This function is here for building/linking only */
-}
diff --git a/src/soc/amd/picasso/cache_as_ram.S b/src/soc/amd/picasso/cache_as_ram.S
deleted file mode 100644
index 28690628d6..0000000000
--- a/src/soc/amd/picasso/cache_as_ram.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-/*
- * TODO: This is a dummy file for making bootblock build and link. At some
- * point, this should be removed from picasso since bootblock is
- * ignored.
- */
-.global bootblock_pre_c_entry
-bootblock_pre_c_entry: