diff options
Diffstat (limited to 'src/mainboard/google/brya')
| -rw-r--r-- | src/mainboard/google/brya/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/google/brya/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc (renamed from src/mainboard/google/brya/variants/baseboard/Makefile.inc) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb (renamed from src/mainboard/google/brya/variants/baseboard/devicetree.cb) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brya/gpio.c (renamed from src/mainboard/google/brya/variants/baseboard/gpio.c) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/ec.h (renamed from src/mainboard/google/brya/variants/baseboard/include/baseboard/ec.h) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/gpio.h (renamed from src/mainboard/google/brya/variants/baseboard/include/baseboard/gpio.h) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/variants.h (renamed from src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h) | 0 | ||||
| -rw-r--r-- | src/mainboard/google/brya/variants/baseboard/brya/memory.c (renamed from src/mainboard/google/brya/variants/baseboard/memory.c) | 0 |
9 files changed, 9 insertions, 4 deletions
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index 80e8d72bdd..d1b6f24ca3 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -35,6 +35,10 @@ config BOARD_GOOGLE_BASEBOARD_BRYA if BOARD_GOOGLE_BASEBOARD_BRYA +config BASEBOARD_DIR + string + default "brya" if BOARD_GOOGLE_BASEBOARD_BRYA + config CHROMEOS select CHROMEOS_DRAM_PART_NUMBER_IN_CBI select EC_GOOGLE_CHROMEEC_SWITCHES @@ -42,7 +46,7 @@ config CHROMEOS select VBOOT_LID_SWITCH config DEVICETREE - default "variants/baseboard/devicetree.cb" + default "variants/baseboard/\$(CONFIG_BASEBOARD_DIR)/devicetree.cb" config DRIVER_TPM_I2C_BUS hex @@ -64,7 +68,7 @@ config MAINBOARD_DIR config MAINBOARD_FAMILY string - default "Google_Brya" + default "Google_Brya" if BOARD_GOOGLE_BASEBOARD_BRYA config MAINBOARD_PART_NUMBER default "Brya" if BOARD_GOOGLE_BRYA0 diff --git a/src/mainboard/google/brya/Makefile.inc b/src/mainboard/google/brya/Makefile.inc index 0686a3018b..717cf5fe40 100644 --- a/src/mainboard/google/brya/Makefile.inc +++ b/src/mainboard/google/brya/Makefile.inc @@ -10,11 +10,12 @@ ramstage-y += mainboard.c ramstage-y += ec.c VARIANT_DIR:=$(call strip_quotes,$(CONFIG_VARIANT_DIR)) +BASEBOARD_DIR:=$(call strip_quotes,$(CONFIG_BASEBOARD_DIR)) -subdirs-y += variants/baseboard +subdirs-y += variants/baseboard/$(BASEBOARD_DIR) subdirs-y += variants/$(VARIANT_DIR) subdirs-y += variants/$(VARIANT_DIR)/memory subdirs-y += spd -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/$(BASEBOARD_DIR)/include CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/brya/variants/baseboard/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc index 1d38b77ea0..1d38b77ea0 100644 --- a/src/mainboard/google/brya/variants/baseboard/Makefile.inc +++ b/src/mainboard/google/brya/variants/baseboard/brya/Makefile.inc diff --git a/src/mainboard/google/brya/variants/baseboard/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb index 12bff55b68..12bff55b68 100644 --- a/src/mainboard/google/brya/variants/baseboard/devicetree.cb +++ b/src/mainboard/google/brya/variants/baseboard/brya/devicetree.cb diff --git a/src/mainboard/google/brya/variants/baseboard/gpio.c b/src/mainboard/google/brya/variants/baseboard/brya/gpio.c index bb74526add..bb74526add 100644 --- a/src/mainboard/google/brya/variants/baseboard/gpio.c +++ b/src/mainboard/google/brya/variants/baseboard/brya/gpio.c diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/ec.h b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/ec.h index c76274ef66..c76274ef66 100644 --- a/src/mainboard/google/brya/variants/baseboard/include/baseboard/ec.h +++ b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/ec.h diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/gpio.h index 0de7ffd36c..0de7ffd36c 100644 --- a/src/mainboard/google/brya/variants/baseboard/include/baseboard/gpio.h +++ b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/gpio.h diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/variants.h index c938de820d..c938de820d 100644 --- a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h +++ b/src/mainboard/google/brya/variants/baseboard/brya/include/baseboard/variants.h diff --git a/src/mainboard/google/brya/variants/baseboard/memory.c b/src/mainboard/google/brya/variants/baseboard/brya/memory.c index 2a0b6aca36..2a0b6aca36 100644 --- a/src/mainboard/google/brya/variants/baseboard/memory.c +++ b/src/mainboard/google/brya/variants/baseboard/brya/memory.c |