From 901b732fed4e6556685598b65cb5b22169f22647 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Sat, 4 Oct 2014 17:00:56 -0700 Subject: [PATCH] t132: Add vboot2 support BUG=chrome-os-partner:32684 BRANCH=None TEST=Compiles successfully and boots to kernel prompt using vboot2 Original-Change-Id: Ibf7666d273e4d1af719c60d3f02bddcb4461f4bd Original-Signed-off-by: Furquan Shaikh Original-Reviewed-on: https://chromium-review.googlesource.com/221576 Original-Tested-by: Furquan Shaikh Original-Reviewed-by: Aaron Durbin Original-Commit-Queue: Furquan Shaikh (cherry picked from commit 8335915940ae9ba9e51e360df6963a27b05d6324) Signed-off-by: Aaron Durbin Change-Id: I7d3d5cda4c4be945931d9133ab18680dac1dcefe Reviewed-on: http://review.coreboot.org/9430 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/mainboard/google/rush/memlayout.ld | 2 +- src/mainboard/google/rush_ryu/memlayout.ld | 2 +- src/soc/nvidia/tegra132/Makefile.inc | 14 ++++++ .../soc/{memlayout.ld => memlayout_vboot.ld} | 11 ++--- .../tegra132/include/soc/memlayout_vboot2.ld | 46 +++++++++++++++++++ .../nvidia/tegra132/include/soc/verstage.h | 25 ++++++++++ src/soc/nvidia/tegra132/verstage.c | 39 ++++++++++++++++ 7 files changed, 131 insertions(+), 8 deletions(-) rename src/soc/nvidia/tegra132/include/soc/{memlayout.ld => memlayout_vboot.ld} (88%) create mode 100644 src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld create mode 100644 src/soc/nvidia/tegra132/include/soc/verstage.h create mode 100644 src/soc/nvidia/tegra132/verstage.c diff --git a/src/mainboard/google/rush/memlayout.ld b/src/mainboard/google/rush/memlayout.ld index ead7f47838..85f4a97855 100644 --- a/src/mainboard/google/rush/memlayout.ld +++ b/src/mainboard/google/rush/memlayout.ld @@ -1 +1 @@ -#include +#include diff --git a/src/mainboard/google/rush_ryu/memlayout.ld b/src/mainboard/google/rush_ryu/memlayout.ld index ead7f47838..85f4a97855 100644 --- a/src/mainboard/google/rush_ryu/memlayout.ld +++ b/src/mainboard/google/rush_ryu/memlayout.ld @@ -1 +1 @@ -#include +#include diff --git a/src/soc/nvidia/tegra132/Makefile.inc b/src/soc/nvidia/tegra132/Makefile.inc index 8ad9b83059..5cdf8e2003 100644 --- a/src/soc/nvidia/tegra132/Makefile.inc +++ b/src/soc/nvidia/tegra132/Makefile.inc @@ -20,6 +20,20 @@ ifeq ($(CONFIG_BOOTBLOCK_CONSOLE),y) bootblock-$(CONFIG_DRIVERS_UART) += uart.c endif +verstage-y += verstage.c +verstage-y += cbfs.c +verstage-y += dma.c +verstage-y += monotonic_timer.c +verstage-y += spi.c +verstage-y += padconfig.c +verstage-y += funitcfg.c +verstage-$(CONFIG_CONSOLE_SERIAL_UART) += uart.c +verstage-y += ../tegra/gpio.c +verstage-y += ../tegra/i2c.c +verstage-y += ../tegra/pinmux.c +verstage-y += clock.c +verstage-y += i2c.c + romstage-y += 32bit_reset.S romstage-y += romstage_asm.S romstage-y += addressmap.c diff --git a/src/soc/nvidia/tegra132/include/soc/memlayout.ld b/src/soc/nvidia/tegra132/include/soc/memlayout_vboot.ld similarity index 88% rename from src/soc/nvidia/tegra132/include/soc/memlayout.ld rename to src/soc/nvidia/tegra132/include/soc/memlayout_vboot.ld index 63cf4f031c..c097c3cd6a 100644 --- a/src/soc/nvidia/tegra132/include/soc/memlayout.ld +++ b/src/soc/nvidia/tegra132/include/soc/memlayout_vboot.ld @@ -31,12 +31,11 @@ SECTIONS { SRAM_START(0x40000000) - /* 16K hole */ - PRERAM_CBMEM_CONSOLE(0x40004000, 8K) - CBFS_CACHE(0x40006000, 88K) - STACK(0x4001C000, 16K) - BOOTBLOCK(0x40020000, 20K) - ROMSTAGE(0x40025000, 108K) + PRERAM_CBMEM_CONSOLE(0x40000000, 8K) + CBFS_CACHE(0x40002000, 88K) + STACK(0x40018000, 16K) + BOOTBLOCK(0x4001C000, 20K) + ROMSTAGE(0x40021000, 124K) SRAM_END(0x40040000) DRAM_START(0x80000000) diff --git a/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld b/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld new file mode 100644 index 0000000000..8743268492 --- /dev/null +++ b/src/soc/nvidia/tegra132/include/soc/memlayout_vboot2.ld @@ -0,0 +1,46 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2014 Google Inc. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include + +#include + +/* + * Note: The BootROM uses the address range [0x4000_0000:0x4000_E000) itself, + * so the bootblock loading address must be placed after that. After the + * handoff that area may be reclaimed for other uses, e.g. CBFS cache. + * TODO: Did this change on Tegra132? What's the new valid range? + */ + +SECTIONS +{ + SRAM_START(0x40000000) + PRERAM_CBMEM_CONSOLE(0x40000000, 8K) + CBFS_CACHE(0x40002000, 72K) + VBOOT2_WORK(0x40014000, 16K) + STACK(0x40018000, 8K) + BOOTBLOCK(0x4001A000, 20K) + VERSTAGE(0x4001F000, 60K) + ROMSTAGE(0x4002E000, 72K) + SRAM_END(0x40040000) + + DRAM_START(0x80000000) + RAMSTAGE(0x80200000, 192K) +} diff --git a/src/soc/nvidia/tegra132/include/soc/verstage.h b/src/soc/nvidia/tegra132/include/soc/verstage.h new file mode 100644 index 0000000000..6901bc3497 --- /dev/null +++ b/src/soc/nvidia/tegra132/include/soc/verstage.h @@ -0,0 +1,25 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2014 Google Inc. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __SOC_NVIDIA_TEGRA132_SOC_VERSTAGE_H__ +#define __SOC_NVIDIA_TEGRA132_SOC_VERSTAGE_H__ + +void verstage_mainboard_init(void); + +#endif /* __SOC_NVIDIA_TEGRA132_SOC_VERSTAGE_H__ */ diff --git a/src/soc/nvidia/tegra132/verstage.c b/src/soc/nvidia/tegra132/verstage.c new file mode 100644 index 0000000000..ba3e18393a --- /dev/null +++ b/src/soc/nvidia/tegra132/verstage.c @@ -0,0 +1,39 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2014 Google Inc. + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include +#include +#include + +void __attribute__((weak)) verstage_mainboard_init(void) +{ + /* Default empty implementation. */ +} + +void main(void) +{ + console_init(); + exception_init(); + + verstage_mainboard_init(); + + vboot2_verify_firmware(); +}