Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
mb/Kconfig: Align ROM size options

Change-Id: I0160e72a8961f1aa34982f6348825708e7be9c40
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39180
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
M src/mainboard/Kconfig
1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/mainboard/Kconfig b/src/mainboard/Kconfig
index df80e64..95459ff 100644
--- a/src/mainboard/Kconfig
+++ b/src/mainboard/Kconfig
@@ -44,16 +44,16 @@
# TODO: No help text possible for choice fields?
choice
prompt "ROM chip size"
- default COREBOOT_ROMSIZE_KB_64 if BOARD_ROMSIZE_KB_64
- default COREBOOT_ROMSIZE_KB_128 if BOARD_ROMSIZE_KB_128
- default COREBOOT_ROMSIZE_KB_256 if BOARD_ROMSIZE_KB_256
- default COREBOOT_ROMSIZE_KB_512 if BOARD_ROMSIZE_KB_512
- default COREBOOT_ROMSIZE_KB_1024 if BOARD_ROMSIZE_KB_1024
- default COREBOOT_ROMSIZE_KB_2048 if BOARD_ROMSIZE_KB_2048
- default COREBOOT_ROMSIZE_KB_4096 if BOARD_ROMSIZE_KB_4096
- default COREBOOT_ROMSIZE_KB_5120 if BOARD_ROMSIZE_KB_5120
- default COREBOOT_ROMSIZE_KB_6144 if BOARD_ROMSIZE_KB_6144
- default COREBOOT_ROMSIZE_KB_8192 if BOARD_ROMSIZE_KB_8192
+ default COREBOOT_ROMSIZE_KB_64 if BOARD_ROMSIZE_KB_64
+ default COREBOOT_ROMSIZE_KB_128 if BOARD_ROMSIZE_KB_128
+ default COREBOOT_ROMSIZE_KB_256 if BOARD_ROMSIZE_KB_256
+ default COREBOOT_ROMSIZE_KB_512 if BOARD_ROMSIZE_KB_512
+ default COREBOOT_ROMSIZE_KB_1024 if BOARD_ROMSIZE_KB_1024
+ default COREBOOT_ROMSIZE_KB_2048 if BOARD_ROMSIZE_KB_2048
+ default COREBOOT_ROMSIZE_KB_4096 if BOARD_ROMSIZE_KB_4096
+ default COREBOOT_ROMSIZE_KB_5120 if BOARD_ROMSIZE_KB_5120
+ default COREBOOT_ROMSIZE_KB_6144 if BOARD_ROMSIZE_KB_6144
+ default COREBOOT_ROMSIZE_KB_8192 if BOARD_ROMSIZE_KB_8192
default COREBOOT_ROMSIZE_KB_10240 if BOARD_ROMSIZE_KB_10240
default COREBOOT_ROMSIZE_KB_12288 if BOARD_ROMSIZE_KB_12288
default COREBOOT_ROMSIZE_KB_16384 if BOARD_ROMSIZE_KB_16384
@@ -145,16 +145,16 @@
# Map the config names to an integer (KB).
config COREBOOT_ROMSIZE_KB
int
- default 64 if COREBOOT_ROMSIZE_KB_64
- default 128 if COREBOOT_ROMSIZE_KB_128
- default 256 if COREBOOT_ROMSIZE_KB_256
- default 512 if COREBOOT_ROMSIZE_KB_512
- default 1024 if COREBOOT_ROMSIZE_KB_1024
- default 2048 if COREBOOT_ROMSIZE_KB_2048
- default 4096 if COREBOOT_ROMSIZE_KB_4096
- default 5120 if COREBOOT_ROMSIZE_KB_5120
- default 6144 if COREBOOT_ROMSIZE_KB_6144
- default 8192 if COREBOOT_ROMSIZE_KB_8192
+ default 64 if COREBOOT_ROMSIZE_KB_64
+ default 128 if COREBOOT_ROMSIZE_KB_128
+ default 256 if COREBOOT_ROMSIZE_KB_256
+ default 512 if COREBOOT_ROMSIZE_KB_512
+ default 1024 if COREBOOT_ROMSIZE_KB_1024
+ default 2048 if COREBOOT_ROMSIZE_KB_2048
+ default 4096 if COREBOOT_ROMSIZE_KB_4096
+ default 5120 if COREBOOT_ROMSIZE_KB_5120
+ default 6144 if COREBOOT_ROMSIZE_KB_6144
+ default 8192 if COREBOOT_ROMSIZE_KB_8192
default 10240 if COREBOOT_ROMSIZE_KB_10240
default 12288 if COREBOOT_ROMSIZE_KB_12288
default 16384 if COREBOOT_ROMSIZE_KB_16384
@@ -164,21 +164,21 @@
# Map the config names to a hex value (bytes).
config ROM_SIZE
hex
- default 0x10000 if COREBOOT_ROMSIZE_KB_64
- default 0x20000 if COREBOOT_ROMSIZE_KB_128
- default 0x40000 if COREBOOT_ROMSIZE_KB_256
- default 0x80000 if COREBOOT_ROMSIZE_KB_512
- default 0x100000 if COREBOOT_ROMSIZE_KB_1024
- default 0x200000 if COREBOOT_ROMSIZE_KB_2048
- default 0x400000 if COREBOOT_ROMSIZE_KB_4096
- default 0x500000 if COREBOOT_ROMSIZE_KB_5120
- default 0x600000 if COREBOOT_ROMSIZE_KB_6144
- default 0x800000 if COREBOOT_ROMSIZE_KB_8192
- default 0xa00000 if COREBOOT_ROMSIZE_KB_10240
- default 0xc00000 if COREBOOT_ROMSIZE_KB_12288
- default 0x1000000 if COREBOOT_ROMSIZE_KB_16384
- default 0x2000000 if COREBOOT_ROMSIZE_KB_32768
- default 0x4000000 if COREBOOT_ROMSIZE_KB_65536
+ default 0x00010000 if COREBOOT_ROMSIZE_KB_64
+ default 0x00020000 if COREBOOT_ROMSIZE_KB_128
+ default 0x00040000 if COREBOOT_ROMSIZE_KB_256
+ default 0x00080000 if COREBOOT_ROMSIZE_KB_512
+ default 0x00100000 if COREBOOT_ROMSIZE_KB_1024
+ default 0x00200000 if COREBOOT_ROMSIZE_KB_2048
+ default 0x00400000 if COREBOOT_ROMSIZE_KB_4096
+ default 0x00500000 if COREBOOT_ROMSIZE_KB_5120
+ default 0x00600000 if COREBOOT_ROMSIZE_KB_6144
+ default 0x00800000 if COREBOOT_ROMSIZE_KB_8192
+ default 0x00a00000 if COREBOOT_ROMSIZE_KB_10240
+ default 0x00c00000 if COREBOOT_ROMSIZE_KB_12288
+ default 0x01000000 if COREBOOT_ROMSIZE_KB_16384
+ default 0x02000000 if COREBOOT_ROMSIZE_KB_32768
+ default 0x04000000 if COREBOOT_ROMSIZE_KB_65536

config ENABLE_POWER_BUTTON
bool "Enable the power button" if POWER_BUTTON_IS_OPTIONAL

To view, visit change 39180. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I0160e72a8961f1aa34982f6348825708e7be9c40
Gerrit-Change-Number: 39180
Gerrit-PatchSet: 4
Gerrit-Owner: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Angel Pons <th3fanbus@gmail.com>
Gerrit-Reviewer: Nico Huber <nico.h@gmx.de>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged