From ebdef9fab34f6e3545956dfdc3605a7433734c28 Mon Sep 17 00:00:00 2001 From: David Hendricks Date: Tue, 3 Mar 2015 20:19:31 -0800 Subject: [PATCH] veyron_{brain,danger}: Specify vboot romstage and ramstage indices This applies the same hack to Danger and Brain as on Rialto which allows us to remove the EC-related sections from their respective flashmaps. BUG=none BRANCH=veyron CQ-DEPEND=CL:255669 TEST=built and booted on Brain w/ depthcharge and mosys changes, was able to read vbnv data from userspace Change-Id: I95715d59a21cd081ac4a3a2216576ede5620f1a5 Signed-off-by: Patrick Georgi Original-Commit-Id: 4de4273be9ac80ca77a34bc076d1f265fbb94e9f Original-Change-Id: I6c2041e8c17ab157599255a505aaef5e2447a241 Original-Signed-off-by: David Hendricks Original-Reviewed-on: https://chromium-review.googlesource.com/255780 Original-Reviewed-by: Hung-Te Lin Original-Reviewed-by: Julius Werner Reviewed-on: http://review.coreboot.org/9832 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/mainboard/google/veyron_brain/Kconfig | 9 ++++++++- src/mainboard/google/veyron_danger/Kconfig | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/mainboard/google/veyron_brain/Kconfig b/src/mainboard/google/veyron_brain/Kconfig index 6361d9e7e2..e5e38f9e5d 100644 --- a/src/mainboard/google/veyron_brain/Kconfig +++ b/src/mainboard/google/veyron_brain/Kconfig @@ -48,9 +48,16 @@ config MAINBOARD_VENDOR string default "Google" +# The 'ecrwhash' is removed from FMAP on Brain, since we don't have EC. +# As a result, we have to hack RAMSTAGE and ROMSTAGE index until there are +# better approaches for vboot2 to find right index. config VBOOT_RAMSTAGE_INDEX hex - default 0x3 + default 0x2 + +config VBOOT_ROMSTAGE_INDEX + hex + default 0x1 config BOOT_MEDIA_SPI_BUS int diff --git a/src/mainboard/google/veyron_danger/Kconfig b/src/mainboard/google/veyron_danger/Kconfig index 4c7405421b..2fad394f7b 100644 --- a/src/mainboard/google/veyron_danger/Kconfig +++ b/src/mainboard/google/veyron_danger/Kconfig @@ -49,9 +49,16 @@ config MAINBOARD_VENDOR string default "Google" +# The 'ecrwhash' is removed from FMAP on Danger, since we don't have EC. +# As a result, we have to hack RAMSTAGE and ROMSTAGE index until there are +# better approaches for vboot2 to find right index. config VBOOT_RAMSTAGE_INDEX hex - default 0x3 + default 0x2 + +config VBOOT_ROMSTAGE_INDEX + hex + default 0x1 config BOOT_MEDIA_SPI_BUS int