mb/google/brya: add BASEBOARD_DIR to support different baseboard

In order to support different baseboard configuration, we
add the BASEBOARD_DIR to switch the directory. The expected
structure looks like:

mb
..|_ google
.........|_ brya
.............. |_ variants
.....................|_ baseboard
..............................|_ brya
....................................|_ gpio.c
....................................|_ memory.c
....................................|_ devicetree
..............................|_ brask
....................................|_ gpio.c
....................................|_ memory.c
....................................|_ devicetree
......................|_ brya_variant1
......................|_ brya_variant2
......................|_ ...
......................|_ brask_variant1
......................|_ brask_variant2
......................|_ ...
...............|_ <all mb common code>

BUG=b:191472401
BRANCH=None
TEST=build pass

Change-Id: Ic99e42dbbd27fa3e1f6cb3a1b5daee1c8c7b1083
Signed-off-by: Zhuohao Lee <zhuohao@chromium.org>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/56308
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: EricR Lai <ericr_lai@compal.corp-partner.google.com>

3 files changed, 0 insertions, 123 deletions

diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/brya/variants/baseboard/include/baseboard/ec.h
deleted file mode 100644
index c76274ef66..0000000000
--- a/src/mainboard/google/brya/variants/baseboard/include/baseboard/ec.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#ifndef __BASEBOARD_EC_H__
-#define __BASEBOARD_EC_H__
-
-#include <ec/ec.h>
-#include <ec/google/chromeec/ec_commands.h>
-#include <baseboard/gpio.h>
-
-#define MAINBOARD_EC_SCI_EVENTS \
-	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED)        |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN)          |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED)      |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED)   |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_LOW)       |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_CRITICAL)  |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY)           |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_STATUS)    |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_THRESHOLD) |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_START)    |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_THROTTLE_STOP)     |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_USB_CHARGER)       |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MKBP)              |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_PD_MCU)            |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE)       |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_USB_MUX))
-#define MAINBOARD_EC_SMI_EVENTS \
-	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_CLOSED))
-/* EC can wake from S5 with lid or power button */
-#define MAINBOARD_EC_S5_WAKE_EVENTS \
-	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_LID_OPEN)     |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_POWER_BUTTON))
-/*
- * EC can wake from S3/S0ix with:
- * 1. Lid open
- * 2. AC Connect/Disconnect
- * 3. Power button
- * 4. Key press
- * 5. Mode change
- */
-#define MAINBOARD_EC_S3_WAKE_EVENTS \
-	(MAINBOARD_EC_S5_WAKE_EVENTS |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_CONNECTED)    |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_AC_DISCONNECTED) |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_KEY_PRESSED)     |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_USB_MUX)         |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_MODE_CHANGE))
-#define MAINBOARD_EC_S0IX_WAKE_EVENTS \
-	(MAINBOARD_EC_S3_WAKE_EVENTS |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_HANG_DETECT))
-/* Log EC wake events plus EC shutdown events */
-#define MAINBOARD_EC_LOG_EVENTS \
-	(EC_HOST_EVENT_MASK(EC_HOST_EVENT_THERMAL_SHUTDOWN) |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_BATTERY_SHUTDOWN) |\
-	 EC_HOST_EVENT_MASK(EC_HOST_EVENT_PANIC))
-/*
- * ACPI related definitions for ASL code.
- */
-/* Enable EC backed ALS device in ACPI */
-#define EC_ENABLE_ALS_DEVICE
-/* Enable Keyboard Backlight */
-#define EC_ENABLE_KEYBOARD_BACKLIGHT
-/* Enable LID switch and provide wake pin for EC */
-#define EC_ENABLE_LID_SWITCH
-#define EC_ENABLE_WAKE_PIN      GPE_EC_WAKE
-/* Enable Tablet switch */
-#define EC_ENABLE_TBMC_DEVICE
-/* Enable EC backed PD MCU device in ACPI */
-#define EC_ENABLE_PD_MCU_DEVICE
-#define SIO_EC_MEMMAP_ENABLE     /* EC Memory Map Resources */
-#define SIO_EC_HOST_ENABLE       /* EC Host Interface Resources */
-#define SIO_EC_ENABLE_PS2K       /* Enable PS/2 Keyboard */
-
-#define EC_ENABLE_SYNC_IRQ      /* Enable tight timestamp / wake support */
-
-#endif /* __BASEBOARD_EC_H__ */
diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/brya/variants/baseboard/include/baseboard/gpio.h
deleted file mode 100644
index 0de7ffd36c..0000000000
--- a/src/mainboard/google/brya/variants/baseboard/include/baseboard/gpio.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#ifndef __BASEBOARD_GPIO_H__
-#define __BASEBOARD_GPIO_H__
-
-#include <soc/gpe.h>
-#include <soc/gpio.h>
-
-/* eSPI virtual wire reporting */
-#define EC_SCI_GPI		GPE0_ESPI
-/* EC wake is EC_PCH_INT which is routed to GPP_F17 pin */
-#define GPE_EC_WAKE		GPE0_DW2_17
-/* WP signal to PCH */
-#define GPIO_PCH_WP		GPP_E15
-/* EC in RW or RO */
-#define GPIO_EC_IN_RW		GPP_F18
-/* Used to gate SoC's SLP_S0# signal */
-#define GPIO_SLP_S0_GATE	GPP_F9
-/* GPIO IRQ for tight timestamps / wake support */
-#define EC_SYNC_IRQ		GPP_F17_IRQ
-
-#endif /* __BASEBOARD_GPIO_H__ */
diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
deleted file mode 100644
index c938de820d..0000000000
--- a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#ifndef __BASEBOARD_VARIANTS_H__
-#define __BASEBOARD_VARIANTS_H__
-
-#include <chip.h>
-#include <soc/gpio.h>
-#include <soc/meminit.h>
-#include <stdint.h>
-
-/* The next set of functions return the gpio table and fill in the number of entries for
- * each table.
- */
-
-const struct pad_config *variant_gpio_table(size_t *num);
-const struct pad_config *variant_gpio_override_table(size_t *num);
-const struct pad_config *variant_early_gpio_table(size_t *num);
-const struct cros_gpio *variant_cros_gpios(size_t *num);
-
-const struct mb_cfg *variant_memory_params(void);
-int variant_memory_sku(void);
-bool variant_is_half_populated(void);
-void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config);
-
-#endif /*__BASEBOARD_VARIANTS_H__ */