From 0fbd20e58f5e73fb531fbb8dbb6089c607262122 Mon Sep 17 00:00:00 2001 From: Martin Roth Date: Thu, 18 Jan 2024 16:06:37 -0700 Subject: mb/google/gale to nyan_blaze: 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: I92f8bd7e1c9fc6e4120fb94c2299a266304e19de Reviewed-on: https://review.coreboot.org/c/coreboot/+/80107 Reviewed-by: Felix Singer Reviewed-by: Maximilian Brune Tested-by: build bot (Jenkins) --- src/mainboard/google/gale/Makefile.inc | 29 ------------ src/mainboard/google/gale/Makefile.mk | 29 ++++++++++++ src/mainboard/google/geralt/Makefile.inc | 28 ------------ src/mainboard/google/geralt/Makefile.mk | 28 ++++++++++++ src/mainboard/google/glados/Makefile.inc | 22 ---------- src/mainboard/google/glados/Makefile.mk | 22 ++++++++++ .../google/glados/variants/asuka/Makefile.inc | 11 ----- .../google/glados/variants/asuka/Makefile.mk | 11 +++++ .../google/glados/variants/caroline/Makefile.inc | 10 ----- .../google/glados/variants/caroline/Makefile.mk | 10 +++++ .../google/glados/variants/cave/Makefile.inc | 13 ------ .../google/glados/variants/cave/Makefile.mk | 13 ++++++ .../google/glados/variants/chell/Makefile.inc | 18 -------- .../google/glados/variants/chell/Makefile.mk | 18 ++++++++ .../google/glados/variants/glados/Makefile.inc | 11 ----- .../google/glados/variants/glados/Makefile.mk | 11 +++++ .../google/glados/variants/lars/Makefile.inc | 21 --------- .../google/glados/variants/lars/Makefile.mk | 21 +++++++++ .../google/glados/variants/sentry/Makefile.inc | 21 --------- .../google/glados/variants/sentry/Makefile.mk | 21 +++++++++ src/mainboard/google/gru/Makefile.inc | 25 ----------- src/mainboard/google/gru/Makefile.mk | 25 +++++++++++ src/mainboard/google/gru/sdram_params/Makefile.inc | 15 ------- src/mainboard/google/gru/sdram_params/Makefile.mk | 15 +++++++ src/mainboard/google/guybrush/Makefile.inc | 38 ---------------- src/mainboard/google/guybrush/Makefile.mk | 38 ++++++++++++++++ .../guybrush/variants/baseboard/Makefile.inc | 14 ------ .../google/guybrush/variants/baseboard/Makefile.mk | 14 ++++++ .../google/guybrush/variants/dewatt/Makefile.inc | 10 ----- .../google/guybrush/variants/dewatt/Makefile.mk | 10 +++++ .../guybrush/variants/dewatt/memory/Makefile.inc | 18 -------- .../guybrush/variants/dewatt/memory/Makefile.mk | 18 ++++++++ .../google/guybrush/variants/guybrush/Makefile.inc | 16 ------- .../google/guybrush/variants/guybrush/Makefile.mk | 16 +++++++ .../guybrush/variants/guybrush/memory/Makefile.inc | 10 ----- .../guybrush/variants/guybrush/memory/Makefile.mk | 10 +++++ .../guybrush/variants/nipperkin/Makefile.inc | 16 ------- .../google/guybrush/variants/nipperkin/Makefile.mk | 16 +++++++ .../variants/nipperkin/memory/Makefile.inc | 10 ----- .../guybrush/variants/nipperkin/memory/Makefile.mk | 10 +++++ src/mainboard/google/hatch/Makefile.inc | 22 ---------- src/mainboard/google/hatch/Makefile.mk | 22 ++++++++++ .../google/hatch/variants/akemi/Makefile.inc | 13 ------ .../google/hatch/variants/akemi/Makefile.mk | 13 ++++++ .../google/hatch/variants/baseboard/Makefile.inc | 12 ----- .../google/hatch/variants/baseboard/Makefile.mk | 12 +++++ .../google/hatch/variants/dratini/Makefile.inc | 17 -------- .../google/hatch/variants/dratini/Makefile.mk | 17 ++++++++ .../google/hatch/variants/hatch/Makefile.inc | 13 ------ .../google/hatch/variants/hatch/Makefile.mk | 13 ++++++ .../google/hatch/variants/helios/Makefile.inc | 10 ----- .../google/hatch/variants/helios/Makefile.mk | 10 +++++ .../google/hatch/variants/jinlon/Makefile.inc | 17 -------- .../google/hatch/variants/jinlon/Makefile.mk | 17 ++++++++ .../google/hatch/variants/kindred/Makefile.inc | 16 ------- .../google/hatch/variants/kindred/Makefile.mk | 16 +++++++ .../google/hatch/variants/kohaku/Makefile.inc | 11 ----- .../google/hatch/variants/kohaku/Makefile.mk | 11 +++++ .../google/hatch/variants/mushu/Makefile.inc | 13 ------ .../google/hatch/variants/mushu/Makefile.mk | 13 ++++++ .../google/hatch/variants/nightfury/Makefile.inc | 15 ------- .../google/hatch/variants/nightfury/Makefile.mk | 15 +++++++ .../google/hatch/variants/palkia/Makefile.inc | 10 ----- .../google/hatch/variants/palkia/Makefile.mk | 10 +++++ src/mainboard/google/herobrine/Makefile.inc | 12 ----- src/mainboard/google/herobrine/Makefile.mk | 12 +++++ src/mainboard/google/jecht/Makefile.inc | 23 ---------- src/mainboard/google/jecht/Makefile.mk | 23 ++++++++++ src/mainboard/google/jecht/spd/Makefile.inc | 3 -- src/mainboard/google/jecht/spd/Makefile.mk | 3 ++ src/mainboard/google/kahlee/Makefile.inc | 23 ---------- src/mainboard/google/kahlee/Makefile.mk | 23 ++++++++++ .../google/kahlee/variants/aleena/Makefile.inc | 3 -- .../google/kahlee/variants/aleena/Makefile.mk | 3 ++ .../google/kahlee/variants/baseboard/Makefile.inc | 18 -------- .../google/kahlee/variants/baseboard/Makefile.mk | 18 ++++++++ .../kahlee/variants/baseboard/spd/Makefile.inc | 18 -------- .../kahlee/variants/baseboard/spd/Makefile.mk | 18 ++++++++ .../google/kahlee/variants/careena/Makefile.inc | 7 --- .../google/kahlee/variants/careena/Makefile.mk | 7 +++ .../kahlee/variants/careena/spd/Makefile.inc | 18 -------- .../google/kahlee/variants/careena/spd/Makefile.mk | 18 ++++++++ .../google/kahlee/variants/grunt/Makefile.inc | 3 -- .../google/kahlee/variants/grunt/Makefile.mk | 3 ++ .../google/kahlee/variants/liara/Makefile.inc | 3 -- .../google/kahlee/variants/liara/Makefile.mk | 3 ++ .../google/kahlee/variants/nuwani/Makefile.inc | 3 -- .../google/kahlee/variants/nuwani/Makefile.mk | 3 ++ .../google/kahlee/variants/nuwani/spd/Makefile.inc | 18 -------- .../google/kahlee/variants/nuwani/spd/Makefile.mk | 18 ++++++++ .../google/kahlee/variants/treeya/Makefile.inc | 5 --- .../google/kahlee/variants/treeya/Makefile.mk | 5 +++ .../google/kahlee/variants/treeya/spd/Makefile.inc | 18 -------- .../google/kahlee/variants/treeya/spd/Makefile.mk | 18 ++++++++ src/mainboard/google/kukui/Makefile.inc | 33 -------------- src/mainboard/google/kukui/Makefile.mk | 33 ++++++++++++++ .../google/kukui/sdram_params/Makefile.inc | 26 ----------- .../google/kukui/sdram_params/Makefile.mk | 26 +++++++++++ src/mainboard/google/link/Makefile.inc | 17 -------- src/mainboard/google/link/Makefile.mk | 17 ++++++++ src/mainboard/google/mistral/Makefile.inc | 17 -------- src/mainboard/google/mistral/Makefile.mk | 17 ++++++++ src/mainboard/google/myst/Makefile.inc | 51 ---------------------- src/mainboard/google/myst/Makefile.mk | 51 ++++++++++++++++++++++ .../google/myst/variants/baseboard/Makefile.inc | 14 ------ .../google/myst/variants/baseboard/Makefile.mk | 14 ++++++ .../google/myst/variants/myst/Makefile.inc | 3 -- .../google/myst/variants/myst/Makefile.mk | 3 ++ .../google/myst/variants/myst/memory/Makefile.inc | 10 ----- .../google/myst/variants/myst/memory/Makefile.mk | 10 +++++ src/mainboard/google/nyan/Makefile.inc | 31 ------------- src/mainboard/google/nyan/Makefile.mk | 31 +++++++++++++ src/mainboard/google/nyan/bct/Makefile.inc | 9 ---- src/mainboard/google/nyan/bct/Makefile.mk | 9 ++++ src/mainboard/google/nyan_big/Makefile.inc | 30 ------------- src/mainboard/google/nyan_big/Makefile.mk | 30 +++++++++++++ src/mainboard/google/nyan_big/bct/Makefile.inc | 9 ---- src/mainboard/google/nyan_big/bct/Makefile.mk | 9 ++++ src/mainboard/google/nyan_blaze/Makefile.inc | 30 ------------- src/mainboard/google/nyan_blaze/Makefile.mk | 30 +++++++++++++ src/mainboard/google/nyan_blaze/bct/Makefile.inc | 9 ---- src/mainboard/google/nyan_blaze/bct/Makefile.mk | 9 ++++ 122 files changed, 989 insertions(+), 989 deletions(-) delete mode 100644 src/mainboard/google/gale/Makefile.inc create mode 100644 src/mainboard/google/gale/Makefile.mk delete mode 100644 src/mainboard/google/geralt/Makefile.inc create mode 100644 src/mainboard/google/geralt/Makefile.mk delete mode 100644 src/mainboard/google/glados/Makefile.inc create mode 100644 src/mainboard/google/glados/Makefile.mk delete mode 100644 src/mainboard/google/glados/variants/asuka/Makefile.inc create mode 100644 src/mainboard/google/glados/variants/asuka/Makefile.mk delete mode 100644 src/mainboard/google/glados/variants/caroline/Makefile.inc create mode 100644 src/mainboard/google/glados/variants/caroline/Makefile.mk delete mode 100644 src/mainboard/google/glados/variants/cave/Makefile.inc create mode 100644 src/mainboard/google/glados/variants/cave/Makefile.mk delete mode 100644 src/mainboard/google/glados/variants/chell/Makefile.inc create mode 100644 src/mainboard/google/glados/variants/chell/Makefile.mk delete mode 100644 src/mainboard/google/glados/variants/glados/Makefile.inc create mode 100644 src/mainboard/google/glados/variants/glados/Makefile.mk delete mode 100644 src/mainboard/google/glados/variants/lars/Makefile.inc create mode 100644 src/mainboard/google/glados/variants/lars/Makefile.mk delete mode 100644 src/mainboard/google/glados/variants/sentry/Makefile.inc create mode 100644 src/mainboard/google/glados/variants/sentry/Makefile.mk delete mode 100644 src/mainboard/google/gru/Makefile.inc create mode 100644 src/mainboard/google/gru/Makefile.mk delete mode 100644 src/mainboard/google/gru/sdram_params/Makefile.inc create mode 100644 src/mainboard/google/gru/sdram_params/Makefile.mk delete mode 100644 src/mainboard/google/guybrush/Makefile.inc create mode 100644 src/mainboard/google/guybrush/Makefile.mk delete mode 100644 src/mainboard/google/guybrush/variants/baseboard/Makefile.inc create mode 100644 src/mainboard/google/guybrush/variants/baseboard/Makefile.mk delete mode 100644 src/mainboard/google/guybrush/variants/dewatt/Makefile.inc create mode 100644 src/mainboard/google/guybrush/variants/dewatt/Makefile.mk delete mode 100644 src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc create mode 100644 src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.mk delete mode 100644 src/mainboard/google/guybrush/variants/guybrush/Makefile.inc create mode 100644 src/mainboard/google/guybrush/variants/guybrush/Makefile.mk delete mode 100644 src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc create mode 100644 src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.mk delete mode 100644 src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc create mode 100644 src/mainboard/google/guybrush/variants/nipperkin/Makefile.mk delete mode 100644 src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc create mode 100644 src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.mk delete mode 100644 src/mainboard/google/hatch/Makefile.inc create mode 100644 src/mainboard/google/hatch/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/akemi/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/akemi/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/baseboard/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/baseboard/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/dratini/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/dratini/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/hatch/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/hatch/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/helios/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/helios/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/jinlon/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/jinlon/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/kindred/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/kindred/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/kohaku/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/kohaku/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/mushu/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/mushu/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/nightfury/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/nightfury/Makefile.mk delete mode 100644 src/mainboard/google/hatch/variants/palkia/Makefile.inc create mode 100644 src/mainboard/google/hatch/variants/palkia/Makefile.mk delete mode 100644 src/mainboard/google/herobrine/Makefile.inc create mode 100644 src/mainboard/google/herobrine/Makefile.mk delete mode 100644 src/mainboard/google/jecht/Makefile.inc create mode 100644 src/mainboard/google/jecht/Makefile.mk delete mode 100644 src/mainboard/google/jecht/spd/Makefile.inc create mode 100644 src/mainboard/google/jecht/spd/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/Makefile.inc create mode 100644 src/mainboard/google/kahlee/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/aleena/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/aleena/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/baseboard/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/baseboard/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/careena/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/careena/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/careena/spd/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/grunt/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/grunt/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/liara/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/liara/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/nuwani/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/nuwani/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/treeya/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/treeya/Makefile.mk delete mode 100644 src/mainboard/google/kahlee/variants/treeya/spd/Makefile.inc create mode 100644 src/mainboard/google/kahlee/variants/treeya/spd/Makefile.mk delete mode 100644 src/mainboard/google/kukui/Makefile.inc create mode 100644 src/mainboard/google/kukui/Makefile.mk delete mode 100644 src/mainboard/google/kukui/sdram_params/Makefile.inc create mode 100644 src/mainboard/google/kukui/sdram_params/Makefile.mk delete mode 100644 src/mainboard/google/link/Makefile.inc create mode 100644 src/mainboard/google/link/Makefile.mk delete mode 100644 src/mainboard/google/mistral/Makefile.inc create mode 100644 src/mainboard/google/mistral/Makefile.mk delete mode 100644 src/mainboard/google/myst/Makefile.inc create mode 100644 src/mainboard/google/myst/Makefile.mk delete mode 100644 src/mainboard/google/myst/variants/baseboard/Makefile.inc create mode 100644 src/mainboard/google/myst/variants/baseboard/Makefile.mk delete mode 100644 src/mainboard/google/myst/variants/myst/Makefile.inc create mode 100644 src/mainboard/google/myst/variants/myst/Makefile.mk delete mode 100644 src/mainboard/google/myst/variants/myst/memory/Makefile.inc create mode 100644 src/mainboard/google/myst/variants/myst/memory/Makefile.mk delete mode 100644 src/mainboard/google/nyan/Makefile.inc create mode 100644 src/mainboard/google/nyan/Makefile.mk delete mode 100644 src/mainboard/google/nyan/bct/Makefile.inc create mode 100644 src/mainboard/google/nyan/bct/Makefile.mk delete mode 100644 src/mainboard/google/nyan_big/Makefile.inc create mode 100644 src/mainboard/google/nyan_big/Makefile.mk delete mode 100644 src/mainboard/google/nyan_big/bct/Makefile.inc create mode 100644 src/mainboard/google/nyan_big/bct/Makefile.mk delete mode 100644 src/mainboard/google/nyan_blaze/Makefile.inc create mode 100644 src/mainboard/google/nyan_blaze/Makefile.mk delete mode 100644 src/mainboard/google/nyan_blaze/bct/Makefile.inc create mode 100644 src/mainboard/google/nyan_blaze/bct/Makefile.mk (limited to 'src/mainboard/google') diff --git a/src/mainboard/google/gale/Makefile.inc b/src/mainboard/google/gale/Makefile.inc deleted file mode 100644 index f23f804de5..0000000000 --- a/src/mainboard/google/gale/Makefile.inc +++ /dev/null @@ -1,29 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock.c -bootblock-y += cdp.c -bootblock-y += mmu.c -bootblock-y += reset.c - -verstage-y += boardid.c -verstage-y += cdp.c -verstage-y += chromeos.c -verstage-y += blsp.c -verstage-y += reset.c -verstage-y += verstage.c - -romstage-y += romstage.c -romstage-y += boardid.c -romstage-y += cdp.c -romstage-y += chromeos.c -romstage-y += mmu.c -romstage-y += reset.c -romstage-y += blsp.c - -ramstage-y += boardid.c -ramstage-y += cdp.c -ramstage-y += chromeos.c -ramstage-y += mainboard.c -ramstage-y += mmu.c -ramstage-y += reset.c -ramstage-y += blsp.c diff --git a/src/mainboard/google/gale/Makefile.mk b/src/mainboard/google/gale/Makefile.mk new file mode 100644 index 0000000000..f23f804de5 --- /dev/null +++ b/src/mainboard/google/gale/Makefile.mk @@ -0,0 +1,29 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock.c +bootblock-y += cdp.c +bootblock-y += mmu.c +bootblock-y += reset.c + +verstage-y += boardid.c +verstage-y += cdp.c +verstage-y += chromeos.c +verstage-y += blsp.c +verstage-y += reset.c +verstage-y += verstage.c + +romstage-y += romstage.c +romstage-y += boardid.c +romstage-y += cdp.c +romstage-y += chromeos.c +romstage-y += mmu.c +romstage-y += reset.c +romstage-y += blsp.c + +ramstage-y += boardid.c +ramstage-y += cdp.c +ramstage-y += chromeos.c +ramstage-y += mainboard.c +ramstage-y += mmu.c +ramstage-y += reset.c +ramstage-y += blsp.c diff --git a/src/mainboard/google/geralt/Makefile.inc b/src/mainboard/google/geralt/Makefile.inc deleted file mode 100644 index b1af289d55..0000000000 --- a/src/mainboard/google/geralt/Makefile.inc +++ /dev/null @@ -1,28 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += memlayout.ld -bootblock-y += bootblock.c -bootblock-y += chromeos.c -bootblock-$(CONFIG_VBOOT_CBFS_INTEGRATION) += reset.c - -verstage-y += memlayout.ld -verstage-y += chromeos.c -verstage-y += reset.c -verstage-y += verstage.c - -romstage-y += memlayout.ld -romstage-y += chromeos.c -romstage-y += regulator.c -romstage-y += reset.c -romstage-y += romstage.c -romstage-y += sdram_configs.c - -ramstage-y += memlayout.ld -ramstage-y += boardid.c -ramstage-y += chromeos.c -ramstage-y += mainboard.c -ramstage-y += panel.c -ramstage-y += regulator.c -ramstage-y += reset.c -ramstage-$(CONFIG_BOARD_GOOGLE_CIRI) += panel_ciri.c -ramstage-$(CONFIG_BOARD_GOOGLE_GERALT) += panel_geralt.c diff --git a/src/mainboard/google/geralt/Makefile.mk b/src/mainboard/google/geralt/Makefile.mk new file mode 100644 index 0000000000..b1af289d55 --- /dev/null +++ b/src/mainboard/google/geralt/Makefile.mk @@ -0,0 +1,28 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += memlayout.ld +bootblock-y += bootblock.c +bootblock-y += chromeos.c +bootblock-$(CONFIG_VBOOT_CBFS_INTEGRATION) += reset.c + +verstage-y += memlayout.ld +verstage-y += chromeos.c +verstage-y += reset.c +verstage-y += verstage.c + +romstage-y += memlayout.ld +romstage-y += chromeos.c +romstage-y += regulator.c +romstage-y += reset.c +romstage-y += romstage.c +romstage-y += sdram_configs.c + +ramstage-y += memlayout.ld +ramstage-y += boardid.c +ramstage-y += chromeos.c +ramstage-y += mainboard.c +ramstage-y += panel.c +ramstage-y += regulator.c +ramstage-y += reset.c +ramstage-$(CONFIG_BOARD_GOOGLE_CIRI) += panel_ciri.c +ramstage-$(CONFIG_BOARD_GOOGLE_GERALT) += panel_geralt.c diff --git a/src/mainboard/google/glados/Makefile.inc b/src/mainboard/google/glados/Makefile.inc deleted file mode 100644 index 9fd41f89a7..0000000000 --- a/src/mainboard/google/glados/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += spd - -bootblock-y += bootblock_mainboard.c - -romstage-y += spd/spd.c - -bootblock-$(CONFIG_CHROMEOS) += chromeos.c -verstage-$(CONFIG_CHROMEOS) += chromeos.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c - -ramstage-y += mainboard.c - -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads - -subdirs-y += variants/$(VARIANT_DIR) -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/glados/Makefile.mk b/src/mainboard/google/glados/Makefile.mk new file mode 100644 index 0000000000..9fd41f89a7 --- /dev/null +++ b/src/mainboard/google/glados/Makefile.mk @@ -0,0 +1,22 @@ +## SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += spd + +bootblock-y += bootblock_mainboard.c + +romstage-y += spd/spd.c + +bootblock-$(CONFIG_CHROMEOS) += chromeos.c +verstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c + +ramstage-y += mainboard.c + +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads + +subdirs-y += variants/$(VARIANT_DIR) +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/glados/variants/asuka/Makefile.inc b/src/mainboard/google/glados/variants/asuka/Makefile.inc deleted file mode 100644 index d1b4d16ba0..0000000000 --- a/src/mainboard/google/glados/variants/asuka/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += variant.c -ramstage-y += variant.c - -SPD_SOURCES = hynix_dimm_H9CCNNN8GTMLAR-NUD # 0b0000 Single Channel 2GB -SPD_SOURCES += hynix_dimm_H9CCNNN8GTMLAR-NUD # 0b0001 Dual Channel 4GB -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0010 Single Channel 2GB -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0011 Dual Channel 4GB -SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866 # 0b0100 Single Channel 2GB -SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866 # 0b0101 Dual Channel 4GB diff --git a/src/mainboard/google/glados/variants/asuka/Makefile.mk b/src/mainboard/google/glados/variants/asuka/Makefile.mk new file mode 100644 index 0000000000..d1b4d16ba0 --- /dev/null +++ b/src/mainboard/google/glados/variants/asuka/Makefile.mk @@ -0,0 +1,11 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += variant.c +ramstage-y += variant.c + +SPD_SOURCES = hynix_dimm_H9CCNNN8GTMLAR-NUD # 0b0000 Single Channel 2GB +SPD_SOURCES += hynix_dimm_H9CCNNN8GTMLAR-NUD # 0b0001 Dual Channel 4GB +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0010 Single Channel 2GB +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0011 Dual Channel 4GB +SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866 # 0b0100 Single Channel 2GB +SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866 # 0b0101 Dual Channel 4GB diff --git a/src/mainboard/google/glados/variants/caroline/Makefile.inc b/src/mainboard/google/glados/variants/caroline/Makefile.inc deleted file mode 100644 index 6a942ee456..0000000000 --- a/src/mainboard/google/glados/variants/caroline/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += variant.c -ramstage-y += variant.c -smm-y += variant.c - -# SPD data by index -SPD_SOURCES = samsung_dimm_K4E8E324EB-EGCF # 0b0000 -SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0001 -SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCG # 0b0010 diff --git a/src/mainboard/google/glados/variants/caroline/Makefile.mk b/src/mainboard/google/glados/variants/caroline/Makefile.mk new file mode 100644 index 0000000000..6a942ee456 --- /dev/null +++ b/src/mainboard/google/glados/variants/caroline/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += variant.c +ramstage-y += variant.c +smm-y += variant.c + +# SPD data by index +SPD_SOURCES = samsung_dimm_K4E8E324EB-EGCF # 0b0000 +SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0001 +SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCG # 0b0010 diff --git a/src/mainboard/google/glados/variants/cave/Makefile.inc b/src/mainboard/google/glados/variants/cave/Makefile.inc deleted file mode 100644 index 88e450ed6f..0000000000 --- a/src/mainboard/google/glados/variants/cave/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += variant.c -ramstage-y += variant.c -smm-y += variant.c - -# SPD data by index. No method for board identification yet -SPD_SOURCES = micron_4GiB_dimm_MT52L256M32D1PF # 0b0000 -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0001 -SPD_SOURCES += micron_8GiB_dimm_MT52L512M32D2PF # 0b0010 -SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0011 -SPD_SOURCES += micron_16GiB_dimm_MT52L1G32D4PG # 0b0100 -SPD_SOURCES += hynix_dimm_H9CCNNNCLTMLAR # 0b0101 diff --git a/src/mainboard/google/glados/variants/cave/Makefile.mk b/src/mainboard/google/glados/variants/cave/Makefile.mk new file mode 100644 index 0000000000..88e450ed6f --- /dev/null +++ b/src/mainboard/google/glados/variants/cave/Makefile.mk @@ -0,0 +1,13 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += variant.c +ramstage-y += variant.c +smm-y += variant.c + +# SPD data by index. No method for board identification yet +SPD_SOURCES = micron_4GiB_dimm_MT52L256M32D1PF # 0b0000 +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0001 +SPD_SOURCES += micron_8GiB_dimm_MT52L512M32D2PF # 0b0010 +SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0011 +SPD_SOURCES += micron_16GiB_dimm_MT52L1G32D4PG # 0b0100 +SPD_SOURCES += hynix_dimm_H9CCNNNCLTMLAR # 0b0101 diff --git a/src/mainboard/google/glados/variants/chell/Makefile.inc b/src/mainboard/google/glados/variants/chell/Makefile.inc deleted file mode 100644 index 53861e9839..0000000000 --- a/src/mainboard/google/glados/variants/chell/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += variant.c -ramstage-y += variant.c -smm-y += variant.c - -# SPD data by index. No method for board identification yet -SPD_SOURCES = samsung_dimm_K4E8E304EE-EGCF # 0b0000 -SPD_SOURCES += samsung_dimm_K4E6E304EE-EGCF # 0b0001 -SPD_SOURCES += hynix_dimm_H9CCNNN8GTMLAR # 0b0010 -SPD_SOURCES += hynix_dimm_H9CCNNNBJTMLAR # 0b0011 -SPD_SOURCES += hynix_dimm_H9CCNNNCLTMLAR # 0b0100 -SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0101 -SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCF # 0b0110 -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0111 -SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR # 0b1000 -SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR # 0b1001 -SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR # 0b1010 diff --git a/src/mainboard/google/glados/variants/chell/Makefile.mk b/src/mainboard/google/glados/variants/chell/Makefile.mk new file mode 100644 index 0000000000..53861e9839 --- /dev/null +++ b/src/mainboard/google/glados/variants/chell/Makefile.mk @@ -0,0 +1,18 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += variant.c +ramstage-y += variant.c +smm-y += variant.c + +# SPD data by index. No method for board identification yet +SPD_SOURCES = samsung_dimm_K4E8E304EE-EGCF # 0b0000 +SPD_SOURCES += samsung_dimm_K4E6E304EE-EGCF # 0b0001 +SPD_SOURCES += hynix_dimm_H9CCNNN8GTMLAR # 0b0010 +SPD_SOURCES += hynix_dimm_H9CCNNNBJTMLAR # 0b0011 +SPD_SOURCES += hynix_dimm_H9CCNNNCLTMLAR # 0b0100 +SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0101 +SPD_SOURCES += samsung_dimm_K4EBE304EB-EGCF # 0b0110 +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0111 +SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR # 0b1000 +SPD_SOURCES += hynix_dimm_H9CCNNNCLGALAR # 0b1001 +SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR # 0b1010 diff --git a/src/mainboard/google/glados/variants/glados/Makefile.inc b/src/mainboard/google/glados/variants/glados/Makefile.inc deleted file mode 100644 index 8858453cfc..0000000000 --- a/src/mainboard/google/glados/variants/glados/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += variant.c -ramstage-y += variant.c -smm-y += variant.c - -# SPD data by index. No method for board identification yet -SPD_SOURCES = empty # 0b0000 -SPD_SOURCES += samsung_dimm_K4E6E304EE-EGCF # 0b0001 -SPD_SOURCES += hynix_dimm_H9CCNNN8JTBLAR # 0b0010 -SPD_SOURCES += hynix_dimm_H9CCNNNBLTALAR # 0b0011 diff --git a/src/mainboard/google/glados/variants/glados/Makefile.mk b/src/mainboard/google/glados/variants/glados/Makefile.mk new file mode 100644 index 0000000000..8858453cfc --- /dev/null +++ b/src/mainboard/google/glados/variants/glados/Makefile.mk @@ -0,0 +1,11 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += variant.c +ramstage-y += variant.c +smm-y += variant.c + +# SPD data by index. No method for board identification yet +SPD_SOURCES = empty # 0b0000 +SPD_SOURCES += samsung_dimm_K4E6E304EE-EGCF # 0b0001 +SPD_SOURCES += hynix_dimm_H9CCNNN8JTBLAR # 0b0010 +SPD_SOURCES += hynix_dimm_H9CCNNNBLTALAR # 0b0011 diff --git a/src/mainboard/google/glados/variants/lars/Makefile.inc b/src/mainboard/google/glados/variants/lars/Makefile.inc deleted file mode 100644 index f295a360c2..0000000000 --- a/src/mainboard/google/glados/variants/lars/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += variant.c -ramstage-y += variant.c - -SPD_SOURCES = hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866 # 0b0000 Single Channel 2GB -SPD_SOURCES += hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866 # 0b0001 Dual Channel 8GB -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF-1G-1866 # 0b0010 Dual Channel 4GB -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF-1G-1866 # 0b0011 Single Channel 2GB -SPD_SOURCES += hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866 # 0b0100 Single Channel 4GB -SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF-2G-1866 # 0b0101 Dual Channel 8GB -SPD_SOURCES += hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866 # 0b0110 Dual Channel 4GB -SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR # 0b0111 Single Channel 4GB -SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866 # 0b1000 Dual Channel 4GB -SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107-2G-1866 # 0b1001 Dual Channel 8GB -SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR # 0b1010 Dual Channel 4GB -SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107-2G-1866 # 0b1011 Single Channel 4GB -SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF-2G-1866 # 0b1100 Single Channel 4GB -SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR # 0b1101 Dual Channel 8GB -SPD_SOURCES += empty # 0b1110 -SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/glados/variants/lars/Makefile.mk b/src/mainboard/google/glados/variants/lars/Makefile.mk new file mode 100644 index 0000000000..f295a360c2 --- /dev/null +++ b/src/mainboard/google/glados/variants/lars/Makefile.mk @@ -0,0 +1,21 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += variant.c +ramstage-y += variant.c + +SPD_SOURCES = hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866 # 0b0000 Single Channel 2GB +SPD_SOURCES += hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866 # 0b0001 Dual Channel 8GB +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF-1G-1866 # 0b0010 Dual Channel 4GB +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF-1G-1866 # 0b0011 Single Channel 2GB +SPD_SOURCES += hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866 # 0b0100 Single Channel 4GB +SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF-2G-1866 # 0b0101 Dual Channel 8GB +SPD_SOURCES += hynix_dimm_H9CCNNN8JTBLAR-NUD-1G-1866 # 0b0110 Dual Channel 4GB +SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR # 0b0111 Single Channel 4GB +SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866 # 0b1000 Dual Channel 4GB +SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107-2G-1866 # 0b1001 Dual Channel 8GB +SPD_SOURCES += hynix_dimm_H9CCNNN8GTALAR # 0b1010 Dual Channel 4GB +SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107-2G-1866 # 0b1011 Single Channel 4GB +SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF-2G-1866 # 0b1100 Single Channel 4GB +SPD_SOURCES += hynix_dimm_H9CCNNNBJTALAR # 0b1101 Dual Channel 8GB +SPD_SOURCES += empty # 0b1110 +SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/glados/variants/sentry/Makefile.inc b/src/mainboard/google/glados/variants/sentry/Makefile.inc deleted file mode 100644 index 4de16c951a..0000000000 --- a/src/mainboard/google/glados/variants/sentry/Makefile.inc +++ /dev/null @@ -1,21 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += variant.c -ramstage-y += variant.c - -SPD_SOURCES = hynix_dimm_H9CCNNN8GTMLAR-NUD # 0b0000 Dual Channel 4GB -SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866 # 0b0001 Dual Channel 4GB -SPD_SOURCES += samsung_dimm_K4E8E304EE-EGCF # 0b0010 Dual Channel 4GB -SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0011 Dual Channel 8GB -SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107-2G-1866 # 0b0100 Dual Channel 8GB -SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0101 Dual Channel 8GB -SPD_SOURCES += hynix_dimm_H9CCNNNBJTMLAR-NUD # 0b0110 Dual Channel 4GB -SPD_SOURCES += hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866 # 0b0111 Dual Channel 8GB -SPD_SOURCES += empty # 0b1000 -SPD_SOURCES += empty # 0b1001 -SPD_SOURCES += empty # 0b1010 -SPD_SOURCES += empty # 0b1011 -SPD_SOURCES += empty # 0b1100 -SPD_SOURCES += empty # 0b1101 -SPD_SOURCES += empty # 0b1110 -SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/glados/variants/sentry/Makefile.mk b/src/mainboard/google/glados/variants/sentry/Makefile.mk new file mode 100644 index 0000000000..4de16c951a --- /dev/null +++ b/src/mainboard/google/glados/variants/sentry/Makefile.mk @@ -0,0 +1,21 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += variant.c +ramstage-y += variant.c + +SPD_SOURCES = hynix_dimm_H9CCNNN8GTMLAR-NUD # 0b0000 Dual Channel 4GB +SPD_SOURCES += micron_dimm_MT52L256M32D1PF-107-1G-1866 # 0b0001 Dual Channel 4GB +SPD_SOURCES += samsung_dimm_K4E8E304EE-EGCF # 0b0010 Dual Channel 4GB +SPD_SOURCES += samsung_dimm_K4E6E304EB-EGCF # 0b0011 Dual Channel 8GB +SPD_SOURCES += micron_dimm_MT52L512M32D2PF-107-2G-1866 # 0b0100 Dual Channel 8GB +SPD_SOURCES += samsung_dimm_K4E8E324EB-EGCF # 0b0101 Dual Channel 8GB +SPD_SOURCES += hynix_dimm_H9CCNNNBJTMLAR-NUD # 0b0110 Dual Channel 4GB +SPD_SOURCES += hynix_dimm_H9CCNNNBLTBLAR-NUD-2G-1866 # 0b0111 Dual Channel 8GB +SPD_SOURCES += empty # 0b1000 +SPD_SOURCES += empty # 0b1001 +SPD_SOURCES += empty # 0b1010 +SPD_SOURCES += empty # 0b1011 +SPD_SOURCES += empty # 0b1100 +SPD_SOURCES += empty # 0b1101 +SPD_SOURCES += empty # 0b1110 +SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/gru/Makefile.inc b/src/mainboard/google/gru/Makefile.inc deleted file mode 100644 index b800945466..0000000000 --- a/src/mainboard/google/gru/Makefile.inc +++ /dev/null @@ -1,25 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += sdram_params/ - -bootblock-y += bootblock.c -bootblock-y += chromeos.c -bootblock-y += pwm_regulator.c -bootblock-y += boardid.c -bootblock-y += reset.c - -verstage-y += chromeos.c -verstage-y += reset.c - -romstage-y += boardid.c -romstage-y += chromeos.c -romstage-y += pwm_regulator.c -romstage-y += romstage.c -romstage-y += reset.c -romstage-y += sdram_configs.c - -ramstage-y += boardid.c -ramstage-y += chromeos.c -ramstage-y += mainboard.c -ramstage-y += reset.c -ramstage-y += sdram_configs.c # Needed for ram_code() diff --git a/src/mainboard/google/gru/Makefile.mk b/src/mainboard/google/gru/Makefile.mk new file mode 100644 index 0000000000..b800945466 --- /dev/null +++ b/src/mainboard/google/gru/Makefile.mk @@ -0,0 +1,25 @@ +## SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += sdram_params/ + +bootblock-y += bootblock.c +bootblock-y += chromeos.c +bootblock-y += pwm_regulator.c +bootblock-y += boardid.c +bootblock-y += reset.c + +verstage-y += chromeos.c +verstage-y += reset.c + +romstage-y += boardid.c +romstage-y += chromeos.c +romstage-y += pwm_regulator.c +romstage-y += romstage.c +romstage-y += reset.c +romstage-y += sdram_configs.c + +ramstage-y += boardid.c +ramstage-y += chromeos.c +ramstage-y += mainboard.c +ramstage-y += reset.c +ramstage-y += sdram_configs.c # Needed for ram_code() diff --git a/src/mainboard/google/gru/sdram_params/Makefile.inc b/src/mainboard/google/gru/sdram_params/Makefile.inc deleted file mode 100644 index 3314c0af91..0000000000 --- a/src/mainboard/google/gru/sdram_params/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -sdram-params := -sdram-params += sdram-lpddr3-generic-4GB-928 -sdram-params += sdram-lpddr3-generic-4GB-800 - -sdram-params += sdram-lpddr3-generic-2GB-928 -sdram-params += sdram-lpddr3-generic-2GB-800 - -$(foreach params,$(sdram-params), \ - $(eval cbfs-files-y += $(params)) \ - $(eval $(params)-file := $(params).c:struct) \ - $(eval $(params)-type := struct) \ - $(eval $(params)-compression := $(CBFS_COMPRESS_FLAG)) \ -) diff --git a/src/mainboard/google/gru/sdram_params/Makefile.mk b/src/mainboard/google/gru/sdram_params/Makefile.mk new file mode 100644 index 0000000000..3314c0af91 --- /dev/null +++ b/src/mainboard/google/gru/sdram_params/Makefile.mk @@ -0,0 +1,15 @@ +## SPDX-License-Identifier: GPL-2.0-only + +sdram-params := +sdram-params += sdram-lpddr3-generic-4GB-928 +sdram-params += sdram-lpddr3-generic-4GB-800 + +sdram-params += sdram-lpddr3-generic-2GB-928 +sdram-params += sdram-lpddr3-generic-2GB-800 + +$(foreach params,$(sdram-params), \ + $(eval cbfs-files-y += $(params)) \ + $(eval $(params)-file := $(params).c:struct) \ + $(eval $(params)-type := struct) \ + $(eval $(params)-compression := $(CBFS_COMPRESS_FLAG)) \ +) diff --git a/src/mainboard/google/guybrush/Makefile.inc b/src/mainboard/google/guybrush/Makefile.inc deleted file mode 100644 index fd03124dcd..0000000000 --- a/src/mainboard/google/guybrush/Makefile.inc +++ /dev/null @@ -1,38 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -bootblock-y += bootblock.c -bootblock-$(CONFIG_CHROMEOS) += chromeos.c - -romstage-y += port_descriptors.c -romstage-y += romstage.c - -ramstage-y += mainboard.c -ramstage-y += ec.c -ramstage-y += port_descriptors.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -all-y += spi_speeds.c - -verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += verstage.c -verstage-$(CONFIG_CHROMEOS) += chromeos.c - -subdirs-y += variants/baseboard -subdirs-y += variants/$(VARIANT_DIR) - -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include - -APCB_NAME=data.apcb -APCB_PATH=$(src)/mainboard/$(MAINBOARDDIR) - -LIB_SPD_DEPS = $(SPD_SOURCES) - -APCB_SOURCES = $(obj)/$(APCB_NAME).gen -APCB_SOURCES_RECOVERY = $(obj)/$(APCB_NAME).gen - -$(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \ - $(APCB_V3_EDIT_TOOL) \ - $(APCB_PATH)/$(APCB_NAME) - $(APCB_V3_EDIT_TOOL) $(APCB_PATH)/$(APCB_NAME) \ - $(obj)/$(APCB_NAME).gen \ - --spd_sources $(SPD_SOURCES) diff --git a/src/mainboard/google/guybrush/Makefile.mk b/src/mainboard/google/guybrush/Makefile.mk new file mode 100644 index 0000000000..fd03124dcd --- /dev/null +++ b/src/mainboard/google/guybrush/Makefile.mk @@ -0,0 +1,38 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +bootblock-y += bootblock.c +bootblock-$(CONFIG_CHROMEOS) += chromeos.c + +romstage-y += port_descriptors.c +romstage-y += romstage.c + +ramstage-y += mainboard.c +ramstage-y += ec.c +ramstage-y += port_descriptors.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c + +all-y += spi_speeds.c + +verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += verstage.c +verstage-$(CONFIG_CHROMEOS) += chromeos.c + +subdirs-y += variants/baseboard +subdirs-y += variants/$(VARIANT_DIR) + +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include + +APCB_NAME=data.apcb +APCB_PATH=$(src)/mainboard/$(MAINBOARDDIR) + +LIB_SPD_DEPS = $(SPD_SOURCES) + +APCB_SOURCES = $(obj)/$(APCB_NAME).gen +APCB_SOURCES_RECOVERY = $(obj)/$(APCB_NAME).gen + +$(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \ + $(APCB_V3_EDIT_TOOL) \ + $(APCB_PATH)/$(APCB_NAME) + $(APCB_V3_EDIT_TOOL) $(APCB_PATH)/$(APCB_NAME) \ + $(obj)/$(APCB_NAME).gen \ + --spd_sources $(SPD_SOURCES) diff --git a/src/mainboard/google/guybrush/variants/baseboard/Makefile.inc b/src/mainboard/google/guybrush/variants/baseboard/Makefile.inc deleted file mode 100644 index 74d030dd74..0000000000 --- a/src/mainboard/google/guybrush/variants/baseboard/Makefile.inc +++ /dev/null @@ -1,14 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c -bootblock-y += helpers.c - -romstage-y += helpers.c -romstage-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += helpers.c - -verstage-y += gpio.c - -smm-y += gpio.c diff --git a/src/mainboard/google/guybrush/variants/baseboard/Makefile.mk b/src/mainboard/google/guybrush/variants/baseboard/Makefile.mk new file mode 100644 index 0000000000..74d030dd74 --- /dev/null +++ b/src/mainboard/google/guybrush/variants/baseboard/Makefile.mk @@ -0,0 +1,14 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c +bootblock-y += helpers.c + +romstage-y += helpers.c +romstage-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += helpers.c + +verstage-y += gpio.c + +smm-y += gpio.c diff --git a/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc b/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc deleted file mode 100644 index 823860b4a3..0000000000 --- a/src/mainboard/google/guybrush/variants/dewatt/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -bootblock-y += gpio.c -romstage-y += gpio.c -ramstage-y += gpio.c -verstage-y += gpio.c - -subdirs-y += ./memory - -romstage-y += variant.c diff --git a/src/mainboard/google/guybrush/variants/dewatt/Makefile.mk b/src/mainboard/google/guybrush/variants/dewatt/Makefile.mk new file mode 100644 index 0000000000..823860b4a3 --- /dev/null +++ b/src/mainboard/google/guybrush/variants/dewatt/Makefile.mk @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +bootblock-y += gpio.c +romstage-y += gpio.c +ramstage-y += gpio.c +verstage-y += gpio.c + +subdirs-y += ./memory + +romstage-y += variant.c diff --git a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc deleted file mode 100644 index c6b64cf35a..0000000000 --- a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Generated by: -# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/dewatt/memory src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt - -SPD_SOURCES = -SPD_SOURCES += spd/lp4x/set-1/spd-4.hex # ID = 0(0b0000) Parts = MT53E1G32D2NP-046 WT:A -SPD_SOURCES += spd/lp4x/set-1/spd-1.hex # ID = 1(0b0001) Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B -SPD_SOURCES += spd/lp4x/set-1/spd-9.hex # ID = 2(0b0010) Parts = NT6AP256T32AV-J1 -SPD_SOURCES += spd/lp4x/set-1/spd-3.hex # ID = 3(0b0011) Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR, H54G56CYRBX247 -SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 4(0b0100) -SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 5(0b0101) -SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 6(0b0110) -SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 7(0b0111) -SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 8(0b1000) -SPD_SOURCES += src/mainboard/google/guybrush/variants/dewatt/memory/K4U6E3S4AB-MGCL.hex # ID = 9(0b1001) Parts = K4U6E3S4AB-MGCL -SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 10(0b1010) -SPD_SOURCES += src/mainboard/google/guybrush/variants/dewatt/memory/K4UBE3D4AB-MGCL.hex # ID = 11(0b1011) Parts = K4UBE3D4AB-MGCL diff --git a/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.mk b/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.mk new file mode 100644 index 0000000000..c6b64cf35a --- /dev/null +++ b/src/mainboard/google/guybrush/variants/dewatt/memory/Makefile.mk @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/dewatt/memory src/mainboard/google/guybrush/variants/dewatt/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp4x/set-1/spd-4.hex # ID = 0(0b0000) Parts = MT53E1G32D2NP-046 WT:A +SPD_SOURCES += spd/lp4x/set-1/spd-1.hex # ID = 1(0b0001) Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B +SPD_SOURCES += spd/lp4x/set-1/spd-9.hex # ID = 2(0b0010) Parts = NT6AP256T32AV-J1 +SPD_SOURCES += spd/lp4x/set-1/spd-3.hex # ID = 3(0b0011) Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR, H54G56CYRBX247 +SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 4(0b0100) +SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 5(0b0101) +SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 6(0b0110) +SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 7(0b0111) +SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 8(0b1000) +SPD_SOURCES += src/mainboard/google/guybrush/variants/dewatt/memory/K4U6E3S4AB-MGCL.hex # ID = 9(0b1001) Parts = K4U6E3S4AB-MGCL +SPD_SOURCES += spd/lp4x/set-1/spd-empty.hex # ID = 10(0b1010) +SPD_SOURCES += src/mainboard/google/guybrush/variants/dewatt/memory/K4UBE3D4AB-MGCL.hex # ID = 11(0b1011) Parts = K4UBE3D4AB-MGCL diff --git a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc deleted file mode 100644 index fa2c4dec38..0000000000 --- a/src/mainboard/google/guybrush/variants/guybrush/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -bootblock-y += gpio.c -bootblock-y += variant.c - -romstage-y += gpio.c -romstage-y += variant.c - -ramstage-y += gpio.c -ramstage-y += variant.c - -verstage-y += gpio.c - -subdirs-y += ./memory - -smm-y += gpio.c diff --git a/src/mainboard/google/guybrush/variants/guybrush/Makefile.mk b/src/mainboard/google/guybrush/variants/guybrush/Makefile.mk new file mode 100644 index 0000000000..fa2c4dec38 --- /dev/null +++ b/src/mainboard/google/guybrush/variants/guybrush/Makefile.mk @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +bootblock-y += gpio.c +bootblock-y += variant.c + +romstage-y += gpio.c +romstage-y += variant.c + +ramstage-y += gpio.c +ramstage-y += variant.c + +verstage-y += gpio.c + +subdirs-y += ./memory + +smm-y += gpio.c diff --git a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc deleted file mode 100644 index 2b86d005c4..0000000000 --- a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Generated by: -# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/guybrush/memory src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt - -SPD_SOURCES = -SPD_SOURCES += spd/lp4x/set-1/spd-4.hex # ID = 0(0b0000) Parts = MT53E1G32D2NP-046 WT:A -SPD_SOURCES += spd/lp4x/set-1/spd-1.hex # ID = 1(0b0001) Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, K4U6E3S4AB-MGCL, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B -SPD_SOURCES += spd/lp4x/set-1/spd-9.hex # ID = 2(0b0010) Parts = NT6AP256T32AV-J1 -SPD_SOURCES += spd/lp4x/set-1/spd-3.hex # ID = 3(0b0011) Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR, H54G56CYRBX247, K4UBE3D4AB-MGCL diff --git a/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.mk b/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.mk new file mode 100644 index 0000000000..2b86d005c4 --- /dev/null +++ b/src/mainboard/google/guybrush/variants/guybrush/memory/Makefile.mk @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/guybrush/memory src/mainboard/google/guybrush/variants/guybrush/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp4x/set-1/spd-4.hex # ID = 0(0b0000) Parts = MT53E1G32D2NP-046 WT:A +SPD_SOURCES += spd/lp4x/set-1/spd-1.hex # ID = 1(0b0001) Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, K4U6E3S4AB-MGCL, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B +SPD_SOURCES += spd/lp4x/set-1/spd-9.hex # ID = 2(0b0010) Parts = NT6AP256T32AV-J1 +SPD_SOURCES += spd/lp4x/set-1/spd-3.hex # ID = 3(0b0011) Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR, H54G56CYRBX247, K4UBE3D4AB-MGCL diff --git a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc deleted file mode 100644 index e166093f7c..0000000000 --- a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -bootblock-y += gpio.c -romstage-y += gpio.c -ramstage-y += gpio.c -verstage-y += gpio.c - -romstage-y += tpm_tis.c -ramstage-y += tpm_tis.c -verstage-y += tpm_tis.c - -ramstage-y += ramstage.c - -subdirs-y += ./memory - -smm-y += gpio.c diff --git a/src/mainboard/google/guybrush/variants/nipperkin/Makefile.mk b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.mk new file mode 100644 index 0000000000..e166093f7c --- /dev/null +++ b/src/mainboard/google/guybrush/variants/nipperkin/Makefile.mk @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +bootblock-y += gpio.c +romstage-y += gpio.c +ramstage-y += gpio.c +verstage-y += gpio.c + +romstage-y += tpm_tis.c +ramstage-y += tpm_tis.c +verstage-y += tpm_tis.c + +ramstage-y += ramstage.c + +subdirs-y += ./memory + +smm-y += gpio.c diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc deleted file mode 100644 index 9becda6ba8..0000000000 --- a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Generated by: -# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/nipperkin/memory src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt - -SPD_SOURCES = -SPD_SOURCES += spd/lp4x/set-1/spd-4.hex # ID = 0(0b0000) Parts = MT53E1G32D2NP-046 WT:A -SPD_SOURCES += spd/lp4x/set-1/spd-1.hex # ID = 1(0b0001) Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, K4U6E3S4AB-MGCL, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B -SPD_SOURCES += spd/lp4x/set-1/spd-9.hex # ID = 2(0b0010) Parts = NT6AP256T32AV-J1 -SPD_SOURCES += spd/lp4x/set-1/spd-3.hex # ID = 3(0b0011) Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR, H54G56CYRBX247, K4UBE3D4AB-MGCL diff --git a/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.mk b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.mk new file mode 100644 index 0000000000..9becda6ba8 --- /dev/null +++ b/src/mainboard/google/guybrush/variants/nipperkin/memory/Makefile.mk @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# util/spd_tools/bin/part_id_gen CZN lp4x src/mainboard/google/guybrush/variants/nipperkin/memory src/mainboard/google/guybrush/variants/nipperkin/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp4x/set-1/spd-4.hex # ID = 0(0b0000) Parts = MT53E1G32D2NP-046 WT:A +SPD_SOURCES += spd/lp4x/set-1/spd-1.hex # ID = 1(0b0001) Parts = MT53E512M32D2NP-046 WT:F, H9HCNNNBKMMLXR-NEE, MT53E512M32D2NP-046 WT:E, K4U6E3S4AA-MGCR, K4U6E3S4AB-MGCL, H54G46CYRBX267, MT53E512M32D1NP-046 WT:B +SPD_SOURCES += spd/lp4x/set-1/spd-9.hex # ID = 2(0b0010) Parts = NT6AP256T32AV-J1 +SPD_SOURCES += spd/lp4x/set-1/spd-3.hex # ID = 3(0b0011) Parts = MT53E1G32D2NP-046 WT:B, H9HCNNNCPMMLXR-NEE, K4UBE3D4AA-MGCR, H54G56CYRBX247, K4UBE3D4AB-MGCL diff --git a/src/mainboard/google/hatch/Makefile.inc b/src/mainboard/google/hatch/Makefile.inc deleted file mode 100644 index c1bd77a1f4..0000000000 --- a/src/mainboard/google/hatch/Makefile.inc +++ /dev/null @@ -1,22 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock.c -bootblock-$(CONFIG_CHROMEOS) += chromeos.c - -ramstage-y += ramstage.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c - -romstage-$(CONFIG_ROMSTAGE_SPD_CBFS) += romstage_spd_cbfs.c -romstage-$(CONFIG_ROMSTAGE_SPD_SMBUS) += romstage_spd_smbus.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c - -verstage-$(CONFIG_CHROMEOS) += chromeos.c - -subdirs-y += variants/baseboard -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include - -subdirs-y += variants/$(VARIANT_DIR) -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include - -subdirs-$(CONFIG_ROMSTAGE_SPD_CBFS) += spd diff --git a/src/mainboard/google/hatch/Makefile.mk b/src/mainboard/google/hatch/Makefile.mk new file mode 100644 index 0000000000..c1bd77a1f4 --- /dev/null +++ b/src/mainboard/google/hatch/Makefile.mk @@ -0,0 +1,22 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock.c +bootblock-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-y += ramstage.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_EC_GOOGLE_CHROMEEC) += ec.c + +romstage-$(CONFIG_ROMSTAGE_SPD_CBFS) += romstage_spd_cbfs.c +romstage-$(CONFIG_ROMSTAGE_SPD_SMBUS) += romstage_spd_smbus.c +romstage-$(CONFIG_CHROMEOS) += chromeos.c + +verstage-$(CONFIG_CHROMEOS) += chromeos.c + +subdirs-y += variants/baseboard +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include + +subdirs-y += variants/$(VARIANT_DIR) +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include + +subdirs-$(CONFIG_ROMSTAGE_SPD_CBFS) += spd diff --git a/src/mainboard/google/hatch/variants/akemi/Makefile.inc b/src/mainboard/google/hatch/variants/akemi/Makefile.inc deleted file mode 100644 index 0285219153..0000000000 --- a/src/mainboard/google/hatch/variants/akemi/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = 4G_2400 # 0b000 -SPD_SOURCES += empty_ddr4 # 0b001 -SPD_SOURCES += 8G_2400 # 0b010 -SPD_SOURCES += 8G_2666 # 0b011 -SPD_SOURCES += 16G_2400 # 0b100 -SPD_SOURCES += 16G_2666 # 0b101 -SPD_SOURCES += 8G_3200 # 0b110 - -bootblock-y += gpio.c -ramstage-y += gpio.c -ramstage-y += variant.c diff --git a/src/mainboard/google/hatch/variants/akemi/Makefile.mk b/src/mainboard/google/hatch/variants/akemi/Makefile.mk new file mode 100644 index 0000000000..0285219153 --- /dev/null +++ b/src/mainboard/google/hatch/variants/akemi/Makefile.mk @@ -0,0 +1,13 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = 4G_2400 # 0b000 +SPD_SOURCES += empty_ddr4 # 0b001 +SPD_SOURCES += 8G_2400 # 0b010 +SPD_SOURCES += 8G_2666 # 0b011 +SPD_SOURCES += 16G_2400 # 0b100 +SPD_SOURCES += 16G_2666 # 0b101 +SPD_SOURCES += 8G_3200 # 0b110 + +bootblock-y += gpio.c +ramstage-y += gpio.c +ramstage-y += variant.c diff --git a/src/mainboard/google/hatch/variants/baseboard/Makefile.inc b/src/mainboard/google/hatch/variants/baseboard/Makefile.inc deleted file mode 100644 index c0514376ac..0000000000 --- a/src/mainboard/google/hatch/variants/baseboard/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -romstage-y += gpio.c -romstage-y += memory.c - -ramstage-y += gpio.c - -verstage-y += gpio.c - -smm-y += gpio.c diff --git a/src/mainboard/google/hatch/variants/baseboard/Makefile.mk b/src/mainboard/google/hatch/variants/baseboard/Makefile.mk new file mode 100644 index 0000000000..c0514376ac --- /dev/null +++ b/src/mainboard/google/hatch/variants/baseboard/Makefile.mk @@ -0,0 +1,12 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +romstage-y += gpio.c +romstage-y += memory.c + +ramstage-y += gpio.c + +verstage-y += gpio.c + +smm-y += gpio.c diff --git a/src/mainboard/google/hatch/variants/dratini/Makefile.inc b/src/mainboard/google/hatch/variants/dratini/Makefile.inc deleted file mode 100644 index 0180d5a0f0..0000000000 --- a/src/mainboard/google/hatch/variants/dratini/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = 4G_2400 # 0b0000 -SPD_SOURCES += empty_ddr4 # 0b0001 -SPD_SOURCES += 8G_2400 # 0b0010 -SPD_SOURCES += 8G_2666 # 0b0011 -SPD_SOURCES += 16G_2400 # 0b0100 -SPD_SOURCES += 16G_2666 # 0b0101 -SPD_SOURCES += 8G_3200 # 0b0110 -SPD_SOURCES += 16G_3200 # 0b0111 -SPD_SOURCES += 16G_2666_2bg # 0b1000 -SPD_SOURCES += 16G_3200_4bg # 0b1001 - -bootblock-y += gpio.c -ramstage-y += gpio.c -ramstage-y += variant.c -ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/dratini/Makefile.mk b/src/mainboard/google/hatch/variants/dratini/Makefile.mk new file mode 100644 index 0000000000..0180d5a0f0 --- /dev/null +++ b/src/mainboard/google/hatch/variants/dratini/Makefile.mk @@ -0,0 +1,17 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = 4G_2400 # 0b0000 +SPD_SOURCES += empty_ddr4 # 0b0001 +SPD_SOURCES += 8G_2400 # 0b0010 +SPD_SOURCES += 8G_2666 # 0b0011 +SPD_SOURCES += 16G_2400 # 0b0100 +SPD_SOURCES += 16G_2666 # 0b0101 +SPD_SOURCES += 8G_3200 # 0b0110 +SPD_SOURCES += 16G_3200 # 0b0111 +SPD_SOURCES += 16G_2666_2bg # 0b1000 +SPD_SOURCES += 16G_3200_4bg # 0b1001 + +bootblock-y += gpio.c +ramstage-y += gpio.c +ramstage-y += variant.c +ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/hatch/Makefile.inc b/src/mainboard/google/hatch/variants/hatch/Makefile.inc deleted file mode 100644 index b6c3162f1d..0000000000 --- a/src/mainboard/google/hatch/variants/hatch/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = 4G_2400 # 0b000 -SPD_SOURCES += empty_ddr4 # 0b001 -SPD_SOURCES += 8G_2400 # 0b010 -SPD_SOURCES += 8G_2666 # 0b011 -SPD_SOURCES += 16G_2400 # 0b100 -SPD_SOURCES += 16G_2666 # 0b101 - -bootblock-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/hatch/Makefile.mk b/src/mainboard/google/hatch/variants/hatch/Makefile.mk new file mode 100644 index 0000000000..b6c3162f1d --- /dev/null +++ b/src/mainboard/google/hatch/variants/hatch/Makefile.mk @@ -0,0 +1,13 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = 4G_2400 # 0b000 +SPD_SOURCES += empty_ddr4 # 0b001 +SPD_SOURCES += 8G_2400 # 0b010 +SPD_SOURCES += 8G_2666 # 0b011 +SPD_SOURCES += 16G_2400 # 0b100 +SPD_SOURCES += 16G_2666 # 0b101 + +bootblock-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/helios/Makefile.inc b/src/mainboard/google/hatch/variants/helios/Makefile.inc deleted file mode 100644 index b980e9bea5..0000000000 --- a/src/mainboard/google/hatch/variants/helios/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = LP_8G_2133 # 0b0000 -SPD_SOURCES += LP_16G_2133 # 0b0001 - -romstage-y += memory.c -bootblock-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/helios/Makefile.mk b/src/mainboard/google/hatch/variants/helios/Makefile.mk new file mode 100644 index 0000000000..b980e9bea5 --- /dev/null +++ b/src/mainboard/google/hatch/variants/helios/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = LP_8G_2133 # 0b0000 +SPD_SOURCES += LP_16G_2133 # 0b0001 + +romstage-y += memory.c +bootblock-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/jinlon/Makefile.inc b/src/mainboard/google/hatch/variants/jinlon/Makefile.inc deleted file mode 100644 index 5f7912b355..0000000000 --- a/src/mainboard/google/hatch/variants/jinlon/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = 4G_2400 # 0b000 -SPD_SOURCES += empty_ddr4 # 0b001 -SPD_SOURCES += 8G_2400 # 0b010 -SPD_SOURCES += 8G_2666 # 0b011 -SPD_SOURCES += 16G_2400 # 0b100 -SPD_SOURCES += 16G_2666 # 0b101 -SPD_SOURCES += 8G_3200 # 0b110 -SPD_SOURCES += 16G_3200 # 0b111 -SPD_SOURCES += 16G_2666_2bg # 0b1000 -SPD_SOURCES += 16G_3200_4bg # 0b1001 - -bootblock-y += gpio.c -ramstage-y += gpio.c -ramstage-y += mainboard.c -ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/jinlon/Makefile.mk b/src/mainboard/google/hatch/variants/jinlon/Makefile.mk new file mode 100644 index 0000000000..5f7912b355 --- /dev/null +++ b/src/mainboard/google/hatch/variants/jinlon/Makefile.mk @@ -0,0 +1,17 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = 4G_2400 # 0b000 +SPD_SOURCES += empty_ddr4 # 0b001 +SPD_SOURCES += 8G_2400 # 0b010 +SPD_SOURCES += 8G_2666 # 0b011 +SPD_SOURCES += 16G_2400 # 0b100 +SPD_SOURCES += 16G_2666 # 0b101 +SPD_SOURCES += 8G_3200 # 0b110 +SPD_SOURCES += 16G_3200 # 0b111 +SPD_SOURCES += 16G_2666_2bg # 0b1000 +SPD_SOURCES += 16G_3200_4bg # 0b1001 + +bootblock-y += gpio.c +ramstage-y += gpio.c +ramstage-y += mainboard.c +ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/kindred/Makefile.inc b/src/mainboard/google/hatch/variants/kindred/Makefile.inc deleted file mode 100644 index 767e119dbc..0000000000 --- a/src/mainboard/google/hatch/variants/kindred/Makefile.inc +++ /dev/null @@ -1,16 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = 4G_2400 # 0b000 -SPD_SOURCES += empty_ddr4 # 0b001 -SPD_SOURCES += 8G_2400 # 0b010 -SPD_SOURCES += 8G_2666 # 0b011 -SPD_SOURCES += 16G_2400 # 0b100 -SPD_SOURCES += 16G_2666 # 0b101 -SPD_SOURCES += 8G_3200 # 0b110 -SPD_SOURCES += 16G_3200 # 0b111 - -bootblock-y += gpio.c -ramstage-y += gpio.c -ramstage-y += variant.c - -$(call add_vbt_to_cbfs, vbt-kled.bin, kled-data.vbt) diff --git a/src/mainboard/google/hatch/variants/kindred/Makefile.mk b/src/mainboard/google/hatch/variants/kindred/Makefile.mk new file mode 100644 index 0000000000..767e119dbc --- /dev/null +++ b/src/mainboard/google/hatch/variants/kindred/Makefile.mk @@ -0,0 +1,16 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = 4G_2400 # 0b000 +SPD_SOURCES += empty_ddr4 # 0b001 +SPD_SOURCES += 8G_2400 # 0b010 +SPD_SOURCES += 8G_2666 # 0b011 +SPD_SOURCES += 16G_2400 # 0b100 +SPD_SOURCES += 16G_2666 # 0b101 +SPD_SOURCES += 8G_3200 # 0b110 +SPD_SOURCES += 16G_3200 # 0b111 + +bootblock-y += gpio.c +ramstage-y += gpio.c +ramstage-y += variant.c + +$(call add_vbt_to_cbfs, vbt-kled.bin, kled-data.vbt) diff --git a/src/mainboard/google/hatch/variants/kohaku/Makefile.inc b/src/mainboard/google/hatch/variants/kohaku/Makefile.inc deleted file mode 100644 index 3e5c58173c..0000000000 --- a/src/mainboard/google/hatch/variants/kohaku/Makefile.inc +++ /dev/null @@ -1,11 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = LP_8G_2133 # 0b000 -SPD_SOURCES += LP_16G_2133 # 0b001 - -romstage-y += memory.c - -bootblock-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/kohaku/Makefile.mk b/src/mainboard/google/hatch/variants/kohaku/Makefile.mk new file mode 100644 index 0000000000..3e5c58173c --- /dev/null +++ b/src/mainboard/google/hatch/variants/kohaku/Makefile.mk @@ -0,0 +1,11 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = LP_8G_2133 # 0b000 +SPD_SOURCES += LP_16G_2133 # 0b001 + +romstage-y += memory.c + +bootblock-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/mushu/Makefile.inc b/src/mainboard/google/hatch/variants/mushu/Makefile.inc deleted file mode 100644 index b6c3162f1d..0000000000 --- a/src/mainboard/google/hatch/variants/mushu/Makefile.inc +++ /dev/null @@ -1,13 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = 4G_2400 # 0b000 -SPD_SOURCES += empty_ddr4 # 0b001 -SPD_SOURCES += 8G_2400 # 0b010 -SPD_SOURCES += 8G_2666 # 0b011 -SPD_SOURCES += 16G_2400 # 0b100 -SPD_SOURCES += 16G_2666 # 0b101 - -bootblock-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/mushu/Makefile.mk b/src/mainboard/google/hatch/variants/mushu/Makefile.mk new file mode 100644 index 0000000000..b6c3162f1d --- /dev/null +++ b/src/mainboard/google/hatch/variants/mushu/Makefile.mk @@ -0,0 +1,13 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = 4G_2400 # 0b000 +SPD_SOURCES += empty_ddr4 # 0b001 +SPD_SOURCES += 8G_2400 # 0b010 +SPD_SOURCES += 8G_2666 # 0b011 +SPD_SOURCES += 16G_2400 # 0b100 +SPD_SOURCES += 16G_2666 # 0b101 + +bootblock-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += ramstage.c diff --git a/src/mainboard/google/hatch/variants/nightfury/Makefile.inc b/src/mainboard/google/hatch/variants/nightfury/Makefile.inc deleted file mode 100644 index a856f44082..0000000000 --- a/src/mainboard/google/hatch/variants/nightfury/Makefile.inc +++ /dev/null @@ -1,15 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = LP_8G_2133 # 0b000 -SPD_SOURCES += LP_16G_2133 # 0b001 -SPD_SOURCES += LP_4G_2133 # 0b010 - -romstage-y += memory.c - -bootblock-y += gpio.c - -ramstage-y += gpio.c -ramstage-y += ramstage.c -ramstage-y += variant.c - -$(call add_vbt_to_cbfs, vbt-nightfury-qled.bin, nightfury-qled-data.vbt) diff --git a/src/mainboard/google/hatch/variants/nightfury/Makefile.mk b/src/mainboard/google/hatch/variants/nightfury/Makefile.mk new file mode 100644 index 0000000000..a856f44082 --- /dev/null +++ b/src/mainboard/google/hatch/variants/nightfury/Makefile.mk @@ -0,0 +1,15 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = LP_8G_2133 # 0b000 +SPD_SOURCES += LP_16G_2133 # 0b001 +SPD_SOURCES += LP_4G_2133 # 0b010 + +romstage-y += memory.c + +bootblock-y += gpio.c + +ramstage-y += gpio.c +ramstage-y += ramstage.c +ramstage-y += variant.c + +$(call add_vbt_to_cbfs, vbt-nightfury-qled.bin, nightfury-qled-data.vbt) diff --git a/src/mainboard/google/hatch/variants/palkia/Makefile.inc b/src/mainboard/google/hatch/variants/palkia/Makefile.inc deleted file mode 100644 index a6a72229ae..0000000000 --- a/src/mainboard/google/hatch/variants/palkia/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-or-later -## - -SPD_SOURCES = LP_8G_2133 # 0b0000 -SPD_SOURCES += LP_16G_2133 # 0b0001 - -romstage-y += memory.c -bootblock-y += gpio.c - -ramstage-y += gpio.c diff --git a/src/mainboard/google/hatch/variants/palkia/Makefile.mk b/src/mainboard/google/hatch/variants/palkia/Makefile.mk new file mode 100644 index 0000000000..a6a72229ae --- /dev/null +++ b/src/mainboard/google/hatch/variants/palkia/Makefile.mk @@ -0,0 +1,10 @@ +## SPDX-License-Identifier: GPL-2.0-or-later +## + +SPD_SOURCES = LP_8G_2133 # 0b0000 +SPD_SOURCES += LP_16G_2133 # 0b0001 + +romstage-y += memory.c +bootblock-y += gpio.c + +ramstage-y += gpio.c diff --git a/src/mainboard/google/herobrine/Makefile.inc b/src/mainboard/google/herobrine/Makefile.inc deleted file mode 100644 index a80779946d..0000000000 --- a/src/mainboard/google/herobrine/Makefile.inc +++ /dev/null @@ -1,12 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -all-y += chromeos.c -ifneq ($(CONFIG_BOARD_GOOGLE_SENOR),y) -all-y += boardid.c -all-y += reset.c -endif -bootblock-y += bootblock.c - -romstage-y += romstage.c - -ramstage-y += mainboard.c diff --git a/src/mainboard/google/herobrine/Makefile.mk b/src/mainboard/google/herobrine/Makefile.mk new file mode 100644 index 0000000000..a80779946d --- /dev/null +++ b/src/mainboard/google/herobrine/Makefile.mk @@ -0,0 +1,12 @@ +## SPDX-License-Identifier: GPL-2.0-only + +all-y += chromeos.c +ifneq ($(CONFIG_BOARD_GOOGLE_SENOR),y) +all-y += boardid.c +all-y += reset.c +endif +bootblock-y += bootblock.c + +romstage-y += romstage.c + +ramstage-y += mainboard.c diff --git a/src/mainboard/google/jecht/Makefile.inc b/src/mainboard/google/jecht/Makefile.inc deleted file mode 100644 index ed74d75109..0000000000 --- a/src/mainboard/google/jecht/Makefile.inc +++ /dev/null @@ -1,23 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += spd -romstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c -verstage-$(CONFIG_CHROMEOS) += chromeos.c -ramstage-y += lan.c - -smm-y += led.c - -romstage-y += variants/$(VARIANT_DIR)/pei_data.c -ramstage-y += variants/$(VARIANT_DIR)/pei_data.c - -bootblock-y += led.c - -bootblock-y += bootblock.c - -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads - -subdirs-y += variants/$(VARIANT_DIR) -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include - -romstage-y += variants/$(VARIANT_DIR)/gpio.c diff --git a/src/mainboard/google/jecht/Makefile.mk b/src/mainboard/google/jecht/Makefile.mk new file mode 100644 index 0000000000..ed74d75109 --- /dev/null +++ b/src/mainboard/google/jecht/Makefile.mk @@ -0,0 +1,23 @@ +## SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += spd +romstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c +verstage-$(CONFIG_CHROMEOS) += chromeos.c +ramstage-y += lan.c + +smm-y += led.c + +romstage-y += variants/$(VARIANT_DIR)/pei_data.c +ramstage-y += variants/$(VARIANT_DIR)/pei_data.c + +bootblock-y += led.c + +bootblock-y += bootblock.c + +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads + +subdirs-y += variants/$(VARIANT_DIR) +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include + +romstage-y += variants/$(VARIANT_DIR)/gpio.c diff --git a/src/mainboard/google/jecht/spd/Makefile.inc b/src/mainboard/google/jecht/spd/Makefile.inc deleted file mode 100644 index 6ecc95b482..0000000000 --- a/src/mainboard/google/jecht/spd/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -romstage-y += spd.c diff --git a/src/mainboard/google/jecht/spd/Makefile.mk b/src/mainboard/google/jecht/spd/Makefile.mk new file mode 100644 index 0000000000..6ecc95b482 --- /dev/null +++ b/src/mainboard/google/jecht/spd/Makefile.mk @@ -0,0 +1,3 @@ +## SPDX-License-Identifier: GPL-2.0-only + +romstage-y += spd.c diff --git a/src/mainboard/google/kahlee/Makefile.inc b/src/mainboard/google/kahlee/Makefile.inc deleted file mode 100644 index 94705922a6..0000000000 --- a/src/mainboard/google/kahlee/Makefile.inc +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += bootblock/bootblock.c -bootblock-y += BiosCallOuts.c -bootblock-y += ec.c - -romstage-y += BiosCallOuts.c -romstage-y += chromeos.c -romstage-y += OemCustomize.c - -ramstage-y += BiosCallOuts.c -ramstage-y += chromeos.c -ramstage-y += ec.c -ramstage-y += OemCustomize.c - -verstage-y += chromeos.c -verstage-y += ec.c - -subdirs-y += variants/baseboard -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include - -subdirs-y += variants/$(VARIANT_DIR) -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/kahlee/Makefile.mk b/src/mainboard/google/kahlee/Makefile.mk new file mode 100644 index 0000000000..94705922a6 --- /dev/null +++ b/src/mainboard/google/kahlee/Makefile.mk @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += bootblock/bootblock.c +bootblock-y += BiosCallOuts.c +bootblock-y += ec.c + +romstage-y += BiosCallOuts.c +romstage-y += chromeos.c +romstage-y += OemCustomize.c + +ramstage-y += BiosCallOuts.c +ramstage-y += chromeos.c +ramstage-y += ec.c +ramstage-y += OemCustomize.c + +verstage-y += chromeos.c +verstage-y += ec.c + +subdirs-y += variants/baseboard +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include + +subdirs-y += variants/$(VARIANT_DIR) +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include diff --git a/src/mainboard/google/kahlee/variants/aleena/Makefile.inc b/src/mainboard/google/kahlee/variants/aleena/Makefile.inc deleted file mode 100644 index 3a8e8607ad..0000000000 --- a/src/mainboard/google/kahlee/variants/aleena/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += ../baseboard/spd diff --git a/src/mainboard/google/kahlee/variants/aleena/Makefile.mk b/src/mainboard/google/kahlee/variants/aleena/Makefile.mk new file mode 100644 index 0000000000..3a8e8607ad --- /dev/null +++ b/src/mainboard/google/kahlee/variants/aleena/Makefile.mk @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += ../baseboard/spd diff --git a/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc deleted file mode 100644 index be4074d28c..0000000000 --- a/src/mainboard/google/kahlee/variants/baseboard/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c -bootblock-y += OemCustomize.c - -romstage-y += OemCustomize.c -romstage-y += gpio.c -romstage-y += memory.c - -ramstage-y += gpio.c -ramstage-y += mainboard.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/kahlee/variants/baseboard/Makefile.mk b/src/mainboard/google/kahlee/variants/baseboard/Makefile.mk new file mode 100644 index 0000000000..be4074d28c --- /dev/null +++ b/src/mainboard/google/kahlee/variants/baseboard/Makefile.mk @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c +bootblock-y += OemCustomize.c + +romstage-y += OemCustomize.c +romstage-y += gpio.c +romstage-y += memory.c + +ramstage-y += gpio.c +ramstage-y += mainboard.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/kahlee/variants/baseboard/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc deleted file mode 100644 index 1ec3342891..0000000000 --- a/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000 -SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001 -SPD_SOURCES += micron-MT40A512M16JY-083E-B # 0b0010 -SPD_SOURCES += micron-MT40A1G16KNR-075-E # 0b0011 -SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100 -SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101 -SPD_SOURCES += micron-MT40A512M16LY-075-E # 0b0110 -SPD_SOURCES += hynix-H5ANAG6NCMR-VKC # 0b0111 -SPD_SOURCES += hynix-H5AN8G6NCJR-VKC # 0b1000 -SPD_SOURCES += samsung-K4A8G165WC-BCTD # 0b1001 -SPD_SOURCES += samsung-K4AAG165WB-MCTD # 0b1010 -SPD_SOURCES += micron-MT40A512M16TB-062E-J # 0b1011 -SPD_SOURCES += empty # 0b1100 -SPD_SOURCES += empty # 0b1101 -SPD_SOURCES += empty # 0b1110 -SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.mk b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.mk new file mode 100644 index 0000000000..1ec3342891 --- /dev/null +++ b/src/mainboard/google/kahlee/variants/baseboard/spd/Makefile.mk @@ -0,0 +1,18 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000 +SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001 +SPD_SOURCES += micron-MT40A512M16JY-083E-B # 0b0010 +SPD_SOURCES += micron-MT40A1G16KNR-075-E # 0b0011 +SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100 +SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101 +SPD_SOURCES += micron-MT40A512M16LY-075-E # 0b0110 +SPD_SOURCES += hynix-H5ANAG6NCMR-VKC # 0b0111 +SPD_SOURCES += hynix-H5AN8G6NCJR-VKC # 0b1000 +SPD_SOURCES += samsung-K4A8G165WC-BCTD # 0b1001 +SPD_SOURCES += samsung-K4AAG165WB-MCTD # 0b1010 +SPD_SOURCES += micron-MT40A512M16TB-062E-J # 0b1011 +SPD_SOURCES += empty # 0b1100 +SPD_SOURCES += empty # 0b1101 +SPD_SOURCES += empty # 0b1110 +SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/Makefile.inc deleted file mode 100644 index 57d8bf1349..0000000000 --- a/src/mainboard/google/kahlee/variants/careena/Makefile.inc +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += ./spd - -bootblock-y += variant.c -romstage-y += variant.c -ramstage-y += mainboard.c diff --git a/src/mainboard/google/kahlee/variants/careena/Makefile.mk b/src/mainboard/google/kahlee/variants/careena/Makefile.mk new file mode 100644 index 0000000000..57d8bf1349 --- /dev/null +++ b/src/mainboard/google/kahlee/variants/careena/Makefile.mk @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += ./spd + +bootblock-y += variant.c +romstage-y += variant.c +ramstage-y += mainboard.c diff --git a/src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc deleted file mode 100644 index 4c1da68f3d..0000000000 --- a/src/mainboard/google/kahlee/variants/careena/spd/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000 -SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001 -SPD_SOURCES += micron-MT40A512M16JY-083E-B # 0b0010 -SPD_SOURCES += micron-MT40A1G16KNR-075-E # 0b0011 -SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100 -SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101 -SPD_SOURCES += micron-MT40A512M16LY-075-E # 0b0110 -SPD_SOURCES += hynix-H5ANAG6NCMR-VKC # 0b0111 -SPD_SOURCES += hynix-H5AN8G6NCJR-VKC # 0b1000 -SPD_SOURCES += samsung-K4A8G165WC-BCTD # 0b1001 -SPD_SOURCES += samsung-K4AAG165WB-MCTD # 0b1010 -SPD_SOURCES += micron-MT40A512M16TB-062E-J # 0b1011 -SPD_SOURCES += samsung-K4AAG165WA-BCTD # 0b1100 -SPD_SOURCES += hynix-H5ANAG6NCMR-XNC # 0b1101 -SPD_SOURCES += micron-MT40A1G16RC-062E-B # 0b1110 -SPD_SOURCES += samsung-K4AAG165WA-BCWE # 0b1111 diff --git a/src/mainboard/google/kahlee/variants/careena/spd/Makefile.mk b/src/mainboard/google/kahlee/variants/careena/spd/Makefile.mk new file mode 100644 index 0000000000..4c1da68f3d --- /dev/null +++ b/src/mainboard/google/kahlee/variants/careena/spd/Makefile.mk @@ -0,0 +1,18 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000 +SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001 +SPD_SOURCES += micron-MT40A512M16JY-083E-B # 0b0010 +SPD_SOURCES += micron-MT40A1G16KNR-075-E # 0b0011 +SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100 +SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101 +SPD_SOURCES += micron-MT40A512M16LY-075-E # 0b0110 +SPD_SOURCES += hynix-H5ANAG6NCMR-VKC # 0b0111 +SPD_SOURCES += hynix-H5AN8G6NCJR-VKC # 0b1000 +SPD_SOURCES += samsung-K4A8G165WC-BCTD # 0b1001 +SPD_SOURCES += samsung-K4AAG165WB-MCTD # 0b1010 +SPD_SOURCES += micron-MT40A512M16TB-062E-J # 0b1011 +SPD_SOURCES += samsung-K4AAG165WA-BCTD # 0b1100 +SPD_SOURCES += hynix-H5ANAG6NCMR-XNC # 0b1101 +SPD_SOURCES += micron-MT40A1G16RC-062E-B # 0b1110 +SPD_SOURCES += samsung-K4AAG165WA-BCWE # 0b1111 diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc b/src/mainboard/google/kahlee/variants/grunt/Makefile.inc deleted file mode 100644 index 3a8e8607ad..0000000000 --- a/src/mainboard/google/kahlee/variants/grunt/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += ../baseboard/spd diff --git a/src/mainboard/google/kahlee/variants/grunt/Makefile.mk b/src/mainboard/google/kahlee/variants/grunt/Makefile.mk new file mode 100644 index 0000000000..3a8e8607ad --- /dev/null +++ b/src/mainboard/google/kahlee/variants/grunt/Makefile.mk @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += ../baseboard/spd diff --git a/src/mainboard/google/kahlee/variants/liara/Makefile.inc b/src/mainboard/google/kahlee/variants/liara/Makefile.inc deleted file mode 100644 index 3a8e8607ad..0000000000 --- a/src/mainboard/google/kahlee/variants/liara/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += ../baseboard/spd diff --git a/src/mainboard/google/kahlee/variants/liara/Makefile.mk b/src/mainboard/google/kahlee/variants/liara/Makefile.mk new file mode 100644 index 0000000000..3a8e8607ad --- /dev/null +++ b/src/mainboard/google/kahlee/variants/liara/Makefile.mk @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += ../baseboard/spd diff --git a/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc b/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc deleted file mode 100644 index 21b0276a72..0000000000 --- a/src/mainboard/google/kahlee/variants/nuwani/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += ./spd diff --git a/src/mainboard/google/kahlee/variants/nuwani/Makefile.mk b/src/mainboard/google/kahlee/variants/nuwani/Makefile.mk new file mode 100644 index 0000000000..21b0276a72 --- /dev/null +++ b/src/mainboard/google/kahlee/variants/nuwani/Makefile.mk @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += ./spd diff --git a/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.inc deleted file mode 100644 index e72c9e6d7a..0000000000 --- a/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000 -SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001 -SPD_SOURCES += micron-MT40A512M16JY-083E-B # 0b0010 -SPD_SOURCES += micron-MT40A1G16KNR-075-E # 0b0011 -SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100 -SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101 -SPD_SOURCES += micron-MT40A512M16LY-075-E # 0b0110 -SPD_SOURCES += hynix-H5ANAG6NCMR-VKC # 0b0111 -SPD_SOURCES += hynix-H5AN8G6NCJR-VKC # 0b1000 -SPD_SOURCES += samsung-K4A8G165WC-BCTD # 0b1001 -SPD_SOURCES += samsung-K4AAG165WB-MCTD # 0b1010 -SPD_SOURCES += micron-MT40A512M16TB-062E-J # 0b1011 -SPD_SOURCES += samsung-K4A8G165WC-BCWE # 0b1100 -SPD_SOURCES += hynix-H5AN8G6NCJR-XNC # 0b1101 -SPD_SOURCES += empty # 0b1110 -SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.mk b/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.mk new file mode 100644 index 0000000000..e72c9e6d7a --- /dev/null +++ b/src/mainboard/google/kahlee/variants/nuwani/spd/Makefile.mk @@ -0,0 +1,18 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000 +SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001 +SPD_SOURCES += micron-MT40A512M16JY-083E-B # 0b0010 +SPD_SOURCES += micron-MT40A1G16KNR-075-E # 0b0011 +SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100 +SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101 +SPD_SOURCES += micron-MT40A512M16LY-075-E # 0b0110 +SPD_SOURCES += hynix-H5ANAG6NCMR-VKC # 0b0111 +SPD_SOURCES += hynix-H5AN8G6NCJR-VKC # 0b1000 +SPD_SOURCES += samsung-K4A8G165WC-BCTD # 0b1001 +SPD_SOURCES += samsung-K4AAG165WB-MCTD # 0b1010 +SPD_SOURCES += micron-MT40A512M16TB-062E-J # 0b1011 +SPD_SOURCES += samsung-K4A8G165WC-BCWE # 0b1100 +SPD_SOURCES += hynix-H5AN8G6NCJR-XNC # 0b1101 +SPD_SOURCES += empty # 0b1110 +SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc b/src/mainboard/google/kahlee/variants/treeya/Makefile.inc deleted file mode 100644 index 525e76c875..0000000000 --- a/src/mainboard/google/kahlee/variants/treeya/Makefile.inc +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += ./spd - -ramstage-y += audio.c diff --git a/src/mainboard/google/kahlee/variants/treeya/Makefile.mk b/src/mainboard/google/kahlee/variants/treeya/Makefile.mk new file mode 100644 index 0000000000..525e76c875 --- /dev/null +++ b/src/mainboard/google/kahlee/variants/treeya/Makefile.mk @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += ./spd + +ramstage-y += audio.c diff --git a/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.inc b/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.inc deleted file mode 100644 index e72c9e6d7a..0000000000 --- a/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.inc +++ /dev/null @@ -1,18 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000 -SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001 -SPD_SOURCES += micron-MT40A512M16JY-083E-B # 0b0010 -SPD_SOURCES += micron-MT40A1G16KNR-075-E # 0b0011 -SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100 -SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101 -SPD_SOURCES += micron-MT40A512M16LY-075-E # 0b0110 -SPD_SOURCES += hynix-H5ANAG6NCMR-VKC # 0b0111 -SPD_SOURCES += hynix-H5AN8G6NCJR-VKC # 0b1000 -SPD_SOURCES += samsung-K4A8G165WC-BCTD # 0b1001 -SPD_SOURCES += samsung-K4AAG165WB-MCTD # 0b1010 -SPD_SOURCES += micron-MT40A512M16TB-062E-J # 0b1011 -SPD_SOURCES += samsung-K4A8G165WC-BCWE # 0b1100 -SPD_SOURCES += hynix-H5AN8G6NCJR-XNC # 0b1101 -SPD_SOURCES += empty # 0b1110 -SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.mk b/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.mk new file mode 100644 index 0000000000..e72c9e6d7a --- /dev/null +++ b/src/mainboard/google/kahlee/variants/treeya/spd/Makefile.mk @@ -0,0 +1,18 @@ +## SPDX-License-Identifier: GPL-2.0-only + +SPD_SOURCES = hynix-H5AN8G6NAFR-UH # 0b0000 +SPD_SOURCES += hynix-H5ANAG6NAMR-UH # 0b0001 +SPD_SOURCES += micron-MT40A512M16JY-083E-B # 0b0010 +SPD_SOURCES += micron-MT40A1G16KNR-075-E # 0b0011 +SPD_SOURCES += samsung-K4A8G165WB-BCRC # 0b0100 +SPD_SOURCES += samsung-K4AAG165WB-MCRC # 0b0101 +SPD_SOURCES += micron-MT40A512M16LY-075-E # 0b0110 +SPD_SOURCES += hynix-H5ANAG6NCMR-VKC # 0b0111 +SPD_SOURCES += hynix-H5AN8G6NCJR-VKC # 0b1000 +SPD_SOURCES += samsung-K4A8G165WC-BCTD # 0b1001 +SPD_SOURCES += samsung-K4AAG165WB-MCTD # 0b1010 +SPD_SOURCES += micron-MT40A512M16TB-062E-J # 0b1011 +SPD_SOURCES += samsung-K4A8G165WC-BCWE # 0b1100 +SPD_SOURCES += hynix-H5AN8G6NCJR-XNC # 0b1101 +SPD_SOURCES += empty # 0b1110 +SPD_SOURCES += empty # 0b1111 diff --git a/src/mainboard/google/kukui/Makefile.inc b/src/mainboard/google/kukui/Makefile.inc deleted file mode 100644 index 7b0298d61e..0000000000 --- a/src/mainboard/google/kukui/Makefile.inc +++ /dev/null @@ -1,33 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -subdirs-y += sdram_params/ -subdirs-y += panel_params/ - -bootblock-y += bootblock.c -bootblock-y += reset.c - -verstage-y += chromeos.c -verstage-y += early_init.c -verstage-y += reset.c -verstage-y += verstage.c - -romstage-y += boardid.c -romstage-y += chromeos.c -romstage-y += early_init.c -romstage-y += reset.c -romstage-y += romstage.c -romstage-y += sdram_configs.c - -ramstage-y += boardid.c -ramstage-y += chromeos.c -ramstage-y += mainboard.c -ramstage-$(CONFIG_BOARD_GOOGLE_FLAPJACK) += panel_flapjack.c -ramstage-$(CONFIG_BOARD_GOOGLE_KAKADU) += panel_kakadu.c -ramstage-$(CONFIG_BOARD_GOOGLE_KATSU) += panel_katsu.c -ramstage-$(CONFIG_BOARD_GOOGLE_KODAMA) += panel_kodama.c -ramstage-$(CONFIG_BOARD_GOOGLE_KRANE) += panel_krane.c -ramstage-$(CONFIG_BOARD_GOOGLE_KUKUI) += panel_kukui.c -ramstage-$(CONFIG_DRIVER_PARADE_PS8640) += panel_ps8640.c -ramstage-$(CONFIG_DRIVER_ANALOGIX_ANX7625) += panel_anx7625.c - -ramstage-y += reset.c diff --git a/src/mainboard/google/kukui/Makefile.mk b/src/mainboard/google/kukui/Makefile.mk new file mode 100644 index 0000000000..7b0298d61e --- /dev/null +++ b/src/mainboard/google/kukui/Makefile.mk @@ -0,0 +1,33 @@ +## SPDX-License-Identifier: GPL-2.0-only + +subdirs-y += sdram_params/ +subdirs-y += panel_params/ + +bootblock-y += bootblock.c +bootblock-y += reset.c + +verstage-y += chromeos.c +verstage-y += early_init.c +verstage-y += reset.c +verstage-y += verstage.c + +romstage-y += boardid.c +romstage-y += chromeos.c +romstage-y += early_init.c +romstage-y += reset.c +romstage-y += romstage.c +romstage-y += sdram_configs.c + +ramstage-y += boardid.c +ramstage-y += chromeos.c +ramstage-y += mainboard.c +ramstage-$(CONFIG_BOARD_GOOGLE_FLAPJACK) += panel_flapjack.c +ramstage-$(CONFIG_BOARD_GOOGLE_KAKADU) += panel_kakadu.c +ramstage-$(CONFIG_BOARD_GOOGLE_KATSU) += panel_katsu.c +ramstage-$(CONFIG_BOARD_GOOGLE_KODAMA) += panel_kodama.c +ramstage-$(CONFIG_BOARD_GOOGLE_KRANE) += panel_krane.c +ramstage-$(CONFIG_BOARD_GOOGLE_KUKUI) += panel_kukui.c +ramstage-$(CONFIG_DRIVER_PARADE_PS8640) += panel_ps8640.c +ramstage-$(CONFIG_DRIVER_ANALOGIX_ANX7625) += panel_anx7625.c + +ramstage-y += reset.c diff --git a/src/mainboard/google/kukui/sdram_params/Makefile.inc b/src/mainboard/google/kukui/sdram_params/Makefile.inc deleted file mode 100644 index e7fc110973..0000000000 --- a/src/mainboard/google/kukui/sdram_params/Makefile.inc +++ /dev/null @@ -1,26 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -sdram-params := -sdram-params += sdram-lpddr4x-K4UBE3D4AA-MGCR-4GB -sdram-params += sdram-lpddr4x-H9HCNNNCPMALHR-4GB -sdram-params += sdram-lpddr4x-H9HCNNNCPMMLXR-NEE-4GB -sdram-params += sdram-lpddr4x-K4UBE3D4AA-MGCL-4GB -sdram-params += sdram-lpddr4x-KMDH6001DA-B422-4GB -sdram-params += sdram-lpddr4x-KMDP6001DA-B425-4GB -sdram-params += sdram-lpddr4x-KMDV6001DA-B620-4GB -sdram-params += sdram-lpddr4x-MT29VZZZAD8DQKSL-4GB -sdram-params += sdram-lpddr4x-MT53E1G32D4NQ-4GB -sdram-params += sdram-lpddr4x-MT53E2G32D4NQ-046-8GB -sdram-params += sdram-lpddr4x-SDADA4CR-128G-4GB -sdram-params += sdram-lpddr4x-H9HCNNNFAMMLXR-NEE-8GB -sdram-params += sdram-lpddr4x-MT53E1G32D2NP-046-4GB -sdram-params += sdram-lpddr4x-MT29VZZZCD9GQKPR-046-8GB -sdram-params += sdram-lpddr4x-MT29VZZZAD9GQFSM-046-4GB -sdram-params += sdram-lpddr4x-FEPRF6432-58A1930-4GB - -$(foreach params,$(sdram-params), \ - $(eval cbfs-files-y += $(params)) \ - $(eval $(params)-file := $(params).c:struct) \ - $(eval $(params)-type := struct) \ - $(eval $(params)-compression := $(CBFS_COMPRESS_FLAG)) \ -) diff --git a/src/mainboard/google/kukui/sdram_params/Makefile.mk b/src/mainboard/google/kukui/sdram_params/Makefile.mk new file mode 100644 index 0000000000..e7fc110973 --- /dev/null +++ b/src/mainboard/google/kukui/sdram_params/Makefile.mk @@ -0,0 +1,26 @@ +## SPDX-License-Identifier: GPL-2.0-only + +sdram-params := +sdram-params += sdram-lpddr4x-K4UBE3D4AA-MGCR-4GB +sdram-params += sdram-lpddr4x-H9HCNNNCPMALHR-4GB +sdram-params += sdram-lpddr4x-H9HCNNNCPMMLXR-NEE-4GB +sdram-params += sdram-lpddr4x-K4UBE3D4AA-MGCL-4GB +sdram-params += sdram-lpddr4x-KMDH6001DA-B422-4GB +sdram-params += sdram-lpddr4x-KMDP6001DA-B425-4GB +sdram-params += sdram-lpddr4x-KMDV6001DA-B620-4GB +sdram-params += sdram-lpddr4x-MT29VZZZAD8DQKSL-4GB +sdram-params += sdram-lpddr4x-MT53E1G32D4NQ-4GB +sdram-params += sdram-lpddr4x-MT53E2G32D4NQ-046-8GB +sdram-params += sdram-lpddr4x-SDADA4CR-128G-4GB +sdram-params += sdram-lpddr4x-H9HCNNNFAMMLXR-NEE-8GB +sdram-params += sdram-lpddr4x-MT53E1G32D2NP-046-4GB +sdram-params += sdram-lpddr4x-MT29VZZZCD9GQKPR-046-8GB +sdram-params += sdram-lpddr4x-MT29VZZZAD9GQFSM-046-4GB +sdram-params += sdram-lpddr4x-FEPRF6432-58A1930-4GB + +$(foreach params,$(sdram-params), \ + $(eval cbfs-files-y += $(params)) \ + $(eval $(params)-file := $(params).c:struct) \ + $(eval $(params)-type := struct) \ + $(eval $(params)-compression := $(CBFS_COMPRESS_FLAG)) \ +) diff --git a/src/mainboard/google/link/Makefile.inc b/src/mainboard/google/link/Makefile.inc deleted file mode 100644 index 6b3f1b568c..0000000000 --- a/src/mainboard/google/link/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -ramstage-y += ec.c - -romstage-y += chromeos.c -ramstage-y += chromeos.c -ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads - -# Order of names in SPD_SOURCES is important! -SPD_SOURCES = elpida_4Gb_1600_x16 -SPD_SOURCES += samsung_4Gb_1600_1.35v_x16 -SPD_SOURCES += micron_4Gb_1600_1.35v_x16 - -bootblock-y += gpio.c -romstage-y += gpio.c -bootblock-y += early_init.c -romstage-y += early_init.c diff --git a/src/mainboard/google/link/Makefile.mk b/src/mainboard/google/link/Makefile.mk new file mode 100644 index 0000000000..6b3f1b568c --- /dev/null +++ b/src/mainboard/google/link/Makefile.mk @@ -0,0 +1,17 @@ +## SPDX-License-Identifier: GPL-2.0-only + +ramstage-y += ec.c + +romstage-y += chromeos.c +ramstage-y += chromeos.c +ramstage-$(CONFIG_MAINBOARD_USE_LIBGFXINIT) += gma-mainboard.ads + +# Order of names in SPD_SOURCES is important! +SPD_SOURCES = elpida_4Gb_1600_x16 +SPD_SOURCES += samsung_4Gb_1600_1.35v_x16 +SPD_SOURCES += micron_4Gb_1600_1.35v_x16 + +bootblock-y += gpio.c +romstage-y += gpio.c +bootblock-y += early_init.c +romstage-y += early_init.c diff --git a/src/mainboard/google/mistral/Makefile.inc b/src/mainboard/google/mistral/Makefile.inc deleted file mode 100644 index 1cbaa8b3fa..0000000000 --- a/src/mainboard/google/mistral/Makefile.inc +++ /dev/null @@ -1,17 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += chromeos.c -bootblock-y += reset.c -bootblock-y += bootblock.c - -verstage-y += chromeos.c -verstage-y += reset.c -verstage-y += verstage.c - -romstage-y += chromeos.c -romstage-y += reset.c -romstage-y += romstage.c - -ramstage-y += chromeos.c -ramstage-y += reset.c -ramstage-y += mainboard.c diff --git a/src/mainboard/google/mistral/Makefile.mk b/src/mainboard/google/mistral/Makefile.mk new file mode 100644 index 0000000000..1cbaa8b3fa --- /dev/null +++ b/src/mainboard/google/mistral/Makefile.mk @@ -0,0 +1,17 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += chromeos.c +bootblock-y += reset.c +bootblock-y += bootblock.c + +verstage-y += chromeos.c +verstage-y += reset.c +verstage-y += verstage.c + +romstage-y += chromeos.c +romstage-y += reset.c +romstage-y += romstage.c + +ramstage-y += chromeos.c +ramstage-y += reset.c +ramstage-y += mainboard.c diff --git a/src/mainboard/google/myst/Makefile.inc b/src/mainboard/google/myst/Makefile.inc deleted file mode 100644 index 4c5f80db8b..0000000000 --- a/src/mainboard/google/myst/Makefile.inc +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -bootblock-y += bootblock.c - -romstage-y += port_descriptors.c - -ramstage-y += ec.c -ramstage-y += mainboard.c -ramstage-y += port_descriptors.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += verstage.c - -subdirs-y += variants/baseboard -subdirs-y += variants/$(VARIANT_DIR) - -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include -CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include - -APCB_NAME=APCB_PHX_D5 - -ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin),) -$(info APCB sources present.) - -APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin - -# The SPD is currently built directly into the APCB. -# Add the below section back in after the apcbtool is updated to handle the -# Phoenix APCB SPD configuration. - -ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.inc),) - -LIB_SPD_DEPS = $(SPD_SOURCES) - -APCB_SOURCES = $(obj)/$(APCB_NAME).gen - -$(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \ - $(APCB_V3A_EDIT_TOOL) \ - $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin - $(APCB_V3A_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin \ - $(obj)/$(APCB_NAME).gen \ - --spd_sources $(SPD_SOURCES) -else -$(info SPD sources not found. Skipping APCB.) -show_notices:: die_no_apcb -endif - -else -$(info APCB sources not found. Skipping APCB.) -show_notices:: warn_no_apcb -endif diff --git a/src/mainboard/google/myst/Makefile.mk b/src/mainboard/google/myst/Makefile.mk new file mode 100644 index 0000000000..305179e117 --- /dev/null +++ b/src/mainboard/google/myst/Makefile.mk @@ -0,0 +1,51 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +bootblock-y += bootblock.c + +romstage-y += port_descriptors.c + +ramstage-y += ec.c +ramstage-y += mainboard.c +ramstage-y += port_descriptors.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c + +verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += verstage.c + +subdirs-y += variants/baseboard +subdirs-y += variants/$(VARIANT_DIR) + +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/baseboard/include +CPPFLAGS_common += -I$(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/include + +APCB_NAME=APCB_PHX_D5 + +ifneq ($(wildcard $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin),) +$(info APCB sources present.) + +APCB_SOURCES = $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin + +# The SPD is currently built directly into the APCB. +# Add the below section back in after the apcbtool is updated to handle the +# Phoenix APCB SPD configuration. + +ifneq ($(wildcard $(src)/mainboard/$(MAINBOARDDIR)/variants/$(VARIANT_DIR)/memory/Makefile.mk),) + +LIB_SPD_DEPS = $(SPD_SOURCES) + +APCB_SOURCES = $(obj)/$(APCB_NAME).gen + +$(obj)/$(APCB_NAME).gen: $(SPD_SOURCES) \ + $(APCB_V3A_EDIT_TOOL) \ + $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin + $(APCB_V3A_EDIT_TOOL) $(MAINBOARD_BLOBS_DIR)/$(APCB_NAME).bin \ + $(obj)/$(APCB_NAME).gen \ + --spd_sources $(SPD_SOURCES) +else +$(info SPD sources not found. Skipping APCB.) +show_notices:: die_no_apcb +endif + +else +$(info APCB sources not found. Skipping APCB.) +show_notices:: warn_no_apcb +endif diff --git a/src/mainboard/google/myst/variants/baseboard/Makefile.inc b/src/mainboard/google/myst/variants/baseboard/Makefile.inc deleted file mode 100644 index 10b34e3379..0000000000 --- a/src/mainboard/google/myst/variants/baseboard/Makefile.inc +++ /dev/null @@ -1,14 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bootblock-y += gpio.c - -ramstage-$(CONFIG_FW_CONFIG) += fw_config.c -ramstage-y += gpio.c -ramstage-y += port_descriptors.c - -romstage-y += gpio.c -romstage-y += port_descriptors.c - -verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += gpio.c - -smm-y += smihandler.c diff --git a/src/mainboard/google/myst/variants/baseboard/Makefile.mk b/src/mainboard/google/myst/variants/baseboard/Makefile.mk new file mode 100644 index 0000000000..10b34e3379 --- /dev/null +++ b/src/mainboard/google/myst/variants/baseboard/Makefile.mk @@ -0,0 +1,14 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bootblock-y += gpio.c + +ramstage-$(CONFIG_FW_CONFIG) += fw_config.c +ramstage-y += gpio.c +ramstage-y += port_descriptors.c + +romstage-y += gpio.c +romstage-y += port_descriptors.c + +verstage-$(CONFIG_VBOOT_STARTS_BEFORE_BOOTBLOCK) += gpio.c + +smm-y += smihandler.c diff --git a/src/mainboard/google/myst/variants/myst/Makefile.inc b/src/mainboard/google/myst/variants/myst/Makefile.inc deleted file mode 100644 index 88e75bde52..0000000000 --- a/src/mainboard/google/myst/variants/myst/Makefile.inc +++ /dev/null @@ -1,3 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later - -subdirs-y += ./memory diff --git a/src/mainboard/google/myst/variants/myst/Makefile.mk b/src/mainboard/google/myst/variants/myst/Makefile.mk new file mode 100644 index 0000000000..88e75bde52 --- /dev/null +++ b/src/mainboard/google/myst/variants/myst/Makefile.mk @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +subdirs-y += ./memory diff --git a/src/mainboard/google/myst/variants/myst/memory/Makefile.inc b/src/mainboard/google/myst/variants/myst/memory/Makefile.inc deleted file mode 100644 index 80510d7c0c..0000000000 --- a/src/mainboard/google/myst/variants/myst/memory/Makefile.inc +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-or-later -# This is an auto-generated file. Do not edit!! -# Generated by: -# util/spd_tools/bin/part_id_gen PHX lp5 src/mainboard/google/myst/variants/myst/memory src/mainboard/google/myst/variants/myst/memory/mem_parts_used.txt - -SPD_SOURCES = -SPD_SOURCES += spd/lp5/set-1/spd-2.hex # ID = 0(0b0000) Parts = H9JCNNNCP3MLYR-N6E -SPD_SOURCES += spd/lp5/set-1/spd-1.hex # ID = 1(0b0001) Parts = MT62F512M32D2DR-031 WT:B -SPD_SOURCES += spd/lp5/set-1/spd-7.hex # ID = 2(0b0010) Parts = MT62F1G32D2DS-026 WT:B -SPD_SOURCES += spd/lp5/set-1/spd-9.hex # ID = 3(0b0011) Parts = K3KL6L60GM-MGCT diff --git a/src/mainboard/google/myst/variants/myst/memory/Makefile.mk b/src/mainboard/google/myst/variants/myst/memory/Makefile.mk new file mode 100644 index 0000000000..80510d7c0c --- /dev/null +++ b/src/mainboard/google/myst/variants/myst/memory/Makefile.mk @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-or-later +# This is an auto-generated file. Do not edit!! +# Generated by: +# util/spd_tools/bin/part_id_gen PHX lp5 src/mainboard/google/myst/variants/myst/memory src/mainboard/google/myst/variants/myst/memory/mem_parts_used.txt + +SPD_SOURCES = +SPD_SOURCES += spd/lp5/set-1/spd-2.hex # ID = 0(0b0000) Parts = H9JCNNNCP3MLYR-N6E +SPD_SOURCES += spd/lp5/set-1/spd-1.hex # ID = 1(0b0001) Parts = MT62F512M32D2DR-031 WT:B +SPD_SOURCES += spd/lp5/set-1/spd-7.hex # ID = 2(0b0010) Parts = MT62F1G32D2DS-026 WT:B +SPD_SOURCES += spd/lp5/set-1/spd-9.hex # ID = 3(0b0011) Parts = K3KL6L60GM-MGCT diff --git a/src/mainboard/google/nyan/Makefile.inc b/src/mainboard/google/nyan/Makefile.inc deleted file mode 100644 index 190cfc5127..0000000000 --- a/src/mainboard/google/nyan/Makefile.inc +++ /dev/null @@ -1,31 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Add a handler for BCT config files -$(call add-special-class,bct-cfg) -bct-cfg-handler= $(eval $(obj)/generated/bct.cfg: $(1)$(2)) - -$(obj)/generated/bct.cfg: - @printf " CAT $(subst $(obj)/,,$(@))\n" - cat $^ > $@ - -subdirs-y += bct - -bootblock-y += boardid.c -bootblock-y += bootblock.c -bootblock-y += pmic.c -bootblock-y += reset.c - -romstage-y += reset.c -romstage-y += romstage.c -romstage-y += sdram_configs.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -romstage-y += early_configs.c - -ramstage-y += reset.c -ramstage-y += boardid.c -ramstage-y += mainboard.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -verstage-y += reset.c -verstage-$(CONFIG_CHROMEOS) += chromeos.c -verstage-y += early_configs.c diff --git a/src/mainboard/google/nyan/Makefile.mk b/src/mainboard/google/nyan/Makefile.mk new file mode 100644 index 0000000000..190cfc5127 --- /dev/null +++ b/src/mainboard/google/nyan/Makefile.mk @@ -0,0 +1,31 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Add a handler for BCT config files +$(call add-special-class,bct-cfg) +bct-cfg-handler= $(eval $(obj)/generated/bct.cfg: $(1)$(2)) + +$(obj)/generated/bct.cfg: + @printf " CAT $(subst $(obj)/,,$(@))\n" + cat $^ > $@ + +subdirs-y += bct + +bootblock-y += boardid.c +bootblock-y += bootblock.c +bootblock-y += pmic.c +bootblock-y += reset.c + +romstage-y += reset.c +romstage-y += romstage.c +romstage-y += sdram_configs.c +romstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += early_configs.c + +ramstage-y += reset.c +ramstage-y += boardid.c +ramstage-y += mainboard.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c + +verstage-y += reset.c +verstage-$(CONFIG_CHROMEOS) += chromeos.c +verstage-y += early_configs.c diff --git a/src/mainboard/google/nyan/bct/Makefile.inc b/src/mainboard/google/nyan/bct/Makefile.inc deleted file mode 100644 index 0c7b2b746a..0000000000 --- a/src/mainboard/google/nyan/bct/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bct-cfg-$(CONFIG_NYAN_BCT_CFG_EMMC) += emmc.cfg -bct-cfg-$(CONFIG_NYAN_BCT_CFG_SPI) += spi.cfg -bct-cfg-y += odmdata.cfg - -# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate -# the include files (sdram-*.inc) by running "./cfg2inc.sh sdram-*.cfg". -# TODO(hungte) Change cfg2inc.sh to NVIDIA's official tool in cbootimage. diff --git a/src/mainboard/google/nyan/bct/Makefile.mk b/src/mainboard/google/nyan/bct/Makefile.mk new file mode 100644 index 0000000000..0c7b2b746a --- /dev/null +++ b/src/mainboard/google/nyan/bct/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bct-cfg-$(CONFIG_NYAN_BCT_CFG_EMMC) += emmc.cfg +bct-cfg-$(CONFIG_NYAN_BCT_CFG_SPI) += spi.cfg +bct-cfg-y += odmdata.cfg + +# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate +# the include files (sdram-*.inc) by running "./cfg2inc.sh sdram-*.cfg". +# TODO(hungte) Change cfg2inc.sh to NVIDIA's official tool in cbootimage. diff --git a/src/mainboard/google/nyan_big/Makefile.inc b/src/mainboard/google/nyan_big/Makefile.inc deleted file mode 100644 index b734b5ba19..0000000000 --- a/src/mainboard/google/nyan_big/Makefile.inc +++ /dev/null @@ -1,30 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Add a handler for BCT config files -$(call add-special-class,bct-cfg) -bct-cfg-handler= $(eval $(obj)/generated/bct.cfg: $(1)$(2)) - -$(obj)/generated/bct.cfg: - @printf " CAT $(subst $(obj)/,,$(@))\n" - cat $^ > $@ - -subdirs-y += bct - -bootblock-y += bootblock.c -bootblock-y += pmic.c -bootblock-y += reset.c - -romstage-y += reset.c -romstage-y += romstage.c -romstage-y += sdram_configs.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c -romstage-y += early_configs.c - -ramstage-y += reset.c -ramstage-y += boardid.c -ramstage-y += mainboard.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c - -verstage-y += reset.c -verstage-$(CONFIG_CHROMEOS) += chromeos.c -verstage-y += early_configs.c diff --git a/src/mainboard/google/nyan_big/Makefile.mk b/src/mainboard/google/nyan_big/Makefile.mk new file mode 100644 index 0000000000..b734b5ba19 --- /dev/null +++ b/src/mainboard/google/nyan_big/Makefile.mk @@ -0,0 +1,30 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Add a handler for BCT config files +$(call add-special-class,bct-cfg) +bct-cfg-handler= $(eval $(obj)/generated/bct.cfg: $(1)$(2)) + +$(obj)/generated/bct.cfg: + @printf " CAT $(subst $(obj)/,,$(@))\n" + cat $^ > $@ + +subdirs-y += bct + +bootblock-y += bootblock.c +bootblock-y += pmic.c +bootblock-y += reset.c + +romstage-y += reset.c +romstage-y += romstage.c +romstage-y += sdram_configs.c +romstage-$(CONFIG_CHROMEOS) += chromeos.c +romstage-y += early_configs.c + +ramstage-y += reset.c +ramstage-y += boardid.c +ramstage-y += mainboard.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c + +verstage-y += reset.c +verstage-$(CONFIG_CHROMEOS) += chromeos.c +verstage-y += early_configs.c diff --git a/src/mainboard/google/nyan_big/bct/Makefile.inc b/src/mainboard/google/nyan_big/bct/Makefile.inc deleted file mode 100644 index f83c93263d..0000000000 --- a/src/mainboard/google/nyan_big/bct/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bct-cfg-$(CONFIG_NYAN_BIG_BCT_CFG_EMMC) += emmc.cfg -bct-cfg-$(CONFIG_NYAN_BIG_BCT_CFG_SPI) += spi.cfg -bct-cfg-y += odmdata.cfg - -# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate -# the include files (sdram-*.inc). See ../../nyan/bct/Makefile.inc for more -# information. diff --git a/src/mainboard/google/nyan_big/bct/Makefile.mk b/src/mainboard/google/nyan_big/bct/Makefile.mk new file mode 100644 index 0000000000..f83c93263d --- /dev/null +++ b/src/mainboard/google/nyan_big/bct/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bct-cfg-$(CONFIG_NYAN_BIG_BCT_CFG_EMMC) += emmc.cfg +bct-cfg-$(CONFIG_NYAN_BIG_BCT_CFG_SPI) += spi.cfg +bct-cfg-y += odmdata.cfg + +# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate +# the include files (sdram-*.inc). See ../../nyan/bct/Makefile.inc for more +# information. diff --git a/src/mainboard/google/nyan_blaze/Makefile.inc b/src/mainboard/google/nyan_blaze/Makefile.inc deleted file mode 100644 index 54410f0812..0000000000 --- a/src/mainboard/google/nyan_blaze/Makefile.inc +++ /dev/null @@ -1,30 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -# Add a handler for BCT config files -$(call add-special-class,bct-cfg) -bct-cfg-handler= $(eval $(obj)/generated/bct.cfg: $(1)$(2)) - -$(obj)/generated/bct.cfg: - @printf " CAT $(subst $(obj)/,,$(@))\n" - cat $^ > $@ - -subdirs-y += bct - -bootblock-y += bootblock.c -bootblock-y += pmic.c -bootblock-y += reset.c - -verstage-$(CONFIG_CHROMEOS) += chromeos.c -verstage-y += early_configs.c -verstage-y += reset.c - -romstage-y += early_configs.c -romstage-y += reset.c -romstage-y += romstage.c -romstage-y += sdram_configs.c -romstage-$(CONFIG_CHROMEOS) += chromeos.c - -ramstage-y += reset.c -ramstage-y += boardid.c -ramstage-y += mainboard.c -ramstage-$(CONFIG_CHROMEOS) += chromeos.c diff --git a/src/mainboard/google/nyan_blaze/Makefile.mk b/src/mainboard/google/nyan_blaze/Makefile.mk new file mode 100644 index 0000000000..54410f0812 --- /dev/null +++ b/src/mainboard/google/nyan_blaze/Makefile.mk @@ -0,0 +1,30 @@ +## SPDX-License-Identifier: GPL-2.0-only + +# Add a handler for BCT config files +$(call add-special-class,bct-cfg) +bct-cfg-handler= $(eval $(obj)/generated/bct.cfg: $(1)$(2)) + +$(obj)/generated/bct.cfg: + @printf " CAT $(subst $(obj)/,,$(@))\n" + cat $^ > $@ + +subdirs-y += bct + +bootblock-y += bootblock.c +bootblock-y += pmic.c +bootblock-y += reset.c + +verstage-$(CONFIG_CHROMEOS) += chromeos.c +verstage-y += early_configs.c +verstage-y += reset.c + +romstage-y += early_configs.c +romstage-y += reset.c +romstage-y += romstage.c +romstage-y += sdram_configs.c +romstage-$(CONFIG_CHROMEOS) += chromeos.c + +ramstage-y += reset.c +ramstage-y += boardid.c +ramstage-y += mainboard.c +ramstage-$(CONFIG_CHROMEOS) += chromeos.c diff --git a/src/mainboard/google/nyan_blaze/bct/Makefile.inc b/src/mainboard/google/nyan_blaze/bct/Makefile.inc deleted file mode 100644 index 02f32a59bd..0000000000 --- a/src/mainboard/google/nyan_blaze/bct/Makefile.inc +++ /dev/null @@ -1,9 +0,0 @@ -## SPDX-License-Identifier: GPL-2.0-only - -bct-cfg-$(CONFIG_NYAN_BLAZE_BCT_CFG_EMMC) += emmc.cfg -bct-cfg-$(CONFIG_NYAN_BLAZE_BCT_CFG_SPI) += spi.cfg -bct-cfg-y += odmdata.cfg - -# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate -# the include files (sdram-*.inc). See ../../nyan/bct/Makefile.inc for more -# information. diff --git a/src/mainboard/google/nyan_blaze/bct/Makefile.mk b/src/mainboard/google/nyan_blaze/bct/Makefile.mk new file mode 100644 index 0000000000..02f32a59bd --- /dev/null +++ b/src/mainboard/google/nyan_blaze/bct/Makefile.mk @@ -0,0 +1,9 @@ +## SPDX-License-Identifier: GPL-2.0-only + +bct-cfg-$(CONFIG_NYAN_BLAZE_BCT_CFG_EMMC) += emmc.cfg +bct-cfg-$(CONFIG_NYAN_BLAZE_BCT_CFG_SPI) += spi.cfg +bct-cfg-y += odmdata.cfg + +# Note when SDRAM config (sdram-*.cfg) files are changed, we have to regenerate +# the include files (sdram-*.inc). See ../../nyan/bct/Makefile.inc for more +# information. -- cgit v1.2.3