Elyes Haouas has submitted this change. ( https://review.coreboot.org/c/coreboot/+/73794 )
Change subject: sb/intel/i82371eb/chip.h: Use 'bool' instead of 'int' ......................................................................
sb/intel/i82371eb/chip.h: Use 'bool' instead of 'int'
This to fix following error using Clang-16.0.0: CC romstage/mainboard/emulation/qemu-i440fx/static.o build/mainboard/emulation/qemu-i440fx/static.c:31:17: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] .ide0_enable = 1, ^ build/mainboard/emulation/qemu-i440fx/static.c:32:17: error: implicit truncation from 'int' to a one-bit wide bit-field changes value from 1 to -1 [-Werror,-Wsingle-bit-bitfield-constant-conversion] .ide1_enable = 1, ^
Change-Id: I36cc19bc2908119fe940941e108ee217a7b26f50 Signed-off-by: Elyes Haouas ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/coreboot/+/73794 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Felix Singer felixsinger@posteo.net --- M src/mainboard/asus/p2b/devicetree.cb M src/mainboard/emulation/qemu-i440fx/devicetree.cb M src/southbridge/intel/i82371eb/chip.h 3 files changed, 41 insertions(+), 18 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Singer: Looks good to me, approved
diff --git a/src/mainboard/asus/p2b/devicetree.cb b/src/mainboard/asus/p2b/devicetree.cb index a650552..42bdade 100644 --- a/src/mainboard/asus/p2b/devicetree.cb +++ b/src/mainboard/asus/p2b/devicetree.cb @@ -42,14 +42,14 @@ device pci 4.1 on end # IDE device pci 4.2 on end # USB device pci 4.3 on end # ACPI - register "ide0_enable" = "1" - register "ide1_enable" = "1" - register "ide_legacy_enable" = "1" + register "ide0_enable" = "true" + register "ide1_enable" = "true" + register "ide_legacy_enable" = "true" # Enable UDMA/33 for higher speed if your IDE device(s) support it. - register "ide0_drive0_udma33_enable" = "1" - register "ide0_drive1_udma33_enable" = "1" - register "ide1_drive0_udma33_enable" = "1" - register "ide1_drive1_udma33_enable" = "1" + register "ide0_drive0_udma33_enable" = "true" + register "ide0_drive1_udma33_enable" = "true" + register "ide1_drive0_udma33_enable" = "true" + register "ide1_drive1_udma33_enable" = "true" register "thrm_polarity" = "1" register "lid_polarity" = "1" end diff --git a/src/mainboard/emulation/qemu-i440fx/devicetree.cb b/src/mainboard/emulation/qemu-i440fx/devicetree.cb index 385fa24..cecba1c 100644 --- a/src/mainboard/emulation/qemu-i440fx/devicetree.cb +++ b/src/mainboard/emulation/qemu-i440fx/devicetree.cb @@ -6,8 +6,8 @@ device pci 01.0 on end # ISA bridge device pci 01.1 on end # IDE device pci 01.3 on end # ACPI - register "ide0_enable" = "1" - register "ide1_enable" = "1" + register "ide0_enable" = "true" + register "ide1_enable" = "true" register "gpo" = "0x7fffbbff" end end diff --git a/src/southbridge/intel/i82371eb/chip.h b/src/southbridge/intel/i82371eb/chip.h index 264f74f..5652cd2 100644 --- a/src/southbridge/intel/i82371eb/chip.h +++ b/src/southbridge/intel/i82371eb/chip.h @@ -4,17 +4,18 @@ #define SOUTHBRIDGE_INTEL_I82371EB_CHIP_H
#include <device/device.h> +#include <types.h>
struct southbridge_intel_i82371eb_config { - int ide0_enable:1; - int ide0_drive0_udma33_enable:1; - int ide0_drive1_udma33_enable:1; - int ide1_enable:1; - int ide1_drive0_udma33_enable:1; - int ide1_drive1_udma33_enable:1; - int ide_legacy_enable:1; - int usb_enable:1; - int gpo22_enable:1; /* GPO22/GPO23 (1) vs. XDIR#/XOE# (0) */ + bool ide0_enable; + bool ide0_drive0_udma33_enable; + bool ide0_drive1_udma33_enable; + bool ide1_enable; + bool ide1_drive0_udma33_enable; + bool ide1_drive1_udma33_enable; + bool ide_legacy_enable; + bool usb_enable; + bool gpo22_enable; /* GPO22/GPO23 (1) vs. XDIR#/XOE# (0) */ int gpo22:1; int gpo23:1; /* acpi */
-
Elyes Haouas (Code Review)