Message ID | 20250521223414.248276-3-pierrick.bouvier@linaro.org |
---|---|
State | New |
Headers | show |
Series | single-binary: build target common libraries with dependencies | expand |
On 22/05/2025 00.34, Pierrick Bouvier wrote: > Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> > --- > hw/arm/meson.build | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/arm/meson.build b/hw/arm/meson.build > index 5098795f61d..d90be8f4c94 100644 > --- a/hw/arm/meson.build > +++ b/hw/arm/meson.build > @@ -8,7 +8,7 @@ arm_common_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) > arm_common_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c')) > arm_common_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c')) > arm_common_ss.add(when: 'CONFIG_MPS3R', if_true: files('mps3r.c')) > -arm_common_ss.add(when: 'CONFIG_MUSICPAL', if_true: [pixman, files('musicpal.c')]) > +arm_common_ss.add(when: 'CONFIG_MUSICPAL', if_true: [files('musicpal.c')]) > arm_common_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c')) > arm_common_ss.add(when: 'CONFIG_OLIMEX_STM32_H405', if_true: files('olimex-stm32-h405.c')) > arm_common_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npcm7xx_boards.c')) > @@ -79,7 +79,7 @@ arm_common_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) > arm_common_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) > arm_common_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) > > -arm_common_ss.add(fdt, files('boot.c')) > +arm_common_ss.add(files('boot.c')) Reviewed-by: Thomas Huth <thuth@redhat.com> There is another bunch of pixmans in hw/display/meson.build and hw/s390x/meson.build ... I wonder whether we could get rid of those now, too?
diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 5098795f61d..d90be8f4c94 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -8,7 +8,7 @@ arm_common_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) arm_common_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c')) arm_common_ss.add(when: 'CONFIG_MICROBIT', if_true: files('microbit.c')) arm_common_ss.add(when: 'CONFIG_MPS3R', if_true: files('mps3r.c')) -arm_common_ss.add(when: 'CONFIG_MUSICPAL', if_true: [pixman, files('musicpal.c')]) +arm_common_ss.add(when: 'CONFIG_MUSICPAL', if_true: [files('musicpal.c')]) arm_common_ss.add(when: 'CONFIG_NETDUINOPLUS2', if_true: files('netduinoplus2.c')) arm_common_ss.add(when: 'CONFIG_OLIMEX_STM32_H405', if_true: files('olimex-stm32-h405.c')) arm_common_ss.add(when: 'CONFIG_NPCM7XX', if_true: files('npcm7xx.c', 'npcm7xx_boards.c')) @@ -79,7 +79,7 @@ arm_common_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) arm_common_ss.add(when: 'CONFIG_VERSATILE', if_true: files('versatilepb.c')) arm_common_ss.add(when: 'CONFIG_VEXPRESS', if_true: files('vexpress.c')) -arm_common_ss.add(fdt, files('boot.c')) +arm_common_ss.add(files('boot.c')) hw_arch += {'arm': arm_ss} hw_common_arch += {'arm': arm_common_ss}
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> --- hw/arm/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)