coreboot-gerrit November 2019

coreboot-gerrit@coreboot.org

1 participants
2418 discussions

Change in coreboot[master]: sc7180: Add QUPv3 FW load & config
by mturney mturney (Code Review) 28 Nov '19

28 Nov '19

Hello Douglas Anderson, Ravi kumar, build bot (Jenkins), Patrick Georgi, Martin Roth, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/coreboot/+/35499 to look at the new patch set (#20). Change subject: sc7180: Add QUPv3 FW load & config ...................................................................... sc7180: Add QUPv3 FW load & config UART driver requires firmware loading Developer/Reviewer, be aware of this patch from Napali: https://review.coreboot.org/c/coreboot/+/25372/78 https://review.coreboot.org/c/coreboot/+/27483/58 Change-Id: I4d91dd10488931247f81a87b0bdcc598f4bceb31 Signed-off-by: Roja Rani Yarubandi <rojay(a)codeaurora.org> --- M src/soc/qualcomm/sc7180/Makefile.inc M src/soc/qualcomm/sc7180/bootblock.c M src/soc/qualcomm/sc7180/include/soc/addressmap.h A src/soc/qualcomm/sc7180/include/soc/qcom_qup_se.h A src/soc/qualcomm/sc7180/include/soc/qupv3_config.h A src/soc/qualcomm/sc7180/include/soc/qupv3_fw_config.h A src/soc/qualcomm/sc7180/qcom_qup_se.c A src/soc/qualcomm/sc7180/qupv3_config.c A src/soc/qualcomm/sc7180/qupv3_fw_config.c 9 files changed, 1,081 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/35499/20 -- To view, visit https://review.coreboot.org/c/coreboot/+/35499 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I4d91dd10488931247f81a87b0bdcc598f4bceb31 Gerrit-Change-Number: 35499 Gerrit-PatchSet: 20 Gerrit-Owner: mturney mturney <mturney(a)codeaurora.org> Gerrit-Reviewer: Douglas Anderson <dianders(a)chromium.org> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Ravi kumar <rbokka(a)codeaurora.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: mturney mturney <mturney(a)codeaurora.org> Gerrit-CC: Julius Werner <jwerner(a)chromium.org> Gerrit-CC: Patrick Rudolph <siro(a)das-labor.org> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-CC: Roja Rani Yarubandi <c_rojay(a)qualcomm.corp-partner.google.com> Gerrit-CC: Stephen Boyd <swboyd(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

Change in coreboot[master]: drivers/intel/fsp1_1: Configure UART after memory init
by David Hendricks (Code Review) 27 Nov '19

27 Nov '19

David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/28464 ) Change subject: drivers/intel/fsp1_1: Configure UART after memory init ...................................................................... Patch Set 4: Heads up - Somebody from Intel commented on https://github.com/IntelFsp/FSP/issues/15 and says it has something to do with coreboot setting the UARTs to ACPI mode. The suggested fix is to conditionally set PcdEnableHsuart0 and PcdEnableHsuart1 (see the issue on Github for details). -- To view, visit https://review.coreboot.org/c/coreboot/+/28464 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ibb6c9e4153b3de58791b211c7f4241be3bceae9d Gerrit-Change-Number: 28464 Gerrit-PatchSet: 4 Gerrit-Owner: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Frans Hendriks <fhendriks(a)eltan.com> Gerrit-Reviewer: Hannah Williams <hannah.williams(a)intel.com> Gerrit-Reviewer: Huang Jin <huang.jin(a)intel.com> Gerrit-Reviewer: Lee Leahy <leroy.p.leahy(a)intel.com> Gerrit-Reviewer: Michał Żygowski <michal.zygowski(a)3mdeb.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Patrick Rudolph <patrick.rudolph(a)9elements.com> Gerrit-Comment-Date: Thu, 28 Nov 2019 01:08:21 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[4.11_branch]: soc/intel/broadwell_de: Re-read SPD on CRC error
by David Hendricks (Code Review) 27 Nov '19

27 Nov '19

David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37303 ) Change subject: soc/intel/broadwell_de: Re-read SPD on CRC error ...................................................................... Patch Set 1: (1 comment) https://review.coreboot.org/c/coreboot/+/37303/1/src/soc/intel/fsp_broadwel… File src/soc/intel/fsp_broadwell_de/romstage/memory.c: https://review.coreboot.org/c/coreboot/+/37303/1/src/soc/intel/fsp_broadwel… PS1, Line 65: "SPD CRC error on channel %d slot %d, retrying..\n", nit: ellipses usually have 3 dots -- To view, visit https://review.coreboot.org/c/coreboot/+/37303 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: 4.11_branch Gerrit-Change-Id: I650c8cd80f75b603db332024748a91af6171f096 Gerrit-Change-Number: 37303 Gerrit-PatchSet: 1 Gerrit-Owner: Andrey Petrov <anpetrov(a)fb.com> Gerrit-Reviewer: Andrey Petrov <anpetrov(a)fb.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 28 Nov 2019 00:56:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in coreboot[4.11_branch]: soc/intel/broadwell_de: Re-read SPD on CRC error
by David Hendricks (Code Review) 27 Nov '19

27 Nov '19

David Hendricks has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/37303 ) Change subject: soc/intel/broadwell_de: Re-read SPD on CRC error ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/37303 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: 4.11_branch Gerrit-Change-Id: I650c8cd80f75b603db332024748a91af6171f096 Gerrit-Change-Number: 37303 Gerrit-PatchSet: 1 Gerrit-Owner: Andrey Petrov <anpetrov(a)fb.com> Gerrit-Reviewer: Andrey Petrov <anpetrov(a)fb.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Patrick Rudolph <siro(a)das-labor.org> Gerrit-Reviewer: Werner Zeh <werner.zeh(a)siemens.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Thu, 28 Nov 2019 00:56:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in coreboot[master]: sc7180: Add UART support
by Julius Werner (Code Review) 27 Nov '19

27 Nov '19

Julius Werner has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/35500 ) Change subject: sc7180: Add UART support ...................................................................... Patch Set 19: Code-Review+2 -- To view, visit https://review.coreboot.org/c/coreboot/+/35500 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: I6494daa108197c030577ac86dab71f9ca6c21bdb Gerrit-Change-Number: 35500 Gerrit-PatchSet: 19 Gerrit-Owner: mturney mturney <mturney(a)codeaurora.org> Gerrit-Reviewer: Julius Werner <jwerner(a)chromium.org> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Ravi kumar <rbokka(a)codeaurora.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Reviewer: mturney mturney <mturney(a)codeaurora.org> Gerrit-CC: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-CC: Roja Rani Yarubandi <c_rojay(a)qualcomm.corp-partner.google.com> Gerrit-Comment-Date: Thu, 28 Nov 2019 00:22:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in em100[master]: Clean up version code
by Stefan Reinauer (Code Review) 27 Nov '19

27 Nov '19

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/37184 ) Change subject: Clean up version code ...................................................................... Clean up version code Organize by HW version first Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Change-Id: Ie44122b28044a781b1fe8a653f080cb84a8dc1b6 --- M em100.c 1 file changed, 14 insertions(+), 12 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/84/37184/1 diff --git a/em100.c b/em100.c index 5e33af2..83fa06a 100644 --- a/em100.c +++ b/em100.c @@ -789,7 +789,6 @@ name); } -/* get MCU and FPGA version, *100 encoded */ int main(int argc, char **argv) { int opt, idx; @@ -895,16 +894,9 @@ if (desiredchip && !chip) return 1; - printf("MCU version: %d.%02d\n", em100.mcu >> 8, em100.mcu & 0xff); - if (em100.fpga > 0x0033) { /* 0.51 */ - if (em100.hwversion == HWVERSION_EM100PRO) - printf("FPGA version: %d.%02d (%s)\n", - em100.fpga >> 8 & 0x7f, em100.fpga & 0xff, - em100.fpga & 0x8000 ? "1.8V" : "3.3V"); - else /* EM100Pro-G2 */ - printf("FPGA version: %d.%03d\n", - em100.fpga >> 8 & 0x7f, em100.fpga & 0xff); - } else { + + if (em100.hwversion == HWVERSION_EM100PRO) { + printf("MCU version: %d.%02d\n", em100.mcu >> 8, em100.mcu & 0xff); /* While the Dediprog software for Windows will refuse to work * with 1.8V chips on older FPGA versions, it does not * specifically output a voltage when reporting the FPGA @@ -912,9 +904,19 @@ * known to behave the old way, 0.75 is behaving the new * way. */ - printf("FPGA version: %d.%02d\n", em100.fpga >> 8, + if (em100.fpga > 0x0033) /* 0.51 */ + printf("FPGA version: %d.%02d (%s)\n", + em100.fpga >> 8 & 0x7f, em100.fpga & 0xff, + em100.fpga & 0x8000 ? "1.8V" : "3.3V"); + else + printf("FPGA version: %d.%02d\n", em100.fpga >> 8, em100.fpga & 0xff); + } else {/* EM100Pro-G2 */ + printf("MCU version: %d.%d\n", em100.mcu >> 8, em100.mcu & 0xff); + printf("FPGA version: %d.%03d\n", + em100.fpga >> 8 & 0x7f, em100.fpga & 0xff); } + printf("Hardware version: %u\n", em100.hwversion); if (em100.serialno != 0xffffffff) -- To view, visit https://review.coreboot.org/c/em100/+/37184 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: Ie44122b28044a781b1fe8a653f080cb84a8dc1b6 Gerrit-Change-Number: 37184 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newchange

2 4

Change in em100[master]: DO NOT COMMIT
by Stefan Reinauer (Code Review) 27 Nov '19

27 Nov '19

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/36805 ) Change subject: DO NOT COMMIT ...................................................................... DO NOT COMMIT backup of all firmware files for testing Change-Id: I8ab0653bf004e95fe44bcb510430eef8e4ba2c5b --- A 00332014.dpfw A 00332016.dpfw A 003322018.dpfw A EM100Pro_4.3.04-Beta J.msi 4 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/05/36805/1 diff --git a/00332014.dpfw b/00332014.dpfw new file mode 100644 index 0000000..a8cf8b9 --- /dev/null +++ b/00332014.dpfw Binary files differ diff --git a/00332016.dpfw b/00332016.dpfw new file mode 100644 index 0000000..9d97ea2 --- /dev/null +++ b/00332016.dpfw Binary files differ diff --git a/003322018.dpfw b/003322018.dpfw new file mode 100644 index 0000000..ca0373e --- /dev/null +++ b/003322018.dpfw Binary files differ diff --git a/EM100Pro_4.3.04-Beta J.msi b/EM100Pro_4.3.04-Beta J.msi new file mode 100644 index 0000000..29877a9 --- /dev/null +++ b/EM100Pro_4.3.04-Beta J.msi Binary files differ -- To view, visit https://review.coreboot.org/c/em100/+/36805 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: I8ab0653bf004e95fe44bcb510430eef8e4ba2c5b Gerrit-Change-Number: 36805 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newchange

1 1

Change in em100[master]: Drop em100pro_chips.h
by Stefan Reinauer (Code Review) 27 Nov '19

27 Nov '19

Hello Stefan Reinauer, I'd like you to do a code review. Please visit https://review.coreboot.org/c/em100/+/37134 to review the following change. Change subject: Drop em100pro_chips.h ...................................................................... Drop em100pro_chips.h Signed-off-by: Stefan Reinauer <stefan.reinauer(a)gmail.com> Change-Id: If116243bf3434bf1c05ff7bc93b6423341d84969 --- M Makefile D em100pro_chips.h 2 files changed, 6 insertions(+), 57,328 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/34/37134/1 -- To view, visit https://review.coreboot.org/c/em100/+/37134 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: If116243bf3434bf1c05ff7bc93b6423341d84969 Gerrit-Change-Number: 37134 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Martin Roth <martinroth(a)google.com> Gerrit-Reviewer: Patrick Georgi <pgeorgi(a)google.com> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Reviewer: Stefan Reinauer <stefan.reinauer(a)gmail.com> Gerrit-MessageType: newchange

2 7

Change in em100[master]: WIP: Use binaries from Windows installer directly
by Stefan Reinauer (Code Review) 27 Nov '19

27 Nov '19

Stefan Reinauer has uploaded this change for review. ( https://review.coreboot.org/c/em100/+/36943 ) Change subject: WIP: Use binaries from Windows installer directly ...................................................................... WIP: Use binaries from Windows installer directly Right now we are parsing the config files into em100pro_chips.h and expect the users to deal with firmware by themselves. With a simple tar implementation we could bundle the original files with the binary much easier. DO NOT COMMIT Change-Id: I8c360e96ce42fd78141a1564976454711e20f527 Signed-off-by: Stefan Reinauer <stefan.reinauer(a)coreboot.org> --- A configs.tar A firmware.tar A tar.c 3 files changed, 217 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/em100 refs/changes/43/36943/1 diff --git a/configs.tar b/configs.tar new file mode 100644 index 0000000..3d71d71 --- /dev/null +++ b/configs.tar Binary files differ diff --git a/firmware.tar b/firmware.tar new file mode 100644 index 0000000..10ed9d9 --- /dev/null +++ b/firmware.tar Binary files differ diff --git a/tar.c b/tar.c new file mode 100644 index 0000000..6f4a117 --- /dev/null +++ b/tar.c @@ -0,0 +1,217 @@ +#define _GNU_SOURCE +//#define DEBUG +#include <stddef.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> + +/* Debugging */ +#include <stdint.h> +#include <ctype.h> +static void hexdump(const void *memory, size_t length) +{ + int i; + uint8_t *m; + int all_zero = 0; + int all_one = 0; + + m = (uint8_t *) memory; + + for (i = 0; i < length; i += 16) { + int j; + + all_zero++; + all_one++; + for (j = 0; j < 16; j++) { + if (m[i + j] != 0) { + all_zero = 0; + break; + } + } + for (j = 0; j < 16; j++) { + if (m[i + j] != 0xff) { + all_one = 0; + break; + } + } + if (all_zero < 2 && all_one < 2) { + printf( "%08x:", i); + for (j = 0; j < 16; j++) + printf( " %02x", m[i + j]); + printf(" "); + for (j = 0; j < 16; j++) + printf( "%c", + isprint(m[i + j]) ? m[i + j] : '.'); + printf( "\n"); + } else if (all_zero == 2 || all_one == 2) { + printf( "...\n"); + } + } +} +/* Debugging */ + +#define ROUND_UP(n, inc) (n + (inc - n % inc) % inc) + +typedef struct { + char name[100]; + char mode[8]; + char owner[8]; + char group[8]; + char size[12]; + char mtime[12]; + char checksum[8]; + char type; + char linkname[100]; + char magic[6]; + char version[2]; + char uname[32]; + char gname[32]; + char devmajor[8]; + char devminor[8]; + char prefix[155]; + char padding[12]; +} __attribute__((packed)) tar_raw_header_t; + +static unsigned int checksum(tar_raw_header_t *file) +{ + int i, chk_off = offsetof(tar_raw_header_t, checksum); + char *raw = (char *)file; + unsigned int chksum = 256; + + for (i = 0; i < sizeof(tar_raw_header_t); i++) { + if (i >= chk_off && i < chk_off + 8) + continue; + chksum += raw[i]; + } + return chksum; +} + +int tar_ls(char *tar, size_t tar_length) +{ + size_t i = 0; + + while (i < tar_length) { + tar_raw_header_t *f = (tar_raw_header_t *)(tar + i); + if (f->name[0] == 0) /* null header at end of tar */ + break; + + unsigned int size = strtol(f->size, NULL, 8); + unsigned int cksum = strtol(f->checksum, NULL, 8); + unsigned int ok = (checksum(f) == cksum); + + if(!ok) + break; + + printf("name: \"%s\" (%s)\n", f->name, ok?"OK":"FAIL"); +#ifdef DEBUG + printf(" mode: \"%s\"\n", f->mode); + printf(" owner: \"%s\"\n", f->owner); + printf(" group: \"%s\"\n", f->group); + printf(" size: %011o\n", size); + printf(" mtime: \"%s\"\n", f->mtime); + printf(" checksum: %07o\n", cksum); + char *t; + switch (f->type) { + case '0': t = "regular"; break; + case '1': t = "link"; break; + case '2': t = "reserved"; break; + case '3': t = "character special"; break; + case '4': t = "block special"; break; + case '5': t = "directory"; break; + case '6': t = "fifo special" break; + case '7': t = "contiguous"; break; + default: t = "<unknown>"; break; + } + printf(" type: %s\n", t); + printf(" linkname: \"%s\"\n\n", strndupa(f->linkname, 100)); +#endif + + i += sizeof(tar_raw_header_t) + ROUND_UP(size, 512); + } + + return 0; +} + +int tar_find(char *tar, size_t tar_length, char *name, char **result, size_t *result_length) +{ + size_t i = 0; + + while (i < tar_length) { + tar_raw_header_t *f = (tar_raw_header_t *)(tar + i); + if (f->name[0] == 0) /* null header at end of tar */ + break; + + unsigned int size = strtol(f->size, NULL, 8); + unsigned int cksum = strtol(f->checksum, NULL, 8); + unsigned int ok = (checksum(f) == cksum); + + if(!ok) + break; + + if (!strncmp(name, f->name, 100) && f->type == '0') { + *result = tar + i + sizeof(tar_raw_header_t); + *result_length = size; + return 0; + } + i += sizeof(tar_raw_header_t) + ROUND_UP(size, 512); + } + + return 1; +} + +int main(int argc, char *argv[]) +{ + FILE *f; + size_t fsize; + char *fw; + + char *filename = "firmware.tar"; + + f = fopen(filename, "rb"); + if (!f) { + perror(filename); + return 0; + } + + fseek(f, 0, SEEK_END); + fsize = ftell(f); + if (fsize < 0) { + perror(filename); + fclose(f); + return 0; + } + fseek(f, 0, SEEK_SET); + + fw = malloc(fsize); + if (!fw) { + printf("ERROR: out of memory.\n"); + fclose(f); + return 0; + } + if (fread(fw, fsize, 1, f) != 1) { + perror(filename); + fclose(f); + free(fw); + return 0; + } + fclose(f); + + tar_ls(fw, fsize); + + char *img; + size_t img_length; + int ret; + + ret = tar_find(fw, fsize, "firmware/em100pro_fw_2.27_0.89_3.3V.dpfw", + &img, &img_length); + + if (ret) { + printf("FILE NOT FOUND\n"); + } else { + printf("firmware/em100pro_fw_2.27_0.89_3.3V.dpfw:\n\n"); + hexdump(img, img_length); + } + + free(fw); +} + -- To view, visit https://review.coreboot.org/c/em100/+/36943 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: em100 Gerrit-Branch: master Gerrit-Change-Id: I8c360e96ce42fd78141a1564976454711e20f527 Gerrit-Change-Number: 36943 Gerrit-PatchSet: 1 Gerrit-Owner: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-MessageType: newchange

3 21

Change in coreboot[master]: util/kconfig: Move coreboot specific changes into Makefile.inc
by Patrick Georgi (Code Review) 27 Nov '19

27 Nov '19

Patrick Georgi has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/37151 ) Change subject: util/kconfig: Move coreboot specific changes into Makefile.inc ...................................................................... util/kconfig: Move coreboot specific changes into Makefile.inc This eases maintenance of our kconfig fork. Change-Id: Ia4bc0bf22e66457356b9f8fcbea9412792495bca Signed-off-by: Patrick Georgi <pgeorgi(a)google.com> --- M Makefile M util/kconfig/Makefile A util/kconfig/Makefile.inc 3 files changed, 26 insertions(+), 16 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/37151/1 diff --git a/Makefile b/Makefile index f3f9592..41a9b3a 100644 --- a/Makefile +++ b/Makefile @@ -119,7 +119,7 @@ # This include must come _before_ the pattern rules below! # Order _does_ matter for pattern rules. -include $(srck)/Makefile +include $(srck)/Makefile.inc # Three cases where we don't need fully populated $(obj) lists: # 1. when no .config exists diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile index 147b125..1713b8d 100644 --- a/util/kconfig/Makefile +++ b/util/kconfig/Makefile @@ -10,14 +10,6 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \ localmodconfig localyesconfig -_OS=$(shell uname -s |cut -c-7) -regex-objs= -ifeq ($(_OS),MINGW32) - regex-objs=regex.o -endif - -Kconfig ?= src/Kconfig - xconfig: $(objk)/qconf $< $(Kconfig) @@ -345,8 +337,6 @@ $(HOSTCC) $(HOSTCFLAGS) -o $@ $^ $(HOSTLOADLIBES_nconf) $(objk)/conf: $(patsubst %,$(objk)/%,$(conf-objs)) $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^ -$(objk)/toada: $(objk)/toada.o - $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^ $(objk)/mconf.o: $(srck)/mconf.c $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< @@ -356,8 +346,6 @@ $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< $(objk)/conf.o: $(srck)/conf.c $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< -$(objk)/regex.o: $(srck)/regex.c - $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -DHAVE_STRING_H -c -o $@ $< $(objk)/zconf.tab.o: $(objk)/zconf.tab.c $(objk)/zconf.lex.c \ $(objk)/zconf.hash.c @@ -385,8 +373,5 @@ $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@ -$(objk)/toada.o: $(srck)/toada.c - $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< - $(objk)/%.o: HOSTCFLAGS+=-I$(srck) -I$(objk) $(objk)/%.o: HOSTCXXFLAGS+=-I$(srck) -I$(objk) diff --git a/util/kconfig/Makefile.inc b/util/kconfig/Makefile.inc new file mode 100644 index 0000000..fb612c9 --- /dev/null +++ b/util/kconfig/Makefile.inc @@ -0,0 +1,25 @@ +# Early configuration of coreboot specific changes +Kconfig ?= src/Kconfig + +# Include verbatim Makefile +include $(dir $(lastword $(MAKEFILE_LIST)))Makefile + +# Extend Linux kconfig build rules + +# Support mingw by shipping our own regex implementation +_OS=$(shell uname -s |cut -c-7) +regex-objs= +ifeq ($(_OS),MINGW32) + regex-objs=regex.o +endif +$(objk)/regex.o: $(srck)/regex.c + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -DHAVE_STRING_H -c -o $@ $< + +conf-objs += $(regex-objs) +mconf-objs += $(regex-objs) + +# Provide tool to convert kconfig output into Ada format +$(objk)/toada: $(objk)/toada.o + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^ +$(objk)/toada.o: $(srck)/toada.c + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< -- To view, visit https://review.coreboot.org/c/coreboot/+/37151 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-Change-Id: Ia4bc0bf22e66457356b9f8fcbea9412792495bca Gerrit-Change-Number: 37151 Gerrit-PatchSet: 1 Gerrit-Owner: Patrick Georgi <pgeorgi(a)google.com> Gerrit-MessageType: newchange

2 5

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2019