diff options
Diffstat (limited to 'src/soc/nvidia/tegra124/bootblock.c')
| -rw-r--r-- | src/soc/nvidia/tegra124/bootblock.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/soc/nvidia/tegra124/bootblock.c b/src/soc/nvidia/tegra124/bootblock.c index 1d18f1e4cf..f08ca413ad 100644 --- a/src/soc/nvidia/tegra124/bootblock.c +++ b/src/soc/nvidia/tegra124/bootblock.c @@ -18,18 +18,15 @@ */ #include <assert.h> -#include <arch/cache.h> #include <arch/exception.h> #include <bootblock_common.h> #include <cbfs.h> #include <console/console.h> #include <soc/clock.h> #include <soc/nvidia/tegra/apbmisc.h> -#include <soc/nvidia/tegra124/early_configs.h> #include <vendorcode/google/chromeos/chromeos.h> #include "pinmux.h" #include "power.h" -#include "verstage.h" void main(void) { @@ -73,11 +70,11 @@ void main(void) PINMUX_PWR_INT_N_FUNC_PMICINTR | PINMUX_INPUT_ENABLE); - if (IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE)) { - early_mainboard_init(); - entry = (void *)verstage_vboot_main; - } else - entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, "fallback/romstage"); + if (IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE)) + entry = NULL; + else + entry = cbfs_load_stage(CBFS_DEFAULT_MEDIA, + CONFIG_CBFS_PREFIX "/romstage"); ASSERT(entry); clock_cpu0_config(entry); |