diff --git a/configs/config.nyan b/configs/config.nyan index 5eb2054473..430c690c83 100644 --- a/configs/config.nyan +++ b/configs/config.nyan @@ -1,6 +1,5 @@ CONFIG_VENDOR_GOOGLE=y CONFIG_BOARD_GOOGLE_NYAN=y -CONFIG_NYAN_IN_A_PIXEL=y CONFIG_COREBOOT_ROMSIZE_KB_1024=y # CONFIG_CONSOLE_SERIAL is not set CONFIG_COLLECT_TIMESTAMPS=y diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index 270e7e1cf3..8ffd1a59c6 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -88,8 +88,18 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS hex default 1 -config NYAN_IN_A_PIXEL - bool "Nyan in a pixel case" - default n +choice + prompt "BCT sdram configuration" + default BCT_SDRAM_792 + help + The SDRAM configuration to put in the BCT. + +config BCT_SDRAM_792 + bool "792 MHz" + +config BCT_SDRAM_924 + bool "924 MHz" + +endchoice endif # BOARD_GOOGLE_NYAN diff --git a/src/mainboard/google/nyan/bct/Makefile.inc b/src/mainboard/google/nyan/bct/Makefile.inc index 460e2fdb7f..52251c4f2b 100644 --- a/src/mainboard/google/nyan/bct/Makefile.inc +++ b/src/mainboard/google/nyan/bct/Makefile.inc @@ -20,8 +20,5 @@ bct-cfg-$(CONFIG_BCT_CFG_EMMC) += emmc.cfg bct-cfg-$(CONFIG_BCT_CFG_SPI) += spi.cfg bct-cfg-y += odmdata.cfg -ifeq ($(CONFIG_NYAN_IN_A_PIXEL),y) - bct-cfg-y += sdram-924.cfg -else - bct-cfg-y += sdram-792.cfg -endif +bct-cfg-$(CONFIG_BCT_SDRAM_924) += sdram-924.cfg +bct-cfg-$(CONFIG_BCT_SDRAM_792) += sdram-792.cfg