mb/google/kahlee: Move ec.h into variant include directories
The mainboard directory is included through the PI makefile - most mainboard directories aren't in the include path at all. Move the ec.h file into the baseboard/variant directory that is already in the include path. BUG=b:69220826 TEST=Build Change-Id: I89d361b700c66ba576de724927574fdab9461fc6 Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/22497 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
		@@ -14,8 +14,8 @@
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <bootblock_common.h>
 | 
					#include <bootblock_common.h>
 | 
				
			||||||
#include <ec.h>
 | 
					 | 
				
			||||||
#include <soc/southbridge.h>
 | 
					#include <soc/southbridge.h>
 | 
				
			||||||
 | 
					#include <variant/ec.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void bootblock_mainboard_init(void)
 | 
					void bootblock_mainboard_init(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,7 +13,7 @@
 | 
				
			|||||||
 * GNU General Public License for more details.
 | 
					 * GNU General Public License for more details.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "ec.h"
 | 
					#include <variant/ec.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* DefinitionBlock Statement */
 | 
					/* DefinitionBlock Statement */
 | 
				
			||||||
DefinitionBlock (
 | 
					DefinitionBlock (
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -16,9 +16,9 @@
 | 
				
			|||||||
#include <arch/acpi.h>
 | 
					#include <arch/acpi.h>
 | 
				
			||||||
#include <console/console.h>
 | 
					#include <console/console.h>
 | 
				
			||||||
#include <ec/google/chromeec/ec.h>
 | 
					#include <ec/google/chromeec/ec.h>
 | 
				
			||||||
#include "ec.h"
 | 
					 | 
				
			||||||
#include <rules.h>
 | 
					#include <rules.h>
 | 
				
			||||||
#include <soc/southbridge.h>
 | 
					#include <soc/southbridge.h>
 | 
				
			||||||
 | 
					#include <variant/ec.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
static void ramstage_ec_init(void)
 | 
					static void ramstage_ec_init(void)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -19,10 +19,10 @@
 | 
				
			|||||||
#include <agesawrapper.h>
 | 
					#include <agesawrapper.h>
 | 
				
			||||||
#include <amd_pci_util.h>
 | 
					#include <amd_pci_util.h>
 | 
				
			||||||
#include <cbmem.h>
 | 
					#include <cbmem.h>
 | 
				
			||||||
#include <ec.h>
 | 
					 | 
				
			||||||
#include <baseboard/variants.h>
 | 
					#include <baseboard/variants.h>
 | 
				
			||||||
#include <soc/nvs.h>
 | 
					#include <soc/nvs.h>
 | 
				
			||||||
#include <soc/smi.h>
 | 
					#include <soc/smi.h>
 | 
				
			||||||
 | 
					#include <variant/ec.h>
 | 
				
			||||||
#include <variant/thermal.h>
 | 
					#include <variant/thermal.h>
 | 
				
			||||||
#include <vendorcode/google/chromeos/chromeos.h>
 | 
					#include <vendorcode/google/chromeos/chromeos.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -18,7 +18,7 @@
 | 
				
			|||||||
#include <cpu/x86/smm.h>
 | 
					#include <cpu/x86/smm.h>
 | 
				
			||||||
#include <ec/google/chromeec/smm.h>
 | 
					#include <ec/google/chromeec/smm.h>
 | 
				
			||||||
#include <soc/smi.h>
 | 
					#include <soc/smi.h>
 | 
				
			||||||
#include "ec.h"
 | 
					#include <variant/ec.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void mainboard_smi_sleep(u8 slp_typ)
 | 
					void mainboard_smi_sleep(u8 slp_typ)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					#include <baseboard/ec.h>
 | 
				
			||||||
@@ -0,0 +1 @@
 | 
				
			|||||||
 | 
					#include <baseboard/ec.h>
 | 
				
			||||||
		Reference in New Issue
	
	Block a user