mb/purism/librem_whl: rename to librem_cnl

Since Whiskeylake SoC code is actually a subset of soc/intel/cannonlake,
rename the baseboard so that boards using other 'cannonlake family' SoCs
(e.g., Cometlake) can be added with minimal confusion.

Rename the mainboard dir and baseboard name, and adjust any references
to them.

Change-Id: I2af7977f1622070eb8bf8449bc8306f9d75b9851
Signed-off-by: Matt DeVillier <matt.devillier@puri.sm>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/47050
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Michael Niewöhner <foss@mniewoehner.de>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>

13 files changed, 5 insertions, 5 deletions

diff --git a/src/mainboard/purism/librem_whl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig
index bc25fb5b3b..38be3806d5 100644
--- a/src/mainboard/purism/librem_whl/Kconfig
+++ b/src/mainboard/purism/librem_cnl/Kconfig
@@ -1,4 +1,4 @@
-config BOARD_PURISM_BASEBOARD_LIBREM_WHL
+config BOARD_PURISM_BASEBOARD_LIBREM_CNL
 	def_bool n
 	select BOARD_ROMSIZE_KB_16384
 	select DRIVERS_GENERIC_CBFS_SERIAL
@@ -13,11 +13,11 @@ config BOARD_PURISM_BASEBOARD_LIBREM_WHL
 	select SPD_READ_BY_WORD
 	select USE_LEGACY_8254_TIMER
 
-if BOARD_PURISM_BASEBOARD_LIBREM_WHL
+if BOARD_PURISM_BASEBOARD_LIBREM_CNL
 
 config MAINBOARD_DIR
 	string
-	default "purism/librem_whl"
+	default "purism/librem_cnl"
 
 config MAINBOARD_FAMILY
 	string
diff --git a/src/mainboard/purism/librem_whl/Kconfig.name b/src/mainboard/purism/librem_cnl/Kconfig.name
index 41a4003102..326165ba07 100644
--- a/src/mainboard/purism/librem_whl/Kconfig.name
+++ b/src/mainboard/purism/librem_cnl/Kconfig.name
@@ -1,3 +1,3 @@
 config BOARD_PURISM_LIBREM_MINI
 	bool "Librem Mini"
-	select BOARD_PURISM_BASEBOARD_LIBREM_WHL
+	select BOARD_PURISM_BASEBOARD_LIBREM_CNL
diff --git a/src/mainboard/purism/librem_whl/Makefile.inc b/src/mainboard/purism/librem_cnl/Makefile.inc
index ba157dfd05..ba157dfd05 100644
--- a/src/mainboard/purism/librem_whl/Makefile.inc
+++ b/src/mainboard/purism/librem_cnl/Makefile.inc
diff --git a/src/mainboard/purism/librem_whl/acpi/mainboard.asl b/src/mainboard/purism/librem_cnl/acpi/mainboard.asl
index 0c9a76b168..0c9a76b168 100644
--- a/src/mainboard/purism/librem_whl/acpi/mainboard.asl
+++ b/src/mainboard/purism/librem_cnl/acpi/mainboard.asl
diff --git a/src/mainboard/purism/librem_whl/board_info.txt b/src/mainboard/purism/librem_cnl/board_info.txt
index e72dcdf2b7..ca61edd88d 100644
--- a/src/mainboard/purism/librem_whl/board_info.txt
+++ b/src/mainboard/purism/librem_cnl/board_info.txt
@@ -1,5 +1,5 @@
 Vendor name: Purism
-Board name: librem_whl
+Board name: librem_cnl
 Category: desktop
 Release year: 2020
 ROM package: SOIC-8
diff --git a/src/mainboard/purism/librem_whl/devicetree.cb b/src/mainboard/purism/librem_cnl/devicetree.cb
index 205033230b..205033230b 100644
--- a/src/mainboard/purism/librem_whl/devicetree.cb
+++ b/src/mainboard/purism/librem_cnl/devicetree.cb
diff --git a/src/mainboard/purism/librem_whl/dsdt.asl b/src/mainboard/purism/librem_cnl/dsdt.asl
index 567a8c01d1..567a8c01d1 100644
--- a/src/mainboard/purism/librem_whl/dsdt.asl
+++ b/src/mainboard/purism/librem_cnl/dsdt.asl
diff --git a/src/mainboard/purism/librem_whl/ramstage.c b/src/mainboard/purism/librem_cnl/ramstage.c
index 56ed1b7844..56ed1b7844 100644
--- a/src/mainboard/purism/librem_whl/ramstage.c
+++ b/src/mainboard/purism/librem_cnl/ramstage.c
diff --git a/src/mainboard/purism/librem_whl/romstage.c b/src/mainboard/purism/librem_cnl/romstage.c
index 3a3ca6b491..3a3ca6b491 100644
--- a/src/mainboard/purism/librem_whl/romstage.c
+++ b/src/mainboard/purism/librem_cnl/romstage.c
diff --git a/src/mainboard/purism/librem_whl/variants/librem_mini/data.vbt b/src/mainboard/purism/librem_cnl/variants/librem_mini/data.vbt
index 2e657d1a9f..2e657d1a9f 100644
--- a/src/mainboard/purism/librem_whl/variants/librem_mini/data.vbt
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/data.vbt
diff --git a/src/mainboard/purism/librem_whl/variants/librem_mini/gpio.c b/src/mainboard/purism/librem_cnl/variants/librem_mini/gpio.c
index 254510ead5..254510ead5 100644
--- a/src/mainboard/purism/librem_whl/variants/librem_mini/gpio.c
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/gpio.c
diff --git a/src/mainboard/purism/librem_whl/variants/librem_mini/hda_verb.c b/src/mainboard/purism/librem_cnl/variants/librem_mini/hda_verb.c
index c3daf3c5ed..c3daf3c5ed 100644
--- a/src/mainboard/purism/librem_whl/variants/librem_mini/hda_verb.c
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/hda_verb.c
diff --git a/src/mainboard/purism/librem_whl/variants/librem_mini/include/variant/gpio.h b/src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/gpio.h
index 9094b0419d..9094b0419d 100644
--- a/src/mainboard/purism/librem_whl/variants/librem_mini/include/variant/gpio.h
+++ b/src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/gpio.h