Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
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 --- R src/mainboard/purism/librem_cnl/Kconfig A src/mainboard/purism/librem_cnl/Kconfig.name R src/mainboard/purism/librem_cnl/Makefile.inc R src/mainboard/purism/librem_cnl/acpi/mainboard.asl R src/mainboard/purism/librem_cnl/board_info.txt R src/mainboard/purism/librem_cnl/devicetree.cb R src/mainboard/purism/librem_cnl/dsdt.asl R src/mainboard/purism/librem_cnl/ramstage.c R src/mainboard/purism/librem_cnl/romstage.c R src/mainboard/purism/librem_cnl/variants/librem_mini/data.vbt R src/mainboard/purism/librem_cnl/variants/librem_mini/gpio.c R src/mainboard/purism/librem_cnl/variants/librem_mini/hda_verb.c R src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/gpio.h D src/mainboard/purism/librem_whl/Kconfig.name 14 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/50/47050/1
diff --git a/src/mainboard/purism/librem_whl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig similarity index 90% rename from src/mainboard/purism/librem_whl/Kconfig rename to src/mainboard/purism/librem_cnl/Kconfig index bc25fb5..38be380 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 @@ 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_cnl/Kconfig.name b/src/mainboard/purism/librem_cnl/Kconfig.name new file mode 100644 index 0000000..326165ba --- /dev/null +++ b/src/mainboard/purism/librem_cnl/Kconfig.name @@ -0,0 +1,3 @@ +config BOARD_PURISM_LIBREM_MINI + bool "Librem Mini" + select BOARD_PURISM_BASEBOARD_LIBREM_CNL diff --git a/src/mainboard/purism/librem_whl/Makefile.inc b/src/mainboard/purism/librem_cnl/Makefile.inc similarity index 100% rename from src/mainboard/purism/librem_whl/Makefile.inc rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/acpi/mainboard.asl rename to 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 similarity index 84% rename from src/mainboard/purism/librem_whl/board_info.txt rename to src/mainboard/purism/librem_cnl/board_info.txt index e72dcdf2..ca61edd 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 similarity index 100% rename from src/mainboard/purism/librem_whl/devicetree.cb rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/dsdt.asl rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/ramstage.c rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/romstage.c rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/variants/librem_mini/data.vbt rename to src/mainboard/purism/librem_cnl/variants/librem_mini/data.vbt Binary files differ diff --git a/src/mainboard/purism/librem_whl/variants/librem_mini/gpio.c b/src/mainboard/purism/librem_cnl/variants/librem_mini/gpio.c similarity index 100% rename from src/mainboard/purism/librem_whl/variants/librem_mini/gpio.c rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/variants/librem_mini/hda_verb.c rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/variants/librem_mini/include/variant/gpio.h rename to src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/gpio.h diff --git a/src/mainboard/purism/librem_whl/Kconfig.name b/src/mainboard/purism/librem_whl/Kconfig.name deleted file mode 100644 index 41a4003..0000000 --- a/src/mainboard/purism/librem_whl/Kconfig.name +++ /dev/null @@ -1,3 +0,0 @@ -config BOARD_PURISM_LIBREM_MINI - bool "Librem Mini" - select BOARD_PURISM_BASEBOARD_LIBREM_WHL
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
Patch Set 1: Code-Review+2
Michael Niewöhner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
Patch Set 1: Code-Review+2
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
Patch Set 1: Code-Review+1
Just wanted to mention that what holds soc/intel/cannonlake/ together is actually the PCH cannonpoint/cnp.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
Patch Set 1: Code-Review+1
Patch Set 1: Code-Review+1
Just wanted to mention that what holds soc/intel/cannonlake/ together is actually the PCH cannonpoint/cnp.
Hrm, good point. I feel we might as well name this `librem_cfl` since CNL isn't really a thing
Matt DeVillier has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
Patch Set 1:
Patch Set 1: Code-Review+1
Patch Set 1: Code-Review+1
Just wanted to mention that what holds soc/intel/cannonlake/ together is actually the PCH cannonpoint/cnp.
Hrm, good point. I feel we might as well name this `librem_cfl` since CNL isn't really a thing
why would I rename to Coffeelake when none of the boards select that SoC? _cnp would be the most logical suffix given the common PCH, but I can't see _cnl vs _cnp being meaningful in any way
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
Patch Set 1:
Just wanted to mention that what holds soc/intel/cannonlake/ together is actually the PCH cannonpoint/cnp.
Hrm, good point. I feel we might as well name this `librem_cfl` since CNL isn't really a thing
why would I rename to Coffeelake when none of the boards select that SoC? _cnp would be the most logical suffix given the common PCH, but I can't see _cnl vs _cnp being meaningful in any way
I agree, `cfl` would be most odd. `cnp` would reflect what's actually on the boards, but `cnl` seems also fine.
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
Patch Set 1:
Patch Set 1:
Just wanted to mention that what holds soc/intel/cannonlake/ together is actually the PCH cannonpoint/cnp.
Hrm, good point. I feel we might as well name this `librem_cfl` since CNL isn't really a thing
why would I rename to Coffeelake when none of the boards select that SoC? _cnp would be the most logical suffix given the common PCH, but I can't see _cnl vs _cnp being meaningful in any way
I agree, `cfl` would be most odd. `cnp` would reflect what's actually on the boards, but `cnl` seems also fine.
Ah yes, I was thinking ahead of reality. I've thought of dropping CNL support and renaming the SoC folder to coffeelake instead, which would be more accurate.
Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
Patch Set 1:
Just wanted to mention that what holds soc/intel/cannonlake/ together is actually the PCH cannonpoint/cnp.
Hrm, good point. I feel we might as well name this `librem_cfl` since CNL isn't really a thing
why would I rename to Coffeelake when none of the boards select that SoC? _cnp would be the most logical suffix given the common PCH, but I can't see _cnl vs _cnp being meaningful in any way
I agree, `cfl` would be most odd. `cnp` would reflect what's actually on the boards, but `cnl` seems also fine.
Ah yes, I was thinking ahead of reality. I've thought of dropping CNL support and renaming the SoC folder to coffeelake instead, which would be more accurate.
But then it would be renamed to cannonpoint :-P
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
Patch Set 1: Code-Review+2
Patch Set 1:
Just wanted to mention that what holds soc/intel/cannonlake/ together is actually the PCH cannonpoint/cnp.
Hrm, good point. I feel we might as well name this `librem_cfl` since CNL isn't really a thing
why would I rename to Coffeelake when none of the boards select that SoC? _cnp would be the most logical suffix given the common PCH, but I can't see _cnl vs _cnp being meaningful in any way
I agree, `cfl` would be most odd. `cnp` would reflect what's actually on the boards, but `cnl` seems also fine.
Ah yes, I was thinking ahead of reality. I've thought of dropping CNL support and renaming the SoC folder to coffeelake instead, which would be more accurate.
But then it would be renamed to cannonpoint :-P
Hrm. Maybe.
Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/47050 )
Change subject: mb/purism/librem_whl: rename to librem_cnl ......................................................................
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 --- R src/mainboard/purism/librem_cnl/Kconfig A src/mainboard/purism/librem_cnl/Kconfig.name R src/mainboard/purism/librem_cnl/Makefile.inc R src/mainboard/purism/librem_cnl/acpi/mainboard.asl R src/mainboard/purism/librem_cnl/board_info.txt R src/mainboard/purism/librem_cnl/devicetree.cb R src/mainboard/purism/librem_cnl/dsdt.asl R src/mainboard/purism/librem_cnl/ramstage.c R src/mainboard/purism/librem_cnl/romstage.c R src/mainboard/purism/librem_cnl/variants/librem_mini/data.vbt R src/mainboard/purism/librem_cnl/variants/librem_mini/gpio.c R src/mainboard/purism/librem_cnl/variants/librem_mini/hda_verb.c R src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/gpio.h D src/mainboard/purism/librem_whl/Kconfig.name 14 files changed, 7 insertions(+), 7 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved Michael Niewöhner: Looks good to me, approved
diff --git a/src/mainboard/purism/librem_whl/Kconfig b/src/mainboard/purism/librem_cnl/Kconfig similarity index 90% rename from src/mainboard/purism/librem_whl/Kconfig rename to src/mainboard/purism/librem_cnl/Kconfig index bc25fb5..38be380 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 @@ 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_cnl/Kconfig.name b/src/mainboard/purism/librem_cnl/Kconfig.name new file mode 100644 index 0000000..326165ba --- /dev/null +++ b/src/mainboard/purism/librem_cnl/Kconfig.name @@ -0,0 +1,3 @@ +config BOARD_PURISM_LIBREM_MINI + bool "Librem Mini" + select BOARD_PURISM_BASEBOARD_LIBREM_CNL diff --git a/src/mainboard/purism/librem_whl/Makefile.inc b/src/mainboard/purism/librem_cnl/Makefile.inc similarity index 100% rename from src/mainboard/purism/librem_whl/Makefile.inc rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/acpi/mainboard.asl rename to 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 similarity index 84% rename from src/mainboard/purism/librem_whl/board_info.txt rename to src/mainboard/purism/librem_cnl/board_info.txt index e72dcdf2..ca61edd 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 similarity index 100% rename from src/mainboard/purism/librem_whl/devicetree.cb rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/dsdt.asl rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/ramstage.c rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/romstage.c rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/variants/librem_mini/data.vbt rename to src/mainboard/purism/librem_cnl/variants/librem_mini/data.vbt Binary files differ diff --git a/src/mainboard/purism/librem_whl/variants/librem_mini/gpio.c b/src/mainboard/purism/librem_cnl/variants/librem_mini/gpio.c similarity index 100% rename from src/mainboard/purism/librem_whl/variants/librem_mini/gpio.c rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/variants/librem_mini/hda_verb.c rename to 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 similarity index 100% rename from src/mainboard/purism/librem_whl/variants/librem_mini/include/variant/gpio.h rename to src/mainboard/purism/librem_cnl/variants/librem_mini/include/variant/gpio.h diff --git a/src/mainboard/purism/librem_whl/Kconfig.name b/src/mainboard/purism/librem_whl/Kconfig.name deleted file mode 100644 index 41a4003..0000000 --- a/src/mainboard/purism/librem_whl/Kconfig.name +++ /dev/null @@ -1,3 +0,0 @@ -config BOARD_PURISM_LIBREM_MINI - bool "Librem Mini" - select BOARD_PURISM_BASEBOARD_LIBREM_WHL
-
Angel Pons (Code Review) -
Matt DeVillier (Code Review)
-
Michael Niewöhner (Code Review)
-
Nico Huber (Code Review)