coreboot-gerrit December 2024

coreboot-gerrit@coreboot.org

1 participants
3018 discussions

[S] Change in coreboot[main]: ec/google/chromeec: Add indexed IO support
by Subrata Banik (Code Review) 23 Dec '24

23 Dec '24

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85449?usp=email ) Change subject: ec/google/chromeec: Add indexed IO support ...................................................................... ec/google/chromeec: Add indexed IO support Add support for indexed IO for ec communication, Indexed I/O allows memory access using a single I/O port base address usually called an index register and another port address called a data register. BUG=b:379224648 TEST= able to build nissa/trulo. Change-Id: I6c1aab3fc914eb5af2736a8ea3adf447040905e0 Signed-off-by: Jayvik Desai <jayvik(a)google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85449 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Caveh Jalali <caveh(a)chromium.org> Reviewed-by: Subrata Banik <subratabanik(a)google.com> --- M src/ec/google/chromeec/Kconfig M src/ec/google/chromeec/ec_lpc.c 2 files changed, 41 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Caveh Jalali: Looks good to me, approved Subrata Banik: Looks good to me, approved diff --git a/src/ec/google/chromeec/Kconfig b/src/ec/google/chromeec/Kconfig index eae1fc6..cf3dc9f 100644 --- a/src/ec/google/chromeec/Kconfig +++ b/src/ec/google/chromeec/Kconfig @@ -60,6 +60,30 @@ this option simply enables the LPC EC code. The eSPI device still needs to correctly configure the bus transactions. +config EC_GOOGLE_CHROMEEC_MEMMAP_INDEXED_IO + depends on EC_GOOGLE_CHROMEEC && ARCH_X86 + def_bool n + help + Google Chrome EC enable support for indexed I/O access. + + Indexed I/O allows devices with multiple memory locations to be + accessed using a single I/O port base address and an index register. + A separate data register, typically located at the address + immediately following the index register, is used for sending and + receiving data to the device. + + Ensure port address and gen3_dec values are correct when selecting + this configuration. + +config EC_GOOGLE_CHROMEEC_MEMMAP_INDEXED_IO_PORT + depends on EC_GOOGLE_CHROMEEC_MEMMAP_INDEXED_IO + hex + default 0x380 + help + Google Chrome EC indexed I/O access address. + + Index register port address for memory mapped indexed IO access + config EC_GOOGLE_CHROMEEC_LPC depends on ARCH_X86 # Needs Plug-and-play. def_bool n diff --git a/src/ec/google/chromeec/ec_lpc.c b/src/ec/google/chromeec/ec_lpc.c index 2a9eabb..e661cf5 100644 --- a/src/ec/google/chromeec/ec_lpc.c +++ b/src/ec/google/chromeec/ec_lpc.c @@ -52,6 +52,15 @@ return byte; } +#if CONFIG(EC_GOOGLE_CHROMEEC_MEMMAP_INDEXED_IO) +/* Read singe byte and return byte read using indexed IO*/ +static inline u8 read_byte_indexed_io(u8 offset) +{ + outb(offset, CONFIG_EC_GOOGLE_CHROMEEC_MEMMAP_INDEXED_IO_PORT); + return inb(CONFIG_EC_GOOGLE_CHROMEEC_MEMMAP_INDEXED_IO_PORT + 1); +} +#endif + /* * Write bytes to a given LPC-mapped address. * @@ -156,6 +165,10 @@ printk(BIOS_ERR, "Error reading memmap data.\n"); return -1; } +#elif CONFIG(EC_GOOGLE_CHROMEEC_MEMMAP_INDEXED_IO) + id1 = read_byte_indexed_io(EC_MEMMAP_ID); + id2 = read_byte_indexed_io(EC_MEMMAP_ID + 1); + flags = read_byte_indexed_io(EC_MEMMAP_HOST_CMD_FLAGS); #else id1 = read_byte(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_ID); id2 = read_byte(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_ID + 1); @@ -358,7 +371,11 @@ /* Return the byte of EC switch states */ uint8_t google_chromeec_get_switches(void) { +#if CONFIG(EC_GOOGLE_CHROMEEC_MEMMAP_INDEXED_IO) + return read_byte_indexed_io(EC_MEMMAP_SWITCHES); +#else return read_byte(EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SWITCHES); +#endif } void google_chromeec_ioport_range(uint16_t *out_base, size_t *out_size) -- To view, visit https://review.coreboot.org/c/coreboot/+/85449?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I6c1aab3fc914eb5af2736a8ea3adf447040905e0 Gerrit-Change-Number: 85449 Gerrit-PatchSet: 7 Gerrit-Owner: Jayvik Desai <jayvik(a)google.com> Gerrit-Reviewer: Boris Mittelberg <bmbm(a)google.com> Gerrit-Reviewer: Caveh Jalali <caveh(a)chromium.org> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[S] Change in coreboot[main]: mb/google/nissa/var/quandiso2: Create a quandiso2 variant
by Subrata Banik (Code Review) 23 Dec '24

