diff options
| author | Gabe Black <gabeblack@google.com> | 2014-01-17 22:11:35 -0800 |
|---|---|---|
| committer | Isaac Christensen <isaac.christensen@se-eng.com> | 2014-09-24 17:41:44 +0200 |
| commit | 5c8d3d22c82c5f67d1c8ae1c9479b1baee49ceb2 (patch) | |
| tree | 95640af32ba38925e155a3f1f09009fd5f90337c /src/mainboard/google/nyan | |
| parent | 1893fd7c2b39c6167fafdc8294a5216170a810e2 (diff) | |
big: Create a nyan_big mainboard which is a copy of nyan.
The nyan_big mainboard is very similar to nyan, but will be different in a few
ways. For instance, the BCT will be different, and the GPIOs may need to be
configured slightly differently.
This change also adds prefixes to the kconfig variables in "choice" blocks
for both boards since having multiple instances of choice blocks with the same
options confuses kconfig even if all of the instances have mutually exclusive
dependencies.
Change-Id: I290a32e47fc118bd4b86d543df617ad324325dbc
Signed-off-by: Gabe Black <gabeblack@google.com>
Reviewed-on: https://chromium-review.googlesource.com/183532
Reviewed-by: Tom Warren <twarren@nvidia.com>
Reviewed-by: David Hendricks <dhendrix@chromium.org>
Commit-Queue: Gabe Black <gabeblack@chromium.org>
Tested-by: Gabe Black <gabeblack@chromium.org>
(cherry picked from commit d1a453fe1aa68b3d12936dd48cc6c94b54f81579)
Signed-off-by: Isaac Christensen <isaac.christensen@se-eng.com>
Reviewed-on: http://review.coreboot.org/6927
Tested-by: build bot (Jenkins)
Diffstat (limited to 'src/mainboard/google/nyan')
| -rw-r--r-- | src/mainboard/google/nyan/Kconfig | 16 | ||||
| -rw-r--r-- | src/mainboard/google/nyan/bct/Makefile.inc | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/mainboard/google/nyan/Kconfig b/src/mainboard/google/nyan/Kconfig index 320039f401..f0cef6a315 100644 --- a/src/mainboard/google/nyan/Kconfig +++ b/src/mainboard/google/nyan/Kconfig @@ -53,16 +53,16 @@ config DRAM_DMA_SIZE choice prompt "BCT boot media" - default BCT_CFG_SPI + default NYAN_BCT_CFG_SPI help Which boot media to configure the BCT for. -config BCT_CFG_SPI +config NYAN_BCT_CFG_SPI bool "SPI" help Configure the BCT for booting from SPI. -config BCT_CFG_EMMC +config NYAN_BCT_CFG_EMMC bool "eMMC" help Configure the BCT for booting from eMMC. @@ -72,7 +72,7 @@ endchoice config BOOT_MEDIA_SPI_BUS int "SPI bus with boot media ROM" range 1 6 - depends on BCT_CFG_SPI + depends on NYAN_BCT_CFG_SPI default 4 help Which SPI bus the boot media is connected to. @@ -80,7 +80,7 @@ config BOOT_MEDIA_SPI_BUS config BOOT_MEDIA_SPI_CHIP_SELECT int "Chip select for SPI boot media" range 0 3 - depends on BCT_CFG_SPI + depends on NYAN_BCT_CFG_SPI default 0 help Which chip select to use for boot media. @@ -91,14 +91,14 @@ config EC_GOOGLE_CHROMEEC_SPI_BUS choice prompt "BCT sdram configuration" - default BCT_SDRAM_792 + default NYAN_BCT_SDRAM_792 help The SDRAM configuration to put in the BCT. -config BCT_SDRAM_792 +config NYAN_BCT_SDRAM_792 bool "792 MHz" -config BCT_SDRAM_924 +config NYAN_BCT_SDRAM_924 bool "924 MHz" endchoice diff --git a/src/mainboard/google/nyan/bct/Makefile.inc b/src/mainboard/google/nyan/bct/Makefile.inc index 52251c4f2b..aacd89f210 100644 --- a/src/mainboard/google/nyan/bct/Makefile.inc +++ b/src/mainboard/google/nyan/bct/Makefile.inc @@ -17,8 +17,8 @@ ## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA ## -bct-cfg-$(CONFIG_BCT_CFG_EMMC) += emmc.cfg -bct-cfg-$(CONFIG_BCT_CFG_SPI) += spi.cfg +bct-cfg-$(CONFIG_NYAN_BCT_CFG_EMMC) += emmc.cfg +bct-cfg-$(CONFIG_NYAN_BCT_CFG_SPI) += spi.cfg bct-cfg-y += odmdata.cfg -bct-cfg-$(CONFIG_BCT_SDRAM_924) += sdram-924.cfg -bct-cfg-$(CONFIG_BCT_SDRAM_792) += sdram-792.cfg +bct-cfg-$(CONFIG_NYAN_BCT_SDRAM_924) += sdram-924.cfg +bct-cfg-$(CONFIG_NYAN_BCT_SDRAM_792) += sdram-792.cfg |