diff options
Diffstat (limited to 'src/mainboard/google/rush_ryu/sdram_configs.c')
| -rw-r--r-- | src/mainboard/google/rush_ryu/sdram_configs.c | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/mainboard/google/rush_ryu/sdram_configs.c b/src/mainboard/google/rush_ryu/sdram_configs.c index 462fec2afe..66978d3df4 100644 --- a/src/mainboard/google/rush_ryu/sdram_configs.c +++ b/src/mainboard/google/rush_ryu/sdram_configs.c @@ -19,36 +19,28 @@ #include <console/console.h> #include <soc/sdram_configs.h> +#include <stdlib.h> -static struct sdram_params sdram_configs[] = { -#include "bct/sdram-hynix-2GB-924.inc" /* ram_code = 0000 */ -#include "bct/sdram-hynix-4GB-792.inc" /* ram_code = 0001 */ -#include "bct/sdram-unused.inc" /* ram_code = 0010 */ -#include "bct/sdram-unused.inc" /* ram_code = 0011 */ -#include "bct/sdram-unused.inc" /* ram_code = 0100 */ -#include "bct/sdram-unused.inc" /* ram_code = 0101 */ -#include "bct/sdram-unused.inc" /* ram_code = 0110 */ -#include "bct/sdram-unused.inc" /* ram_code = 0111 */ -#include "bct/sdram-unused.inc" /* ram_code = 1000 */ -#include "bct/sdram-unused.inc" /* ram_code = 1001 */ -#include "bct/sdram-unused.inc" /* ram_code = 1010 */ -#include "bct/sdram-unused.inc" /* ram_code = 1011 */ -#include "bct/sdram-unused.inc" /* ram_code = 1100 */ -#include "bct/sdram-unused.inc" /* ram_code = 1101 */ -#include "bct/sdram-unused.inc" /* ram_code = 1110 */ -#include "bct/sdram-unused.inc" /* ram_code = 1111 */ +static const struct sdram_params sdram_configs[] = { +#include "bct/sdram-samsung-4GB-924.inc" /* ram_code = 00 */ +#include "bct/sdram-hynix-4GB-924.inc" /* ram_code = 01 */ +#include "bct/sdram-micron-4GB-924.inc" /* ram_code = 10 */ +#include "bct/sdram-micron-4GB-528.inc" /* ram_code = 11 */ }; const struct sdram_params *get_sdram_config() { uint32_t ramcode = sdram_get_ram_code(); + /* * If we need to apply some special hacks to RAMCODE mapping (ex, by * board_id), do that now. */ + ramcode &= 0x3; /* Only bits 1:0 used on Ryu */ printk(BIOS_SPEW, "%s: RAMCODE=%d\n", __func__, ramcode); - if (ramcode >= sizeof(sdram_configs) / sizeof(sdram_configs[0]) || + + if (ramcode >= ARRAY_SIZE(sdram_configs) || sdram_configs[ramcode].MemoryType == NvBootMemoryType_Unused) { die("Invalid RAMCODE."); } |