23 Dec '24

Subrata Banik has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85570?usp=email ) Change subject: mb/google/nissa/var/quandiso2: Create a quandiso2 variant ...................................................................... mb/google/nissa/var/quandiso2: Create a quandiso2 variant This patch creates a new quandiso2 variant which is a Twin Lake platform. This variant uses Quandiso board mounted with the Twin Lake SOC and hence the plan is to reuse the existing quandiso code. BRANCH=firmware-nissa-15217.B TEST=build, and boot into OS Change-Id: I404b579f1758c637d3456f6bed7119e3f4ecc06c Signed-off-by: Shon Wang <shon.wang(a)quanta.corp-partner.google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85570 Reviewed-by: Eric Lai <ericllai(a)google.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Kapil Porwal <kapilporwal(a)google.com> Reviewed-by: Paul Menzel <paulepanter(a)mailbox.org> --- M src/mainboard/google/brya/Kconfig M src/mainboard/google/brya/Kconfig.name 2 files changed, 17 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Kapil Porwal: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve Eric Lai: Looks good to me, approved diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig index aa7e643..84c15a9 100644 --- a/src/mainboard/google/brya/Kconfig +++ b/src/mainboard/google/brya/Kconfig @@ -460,6 +460,16 @@ select HAVE_WWAN_POWER_SEQUENCE select INTEL_GMA_HAVE_VBT +config BOARD_GOOGLE_QUANDISO2 + select BOARD_GOOGLE_BASEBOARD_NISSA + select CHROMEOS_WIFI_SAR if CHROMEOS + select DRIVERS_GENESYSLOGIC_GL9750 + select DRIVERS_GENERIC_GPIO_KEYS + select DRIVERS_I2C_SX9324 + select HAVE_WWAN_POWER_SEQUENCE + select INTEL_GMA_HAVE_VBT + select SOC_INTEL_TWINLAKE + config BOARD_GOOGLE_REDRIX select BOARD_GOOGLE_BASEBOARD_BRYA select DRIVERS_GENESYSLOGIC_GL9755 @@ -755,6 +765,7 @@ default 0x1 if BOARD_GOOGLE_PRIMUS default 0x0 if BOARD_GOOGLE_PUJJO default 0x0 if BOARD_GOOGLE_QUANDISO + default 0x0 if BOARD_GOOGLE_QUANDISO2 default 0x1 if BOARD_GOOGLE_REDRIX default 0x3 if BOARD_GOOGLE_REDRIX4ES default 0x0 if BOARD_GOOGLE_RIVEN @@ -833,6 +844,7 @@ default 13 if BOARD_GOOGLE_PRIMUS default 13 if BOARD_GOOGLE_PUJJO default 13 if BOARD_GOOGLE_QUANDISO + default 13 if BOARD_GOOGLE_QUANDISO2 default 13 if BOARD_GOOGLE_REDRIX default 13 if BOARD_GOOGLE_REDRIX4ES default 13 if BOARD_GOOGLE_RIVEN @@ -916,6 +928,7 @@ default "Primus" if BOARD_GOOGLE_PRIMUS default "Pujjo" if BOARD_GOOGLE_PUJJO default "Quandiso" if BOARD_GOOGLE_QUANDISO + default "Quandiso2" if BOARD_GOOGLE_QUANDISO2 default "Redrix" if BOARD_GOOGLE_REDRIX default "Redrix4ES" if BOARD_GOOGLE_REDRIX4ES default "Riven" if BOARD_GOOGLE_RIVEN @@ -989,6 +1002,7 @@ default "primus" if BOARD_GOOGLE_PRIMUS default "pujjo" if BOARD_GOOGLE_PUJJO default "quandiso" if BOARD_GOOGLE_QUANDISO + default "quandiso" if BOARD_GOOGLE_QUANDISO2 default "redrix" if BOARD_GOOGLE_REDRIX default "redrix4es" if BOARD_GOOGLE_REDRIX4ES default "riven" if BOARD_GOOGLE_RIVEN diff --git a/src/mainboard/google/brya/Kconfig.name b/src/mainboard/google/brya/Kconfig.name index eb0b006..7dd82d0 100644 --- a/src/mainboard/google/brya/Kconfig.name +++ b/src/mainboard/google/brya/Kconfig.name @@ -119,6 +119,9 @@ config BOARD_GOOGLE_QUANDISO bool "-> Quandiso" +config BOARD_GOOGLE_QUANDISO2 + bool "-> Quandiso2" + config BOARD_GOOGLE_REDRIX bool "-> Redrix" -- To view, visit https://review.coreboot.org/c/coreboot/+/85570?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I404b579f1758c637d3456f6bed7119e3f4ecc06c Gerrit-Change-Number: 85570 Gerrit-PatchSet: 6 Gerrit-Owner: Shon Wang <shon.wang(a)quanta.corp-partner.google.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Kyle Lin <kylelinck(a)google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[S] Change in coreboot[main]: mb/google/nissa/var/rull: Add G2 touchscreen to devicetree
by Rui Zhou (Code Review) 23 Dec '24

23 Dec '24

Attention is currently required from: Dinesh Gehlot, Dtrain Hsu, Eric Lai, Jayvik Desai, Kapil Porwal, Kun Liu, Nick Vaccaro, Subrata Banik. Hello Dinesh Gehlot, Eric Lai, Jayvik Desai, Kapil Porwal, Kun Liu, Nick Vaccaro, Subrata Banik, build bot (Jenkins), I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/85656?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Code-Review+1 by Eric Lai, Code-Review+1 by Kun Liu, Code-Review+2 by Kapil Porwal, Verified+1 by build bot (Jenkins) Change subject: mb/google/nissa/var/rull: Add G2 touchscreen to devicetree ...................................................................... mb/google/nissa/var/rull: Add G2 touchscreen to devicetree Add G2 touchscreen override devicetree. BUG=b:384871815 BRANCH=None TEST=1. emerge-nissa coreboot chromeos-bootimage 2. touchpanel function is normal and 'evtest' command displays the touch point Change-Id: I0d68b8d09f2fd280dea17a0542243b88618b5fa1 Signed-off-by: Rui Zhou <zhourui(a)huaqin.corp-partner.google.com> --- M src/mainboard/google/brya/variants/rull/overridetree.cb 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/85656/3 -- To view, visit https://review.coreboot.org/c/coreboot/+/85656?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: newpatchset Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I0d68b8d09f2fd280dea17a0542243b88618b5fa1 Gerrit-Change-Number: 85656 Gerrit-PatchSet: 3 Gerrit-Owner: Rui Zhou <zhourui(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Reviewer: Eric Lai <ericllai(a)google.com> Gerrit-Reviewer: Jayvik Desai <jayvik(a)google.com> Gerrit-Reviewer: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Reviewer: Kun Liu <liukun11(a)huaqin.corp-partner.google.com> Gerrit-Reviewer: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Reviewer: Subrata Banik <subratabanik(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com> Gerrit-Attention: Jayvik Desai <jayvik(a)google.com> Gerrit-Attention: Eric Lai <ericllai(a)google.com> Gerrit-Attention: Dtrain Hsu <dtrain_hsu(a)compal.corp-partner.google.com> Gerrit-Attention: Subrata Banik <subratabanik(a)google.com> Gerrit-Attention: Kapil Porwal <kapilporwal(a)google.com> Gerrit-Attention: Dinesh Gehlot <digehlot(a)google.com> Gerrit-Attention: Nick Vaccaro <nvaccaro(a)chromium.org> Gerrit-Attention: Kun Liu <liukun11(a)huaqin.corp-partner.google.com>

