mb/google/octopus/variants/garg: update new SKU
add new SKU ID below: 19 - Garg PVT (HDMI DB, Touch) 20 - Garg PVT (2A2C DB, Touch) 38 - Garg360 EVT (2A2C DB, touch, no stylues, rear camera) BUG=b:146260545 BRANCH=octopus TEST=emerge-octopus coreboot chromeos-bootimage Change-Id: Ic74ce14db7060f3124c1a277eb3625ce0ff0b9f0 Signed-off-by: Kevin Chiu <Kevin.Chiu@quantatw.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37923 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Marco Chen <marcochen@google.com>
This commit is contained in:
		
				
					committed by
					
						
						Patrick Georgi
					
				
			
			
				
	
			
			
			
						parent
						
							5dd4bf3644
						
					
				
				
					commit
					1f7a11699a
				
			@@ -18,14 +18,7 @@
 | 
				
			|||||||
#include <boardid.h>
 | 
					#include <boardid.h>
 | 
				
			||||||
#include <gpio.h>
 | 
					#include <gpio.h>
 | 
				
			||||||
#include <soc/gpio.h>
 | 
					#include <soc/gpio.h>
 | 
				
			||||||
 | 
					#include <variant/sku.h>
 | 
				
			||||||
enum {
 | 
					 | 
				
			||||||
	SKU_1_2A2C = 1,
 | 
					 | 
				
			||||||
	SKU_9_HDMI = 9,
 | 
					 | 
				
			||||||
	SKU_17_LTE = 17,
 | 
					 | 
				
			||||||
	SKU_18_LTE_TS = 18,
 | 
					 | 
				
			||||||
	SKU_37_2A2C_360 = 37,
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
static const struct pad_config default_override_table[] = {
 | 
					static const struct pad_config default_override_table[] = {
 | 
				
			||||||
	PAD_NC(GPIO_104, UP_20K),
 | 
						PAD_NC(GPIO_104, UP_20K),
 | 
				
			||||||
@@ -83,6 +76,7 @@ const struct pad_config *variant_override_gpio_table(size_t *num)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	switch (sku_id) {
 | 
						switch (sku_id) {
 | 
				
			||||||
	case SKU_9_HDMI:
 | 
						case SKU_9_HDMI:
 | 
				
			||||||
 | 
						case SKU_19_HDMI_TS:
 | 
				
			||||||
		*num = ARRAY_SIZE(hdmi_override_table);
 | 
							*num = ARRAY_SIZE(hdmi_override_table);
 | 
				
			||||||
		return hdmi_override_table;
 | 
							return hdmi_override_table;
 | 
				
			||||||
	case SKU_17_LTE:
 | 
						case SKU_17_LTE:
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1,30 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * This file is part of the coreboot project.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Copyright 2019 Google LLC
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * This program is free software; you can redistribute it and/or modify
 | 
				
			||||||
 | 
					 * it under the terms of the GNU General Public License as published by
 | 
				
			||||||
 | 
					 * the Free Software Foundation; version 2 of the License.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * This program is distributed in the hope that it will be useful,
 | 
				
			||||||
 | 
					 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
				
			||||||
 | 
					 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
				
			||||||
 | 
					 * GNU General Public License for more details.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifndef __MAINBOARD_SKU_H__
 | 
				
			||||||
 | 
					#define __MAINBOARD_SKU_H__
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					enum {
 | 
				
			||||||
 | 
						SKU_1_2A2C = 1,
 | 
				
			||||||
 | 
						SKU_9_HDMI = 9,
 | 
				
			||||||
 | 
						SKU_17_LTE = 17,
 | 
				
			||||||
 | 
						SKU_18_LTE_TS = 18,
 | 
				
			||||||
 | 
						SKU_19_HDMI_TS = 19,
 | 
				
			||||||
 | 
						SKU_20_2A2C_TS = 20,
 | 
				
			||||||
 | 
						SKU_37_2A2C_360 = 37,
 | 
				
			||||||
 | 
						SKU_38_2A2C_360_TS_NO_STYLUES = 38,
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif /* __MAINBOARD_SKU_H__ */
 | 
				
			||||||
@@ -20,14 +20,7 @@
 | 
				
			|||||||
#include <baseboard/variants.h>
 | 
					#include <baseboard/variants.h>
 | 
				
			||||||
#include <delay.h>
 | 
					#include <delay.h>
 | 
				
			||||||
#include <gpio.h>
 | 
					#include <gpio.h>
 | 
				
			||||||
 | 
					#include <variant/sku.h>
 | 
				
			||||||
enum {
 | 
					 | 
				
			||||||
	SKU_1_2A2C = 1,
 | 
					 | 
				
			||||||
	SKU_9_HDMI = 9,
 | 
					 | 
				
			||||||
	SKU_17_LTE = 17,
 | 
					 | 
				
			||||||
	SKU_18_LTE_TS = 18,
 | 
					 | 
				
			||||||
	SKU_37_2A2C_360 = 37,
 | 
					 | 
				
			||||||
};
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
struct gpio_with_delay {
 | 
					struct gpio_with_delay {
 | 
				
			||||||
	gpio_t gpio;
 | 
						gpio_t gpio;
 | 
				
			||||||
@@ -65,6 +58,7 @@ const char *mainboard_vbt_filename(void)
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
	switch (sku_id) {
 | 
						switch (sku_id) {
 | 
				
			||||||
	case SKU_9_HDMI:
 | 
						case SKU_9_HDMI:
 | 
				
			||||||
 | 
						case SKU_19_HDMI_TS:
 | 
				
			||||||
		return "vbt_garg_hdmi.bin";
 | 
							return "vbt_garg_hdmi.bin";
 | 
				
			||||||
	default:
 | 
						default:
 | 
				
			||||||
		return "vbt.bin";
 | 
							return "vbt.bin";
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user