Martin Kepplinger has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32499
Change subject: x86emu: add console.h header to fix compilation ......................................................................
x86emu: add console.h header to fix compilation
Commit 351e3e5 ("src: Use include <console/console.h> when appropriate") has broken the build here, see below, so we include console.h again for x86emu.
In file included from src/device/oprom/x86emu/x86emui.h:65, from src/device/oprom/x86emu/debug.c:40: src/device/oprom/x86emu/debug.c: In function 'x86emu_dump_regs': src/device/oprom/x86emu/debug.h:46:22: error: implicit declaration of function 'printk'; did you mean 'printf'? [-Werror=implicit-function-declaration] #define printf(x...) printk(BIOS_DEBUG, x) ^~~~~~ src/device/oprom/x86emu/debug.c:366:5: note: in expansion of macro 'printf' printf("\tAX=%04x ", M.x86.R_AX ); ^~~~~~
Fixes: 351e3e5 ("src: Use include <console/console.h> when appropriate") Change-Id: I75d0b7c08bfa6dcb07778bbb762223b62cfc3da7 Signed-off-by: Martin Kepplinger martink@posteo.de --- M src/device/oprom/include/x86emu/x86emu.h 1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/32499/1
diff --git a/src/device/oprom/include/x86emu/x86emu.h b/src/device/oprom/include/x86emu/x86emu.h index 4ae82d9..fa23e55 100644 --- a/src/device/oprom/include/x86emu/x86emu.h +++ b/src/device/oprom/include/x86emu/x86emu.h @@ -42,6 +42,7 @@ #define __X86EMU_X86EMU_H
#include <stddef.h> +#include <console/console.h> #if CONFIG(X86EMU_DEBUG) #define DEBUG #endif
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
Patch Set 1: Code-Review+1
(1 comment)
https://review.coreboot.org/#/c/32499/1/src/device/oprom/include/x86emu/x86e... File src/device/oprom/include/x86emu/x86emu.h:
https://review.coreboot.org/#/c/32499/1/src/device/oprom/include/x86emu/x86e... PS1, Line 45: #include <console/console.h> Once adding it back take care of the alphabetical order we have agreed on for includes? Doing so would mean to add console/console.h before stddef.h.
Hello Werner Zeh, HAOUAS Elyes, build bot (Jenkins), Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32499
to look at the new patch set (#2).
Change subject: x86emu: add console.h header to fix compilation ......................................................................
x86emu: add console.h header to fix compilation
Commit 351e3e5 ("src: Use include <console/console.h> when appropriate") has broken the build here, see below, so we include console.h again for x86emu.
In file included from src/device/oprom/x86emu/x86emui.h:65, from src/device/oprom/x86emu/debug.c:40: src/device/oprom/x86emu/debug.c: In function 'x86emu_dump_regs': src/device/oprom/x86emu/debug.h:46:22: error: implicit declaration of function 'printk'; did you mean 'printf'? [-Werror=implicit-function-declaration] #define printf(x...) printk(BIOS_DEBUG, x) ^~~~~~ src/device/oprom/x86emu/debug.c:366:5: note: in expansion of macro 'printf' printf("\tAX=%04x ", M.x86.R_AX ); ^~~~~~
Fixes: 351e3e5 ("src: Use include <console/console.h> when appropriate") Change-Id: I75d0b7c08bfa6dcb07778bbb762223b62cfc3da7 Signed-off-by: Martin Kepplinger martink@posteo.de --- M src/device/oprom/include/x86emu/x86emu.h 1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/32499/2
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
Patch Set 2: Code-Review+2
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
Patch Set 2:
why don't you include <console.h> here "src/device/oprom/x86emu/debug.h" instead of src/device/oprom/include/x86emu/x86emu.h ?
Martin Kepplinger has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
Patch Set 2:
Patch Set 2:
why don't you include <console.h> here "src/device/oprom/x86emu/debug.h" instead of src/device/oprom/include/x86emu/x86emu.h ?
I've put it where it's been before. Should I change it?
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
Patch Set 2:
Patch Set 2:
why don't you include <console.h> here "src/device/oprom/x86emu/debug.h"
instead of src/device/oprom/include/x86emu/x86emu.h ?
I've put it where it's been before. Should I change it?
(git log -p src/device/oprom/x86emu/debug.h)
<console.h> is missing here: src/device/oprom/x86emu/debug.h so I would add that include into "src/device/oprom/x86emu/debug.h" and not src/device/oprom/include/x86emu/x86emu.h
Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
Patch Set 2: Code-Review+1
Hello Werner Zeh, HAOUAS Elyes, Paul Menzel, build bot (Jenkins), Patrick Georgi,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/32499
to look at the new patch set (#3).
Change subject: x86emu: add console.h header to fix compilation ......................................................................
x86emu: add console.h header to fix compilation
Commit 351e3e5 ("src: Use include <console/console.h> when appropriate") has broken the build here, see below, so we include console.h here again.
In file included from src/device/oprom/x86emu/x86emui.h:65, from src/device/oprom/x86emu/debug.c:40: src/device/oprom/x86emu/debug.c: In function 'x86emu_dump_regs': src/device/oprom/x86emu/debug.h:46:22: error: implicit declaration of function 'printk'; did you mean 'printf'? [-Werror=implicit-function-declaration] #define printf(x...) printk(BIOS_DEBUG, x) ^~~~~~ src/device/oprom/x86emu/debug.c:366:5: note: in expansion of macro 'printf' printf("\tAX=%04x ", M.x86.R_AX ); ^~~~~~
Fixes: 351e3e5 ("src: Use include <console/console.h> when appropriate") Change-Id: I75d0b7c08bfa6dcb07778bbb762223b62cfc3da7 Signed-off-by: Martin Kepplinger martink@posteo.de --- M src/device/oprom/x86emu/debug.h 1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/99/32499/3
HAOUAS Elyes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
Patch Set 3: Code-Review+2
Martin Kepplinger has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
Patch Set 3:
thanks for reviewing. any other reason why not to merge the fix?
Werner Zeh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
Patch Set 3: Code-Review+2
Werner Zeh has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32499 )
Change subject: x86emu: add console.h header to fix compilation ......................................................................
x86emu: add console.h header to fix compilation
Commit 351e3e5 ("src: Use include <console/console.h> when appropriate") has broken the build here, see below, so we include console.h here again.
In file included from src/device/oprom/x86emu/x86emui.h:65, from src/device/oprom/x86emu/debug.c:40: src/device/oprom/x86emu/debug.c: In function 'x86emu_dump_regs': src/device/oprom/x86emu/debug.h:46:22: error: implicit declaration of function 'printk'; did you mean 'printf'? [-Werror=implicit-function-declaration] #define printf(x...) printk(BIOS_DEBUG, x) ^~~~~~ src/device/oprom/x86emu/debug.c:366:5: note: in expansion of macro 'printf' printf("\tAX=%04x ", M.x86.R_AX ); ^~~~~~
Fixes: 351e3e5 ("src: Use include <console/console.h> when appropriate") Change-Id: I75d0b7c08bfa6dcb07778bbb762223b62cfc3da7 Signed-off-by: Martin Kepplinger martink@posteo.de Reviewed-on: https://review.coreboot.org/c/coreboot/+/32499 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Reviewed-by: Werner Zeh werner.zeh@siemens.com --- M src/device/oprom/x86emu/debug.h 1 file changed, 2 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Werner Zeh: Looks good to me, approved HAOUAS Elyes: Looks good to me, approved
diff --git a/src/device/oprom/x86emu/debug.h b/src/device/oprom/x86emu/debug.h index f89d5ab..01f633c 100644 --- a/src/device/oprom/x86emu/debug.h +++ b/src/device/oprom/x86emu/debug.h @@ -39,6 +39,8 @@ #ifndef __X86EMU_DEBUG_H #define __X86EMU_DEBUG_H
+#include <console/console.h> + /*---------------------- Macros and type definitions ----------------------*/
/* printf is not available in coreboot... use printk */
-
HAOUAS Elyes (Code Review) -
Martin Kepplinger (Code Review)
-
Paul Menzel (Code Review)
-
Werner Zeh (Code Review)