Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80127?usp=email )
Change subject: util/autoport: Update Makefile.inc generation to Makefile.mk
......................................................................
util/autoport: Update Makefile.inc generation to Makefile.mk
Signed-off-by: Martin Roth <gaumless(a)gmail.com>
Change-Id: Ib77cb3a0852092ac414fe0160fe10d6e58fcf660
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80127
Reviewed-by: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Felix Held <felix-coreboot(a)felixheld.de>
---
M util/autoport/main.go
M util/autoport/readme.md
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Felix Singer: Looks good to me, approved
build bot (Jenkins): Verified
Felix Held: Looks good to me, approved
diff --git a/util/autoport/main.go b/util/autoport/main.go
index ed7cb0e..4f5543b 100644
--- a/util/autoport/main.go
+++ b/util/autoport/main.go
@@ -739,7 +739,7 @@
}
if len(BootBlockFiles) > 0 || len(ROMStageFiles) > 0 || len(RAMStageFiles) > 0 || len(SMMFiles) > 0 {
- mf := Create(ctx, "Makefile.inc")
+ mf := Create(ctx, "Makefile.mk")
defer mf.Close()
writeMF(mf, BootBlockFiles, "bootblock")
writeMF(mf, ROMStageFiles, "romstage")
diff --git a/util/autoport/readme.md b/util/autoport/readme.md
index 907d600..b546120 100644
--- a/util/autoport/readme.md
+++ b/util/autoport/readme.md
@@ -238,7 +238,7 @@
Then, move the generated file into your mainboard's directory
and hook it up to the build system by adding the following
-lines to `Makefile.inc`:
+lines to `Makefile.mk`:
cbfs-files-y += spd.bin
spd.bin-file := spd.bin
--
To view, visit https://review.coreboot.org/c/coreboot/+/80127?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ib77cb3a0852092ac414fe0160fe10d6e58fcf660
Gerrit-Change-Number: 80127
Gerrit-PatchSet: 5
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Attention is currently required from: Christian Walter, Felix Held, Martin L Roth, Michał Żygowski, Patrick Rudolph, Piotr Król, Werner Zeh.
Felix Singer has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80125?usp=email )
Change subject: src, util: Clean up makefile.inc in text, help & comments
......................................................................
Patch Set 4: Code-Review+2
(1 comment)
Patchset:
PS4:
> not 100% sure if the whitespace changes in the kconfig patch will change any behavior
I don't think it changes behavior. I ran make ncurses to confirm. Still works.
--
To view, visit https://review.coreboot.org/c/coreboot/+/80125?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ib69236fb5d68272f92405512dc231fa75ecccaa6
Gerrit-Change-Number: 80125
Gerrit-PatchSet: 4
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Attention: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Attention: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Comment-Date: Fri, 26 Jan 2024 13:07:18 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-MessageType: comment
Attention is currently required from: Christian Walter, Felix Held, Jincheng Li, Johnny Lin, Nico Huber, Patrick Rudolph, Shuo Liu, Tim Chu.
Hello Christian Walter, Felix Held, Jincheng Li, Johnny Lin, Nico Huber, Patrick Rudolph, Shuo Liu, Tim Chu, build bot (Jenkins),
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/80210?usp=email
to look at the new patch set (#3).
The following approvals got outdated and were removed:
Code-Review+1 by Shuo Liu, Verified+1 by build bot (Jenkins)
Change subject: device: Add a helper function to add a downstream bus
......................................................................
device: Add a helper function to add a downstream bus
Adding downstream busses at runtime is a common pattern so add a helper
function.
Signed-off-by: Arthur Heymans <arthur(a)aheymans.xyz>
Change-Id: Ic898189b92997b93304fcbf47c73e2bb5ec09023
---
M src/device/device.c
M src/include/device/device.h
M src/soc/intel/xeon_sp/chip_common.c
M src/soc/intel/xeon_sp/spr/ioat.c
4 files changed, 40 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/80210/3
--
To view, visit https://review.coreboot.org/c/coreboot/+/80210?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ic898189b92997b93304fcbf47c73e2bb5ec09023
Gerrit-Change-Number: 80210
Gerrit-PatchSet: 3
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Jincheng Li <jincheng.li(a)intel.com>
Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Shuo Liu <shuo.liu(a)intel.com>
Gerrit-Reviewer: Tim Chu <Tim.Chu(a)quantatw.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Lean Sheng Tan <sheng.tan(a)9elements.com>
Gerrit-Attention: Nico Huber <nico.h(a)gmx.de>
Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Attention: Johnny Lin <Johnny_Lin(a)wiwynn.com>
Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Shuo Liu <shuo.liu(a)intel.com>
Gerrit-Attention: Jincheng Li <jincheng.li(a)intel.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Attention: Tim Chu <Tim.Chu(a)quantatw.com>
Gerrit-MessageType: newpatchset
Attention is currently required from: Christian Walter, Felix Held, Jincheng Li, Johnny Lin, Nico Huber, Patrick Rudolph, Tim Chu.
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80210?usp=email )
Change subject: device: Add a helper function to add a downstream bus
......................................................................
Patch Set 2:
(2 comments)
File src/device/device.c:
https://review.coreboot.org/c/coreboot/+/80210/comment/23b4b00a_0f67d655 :
PS2, Line 131: * Allocate a new bus structure.
> i'd say something like "Allocate a new downstream bus structure below a device and attach it to the […]
Done
https://review.coreboot.org/c/coreboot/+/80210/comment/784f9cc2_0aca4599 :
PS2, Line 135: Parent bus the newly created device should be attached to.
> Parent device the to be created bus should be attached to.
Done
--
To view, visit https://review.coreboot.org/c/coreboot/+/80210?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ic898189b92997b93304fcbf47c73e2bb5ec09023
Gerrit-Change-Number: 80210
Gerrit-PatchSet: 2
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Jincheng Li <jincheng.li(a)intel.com>
Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Shuo Liu <shuo.liu(a)intel.com>
Gerrit-Reviewer: Tim Chu <Tim.Chu(a)quantatw.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Lean Sheng Tan <sheng.tan(a)9elements.com>
Gerrit-Attention: Nico Huber <nico.h(a)gmx.de>
Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Attention: Johnny Lin <Johnny_Lin(a)wiwynn.com>
Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Jincheng Li <jincheng.li(a)intel.com>
Gerrit-Attention: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Attention: Tim Chu <Tim.Chu(a)quantatw.com>
Gerrit-Comment-Date: Fri, 26 Jan 2024 12:54:31 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-MessageType: comment
Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80124?usp=email )
Change subject: util/mb: Update variant template Makefiles from .inc to .mk
......................................................................
util/mb: Update variant template 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 <gaumless(a)gmail.com>
Change-Id: I2a6a4d1eb7e0d0cd32c8690caf3eff340cdb0d8c
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80124
Reviewed-by: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Felix Held <felix-coreboot(a)felixheld.de>
---
R util/mainboard/google/brya0/template/memory/Makefile.mk
R util/mainboard/google/dalboz/template/Makefile.mk
R util/mainboard/google/dalboz/template/spd/Makefile.mk
R util/mainboard/google/guybrush/template/Makefile.mk
R util/mainboard/google/guybrush/template/memory/Makefile.mk
R util/mainboard/google/hatch/template/Makefile.mk
R util/mainboard/google/nissa/template/memory/Makefile.mk
R util/mainboard/google/puff/template/Makefile.mk
R util/mainboard/google/rex0/template/Makefile.mk
R util/mainboard/google/rex0/template/memory/Makefile.mk
R util/mainboard/google/trembyle/template/Makefile.mk
R util/mainboard/google/trembyle/template/spd/Makefile.mk
R util/mainboard/google/volteer/template/memory/Makefile.mk
R util/mainboard/google/waddledee/template/memory/Makefile.mk
R util/mainboard/google/waddledoo/template/memory/Makefile.mk
15 files changed, 0 insertions(+), 0 deletions(-)
Approvals:
Felix Singer: Looks good to me, approved
build bot (Jenkins): Verified
Felix Held: Looks good to me, approved
diff --git a/util/mainboard/google/brya0/template/memory/Makefile.inc b/util/mainboard/google/brya0/template/memory/Makefile.mk
similarity index 100%
rename from util/mainboard/google/brya0/template/memory/Makefile.inc
rename to util/mainboard/google/brya0/template/memory/Makefile.mk
diff --git a/util/mainboard/google/dalboz/template/Makefile.inc b/util/mainboard/google/dalboz/template/Makefile.mk
similarity index 100%
rename from util/mainboard/google/dalboz/template/Makefile.inc
rename to util/mainboard/google/dalboz/template/Makefile.mk
diff --git a/util/mainboard/google/dalboz/template/spd/Makefile.inc b/util/mainboard/google/dalboz/template/spd/Makefile.mk
similarity index 100%
rename from util/mainboard/google/dalboz/template/spd/Makefile.inc
rename to util/mainboard/google/dalboz/template/spd/Makefile.mk
diff --git a/util/mainboard/google/guybrush/template/Makefile.inc b/util/mainboard/google/guybrush/template/Makefile.mk
similarity index 100%
rename from util/mainboard/google/guybrush/template/Makefile.inc
rename to util/mainboard/google/guybrush/template/Makefile.mk
diff --git a/util/mainboard/google/guybrush/template/memory/Makefile.inc b/util/mainboard/google/guybrush/template/memory/Makefile.mk
similarity index 100%
rename from util/mainboard/google/guybrush/template/memory/Makefile.inc
rename to util/mainboard/google/guybrush/template/memory/Makefile.mk
diff --git a/util/mainboard/google/hatch/template/Makefile.inc b/util/mainboard/google/hatch/template/Makefile.mk
similarity index 100%
rename from util/mainboard/google/hatch/template/Makefile.inc
rename to util/mainboard/google/hatch/template/Makefile.mk
diff --git a/util/mainboard/google/nissa/template/memory/Makefile.inc b/util/mainboard/google/nissa/template/memory/Makefile.mk
similarity index 100%
rename from util/mainboard/google/nissa/template/memory/Makefile.inc
rename to util/mainboard/google/nissa/template/memory/Makefile.mk
diff --git a/util/mainboard/google/puff/template/Makefile.inc b/util/mainboard/google/puff/template/Makefile.mk
similarity index 100%
rename from util/mainboard/google/puff/template/Makefile.inc
rename to util/mainboard/google/puff/template/Makefile.mk
diff --git a/util/mainboard/google/rex0/template/Makefile.inc b/util/mainboard/google/rex0/template/Makefile.mk
similarity index 100%
rename from util/mainboard/google/rex0/template/Makefile.inc
rename to util/mainboard/google/rex0/template/Makefile.mk
diff --git a/util/mainboard/google/rex0/template/memory/Makefile.inc b/util/mainboard/google/rex0/template/memory/Makefile.mk
similarity index 100%
rename from util/mainboard/google/rex0/template/memory/Makefile.inc
rename to util/mainboard/google/rex0/template/memory/Makefile.mk
diff --git a/util/mainboard/google/trembyle/template/Makefile.inc b/util/mainboard/google/trembyle/template/Makefile.mk
similarity index 100%
rename from util/mainboard/google/trembyle/template/Makefile.inc
rename to util/mainboard/google/trembyle/template/Makefile.mk
diff --git a/util/mainboard/google/trembyle/template/spd/Makefile.inc b/util/mainboard/google/trembyle/template/spd/Makefile.mk
similarity index 100%
rename from util/mainboard/google/trembyle/template/spd/Makefile.inc
rename to util/mainboard/google/trembyle/template/spd/Makefile.mk
diff --git a/util/mainboard/google/volteer/template/memory/Makefile.inc b/util/mainboard/google/volteer/template/memory/Makefile.mk
similarity index 100%
rename from util/mainboard/google/volteer/template/memory/Makefile.inc
rename to util/mainboard/google/volteer/template/memory/Makefile.mk
diff --git a/util/mainboard/google/waddledee/template/memory/Makefile.inc b/util/mainboard/google/waddledee/template/memory/Makefile.mk
similarity index 100%
rename from util/mainboard/google/waddledee/template/memory/Makefile.inc
rename to util/mainboard/google/waddledee/template/memory/Makefile.mk
diff --git a/util/mainboard/google/waddledoo/template/memory/Makefile.inc b/util/mainboard/google/waddledoo/template/memory/Makefile.mk
similarity index 100%
rename from util/mainboard/google/waddledoo/template/memory/Makefile.inc
rename to util/mainboard/google/waddledoo/template/memory/Makefile.mk
--
To view, visit https://review.coreboot.org/c/coreboot/+/80124?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I2a6a4d1eb7e0d0cd32c8690caf3eff340cdb0d8c
Gerrit-Change-Number: 80124
Gerrit-PatchSet: 5
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80123?usp=email )
Change subject: util: Rename Makefiles from .inc to .mk
......................................................................
util: 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 <gaumless(a)gmail.com>
Change-Id: I434940ebb46853980596f7ad55d27a62c90280fa
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80123
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Reviewed-by: Felix Held <felix-coreboot(a)felixheld.de>
---
M Makefile.mk
R util/amdfwtool/Makefile.mk
R util/bincfg/Makefile.mk
M util/cbfstool/Makefile
R util/cbfstool/Makefile.mk
R util/cbfstool/bpdt_formats/Makefile.mk
R util/cbfstool/fpt_formats/Makefile.mk
R util/crossgcc/Makefile.mk
M util/futility/Makefile
R util/futility/Makefile.mk
M util/ifdtool/Makefile
R util/ifdtool/Makefile.mk
R util/marvell/Makefile.mk
R util/marvell/doimage_mv/Makefile.mk
R util/nvidia/Makefile.mk
R util/nvramtool/Makefile.mk
R util/qemu/Makefile.mk
R util/sconfig/Makefile.mk
R util/supermicro/Makefile.mk
19 files changed, 8 insertions(+), 8 deletions(-)
Approvals:
build bot (Jenkins): Verified
Felix Held: Looks good to me, approved
Felix Singer: Looks good to me, approved
diff --git a/Makefile.mk b/Makefile.mk
index 87c6bcb..f7b98c7 100644
--- a/Makefile.mk
+++ b/Makefile.mk
@@ -768,7 +768,7 @@
install-git-commit-clangfmt:
cp util/scripts/prepare-commit-msg.clang-format .git/hooks/prepare-commit-msg
-include util/crossgcc/Makefile.inc
+include util/crossgcc/Makefile.mk
.PHONY: tools
tools: $(objutil)/kconfig/conf $(objutil)/kconfig/toada $(CBFSTOOL) $(objutil)/cbfstool/cbfs-compression-tool $(FMAPTOOL) $(RMODTOOL) $(IFWITOOL) $(objutil)/nvramtool/nvramtool $(objutil)/sconfig/sconfig $(IFDTOOL) $(CBOOTIMAGE) $(AMDFWTOOL) $(AMDCOMPRESS) $(FUTILITY) $(BINCFG) $(IFITTOOL) $(objutil)/supermicro/smcbiosinfo $(CSE_FPT) $(CSE_SERGER) $(AMDFWREAD)
diff --git a/util/amdfwtool/Makefile.inc b/util/amdfwtool/Makefile.mk
similarity index 100%
rename from util/amdfwtool/Makefile.inc
rename to util/amdfwtool/Makefile.mk
diff --git a/util/bincfg/Makefile.inc b/util/bincfg/Makefile.mk
similarity index 100%
rename from util/bincfg/Makefile.inc
rename to util/bincfg/Makefile.mk
diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile
index 034aca2..8dde77b 100644
--- a/util/cbfstool/Makefile
+++ b/util/cbfstool/Makefile
@@ -91,7 +91,7 @@
.SILENT:
endif
-include Makefile.inc
+include Makefile.mk
$(objutil)/cbfstool/cbfstool.o: $(VBOOT_SOURCE)/firmware/include/vb2_sha.h
$(objutil)/cbfstool/elogtool.o: $(VBOOT_SOURCE)/firmware/include/vb2_sha.h
diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.mk
similarity index 98%
rename from util/cbfstool/Makefile.inc
rename to util/cbfstool/Makefile.mk
index 80aab67..8577874 100644
--- a/util/cbfstool/Makefile.inc
+++ b/util/cbfstool/Makefile.mk
@@ -98,14 +98,14 @@
elogobj += common.o
elogobj += flashrom.o
-include $(top)/util/cbfstool/fpt_formats/Makefile.inc
+include $(top)/util/cbfstool/fpt_formats/Makefile.mk
cse_fpt_obj :=
cse_fpt_obj += cse_fpt.o
cse_fpt_obj += common.o
cse_fpt_obj += cse_helpers.o
cse_fpt_obj += $(foreach var, $(fpt_formats_obj), $(var))
-include $(top)/util/cbfstool/bpdt_formats/Makefile.inc
+include $(top)/util/cbfstool/bpdt_formats/Makefile.mk
cse_serger_obj :=
cse_serger_obj += cse_serger.o
cse_serger_obj += common.o
diff --git a/util/cbfstool/bpdt_formats/Makefile.inc b/util/cbfstool/bpdt_formats/Makefile.mk
similarity index 100%
rename from util/cbfstool/bpdt_formats/Makefile.inc
rename to util/cbfstool/bpdt_formats/Makefile.mk
diff --git a/util/cbfstool/fpt_formats/Makefile.inc b/util/cbfstool/fpt_formats/Makefile.mk
similarity index 100%
rename from util/cbfstool/fpt_formats/Makefile.inc
rename to util/cbfstool/fpt_formats/Makefile.mk
diff --git a/util/crossgcc/Makefile.inc b/util/crossgcc/Makefile.mk
similarity index 100%
rename from util/crossgcc/Makefile.inc
rename to util/crossgcc/Makefile.mk
diff --git a/util/futility/Makefile b/util/futility/Makefile
index 6901948..14d5f82 100644
--- a/util/futility/Makefile
+++ b/util/futility/Makefile
@@ -23,4 +23,4 @@
endif
endif
-include Makefile.inc
+include Makefile.mk
diff --git a/util/futility/Makefile.inc b/util/futility/Makefile.mk
similarity index 100%
rename from util/futility/Makefile.inc
rename to util/futility/Makefile.mk
diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile
index c021069..72a4dab 100644
--- a/util/ifdtool/Makefile
+++ b/util/ifdtool/Makefile
@@ -10,7 +10,7 @@
HOSTCFLAGS ?= $(CFLAGS)
top := ../..
objutil := ..
-include Makefile.inc
+include Makefile.mk
PROGRAM=$(objutil)/ifdtool/ifdtool
diff --git a/util/ifdtool/Makefile.inc b/util/ifdtool/Makefile.mk
similarity index 100%
rename from util/ifdtool/Makefile.inc
rename to util/ifdtool/Makefile.mk
diff --git a/util/marvell/Makefile.inc b/util/marvell/Makefile.mk
similarity index 100%
rename from util/marvell/Makefile.inc
rename to util/marvell/Makefile.mk
diff --git a/util/marvell/doimage_mv/Makefile.inc b/util/marvell/doimage_mv/Makefile.mk
similarity index 100%
rename from util/marvell/doimage_mv/Makefile.inc
rename to util/marvell/doimage_mv/Makefile.mk
diff --git a/util/nvidia/Makefile.inc b/util/nvidia/Makefile.mk
similarity index 100%
rename from util/nvidia/Makefile.inc
rename to util/nvidia/Makefile.mk
diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.mk
similarity index 100%
rename from util/nvramtool/Makefile.inc
rename to util/nvramtool/Makefile.mk
diff --git a/util/qemu/Makefile.inc b/util/qemu/Makefile.mk
similarity index 93%
rename from util/qemu/Makefile.inc
rename to util/qemu/Makefile.mk
index e1181ad..077fde7 100644
--- a/util/qemu/Makefile.inc
+++ b/util/qemu/Makefile.mk
@@ -2,10 +2,10 @@
# This automatically adds a `qemu` make target if a compatible
# configuration is selected. There are some notable variables
-# that can be set or adapted in `Makefile.inc` files, the make
+# that can be set or adapted in `Makefile.mk` files, the make
# command line or the environment:
#
-# Primarily for `Makefile.inc` use:
+# Primarily for `Makefile.mk` use:
# QEMU-y the QEMU executable
# QEMU_CFG-y a QEMU config that sets the available default devices,
# used to run more comprehensive tests by default,
diff --git a/util/sconfig/Makefile.inc b/util/sconfig/Makefile.mk
similarity index 100%
rename from util/sconfig/Makefile.inc
rename to util/sconfig/Makefile.mk
diff --git a/util/supermicro/Makefile.inc b/util/supermicro/Makefile.mk
similarity index 100%
rename from util/supermicro/Makefile.inc
rename to util/supermicro/Makefile.mk
--
To view, visit https://review.coreboot.org/c/coreboot/+/80123?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I434940ebb46853980596f7ad55d27a62c90280fa
Gerrit-Change-Number: 80123
Gerrit-PatchSet: 5
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org>
Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80122?usp=email )
Change subject: tests: Rename Makefiles from .inc to .mk
......................................................................
tests: 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 <gaumless(a)gmail.com>
Change-Id: Id09eafd293a54198aab87281f529749325df8b07
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80122
Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org>
Reviewed-by: Felix Held <felix-coreboot(a)felixheld.de>
Reviewed-by: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
---
M tests/Makefile.common
M tests/Makefile.mk
R tests/acpi/Makefile.mk
R tests/commonlib/Makefile.mk
R tests/commonlib/bsd/Makefile.mk
R tests/console/Makefile.mk
R tests/device/Makefile.mk
R tests/drivers/Makefile.mk
R tests/lib/Makefile.mk
9 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
build bot (Jenkins): Verified
Felix Held: Looks good to me, approved
Felix Singer: Looks good to me, approved
diff --git a/tests/Makefile.common b/tests/Makefile.common
index e51d253..5cb7b25 100644
--- a/tests/Makefile.common
+++ b/tests/Makefile.common
@@ -42,7 +42,7 @@
TEST_INCLUDES += -I$(dir $(TEST_KCONFIG_AUTOHEADER))
# Note: This is intentionally just a subset of the warnings in the toplevel
-# Makefile.inc. We don't need to be as strict with test code, and things like
+# Makefile.mk. We don't need to be as strict with test code, and things like
# -Wmissing-prototypes just make working with the test framework cumbersome.
# Only put conservative warnings here that really detect code that's obviously
# unintentional.
@@ -95,7 +95,7 @@
$(1)-config-file := $(testobj)/$(1)/config.h
$$($(1)-config-file): $(TEST_KCONFIG_AUTOHEADER)
mkdir -p $$(dir $$@)
- printf '// File generated by tests/Makefile.inc\n// Do not change\n' > $$@
+ printf '// File generated by tests/Makefile.mk\n// Do not change\n' > $$@
printf '#include <%s>\n\n' "$(notdir $(TEST_KCONFIG_AUTOHEADER))" >> $$@
for kv in $$($(1)-config); do \
key="`echo $$$$kv | cut -d '=' -f -1`"; \
diff --git a/tests/Makefile.mk b/tests/Makefile.mk
index 584b4c0..f838f83 100644
--- a/tests/Makefile.mk
+++ b/tests/Makefile.mk
@@ -44,7 +44,7 @@
$(eval $(1)$(2)-stage := $(if $($(1)$(2)-stage),$($(1)$(2)-stage),ramstage))
$(if $(findstring $($(1)$(2)-stage), $(stages)),,
$(error Wrong $(1)$(2)-stage value $($(1)$(2)-stage). \
- Check your $(dir $(1)$(2))Makefile.inc))
+ Check your $(dir $(1)$(2))Makefile.mk))
endef
$(call add-special-class, tests)
diff --git a/tests/acpi/Makefile.inc b/tests/acpi/Makefile.mk
similarity index 100%
rename from tests/acpi/Makefile.inc
rename to tests/acpi/Makefile.mk
diff --git a/tests/commonlib/Makefile.inc b/tests/commonlib/Makefile.mk
similarity index 100%
rename from tests/commonlib/Makefile.inc
rename to tests/commonlib/Makefile.mk
diff --git a/tests/commonlib/bsd/Makefile.inc b/tests/commonlib/bsd/Makefile.mk
similarity index 100%
rename from tests/commonlib/bsd/Makefile.inc
rename to tests/commonlib/bsd/Makefile.mk
diff --git a/tests/console/Makefile.inc b/tests/console/Makefile.mk
similarity index 100%
rename from tests/console/Makefile.inc
rename to tests/console/Makefile.mk
diff --git a/tests/device/Makefile.inc b/tests/device/Makefile.mk
similarity index 100%
rename from tests/device/Makefile.inc
rename to tests/device/Makefile.mk
diff --git a/tests/drivers/Makefile.inc b/tests/drivers/Makefile.mk
similarity index 100%
rename from tests/drivers/Makefile.inc
rename to tests/drivers/Makefile.mk
diff --git a/tests/lib/Makefile.inc b/tests/lib/Makefile.mk
similarity index 100%
rename from tests/lib/Makefile.inc
rename to tests/lib/Makefile.mk
--
To view, visit https://review.coreboot.org/c/coreboot/+/80122?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Id09eafd293a54198aab87281f529749325df8b07
Gerrit-Change-Number: 80122
Gerrit-PatchSet: 5
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Jakub Czapiga <czapiga(a)google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-MessageType: merged
Attention is currently required from: Arthur Heymans, Christian Walter, Jincheng Li, Johnny Lin, Nico Huber, Patrick Rudolph, Tim Chu.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80210?usp=email )
Change subject: device: Add a helper function to add a downstream bus
......................................................................
Patch Set 2:
(2 comments)
File src/device/device.c:
https://review.coreboot.org/c/coreboot/+/80210/comment/5ad37e0a_a0af1ad8 :
PS2, Line 131: * Allocate a new bus structure.
i'd say something like "Allocate a new downstream bus structure below a device and attach it to the device tree if the device doesn't already have a downstream bus." since the current comment doesn't match what the code does and this and the next line have partially duplicate info
https://review.coreboot.org/c/coreboot/+/80210/comment/f0577b18_e4558600 :
PS2, Line 135: Parent bus the newly created device should be attached to.
Parent device the to be created bus should be attached to.
--
To view, visit https://review.coreboot.org/c/coreboot/+/80210?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ic898189b92997b93304fcbf47c73e2bb5ec09023
Gerrit-Change-Number: 80210
Gerrit-PatchSet: 2
Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Jincheng Li <jincheng.li(a)intel.com>
Gerrit-Reviewer: Johnny Lin <Johnny_Lin(a)wiwynn.com>
Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Shuo Liu <shuo.liu(a)intel.com>
Gerrit-Reviewer: Tim Chu <Tim.Chu(a)quantatw.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-CC: Lean Sheng Tan <sheng.tan(a)9elements.com>
Gerrit-Attention: Nico Huber <nico.h(a)gmx.de>
Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Attention: Johnny Lin <Johnny_Lin(a)wiwynn.com>
Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Jincheng Li <jincheng.li(a)intel.com>
Gerrit-Attention: Arthur Heymans <arthur(a)aheymans.xyz>
Gerrit-Attention: Tim Chu <Tim.Chu(a)quantatw.com>
Gerrit-Comment-Date: Fri, 26 Jan 2024 12:34:17 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: Christian Walter, Felix Singer, Martin L Roth, Michał Żygowski, Patrick Rudolph, Piotr Król, Werner Zeh.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80125?usp=email )
Change subject: src, util: Clean up makefile.inc in text, help & comments
......................................................................
Patch Set 4: Code-Review+1
(1 comment)
Patchset:
PS4:
not 100% sure if the whitespace changes in the kconfig patch will change any behavior
--
To view, visit https://review.coreboot.org/c/coreboot/+/80125?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: Ib69236fb5d68272f92405512dc231fa75ecccaa6
Gerrit-Change-Number: 80125
Gerrit-PatchSet: 4
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Reviewer: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Reviewer: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Attention: Michał Żygowski <michal.zygowski(a)3mdeb.com>
Gerrit-Attention: Patrick Rudolph <patrick.rudolph(a)9elements.com>
Gerrit-Attention: Christian Walter <christian.walter(a)9elements.com>
Gerrit-Attention: Werner Zeh <werner.zeh(a)siemens.com>
Gerrit-Attention: Piotr Król <piotr.krol(a)3mdeb.com>
Gerrit-Comment-Date: Fri, 26 Jan 2024 12:03:25 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: Felix Singer, Martin L Roth.
Felix Held has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/80124?usp=email )
Change subject: util/mb: Update variant template Makefiles from .inc to .mk
......................................................................
Patch Set 4: Code-Review+2
--
To view, visit https://review.coreboot.org/c/coreboot/+/80124?usp=email
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings
Gerrit-Project: coreboot
Gerrit-Branch: main
Gerrit-Change-Id: I2a6a4d1eb7e0d0cd32c8690caf3eff340cdb0d8c
Gerrit-Change-Number: 80124
Gerrit-PatchSet: 4
Gerrit-Owner: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Reviewer: Felix Held <felix-coreboot(a)felixheld.de>
Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>
Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>
Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com>
Gerrit-Comment-Date: Fri, 26 Jan 2024 12:01:20 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment