Rename config REGISTER to HW_REGISTER. register is a C keyword, and a later TargetKconfig commit will use it as a struct member.
Signed-off-by: Yonggang Luo <[email protected]> --- hw/Kconfig | 2 +- hw/core/Kconfig | 2 +- hw/core/meson.build | 2 +- hw/dma/Kconfig | 4 ++-- hw/i2c/Kconfig | 2 +- hw/usb/Kconfig | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hw/Kconfig b/hw/Kconfig index c92ca2b13a3..94f963f2944 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -85,7 +85,7 @@ config XILINX_AXI config XLNX_ZYNQMP bool - select REGISTER + select HW_REGISTER select CAN_BUS select PTIMER select XLNX_BBRAM diff --git a/hw/core/Kconfig b/hw/core/Kconfig index d1bdf765ee8..839e249b9d0 100644 --- a/hw/core/Kconfig +++ b/hw/core/Kconfig @@ -29,7 +29,7 @@ config PLATFORM_BUS bool depends on DEVICE_TREE -config REGISTER +config HW_REGISTER bool config SPLIT_IRQ diff --git a/hw/core/meson.build b/hw/core/meson.build index 8fe776d2c86..1c645d7041d 100644 --- a/hw/core/meson.build +++ b/hw/core/meson.build @@ -21,7 +21,7 @@ system_ss.add(when: 'CONFIG_GUEST_LOADER', if_true: files('guest-loader.c')) system_ss.add(when: 'CONFIG_OR_IRQ', if_true: files('or-irq.c')) system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('platform-bus.c')) system_ss.add(when: 'CONFIG_PTIMER', if_true: files('ptimer.c')) -system_ss.add(when: 'CONFIG_REGISTER', if_true: files('register.c')) +system_ss.add(when: 'CONFIG_HW_REGISTER', if_true: files('register.c')) system_ss.add(when: 'CONFIG_SPLIT_IRQ', if_true: files('split-irq.c')) system_ss.add(when: 'CONFIG_XILINX_AXI', if_true: files('stream.c')) system_ss.add(when: 'CONFIG_PLATFORM_BUS', if_true: files('sysbus-fdt.c')) diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig index 0a23e7d7b87..8f221b20634 100644 --- a/hw/dma/Kconfig +++ b/hw/dma/Kconfig @@ -16,7 +16,7 @@ config I8257 config ZYNQ_DEVCFG bool - select REGISTER + select HW_REGISTER config XLNX_ZDMA bool @@ -29,7 +29,7 @@ config SIFIVE_PDMA config XLNX_CSU_DMA bool - select REGISTER + select HW_REGISTER config K230_GSDMA bool \ No newline at end of file diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig index 0766130b596..3482f475cf9 100644 --- a/hw/i2c/Kconfig +++ b/hw/i2c/Kconfig @@ -20,7 +20,7 @@ config ARM_SBCON_I2C config DESIGNWARE_I2C bool - select REGISTER + select HW_REGISTER select I2C config ACPI_SMBUS diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig index e8c00f813a6..43771291a06 100644 --- a/hw/usb/Kconfig +++ b/hw/usb/Kconfig @@ -137,7 +137,7 @@ config IMX_USBPHY config USB_DWC3 bool select USB_XHCI_SYSBUS - select REGISTER + select HW_REGISTER config XLNX_USB_SUBSYS bool -- 2.52.0.windows.1
