* [PATCH v2 0/3] hw/lm32: Kconfig cleanups
@ 2021-02-21 22:56 Philippe Mathieu-Daudé
2021-02-21 22:56 ` [PATCH v2 1/3] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards Philippe Mathieu-Daudé
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-02-21 22:56 UTC (permalink / raw)
To: qemu-trivial, qemu-devel
Cc: Paolo Bonzini, Michael Walle, Philippe Mathieu-Daudé,
Marc-André Lureau
Hi Laurent,
This series is fully reviewed. Since LM32 is not very
active, can this go via qemu-trivial@?
Thanks,
Phil.
v2: Rebased
Supersedes: <20210208135048.2601693-1-f4bug@amsat.org>
Philippe Mathieu-Daudé (3):
hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards
hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES
hw/lm32/Kconfig: Have MILKYMIST select LM32_DEVICES
default-configs/devices/lm32-softmmu.mak | 2 +-
hw/char/meson.build | 4 ++--
hw/intc/meson.build | 2 +-
hw/lm32/Kconfig | 10 +++++++---
hw/lm32/meson.build | 2 +-
hw/timer/meson.build | 2 +-
6 files changed, 13 insertions(+), 9 deletions(-)
--
2.26.2
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/3] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards
2021-02-21 22:56 [PATCH v2 0/3] hw/lm32: Kconfig cleanups Philippe Mathieu-Daudé
@ 2021-02-21 22:56 ` Philippe Mathieu-Daudé
2021-03-09 21:35 ` Laurent Vivier
2021-02-21 22:56 ` [PATCH v2 2/3] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES Philippe Mathieu-Daudé
` (2 subsequent siblings)
3 siblings, 1 reply; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-02-21 22:56 UTC (permalink / raw)
To: qemu-trivial, qemu-devel
Cc: Paolo Bonzini, Michael Walle, Alex Bennée,
Philippe Mathieu-Daudé,
Marc-André Lureau
We want to be able to use the 'LM32' config for architecture
specific features. Introduce CONFIG_LM32_EVR to select the
lm32-evr / lm32-uclinux boards.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
default-configs/devices/lm32-softmmu.mak | 2 +-
hw/lm32/Kconfig | 6 +++++-
hw/lm32/meson.build | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/default-configs/devices/lm32-softmmu.mak b/default-configs/devices/lm32-softmmu.mak
index 115b3e34c98..1bce3f6e8b6 100644
--- a/default-configs/devices/lm32-softmmu.mak
+++ b/default-configs/devices/lm32-softmmu.mak
@@ -8,5 +8,5 @@ CONFIG_SEMIHOSTING=y
# Boards:
#
-CONFIG_LM32=y
+CONFIG_LM32_EVR=y
CONFIG_MILKYMIST=y
diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
index ed2e3060b04..20c36edc402 100644
--- a/hw/lm32/Kconfig
+++ b/hw/lm32/Kconfig
@@ -1,7 +1,6 @@
config LM32
bool
select PTIMER
- select PFLASH_CFI02
config MILKYMIST
bool
@@ -12,3 +11,8 @@ config MILKYMIST
select FRAMEBUFFER
select SD
select USB_OHCI
+
+config LM32_EVR
+ bool
+ select LM32
+ select PFLASH_CFI02
diff --git a/hw/lm32/meson.build b/hw/lm32/meson.build
index 8caf0a727ff..42d6f8db3d9 100644
--- a/hw/lm32/meson.build
+++ b/hw/lm32/meson.build
@@ -1,6 +1,6 @@
lm32_ss = ss.source_set()
# LM32 boards
-lm32_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_boards.c'))
+lm32_ss.add(when: 'CONFIG_LM32_EVR', if_true: files('lm32_boards.c'))
lm32_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist.c'))
hw_arch += {'lm32': lm32_ss}
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 2/3] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES
2021-02-21 22:56 [PATCH v2 0/3] hw/lm32: Kconfig cleanups Philippe Mathieu-Daudé
2021-02-21 22:56 ` [PATCH v2 1/3] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards Philippe Mathieu-Daudé
@ 2021-02-21 22:56 ` Philippe Mathieu-Daudé
2021-03-09 21:36 ` Laurent Vivier
2021-02-21 22:56 ` [PATCH v2 3/3] hw/lm32/Kconfig: Have MILKYMIST select LM32_DEVICES Philippe Mathieu-Daudé
2021-03-08 10:19 ` [PATCH v2 0/3] hw/lm32: Kconfig cleanups Philippe Mathieu-Daudé
3 siblings, 1 reply; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-02-21 22:56 UTC (permalink / raw)
To: qemu-trivial, qemu-devel
Cc: Paolo Bonzini, Michael Walle, Alex Bennée,
Philippe Mathieu-Daudé,
Marc-André Lureau
We want to be able to use the 'LM32' config for architecture
specific features. As CONFIG_LM32 is only used to select
peripherals, rename it CONFIG_LM32_DEVICES.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/char/meson.build | 4 ++--
hw/intc/meson.build | 2 +-
hw/lm32/Kconfig | 4 ++--
hw/timer/meson.build | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hw/char/meson.build b/hw/char/meson.build
index 196ac91fa29..b95e8958514 100644
--- a/hw/char/meson.build
+++ b/hw/char/meson.build
@@ -8,8 +8,8 @@
softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c'))
softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c'))
softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c'))
-softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_juart.c'))
-softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_uart.c'))
+softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_juart.c'))
+softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_uart.c'))
softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-uart.c'))
softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c'))
softmmu_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c'))
diff --git a/hw/intc/meson.build b/hw/intc/meson.build
index 53cba115690..b2c4c085af9 100644
--- a/hw/intc/meson.build
+++ b/hw/intc/meson.build
@@ -14,7 +14,7 @@
softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c'))
softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
-softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_pic.c'))
+softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_pic.c'))
softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_intc.c'))
diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
index 20c36edc402..518c84ed508 100644
--- a/hw/lm32/Kconfig
+++ b/hw/lm32/Kconfig
@@ -1,4 +1,4 @@
-config LM32
+config LM32_DEVICES
bool
select PTIMER
@@ -14,5 +14,5 @@ config MILKYMIST
config LM32_EVR
bool
- select LM32
+ select LM32_DEVICES
select PFLASH_CFI02
diff --git a/hw/timer/meson.build b/hw/timer/meson.build
index be343f68fed..52723f34c42 100644
--- a/hw/timer/meson.build
+++ b/hw/timer/meson.build
@@ -19,7 +19,7 @@
softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c'))
softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c'))
softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c'))
-softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_timer.c'))
+softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_timer.c'))
softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-sysctl.c'))
softmmu_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c'))
softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c'))
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] hw/lm32/Kconfig: Have MILKYMIST select LM32_DEVICES
2021-02-21 22:56 [PATCH v2 0/3] hw/lm32: Kconfig cleanups Philippe Mathieu-Daudé
2021-02-21 22:56 ` [PATCH v2 1/3] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards Philippe Mathieu-Daudé
2021-02-21 22:56 ` [PATCH v2 2/3] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES Philippe Mathieu-Daudé
@ 2021-02-21 22:56 ` Philippe Mathieu-Daudé
2021-03-09 21:37 ` Laurent Vivier
2021-03-08 10:19 ` [PATCH v2 0/3] hw/lm32: Kconfig cleanups Philippe Mathieu-Daudé
3 siblings, 1 reply; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-02-21 22:56 UTC (permalink / raw)
To: qemu-trivial, qemu-devel
Cc: Paolo Bonzini, Michael Walle, Alex Bennée,
Philippe Mathieu-Daudé,
Marc-André Lureau
The Milkymist board requires more than the PTIMER. Directly
select the LM32_DEVICES. This fixes:
/usr/bin/ld:
libqemu-lm32-softmmu.fa.p/target_lm32_gdbstub.c.o: in function `lm32_cpu_gdb_read_register':
target/lm32/gdbstub.c:46: undefined reference to `lm32_pic_get_im'
target/lm32/gdbstub.c:48: undefined reference to `lm32_pic_get_ip'
libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_wcsr_im':
target/lm32/op_helper.c:107: undefined reference to `lm32_pic_set_im'
libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_wcsr_ip':
target/lm32/op_helper.c:114: undefined reference to `lm32_pic_set_ip'
libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_wcsr_jtx':
target/lm32/op_helper.c:120: undefined reference to `lm32_juart_set_jtx'
libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_wcsr_jrx':
target/lm32/op_helper.c:125: undefined reference to `lm32_juart_set_jrx'
libqemu-lm32-softmmu.fa.p/target_lm32_translate.c.o: in function `lm32_cpu_dump_state':
target/lm32/translate.c:1161: undefined reference to `lm32_pic_get_ip'
target/lm32/translate.c:1161: undefined reference to `lm32_pic_get_im'
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/lm32/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
index 518c84ed508..8ac94205d71 100644
--- a/hw/lm32/Kconfig
+++ b/hw/lm32/Kconfig
@@ -6,11 +6,11 @@ config MILKYMIST
bool
# FIXME: disabling it results in compile-time errors
select MILKYMIST_TMU2 if OPENGL && X11
- select PTIMER
select PFLASH_CFI01
select FRAMEBUFFER
select SD
select USB_OHCI
+ select LM32_DEVICES
config LM32_EVR
bool
--
2.26.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 0/3] hw/lm32: Kconfig cleanups
2021-02-21 22:56 [PATCH v2 0/3] hw/lm32: Kconfig cleanups Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2021-02-21 22:56 ` [PATCH v2 3/3] hw/lm32/Kconfig: Have MILKYMIST select LM32_DEVICES Philippe Mathieu-Daudé
@ 2021-03-08 10:19 ` Philippe Mathieu-Daudé
3 siblings, 0 replies; 8+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-03-08 10:19 UTC (permalink / raw)
To: qemu-trivial, qemu-devel
Cc: Paolo Bonzini, Michael Walle, Marc-André Lureau
ping?
On 2/21/21 11:56 PM, Philippe Mathieu-Daudé wrote:
> Hi Laurent,
>
> This series is fully reviewed. Since LM32 is not very
> active, can this go via qemu-trivial@?
>
> Thanks,
>
> Phil.
>
> v2: Rebased
>
> Supersedes: <20210208135048.2601693-1-f4bug@amsat.org>
>
> Philippe Mathieu-Daudé (3):
> hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards
> hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES
> hw/lm32/Kconfig: Have MILKYMIST select LM32_DEVICES
>
> default-configs/devices/lm32-softmmu.mak | 2 +-
> hw/char/meson.build | 4 ++--
> hw/intc/meson.build | 2 +-
> hw/lm32/Kconfig | 10 +++++++---
> hw/lm32/meson.build | 2 +-
> hw/timer/meson.build | 2 +-
> 6 files changed, 13 insertions(+), 9 deletions(-)
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards
2021-02-21 22:56 ` [PATCH v2 1/3] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards Philippe Mathieu-Daudé
@ 2021-03-09 21:35 ` Laurent Vivier
0 siblings, 0 replies; 8+ messages in thread
From: Laurent Vivier @ 2021-03-09 21:35 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-trivial, qemu-devel
Cc: Paolo Bonzini, Alex Bennée, Marc-André Lureau
Le 21/02/2021 à 23:56, Philippe Mathieu-Daudé a écrit :
> We want to be able to use the 'LM32' config for architecture
> specific features. Introduce CONFIG_LM32_EVR to select the
> lm32-evr / lm32-uclinux boards.
>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> default-configs/devices/lm32-softmmu.mak | 2 +-
> hw/lm32/Kconfig | 6 +++++-
> hw/lm32/meson.build | 2 +-
> 3 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/default-configs/devices/lm32-softmmu.mak b/default-configs/devices/lm32-softmmu.mak
> index 115b3e34c98..1bce3f6e8b6 100644
> --- a/default-configs/devices/lm32-softmmu.mak
> +++ b/default-configs/devices/lm32-softmmu.mak
> @@ -8,5 +8,5 @@ CONFIG_SEMIHOSTING=y
>
> # Boards:
> #
> -CONFIG_LM32=y
> +CONFIG_LM32_EVR=y
> CONFIG_MILKYMIST=y
> diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
> index ed2e3060b04..20c36edc402 100644
> --- a/hw/lm32/Kconfig
> +++ b/hw/lm32/Kconfig
> @@ -1,7 +1,6 @@
> config LM32
> bool
> select PTIMER
> - select PFLASH_CFI02
>
> config MILKYMIST
> bool
> @@ -12,3 +11,8 @@ config MILKYMIST
> select FRAMEBUFFER
> select SD
> select USB_OHCI
> +
> +config LM32_EVR
> + bool
> + select LM32
> + select PFLASH_CFI02
> diff --git a/hw/lm32/meson.build b/hw/lm32/meson.build
> index 8caf0a727ff..42d6f8db3d9 100644
> --- a/hw/lm32/meson.build
> +++ b/hw/lm32/meson.build
> @@ -1,6 +1,6 @@
> lm32_ss = ss.source_set()
> # LM32 boards
> -lm32_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_boards.c'))
> +lm32_ss.add(when: 'CONFIG_LM32_EVR', if_true: files('lm32_boards.c'))
> lm32_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist.c'))
>
> hw_arch += {'lm32': lm32_ss}
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/3] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES
2021-02-21 22:56 ` [PATCH v2 2/3] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES Philippe Mathieu-Daudé
@ 2021-03-09 21:36 ` Laurent Vivier
0 siblings, 0 replies; 8+ messages in thread
From: Laurent Vivier @ 2021-03-09 21:36 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-trivial, qemu-devel
Cc: Paolo Bonzini, Michael Walle, Alex Bennée, Marc-André Lureau
Le 21/02/2021 à 23:56, Philippe Mathieu-Daudé a écrit :
> We want to be able to use the 'LM32' config for architecture
> specific features. As CONFIG_LM32 is only used to select
> peripherals, rename it CONFIG_LM32_DEVICES.
>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/char/meson.build | 4 ++--
> hw/intc/meson.build | 2 +-
> hw/lm32/Kconfig | 4 ++--
> hw/timer/meson.build | 2 +-
> 4 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/char/meson.build b/hw/char/meson.build
> index 196ac91fa29..b95e8958514 100644
> --- a/hw/char/meson.build
> +++ b/hw/char/meson.build
> @@ -8,8 +8,8 @@
> softmmu_ss.add(when: 'CONFIG_IPACK', if_true: files('ipoctal232.c'))
> softmmu_ss.add(when: 'CONFIG_ISA_BUS', if_true: files('parallel-isa.c'))
> softmmu_ss.add(when: 'CONFIG_ISA_DEBUG', if_true: files('debugcon.c'))
> -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_juart.c'))
> -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_uart.c'))
> +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_juart.c'))
> +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_uart.c'))
> softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-uart.c'))
> softmmu_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_uart.c'))
> softmmu_ss.add(when: 'CONFIG_PARALLEL', if_true: files('parallel.c'))
> diff --git a/hw/intc/meson.build b/hw/intc/meson.build
> index 53cba115690..b2c4c085af9 100644
> --- a/hw/intc/meson.build
> +++ b/hw/intc/meson.build
> @@ -14,7 +14,7 @@
> softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c'))
> softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c'))
> softmmu_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic_common.c'))
> -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_pic.c'))
> +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_pic.c'))
> softmmu_ss.add(when: 'CONFIG_OPENPIC', if_true: files('openpic.c'))
> softmmu_ss.add(when: 'CONFIG_PL190', if_true: files('pl190.c'))
> softmmu_ss.add(when: 'CONFIG_PUV3', if_true: files('puv3_intc.c'))
> diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
> index 20c36edc402..518c84ed508 100644
> --- a/hw/lm32/Kconfig
> +++ b/hw/lm32/Kconfig
> @@ -1,4 +1,4 @@
> -config LM32
> +config LM32_DEVICES
> bool
> select PTIMER
>
> @@ -14,5 +14,5 @@ config MILKYMIST
>
> config LM32_EVR
> bool
> - select LM32
> + select LM32_DEVICES
> select PFLASH_CFI02
> diff --git a/hw/timer/meson.build b/hw/timer/meson.build
> index be343f68fed..52723f34c42 100644
> --- a/hw/timer/meson.build
> +++ b/hw/timer/meson.build
> @@ -19,7 +19,7 @@
> softmmu_ss.add(when: 'CONFIG_I8254', if_true: files('i8254_common.c', 'i8254.c'))
> softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_epit.c'))
> softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_gpt.c'))
> -softmmu_ss.add(when: 'CONFIG_LM32', if_true: files('lm32_timer.c'))
> +softmmu_ss.add(when: 'CONFIG_LM32_DEVICES', if_true: files('lm32_timer.c'))
> softmmu_ss.add(when: 'CONFIG_MILKYMIST', if_true: files('milkymist-sysctl.c'))
> softmmu_ss.add(when: 'CONFIG_MIPS_CPS', if_true: files('mips_gictimer.c'))
> softmmu_ss.add(when: 'CONFIG_MSF2', if_true: files('mss-timer.c'))
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 3/3] hw/lm32/Kconfig: Have MILKYMIST select LM32_DEVICES
2021-02-21 22:56 ` [PATCH v2 3/3] hw/lm32/Kconfig: Have MILKYMIST select LM32_DEVICES Philippe Mathieu-Daudé
@ 2021-03-09 21:37 ` Laurent Vivier
0 siblings, 0 replies; 8+ messages in thread
From: Laurent Vivier @ 2021-03-09 21:37 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-trivial, qemu-devel
Cc: Paolo Bonzini, Michael Walle, Alex Bennée, Marc-André Lureau
Le 21/02/2021 à 23:56, Philippe Mathieu-Daudé a écrit :
> The Milkymist board requires more than the PTIMER. Directly
> select the LM32_DEVICES. This fixes:
>
> /usr/bin/ld:
> libqemu-lm32-softmmu.fa.p/target_lm32_gdbstub.c.o: in function `lm32_cpu_gdb_read_register':
> target/lm32/gdbstub.c:46: undefined reference to `lm32_pic_get_im'
> target/lm32/gdbstub.c:48: undefined reference to `lm32_pic_get_ip'
> libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_wcsr_im':
> target/lm32/op_helper.c:107: undefined reference to `lm32_pic_set_im'
> libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_wcsr_ip':
> target/lm32/op_helper.c:114: undefined reference to `lm32_pic_set_ip'
> libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_wcsr_jtx':
> target/lm32/op_helper.c:120: undefined reference to `lm32_juart_set_jtx'
> libqemu-lm32-softmmu.fa.p/target_lm32_op_helper.c.o: in function `helper_wcsr_jrx':
> target/lm32/op_helper.c:125: undefined reference to `lm32_juart_set_jrx'
> libqemu-lm32-softmmu.fa.p/target_lm32_translate.c.o: in function `lm32_cpu_dump_state':
> target/lm32/translate.c:1161: undefined reference to `lm32_pic_get_ip'
> target/lm32/translate.c:1161: undefined reference to `lm32_pic_get_im'
>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> hw/lm32/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/hw/lm32/Kconfig b/hw/lm32/Kconfig
> index 518c84ed508..8ac94205d71 100644
> --- a/hw/lm32/Kconfig
> +++ b/hw/lm32/Kconfig
> @@ -6,11 +6,11 @@ config MILKYMIST
> bool
> # FIXME: disabling it results in compile-time errors
> select MILKYMIST_TMU2 if OPENGL && X11
> - select PTIMER
> select PFLASH_CFI01
> select FRAMEBUFFER
> select SD
> select USB_OHCI
> + select LM32_DEVICES
>
> config LM32_EVR
> bool
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-03-09 21:39 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-21 22:56 [PATCH v2 0/3] hw/lm32: Kconfig cleanups Philippe Mathieu-Daudé
2021-02-21 22:56 ` [PATCH v2 1/3] hw/lm32/Kconfig: Introduce CONFIG_LM32_EVR for lm32-evr/uclinux boards Philippe Mathieu-Daudé
2021-03-09 21:35 ` Laurent Vivier
2021-02-21 22:56 ` [PATCH v2 2/3] hw/lm32/Kconfig: Rename CONFIG_LM32 -> CONFIG_LM32_DEVICES Philippe Mathieu-Daudé
2021-03-09 21:36 ` Laurent Vivier
2021-02-21 22:56 ` [PATCH v2 3/3] hw/lm32/Kconfig: Have MILKYMIST select LM32_DEVICES Philippe Mathieu-Daudé
2021-03-09 21:37 ` Laurent Vivier
2021-03-08 10:19 ` [PATCH v2 0/3] hw/lm32: Kconfig cleanups Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.