Re: [PATCH 104/150] meson: convert hw/nvram

["Philippe Mathieu-Daudé" <philmd@redhat.com>]

On 8/17/20 4:40 PM, Paolo Bonzini wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
> 
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  hw/Makefile.objs       | 1 -
>  hw/meson.build         | 1 +
>  hw/nvram/Makefile.objs | 8 --------
>  hw/nvram/meson.build   | 9 +++++++++
>  4 files changed, 10 insertions(+), 9 deletions(-)
>  delete mode 100644 hw/nvram/Makefile.objs
>  create mode 100644 hw/nvram/meson.build
> 
> diff --git a/hw/Makefile.objs b/hw/Makefile.objs
> index 20832841d2..78860ae9c7 100644
> --- a/hw/Makefile.objs
> +++ b/hw/Makefile.objs
> @@ -20,7 +20,6 @@ devices-dirs-y += isa/
>  devices-dirs-y += misc/
>  devices-dirs-y += net/
>  devices-dirs-y += rdma/
> -devices-dirs-y += nvram/
>  endif
>  
>  common-obj-y += $(devices-dirs-y)
> diff --git a/hw/meson.build b/hw/meson.build
> index 53c347c395..0bdd6a2613 100644
> --- a/hw/meson.build
> +++ b/hw/meson.build
> @@ -1,6 +1,7 @@
>  subdir('core')
>  subdir('mem')
>  subdir('nubus')
> +subdir('nvram')
>  subdir('pci')
>  subdir('pci-bridge')
>  subdir('pci-host')
> diff --git a/hw/nvram/Makefile.objs b/hw/nvram/Makefile.objs
> deleted file mode 100644
> index f3ad921382..0000000000
> --- a/hw/nvram/Makefile.objs
> +++ /dev/null
> @@ -1,8 +0,0 @@
> -common-obj-$(CONFIG_DS1225Y) += ds1225y.o
> -common-obj-$(CONFIG_NMC93XX_EEPROM) += eeprom93xx.o
> -common-obj-$(CONFIG_AT24C) += eeprom_at24c.o
> -common-obj-y += fw_cfg.o
> -common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o
> -common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
> -common-obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o
> -obj-$(CONFIG_PSERIES) += spapr_nvram.o
> diff --git a/hw/nvram/meson.build b/hw/nvram/meson.build
> new file mode 100644
> index 0000000000..ba214558ac
> --- /dev/null
> +++ b/hw/nvram/meson.build
> @@ -0,0 +1,9 @@
> +softmmu_ss.add(files('fw_cfg.c'))
> +softmmu_ss.add(when: 'CONFIG_CHRP_NVRAM', if_true: files('chrp_nvram.c'))
> +softmmu_ss.add(when: 'CONFIG_DS1225Y', if_true: files('ds1225y.c'))
> +softmmu_ss.add(when: 'CONFIG_NMC93XX_EEPROM', if_true: files('eeprom93xx.c'))
> +softmmu_ss.add(when: 'CONFIG_AT24C', if_true: files('eeprom_at24c.c'))
> +softmmu_ss.add(when: 'CONFIG_MAC_NVRAM', if_true: files('mac_nvram.c'))
> +softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_nvm.c'))
> +
> +specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('spapr_nvram.c'))
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>