From 5d6d8008403d09a97188e345307c6b6d652c2576 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 16:10:01 -0700 Subject: mb/google/sarien to zork: Rename Makefiles from .inc to .mk The .inc suffix is confusing to various tools as it's not specific to Makefiles. This means that editors don't recognize the files, and don't open them with highlighting and any other specific editor functionality. This issue is also seen in the release notes generation script where Makefiles get renamed before running cloc. Signed-off-by: Martin Roth Change-Id: Ib8a2ae26ed4380592d15e1a7b2d682639413af01 Reviewed-on: https://review.coreboot.org/c/coreboot/+/80109 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Maximilian Brune --- .../google/zork/variants/baseboard/Makefile.inc | 12 ------------ .../google/zork/variants/baseboard/Makefile.mk | 12 ++++++++++++ .../zork/variants/baseboard/dalboz/Makefile.inc | 19 ------------------- .../zork/variants/baseboard/dalboz/Makefile.mk | 19 +++++++++++++++++++ .../zork/variants/baseboard/trembyle/Makefile.inc | 20 -------------------- .../zork/variants/baseboard/trembyle/Makefile.mk | 20 ++++++++++++++++++++ 6 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 src/mainboard/google/zork/variants/baseboard/Makefile.inc create mode 100644 src/mainboard/google/zork/variants/baseboard/Makefile.mk delete mode 100644 src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.inc create mode 100644 src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.mk delete mode 100644 src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.inc create mode 100644 src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.mk (limited to 'src/mainboard/google/zork/variants/baseboard') diff --git a/src/mainboard/google/zork/variants/baseboard/Makefile.inc b/src/mainboard/google/zork/variants/baseboard/Makefile.inc deleted file mode 100644 index 21d6a8f9cf..0000000000 --- a/src/mainboard/google/zork/variants/baseboard/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -all-y += helpers.c - -ramstage-y += ramstage_common.c - -# Add OEM ID table -ifeq ($(CONFIG_USE_OEM_BIN),y) -cbfs-files-y += oem.bin -oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE)) -oem.bin-type := raw -endif #($(CONFIG_USE_OEM_BIN),y) diff --git a/src/mainboard/google/zork/variants/baseboard/Makefile.mk b/src/mainboard/google/zork/variants/baseboard/Makefile.mk new file mode 100644 index 0000000000..21d6a8f9cf --- /dev/null +++ b/src/mainboard/google/zork/variants/baseboard/Makefile.mk @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +all-y += helpers.c + +ramstage-y += ramstage_common.c + +# Add OEM ID table +ifeq ($(CONFIG_USE_OEM_BIN),y) +cbfs-files-y += oem.bin +oem.bin-file := $(call strip_quotes,$(CONFIG_OEM_BIN_FILE)) +oem.bin-type := raw +endif #($(CONFIG_USE_OEM_BIN),y) diff --git a/src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.inc b/src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.inc deleted file mode 100644 index 66dc17512b..0000000000 --- a/src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.inc +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -all-y += gpio.c -smm-y += gpio.c -ramstage-y += fsps.c - -# APCB Board ID GPIO configuration. -# These GPIOs determine which memory SPD will be used during boot. -# APCB_BOARD_ID_GPIO[0-3] = GPIO_NUMBER GPIO_IO_MUX GPIO_BANK_CTL -# GPIO_NUMBER: FCH GPIO number -# GPIO_IO_MUX: Value write to IOMUX to configure this GPIO -# GPIO_BANK_CTL: Value write to GPIOBankCtl[23:16] to configure this GPIO -# APCB_POPULATE_2ND_CHANNEL: Populates 2nd memory channel in APCB when true. -# Trembyle based boards select 1 or 2 channels based on AGPIO84 -# Dalboz based boards only support 1 channel -APCB_BOARD_ID_GPIO0 = 132 1 0 -APCB_BOARD_ID_GPIO1 = 90 1 0 -APCB_BOARD_ID_GPIO2 = 86 3 0 -APCB_BOARD_ID_GPIO3 = 69 1 0 diff --git a/src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.mk b/src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.mk new file mode 100644 index 0000000000..66dc17512b --- /dev/null +++ b/src/mainboard/google/zork/variants/baseboard/dalboz/Makefile.mk @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +all-y += gpio.c +smm-y += gpio.c +ramstage-y += fsps.c + +# APCB Board ID GPIO configuration. +# These GPIOs determine which memory SPD will be used during boot. +# APCB_BOARD_ID_GPIO[0-3] = GPIO_NUMBER GPIO_IO_MUX GPIO_BANK_CTL +# GPIO_NUMBER: FCH GPIO number +# GPIO_IO_MUX: Value write to IOMUX to configure this GPIO +# GPIO_BANK_CTL: Value write to GPIOBankCtl[23:16] to configure this GPIO +# APCB_POPULATE_2ND_CHANNEL: Populates 2nd memory channel in APCB when true. +# Trembyle based boards select 1 or 2 channels based on AGPIO84 +# Dalboz based boards only support 1 channel +APCB_BOARD_ID_GPIO0 = 132 1 0 +APCB_BOARD_ID_GPIO1 = 90 1 0 +APCB_BOARD_ID_GPIO2 = 86 3 0 +APCB_BOARD_ID_GPIO3 = 69 1 0 diff --git a/src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.inc b/src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.inc deleted file mode 100644 index e0c4c90669..0000000000 --- a/src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.inc +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -all-y += gpio.c -smm-y += gpio.c -ramstage-y += fsps.c - -# APCB Board ID GPIO configuration. -# These GPIOs determine which memory SPD will be used during boot. -# APCB_BOARD_ID_GPIO[0-3] = GPIO_NUMBER GPIO_IO_MUX GPIO_BANK_CTL -# GPIO_NUMBER: FCH GPIO number -# GPIO_IO_MUX: Value write to IOMUX to configure this GPIO -# GPIO_BANK_CTL: Value write to GPIOBankCtl[23:16] to configure this GPIO -# APCB_POPULATE_2ND_CHANNEL: Populates 2nd memory channel in APCB when true. -# Trembyle based boards select 1 or 2 channels based on AGPIO84 -# Dalboz based boards only support 1 channel -APCB_BOARD_ID_GPIO0 = 121 1 0 -APCB_BOARD_ID_GPIO1 = 120 1 0 -APCB_BOARD_ID_GPIO2 = 131 3 0 -APCB_BOARD_ID_GPIO3 = 116 1 0 -APCB_POPULATE_2ND_CHANNEL = true diff --git a/src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.mk b/src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.mk new file mode 100644 index 0000000000..e0c4c90669 --- /dev/null +++ b/src/mainboard/google/zork/variants/baseboard/trembyle/Makefile.mk @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +all-y += gpio.c +smm-y += gpio.c +ramstage-y += fsps.c + +# APCB Board ID GPIO configuration. +# These GPIOs determine which memory SPD will be used during boot. +# APCB_BOARD_ID_GPIO[0-3] = GPIO_NUMBER GPIO_IO_MUX GPIO_BANK_CTL +# GPIO_NUMBER: FCH GPIO number +# GPIO_IO_MUX: Value write to IOMUX to configure this GPIO +# GPIO_BANK_CTL: Value write to GPIOBankCtl[23:16] to configure this GPIO +# APCB_POPULATE_2ND_CHANNEL: Populates 2nd memory channel in APCB when true. +# Trembyle based boards select 1 or 2 channels based on AGPIO84 +# Dalboz based boards only support 1 channel +APCB_BOARD_ID_GPIO0 = 121 1 0 +APCB_BOARD_ID_GPIO1 = 120 1 0 +APCB_BOARD_ID_GPIO2 = 131 3 0 +APCB_BOARD_ID_GPIO3 = 116 1 0 +APCB_POPULATE_2ND_CHANNEL = true -- cgit v1.2.3