mb/google/brya/var/ghost: Split ghost4adl into 3 variants

We plan to make 3 firmwares which differ only by Kconfig options and
can share a common variant directory.

ghost4adl: Board with an ADL chip.
ghost4es:  Board near identical but has RPL-ES chip.
ghost:     Will have final RPL silicon.

Since they will only differ by Kconfig options and Intel binary blobs,
let's not duplicate the variant directory but instead share it in
common.

BUG=b:239456576
BRANCH=firmware-brya-14505.B
TEST="make menuconfig", verify layout of board selection

Signed-off-by: Jack Rosenthal <jrosenth@chromium.org>
Change-Id: I94f2048bbe6675a807f8eba986a1ded0a4167733
Reviewed-on: https://review.coreboot.org/c/coreboot/+/65956
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com>
Reviewed-by: Caveh Jalali <caveh@chromium.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Nick Vaccaro <nvaccaro@google.com>

9 files changed, 2 insertions, 2 deletions

diff --git a/src/mainboard/google/brya/variants/ghost4adl/Makefile.inc b/src/mainboard/google/brya/variants/ghost/Makefile.inc
index 073317f666..073317f666 100644
--- a/src/mainboard/google/brya/variants/ghost4adl/Makefile.inc
+++ b/src/mainboard/google/brya/variants/ghost/Makefile.inc
diff --git a/src/mainboard/google/brya/variants/ghost4adl/gpio.c b/src/mainboard/google/brya/variants/ghost/gpio.c
index e6a80f0fb5..e6a80f0fb5 100644
--- a/src/mainboard/google/brya/variants/ghost4adl/gpio.c
+++ b/src/mainboard/google/brya/variants/ghost/gpio.c
diff --git a/src/mainboard/google/brya/variants/ghost4adl/include/variant/ec.h b/src/mainboard/google/brya/variants/ghost/include/variant/ec.h
index 7a2a6ff8b7..7a2a6ff8b7 100644
--- a/src/mainboard/google/brya/variants/ghost4adl/include/variant/ec.h
+++ b/src/mainboard/google/brya/variants/ghost/include/variant/ec.h
diff --git a/src/mainboard/google/brya/variants/ghost4adl/include/variant/gpio.h b/src/mainboard/google/brya/variants/ghost/include/variant/gpio.h
index c4fe342621..c4fe342621 100644
--- a/src/mainboard/google/brya/variants/ghost4adl/include/variant/gpio.h
+++ b/src/mainboard/google/brya/variants/ghost/include/variant/gpio.h
diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory.c b/src/mainboard/google/brya/variants/ghost/memory.c
index 4503a1f587..4503a1f587 100644
--- a/src/mainboard/google/brya/variants/ghost4adl/memory.c
+++ b/src/mainboard/google/brya/variants/ghost/memory.c
diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory/Makefile.inc b/src/mainboard/google/brya/variants/ghost/memory/Makefile.inc
index 9f8d085315..80729d7c29 100644
--- a/src/mainboard/google/brya/variants/ghost4adl/memory/Makefile.inc
+++ b/src/mainboard/google/brya/variants/ghost/memory/Makefile.inc
@@ -1,7 +1,7 @@
 # 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 ADL lp5 src/mainboard/google/brya/variants/ghost4adl/memory src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt
+# ./util/spd_tools/bin/part_id_gen ADL lp5 src/mainboard/google/brya/variants/ghost/memory src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt
 
 SPD_SOURCES =
 SPD_SOURCES += spd/lp5/set-0/spd-1.hex      # ID = 0(0b0000)  Parts = H9JCNNNBK3MLYR-N6E, MT62F512M32D2DR-031 WT:B
diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory/dram_id.generated.txt b/src/mainboard/google/brya/variants/ghost/memory/dram_id.generated.txt
index b4dc8a676b..026ac07dc3 100644
--- a/src/mainboard/google/brya/variants/ghost4adl/memory/dram_id.generated.txt
+++ b/src/mainboard/google/brya/variants/ghost/memory/dram_id.generated.txt
@@ -1,7 +1,7 @@
 # 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 ADL lp5 src/mainboard/google/brya/variants/ghost4adl/memory src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt
+# ./util/spd_tools/bin/part_id_gen ADL lp5 src/mainboard/google/brya/variants/ghost/memory src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt
 
 DRAM Part Name                 ID to assign
 H9JCNNNBK3MLYR-N6E             0 (0000)
diff --git a/src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt b/src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt
index 6f4f2a7177..6f4f2a7177 100644
--- a/src/mainboard/google/brya/variants/ghost4adl/memory/mem_parts_used.txt
+++ b/src/mainboard/google/brya/variants/ghost/memory/mem_parts_used.txt
diff --git a/src/mainboard/google/brya/variants/ghost4adl/overridetree.cb b/src/mainboard/google/brya/variants/ghost/overridetree.cb
index b20593a479..b20593a479 100644
--- a/src/mainboard/google/brya/variants/ghost4adl/overridetree.cb
+++ b/src/mainboard/google/brya/variants/ghost/overridetree.cb