1 0

[XS] Change in coreboot[main]: soc/mediatek/mt8189: Replace SPDX identifiers to GPL-2.0-only OR MIT
by Vince Liu (Code Review) 23 Dec '24

23 Dec '24

Attention is currently required from: Felix Singer, Hung-Te Lin, Yidi Lin, Yu-Ping Wu. Vince Liu has posted comments on this change by Vince Liu. ( https://review.coreboot.org/c/coreboot/+/85723?usp=email ) Change subject: soc/mediatek/mt8189: Replace SPDX identifiers to GPL-2.0-only OR MIT ...................................................................... Patch Set 1: (1 comment) File src/soc/mediatek/mt8189/timer.c: https://review.coreboot.org/c/coreboot/+/85723/comment/5c8dab50_5197fd93?us… : PS1, Line 1: OR MIT > I know GPLv2 is compatible to MIT, but I don't know if MIT can just be added like that afterwards. […] I think that is okay. Here is the example from [Linux kernel](https://docs.kernel.org/process/license-rules.html#license-identifi… ```SPDX-License-Identifier: GPL-2.0 OR MIT``` -- To view, visit https://review.coreboot.org/c/coreboot/+/85723?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I2821a8c097b8d22e1aa91b316ae0fdce80f342de Gerrit-Change-Number: 85723 Gerrit-PatchSet: 1 Gerrit-Owner: Vince Liu <vince-wl.liu(a)mediatek.com> Gerrit-Reviewer: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Reviewer: Yidi Lin <yidilin(a)google.com> Gerrit-Reviewer: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Attention: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Attention: Hung-Te Lin <hungte(a)chromium.org> Gerrit-Attention: Yu-Ping Wu <yupingso(a)google.com> Gerrit-Attention: Yidi Lin <yidilin(a)google.com> Gerrit-Comment-Date: Mon, 23 Dec 2024 01:17:21 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Felix Singer <service+coreboot-gerrit(a)felixsinger.de>

1 0

[XS] Change in coreboot[main]: xcompile: Use Walloc-size GCC option
by Felix Singer (Code Review) 23 Dec '24

23 Dec '24

Attention is currently required from: Elyes Haouas, Martin L Roth, Paul Menzel. Felix Singer has posted comments on this change by Elyes Haouas. ( https://review.coreboot.org/c/coreboot/+/84074?usp=email ) Change subject: xcompile: Use Walloc-size GCC option ...................................................................... Patch Set 15: (1 comment) Commit Message: https://review.coreboot.org/c/coreboot/+/84074/comment/39f1a441_3d7f5b49?us… : PS15, Line 11: introduced move into next line -- To view, visit https://review.coreboot.org/c/coreboot/+/84074?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: If5d36b073bb5b4cccb0cf2b67b43edb3f97f168c Gerrit-Change-Number: 84074 Gerrit-PatchSet: 15 Gerrit-Owner: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-CC: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Martin L Roth <gaumless(a)gmail.com> Gerrit-Attention: Paul Menzel <paulepanter(a)mailbox.org> Gerrit-Attention: Elyes Haouas <ehaouas(a)noos.fr> Gerrit-Comment-Date: Mon, 23 Dec 2024 00:06:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No

1 0

[XS] Change in coreboot[main]: util/docker/doc.coreboot.org: Allow git to work in envs owned by root
by Felix Singer (Code Review) 22 Dec '24

22 Dec '24

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85727?usp=email ) Change subject: util/docker/doc.coreboot.org: Allow git to work in envs owned by root ...................................................................... util/docker/doc.coreboot.org: Allow git to work in envs owned by root Depending on the environment, the /data-in directory might be owned by root and recent git versions refuse to work in these. So explicitly mark /data-in as a safe environment. Change-Id: Ia534928f759e50c2dfb1df8af653dee74c734603 Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85727 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nicholas Chin <nic.c3.14(a)gmail.com> --- M util/docker/doc.coreboot.org/Dockerfile 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Nicholas Chin: Looks good to me, approved build bot (Jenkins): Verified diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile index 9e3da11..8ab1a49 100644 --- a/util/docker/doc.coreboot.org/Dockerfile +++ b/util/docker/doc.coreboot.org/Dockerfile @@ -34,6 +34,8 @@ sphinx_autobuild===2024.2.4 \ sphinx_rtd_theme===2.0.0 +RUN git config --global --add safe.directory /data-in + # For Sphinx-autobuild # Port 8000 - HTTP server # Port 35729 - websockets connection to allow automatic browser reloads after each build -- To view, visit https://review.coreboot.org/c/coreboot/+/85727?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia534928f759e50c2dfb1df8af653dee74c734603 Gerrit-Change-Number: 85727 Gerrit-PatchSet: 3 Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[XS] Change in coreboot[main]: util/docker/doc.coreboot.org: Use Alpine minor instead of point releases
by Felix Singer (Code Review) 22 Dec '24

22 Dec '24

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85726?usp=email ) Change subject: util/docker/doc.coreboot.org: Use Alpine minor instead of point releases ...................................................................... util/docker/doc.coreboot.org: Use Alpine minor instead of point releases There is no reason to stick to the point releases. So use the 3.19 base image referring to the latest minor release instead. Also, update installed packages to latest versions from that release. Change-Id: Ic947f99ae7231918ec2e6105f8f3050a17fd1176 Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85726 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nicholas Chin <nic.c3.14(a)gmail.com> --- M util/docker/doc.coreboot.org/Dockerfile 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Nicholas Chin: Looks good to me, approved build bot (Jenkins): Verified diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile index 1864063..9e3da11 100644 --- a/util/docker/doc.coreboot.org/Dockerfile +++ b/util/docker/doc.coreboot.org/Dockerfile @@ -1,8 +1,10 @@ -FROM alpine:3.19.1 +FROM alpine:3.19 COPY makeSphinx.sh /makeSphinx.sh RUN \ + apk update && \ + apk upgrade --no-cache && \ apk add --no-cache \ python3 \ py3-pip \ -- To view, visit https://review.coreboot.org/c/coreboot/+/85726?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ic947f99ae7231918ec2e6105f8f3050a17fd1176 Gerrit-Change-Number: 85726 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[S] Change in coreboot[main]: util/docker/doc.coreboot.org: Get rid of bash workarounds
by Felix Singer (Code Review) 22 Dec '24

