diff --git a/src/mainboard/google/veyron_danger/sdram_configs.c b/src/mainboard/google/veyron_danger/sdram_configs.c
index 90ddd57125..b1a546a43b 100644
--- a/src/mainboard/google/veyron_danger/sdram_configs.c
+++ b/src/mainboard/google/veyron_danger/sdram_configs.c
@@ -41,16 +41,10 @@ static struct rk3288_sdram_params sdram_configs[] = {
 #include "sdram_inf/sdram-ddr3-hynix-2GB.inc"		/* ram_code = 1101 */
 #include "sdram_inf/sdram-ddr3-samsung-4GB.inc"		/* ram_code = 1110 */
 #include "sdram_inf/sdram-ddr3-hynix-4GB.inc"		/* ram_code = 1111 */
-#include "sdram_inf/sdram-ddr3-samsung-2GB.inc"		/* ram_code = 000Z */
-#include "sdram_inf/sdram-lpddr3-micron-2GB-D2.inc"	/* ram_code = 001Z */
-#include "sdram_inf/sdram-lpddr3-hynix-2GB-BK.inc"	/* ram_code = 00Z0 */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 00Z1 */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 00ZZ */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 010Z */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 011Z */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 01Z0 */
+/* Brain, Jaq, Jerry, Mighty, Danger and Rialto
+ * cannot support tri-state, see b/36279493! */
 };
-_Static_assert(ARRAY_SIZE(sdram_configs) == 24, "Must have 24 sdram_configs!");
+_Static_assert(ARRAY_SIZE(sdram_configs) == 16, "Must have 16 sdram_configs!");
 
 const struct rk3288_sdram_params *get_sdram_config()
 {
diff --git a/src/mainboard/google/veyron_rialto/boardid.c b/src/mainboard/google/veyron_rialto/boardid.c
index dbcfaa8cd8..f7cddcc4fe 100644
--- a/src/mainboard/google/veyron_rialto/boardid.c
+++ b/src/mainboard/google/veyron_rialto/boardid.c
@@ -42,7 +42,7 @@ uint32_t ram_code(void)
 	static gpio_t pins[] = {[3] = GPIO(8, A, 3), [2] = GPIO(8, A, 2),
 		[1] = GPIO(8, A, 1), [0] = GPIO(8, A, 0)}; /* GPIO8_A0 is LSB */
 
-	code = gpio_binary_first_base3_value(pins, ARRAY_SIZE(pins));
+	code = gpio_base2_value(pins, ARRAY_SIZE(pins));
 	printk(BIOS_SPEW, "RAM Config: %u.\n", code);
 
 	return code;
diff --git a/src/mainboard/google/veyron_rialto/sdram_configs.c b/src/mainboard/google/veyron_rialto/sdram_configs.c
index 5a5c3e821b..6c4f3e6f7a 100644
--- a/src/mainboard/google/veyron_rialto/sdram_configs.c
+++ b/src/mainboard/google/veyron_rialto/sdram_configs.c
@@ -41,16 +41,10 @@ static struct rk3288_sdram_params sdram_configs[] = {
 #include "sdram_inf/sdram-unused.inc"			/* ram_code = 1101 */
 #include "sdram_inf/sdram-unused.inc"			/* ram_code = 1110 */
 #include "sdram_inf/sdram-unused.inc"			/* ram_code = 1111 */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 000Z */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 001Z */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 00Z0 */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 00Z1 */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 00ZZ */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 010Z */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 011Z */
-#include "sdram_inf/sdram-unused.inc"			/* ram_code = 01Z0 */
+/* Brain, Jaq, Jerry, Mighty, Danger and Rialto
+ * cannot support tri-state, see b/36279493! */
 };
-_Static_assert(ARRAY_SIZE(sdram_configs) == 24, "Must have 24 sdram_configs!");
+_Static_assert(ARRAY_SIZE(sdram_configs) == 16, "Must have 16 sdram_configs!");
 
 const struct rk3288_sdram_params *get_sdram_config()
 {