Bob: add bob in coreboot

Add bob in coreboot and update as necessary.
1. Add bob HWID
2. Add supported memory source

BUG=chrome-os-partner:59454
BRANCH=firmware-gru-8785.B
TEST=Build firmware passed

Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Change-Id: Iad03a293bdbbb89450f0fea0822e34a4be7064bf
Original-Commit-Id: bff788c71a43403bff2c23b38e69cc27fb869559
Original-Change-Id: I0dcf47eb911337b176f73759a2c70a9dbf4dc68b
Original-Signed-off-by: Shasha Zhao <Sarah_Zhao@asus.com>
Original-Reviewed-on: https://chromium-review.googlesource.com/411083
Original-Reviewed-by: Philip Chen <philipchen@chromium.org>
Original-(cherry picked from commit c5925dfcf59ac755a26182744b2bde59e41a37cf)
Original-Reviewed-on: https://chromium-review.googlesource.com/413744
Original-Reviewed-by: Julius Werner <jwerner@chromium.org>
Reviewed-on: https://review.coreboot.org/17678
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>

src/mainboard/google/gru/Kconfig

@@ -86,12 +86,14 @@ config CONSOLE_SERIAL_UART_ADDRESS
 ##########################################################
 config MAINBOARD_PART_NUMBER
 	string
+	default "Bob" if BOARD_GOOGLE_BOB
 	default "Gru" if BOARD_GOOGLE_GRU
 	default "Kevin" if BOARD_GOOGLE_KEVIN
 
 config GBB_HWID
 	string
 	depends on CHROMEOS
+	default "BOB TEST 7422" if BOARD_GOOGLE_BOB
 	default "GRU TEST 5431" if BOARD_GOOGLE_GRU
 	default "KEVIN TEST 1422" if BOARD_GOOGLE_KEVIN
 

src/mainboard/google/gru/Kconfig.name

@@ -5,3 +5,7 @@ config BOARD_GOOGLE_KEVIN
 config BOARD_GOOGLE_GRU
 	bool "Gru"
 	select BOARD_GOOGLE_GRU_COMMON
+
+config BOARD_GOOGLE_BOB
+	bool "Bob"
+	select BOARD_GOOGLE_GRU_COMMON

src/mainboard/google/gru/mainboard.c

@@ -352,7 +352,7 @@ void mainboard_power_on_backlight(void)
 {
 	gpio_output(GPIO(1, C, 1), 1);  /* BL_EN */
 
-	if (IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU) && board_id() == 0)
+	if ((IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU) || IS_ENABLED(CONFIG_BOARD_GOOGLE_BOB)) && board_id() == 0)
 		enable_backlight_booster();
 }
 

src/mainboard/google/gru/pwm_regulator.c

@@ -48,7 +48,8 @@ void pwm_regulator_configure(enum pwm_regulator pwm, int millivolt)
 	voltage_min = PWM_DESIGN_VOLTAGE_MIN;
 	voltage_max = PWM_DESIGN_VOLTAGE_MAX;
 	if (!(IS_ENABLED(CONFIG_BOARD_GOOGLE_KEVIN) && board_id() < 6) &&
-	    !(IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU) && board_id() < 2)) {
+	    !(IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU) && board_id() < 2) &&
+            !(IS_ENABLED(CONFIG_BOARD_GOOGLE_BOB) && board_id() < 2)) {
 		voltage_min = pwm_design_voltage_later[pwm][0];
 		voltage_max = pwm_design_voltage_later[pwm][1];
 	}

src/mainboard/google/gru/sdram_configs.c

@@ -23,13 +23,22 @@
 #include <types.h>
 
 static const char *sdram_configs[] = {
+#if IS_ENABLED(CONFIG_BOARD_GOOGLE_BOB)
+	"sdram-lpddr3-samsung-2GB-24EB",
+	"sdram-lpddr3-micron-2GB",
+	"sdram-lpddr3-samsung-4GB-04EB",
+	"sdram-lpddr3-micron-4GB",
+#else
 	"sdram-lpddr3-hynix-4GB-666",
 	"sdram-lpddr3-hynix-4GB-800",
 	"sdram-lpddr3-hynix-4GB-933",
+#endif
 };
 
 static struct rk3399_sdram_params params;
 
+#if IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU) || \
+    IS_ENABLED(CONFIG_BOARD_GOOGLE_KEVIN)
 enum dram_speeds {
 	dram_666MHz = 0,
 	dram_800MHz = 1,
@@ -53,11 +62,28 @@ static enum dram_speeds get_sdram_index(void)
 	if (IS_ENABLED(CONFIG_BOARD_GOOGLE_GRU))
 			return dram_800MHz;
 }
+#endif
 
 const struct rk3399_sdram_params *get_sdram_config()
 {
+#if IS_ENABLED(CONFIG_BOARD_GOOGLE_BOB)
+	u32 ramcode = ram_code();
+
+	/*
+	 * through schematic, ramid arrange like following:
+	 * 0: sdram-lpddr3-samsung-2GB-24EB
+	 * 2: sdram-lpddr3-micron-2GB
+	 * 4: sdram-lpddr3-samsung-4GB-04EB
+	 * 6: sdram-lpddr3-micron-4GB
+	 */
+	ramcode = ramcode / 2;
+
+	if (cbfs_boot_load_struct(sdram_configs[ramcode],
+				  &params, sizeof(params)) != sizeof(params))
+#else
 	if (cbfs_boot_load_struct(sdram_configs[get_sdram_index()],
 				  &params, sizeof(params)) != sizeof(params))
+#endif
 		die("Cannot load SDRAM parameter file!");
 	return &params;
 }

src/mainboard/google/gru/sdram_params/Makefile.inc

@@ -15,9 +15,16 @@
 
 sdram-params :=
 
-sdram-params += sdram-lpddr3-hynix-4GB-666
-sdram-params += sdram-lpddr3-hynix-4GB-800
-sdram-params += sdram-lpddr3-hynix-4GB-933
+ifeq ($(CONFIG_BOARD_GOOGLE_BOB),y)
+    sdram-params += sdram-lpddr3-micron-2GB
+    sdram-params += sdram-lpddr3-micron-4GB
+    sdram-params += sdram-lpddr3-samsung-2GB-24EB
+    sdram-params += sdram-lpddr3-samsung-4GB-04EB
+else
+    sdram-params += sdram-lpddr3-hynix-4GB-666
+    sdram-params += sdram-lpddr3-hynix-4GB-800
+    sdram-params += sdram-lpddr3-hynix-4GB-933
+endif
 
 $(foreach params,$(sdram-params), \
 	$(eval cbfs-files-y += $(params)) \