22 Dec '24

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85725?usp=email ) Change subject: util/docker/doc.coreboot.org: Get rid of bash workarounds ...................................................................... util/docker/doc.coreboot.org: Get rid of bash workarounds It seems the .bashrc is not loaded as intended and thus the bash mechanisms never worked. So drop the bash invocations and replace them with the ash shell. Also, don't modify the PATH variable since this is done by the activation script. Change-Id: I544a15c86c212e91ece59b583fb61dad37fca337 Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85725 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nicholas Chin <nic.c3.14(a)gmail.com> --- M util/docker/doc.coreboot.org/Dockerfile M util/docker/doc.coreboot.org/makeSphinx.sh 2 files changed, 5 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified Nicholas Chin: Looks good to me, approved diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile index 0979daf..1864063 100644 --- a/util/docker/doc.coreboot.org/Dockerfile +++ b/util/docker/doc.coreboot.org/Dockerfile @@ -7,7 +7,6 @@ python3 \ py3-pip \ make \ - bash \ git \ ttf-dejavu \ fontconfig \ @@ -21,11 +20,10 @@ USER coreboot ENV VIRTUAL_ENV="/home/coreboot/python3" -ENV PATH=$VIRTUAL_ENV/bin:$PATH:/home/coreboot/.local/bin RUN \ python3 -m venv $VIRTUAL_ENV && \ - echo "source ${VIRTUAL_ENV}/bin/activate" >> /home/coreboot/.bashrc && \ + source ${VIRTUAL_ENV}/bin/activate && \ pip3 install --upgrade --no-cache-dir pip && \ pip3 install --no-cache-dir \ jinja2==3.1.3 \ @@ -39,5 +37,5 @@ # Port 35729 - websockets connection to allow automatic browser reloads after each build EXPOSE 8000 35729 -ENTRYPOINT ["/bin/bash", "/makeSphinx.sh"] +ENTRYPOINT [ "/makeSphinx.sh" ] CMD [] diff --git a/util/docker/doc.coreboot.org/makeSphinx.sh b/util/docker/doc.coreboot.org/makeSphinx.sh index 96a593c..577e487 100755 --- a/util/docker/doc.coreboot.org/makeSphinx.sh +++ b/util/docker/doc.coreboot.org/makeSphinx.sh @@ -1,4 +1,6 @@ -#!/usr/bin/env bash +#!/usr/bin/env ash + +source ${VIRTUAL_ENV}/bin/activate if [ "$1" == "livehtml" ]; then echo "Starting live documentation build" -- To view, visit https://review.coreboot.org/c/coreboot/+/85725?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I544a15c86c212e91ece59b583fb61dad37fca337 Gerrit-Change-Number: 85725 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[XS] Change in coreboot[main]: util/docker/doc.coreboot.org: Don't create volumes
by Felix Singer (Code Review) 22 Dec '24

22 Dec '24

Felix Singer has submitted this change. ( https://review.coreboot.org/c/coreboot/+/85724?usp=email ) Change subject: util/docker/doc.coreboot.org: Don't create volumes ...................................................................... util/docker/doc.coreboot.org: Don't create volumes Volumes are mounted with the command line parameter. Using the VOLUME directive creates a persistent storage in a standard path, which is not intended. So drop that and create equal directories in order to keep the container working. Change-Id: I9b3551cca34d846aba5ca5c89162f82baa6de768 Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/85724 Reviewed-by: Nicholas Chin <nic.c3.14(a)gmail.com> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> --- M util/docker/doc.coreboot.org/Dockerfile 1 file changed, 3 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Nicholas Chin: Looks good to me, approved diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile index fdb4bbe..0979daf 100644 --- a/util/docker/doc.coreboot.org/Dockerfile +++ b/util/docker/doc.coreboot.org/Dockerfile @@ -14,6 +14,9 @@ && chmod 755 /makeSphinx.sh RUN adduser -D coreboot +RUN \ + mkdir /data-in /data-out && \ + chown -R coreboot:coreboot /data-in /data-out USER coreboot @@ -31,8 +34,6 @@ sphinx_autobuild===2024.2.4 \ sphinx_rtd_theme===2.0.0 -VOLUME /data-in /data-out - # For Sphinx-autobuild # Port 8000 - HTTP server # Port 35729 - websockets connection to allow automatic browser reloads after each build -- To view, visit https://review.coreboot.org/c/coreboot/+/85724?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: I9b3551cca34d846aba5ca5c89162f82baa6de768 Gerrit-Change-Number: 85724 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

[XS] Change in coreboot[main]: util/docker/doc.coreboot.org: Allow git to work in envs owned by root
by Nicholas Chin (Code Review) 22 Dec '24

22 Dec '24

Attention is currently required from: Felix Singer, Martin L Roth. Nicholas Chin has posted comments on this change by Felix Singer. ( https://review.coreboot.org/c/coreboot/+/85727?usp=email ) Change subject: util/docker/doc.coreboot.org: Allow git to work in envs owned by root ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/85727?usp=email To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings?usp=email Gerrit-MessageType: comment Gerrit-Project: coreboot Gerrit-Branch: main Gerrit-Change-Id: Ia534928f759e50c2dfb1df8af653dee74c734603 Gerrit-Change-Number: 85727 Gerrit-PatchSet: 2 Gerrit-Owner: Felix Singer <service+coreboot-gerrit(a)felixsinger.de> Gerrit-Reviewer: Martin L Roth <gaumless(a)gmail.com> Gerrit-Reviewer: Nicholas Chin <nic.c3.14(a)gmail.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-Comment-Date: Sun, 22 Dec 2024 22:04:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit December 2024