From 92292c69ced6996f1fa37b3411327f17aaa5869f Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 21 Nov 2014 15:37:59 -0800 Subject: [PATCH] configs: Align ChromeOS board configs to CBFS_SIZE change This patch fixes up our board configs to conform to the new relationship between CBFS_SIZE and ROM_SIZE, and to remove the FLASHMAP_OFFSET which now has a useful default. BRANCH=None BUG=None TEST=Tested with other patches. Change-Id: I4781df455ee15ddc91b51d2c42cdeedd60089027 Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/231576 Reviewed-by: Aaron Durbin --- configs/config.arm64-generic | 2 +- configs/config.cosmos | 5 ++--- configs/config.daisy | 2 +- configs/config.nyan | 3 +-- configs/config.nyan_big | 3 +-- configs/config.nyan_blaze | 3 +-- configs/config.peach_pit | 2 +- configs/config.rush | 3 +-- configs/config.rush_ryu | 3 +-- configs/config.storm | 1 - configs/config.veyron_jerry | 3 +-- configs/config.veyron_mighty | 3 +-- configs/config.veyron_pinky | 3 +-- 13 files changed, 13 insertions(+), 23 deletions(-) diff --git a/configs/config.arm64-generic b/configs/config.arm64-generic index 971f40d9d8..168f854028 100644 --- a/configs/config.arm64-generic +++ b/configs/config.arm64-generic @@ -1,4 +1,4 @@ CONFIG_VENDOR_EMULATION=y CONFIG_BOARD_EMULATION_FOUNDATION_ARMV8=y -CONFIG_COREBOOT_ROMSIZE_KB_4096=y +CONFIG_CBFS_SIZE=0x100000 CONFIG_CONSOLE_SERIAL=y diff --git a/configs/config.cosmos b/configs/config.cosmos index 04ac4d3194..d2033d18ca 100644 --- a/configs/config.cosmos +++ b/configs/config.cosmos @@ -1,6 +1,5 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_COSMOS=y -CONFIG_COREBOOT_ROMSIZE_KB_512=y -CONFIG_FLASHMAP_OFFSET=0x00080000 +CONFIG_CBFS_SIZE=0x80000 CONFIG_VBOOT2_VERIFY_FIRMWARE=y -# CONFIG_CONSOLE_SERIAL is not set \ No newline at end of file +# CONFIG_CONSOLE_SERIAL is not set diff --git a/configs/config.daisy b/configs/config.daisy index 57f3bb9cb7..37d04d61bd 100644 --- a/configs/config.daisy +++ b/configs/config.daisy @@ -1,5 +1,5 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_DAISY=y -CONFIG_COREBOOT_ROMSIZE_KB_1024=y +CONFIG_CBFS_SIZE=0x100000 # CONFIG_CONSOLE_SERIAL is not set CONFIG_COLLECT_TIMESTAMPS=y diff --git a/configs/config.nyan b/configs/config.nyan index bbeedd2c8e..9b61ea8792 100644 --- a/configs/config.nyan +++ b/configs/config.nyan @@ -1,10 +1,9 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_NYAN=y -CONFIG_COREBOOT_ROMSIZE_KB_1024=y +CONFIG_CBFS_SIZE=0x100000 # CONFIG_CONSOLE_SERIAL is not set CONFIG_CONSOLE_CBMEM=y CONFIG_VBOOT_VERIFY_FIRMWARE=y -CONFIG_FLASHMAP_OFFSET=0x00100000 CONFIG_ELOG=y CONFIG_DRIVERS_AS3722_RTC=y CONFIG_DRIVERS_AS3722_RTC_BUS=4 diff --git a/configs/config.nyan_big b/configs/config.nyan_big index c9d09d005c..1763e9849e 100644 --- a/configs/config.nyan_big +++ b/configs/config.nyan_big @@ -1,10 +1,9 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_NYAN_BIG=y -CONFIG_COREBOOT_ROMSIZE_KB_1024=y +CONFIG_CBFS_SIZE=0x100000 # CONFIG_CONSOLE_SERIAL is not set CONFIG_CONSOLE_CBMEM=y CONFIG_VBOOT_VERIFY_FIRMWARE=y -CONFIG_FLASHMAP_OFFSET=0x00100000 CONFIG_ELOG=y CONFIG_DRIVERS_AS3722_RTC=y CONFIG_DRIVERS_AS3722_RTC_BUS=4 diff --git a/configs/config.nyan_blaze b/configs/config.nyan_blaze index 7c49ddf9ea..45f09e7641 100644 --- a/configs/config.nyan_blaze +++ b/configs/config.nyan_blaze @@ -1,10 +1,9 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_NYAN_BLAZE=y -CONFIG_COREBOOT_ROMSIZE_KB_1024=y +CONFIG_CBFS_SIZE=0x100000 # CONFIG_CONSOLE_SERIAL is not set CONFIG_CONSOLE_CBMEM=y CONFIG_VBOOT_VERIFY_FIRMWARE=y -CONFIG_FLASHMAP_OFFSET=0x00100000 CONFIG_ELOG=y CONFIG_DRIVERS_AS3722_RTC=y CONFIG_DRIVERS_AS3722_RTC_BUS=4 diff --git a/configs/config.peach_pit b/configs/config.peach_pit index ef84d7c9dd..d0dac7c34f 100644 --- a/configs/config.peach_pit +++ b/configs/config.peach_pit @@ -1,5 +1,5 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_PEACH_PIT=y -CONFIG_COREBOOT_ROMSIZE_KB_1024=y +CONFIG_CBFS_SIZE=0x100000 # CONFIG_CONSOLE_SERIAL is not set CONFIG_COLLECT_TIMESTAMPS=y diff --git a/configs/config.rush b/configs/config.rush index 602714a5e3..6e9c3656d2 100644 --- a/configs/config.rush +++ b/configs/config.rush @@ -1,8 +1,7 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_RUSH=y -CONFIG_COREBOOT_ROMSIZE_KB_4096=y +CONFIG_CBFS_SIZE=0x200000 # CONFIG_CONSOLE_SERIAL is not set CONFIG_CONSOLE_CBMEM=y CONFIG_MTS_DIRECTORY="3rdparty/mainboard/google/rush" CONFIG_VBOOT2_VERIFY_FIRMWARE=y -CONFIG_FLASHMAP_OFFSET=0x00200000 diff --git a/configs/config.rush_ryu b/configs/config.rush_ryu index bdf8cd2039..b86e9db472 100644 --- a/configs/config.rush_ryu +++ b/configs/config.rush_ryu @@ -1,11 +1,10 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_RUSH_RYU=y -CONFIG_COREBOOT_ROMSIZE_KB_8192=y +CONFIG_CBFS_SIZE=0x200000 # CONFIG_CONSOLE_SERIAL is not set CONFIG_CONSOLE_CBMEM=y CONFIG_MTS_DIRECTORY="3rdparty/mainboard/google/rush_ryu" CONFIG_VBOOT2_VERIFY_FIRMWARE=y -CONFIG_FLASHMAP_OFFSET=0x00200000 CONFIG_ELOG=y CONFIG_DRIVERS_TI_TPS65913_RTC=y CONFIG_DRIVERS_TI_TPS65913_RTC_BUS=4 diff --git a/configs/config.storm b/configs/config.storm index df941741d0..062abc338b 100644 --- a/configs/config.storm +++ b/configs/config.storm @@ -1,6 +1,5 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_STORM=y -CONFIG_COREBOOT_ROMSIZE_KB_4096=y # CONFIG_CONSOLE_SERIAL is not set CONFIG_COLLECT_TIMESTAMPS=y CONFIG_CONSOLE_CBMEM=y diff --git a/configs/config.veyron_jerry b/configs/config.veyron_jerry index b331633032..072396067a 100644 --- a/configs/config.veyron_jerry +++ b/configs/config.veyron_jerry @@ -1,9 +1,8 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_VEYRON_JERRY=y -CONFIG_COREBOOT_ROMSIZE_KB_1024=y +CONFIG_CBFS_SIZE=0x100000 # CONFIG_CONSOLE_SERIAL is not set CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_ELOG=y # CONFIG_CONSOLE_CBMEM=y -CONFIG_FLASHMAP_OFFSET=0x00100000 CONFIG_VBOOT2_VERIFY_FIRMWARE=y diff --git a/configs/config.veyron_mighty b/configs/config.veyron_mighty index d3fbeb1573..b1defb9d6b 100644 --- a/configs/config.veyron_mighty +++ b/configs/config.veyron_mighty @@ -1,9 +1,8 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_VEYRON_MIGHTY=y -CONFIG_COREBOOT_ROMSIZE_KB_1024=y +CONFIG_CBFS_SIZE=0x100000 # CONFIG_CONSOLE_SERIAL is not set CONFIG_COLLECT_TIMESTAMPS=y # CONFIG_ELOG=y # CONFIG_CONSOLE_CBMEM=y -CONFIG_FLASHMAP_OFFSET=0x00100000 CONFIG_VBOOT2_VERIFY_FIRMWARE=y diff --git a/configs/config.veyron_pinky b/configs/config.veyron_pinky index 7192c3bcac..2b39dad46e 100644 --- a/configs/config.veyron_pinky +++ b/configs/config.veyron_pinky @@ -1,8 +1,7 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_VEYRON_PINKY=y -CONFIG_COREBOOT_ROMSIZE_KB_1024=y +CONFIG_CBFS_SIZE=0x100000 # CONFIG_CONSOLE_SERIAL is not set # CONFIG_ELOG=y # CONFIG_CONSOLE_CBMEM=y -CONFIG_FLASHMAP_OFFSET=0x00100000 CONFIG_VBOOT2_VERIFY_FIRMWARE=y