Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
On 4/29/19 9:25 PM, Thomas Huth wrote: > On 25/04/2019 23.41, Philippe Mathieu-Daudé wrote: >> Hi Thomas, >> >> On 4/18/19 8:00 PM, Thomas Huth wrote: >>> This patch is slightly based on earlier work by Ákos Kovács (i.e. >>> his "hw/arm/Kconfig: Add ARM Kconfig" patch). >>> >>> Signed-off-by: Thomas Huth >>> --- >>> default-configs/arm-softmmu.mak | 7 +-- >>> hw/arm/Kconfig | 10 ++ >>> 2 files changed, 11 insertions(+), 6 deletions(-) >>> >>> diff --git a/default-configs/arm-softmmu.mak >>> b/default-configs/arm-softmmu.mak >>> index b7ed3c530b..3f82d635e4 100644 >>> --- a/default-configs/arm-softmmu.mak >>> +++ b/default-configs/arm-softmmu.mak >>> @@ -16,6 +16,7 @@ CONFIG_MUSCA=y >>> CONFIG_CHEETAH=y >>> CONFIG_SX1=y >>> CONFIG_NSERIES=y >>> +CONFIG_STELLARIS=y >>> >>> CONFIG_VGA=y >>> CONFIG_NAND=y >>> @@ -24,16 +25,10 @@ CONFIG_SERIAL=y >>> CONFIG_MAX7310=y >>> CONFIG_TMP421=y >>> CONFIG_PCA9552=y >>> -CONFIG_STELLARIS=y >>> -CONFIG_STELLARIS_INPUT=y >>> -CONFIG_STELLARIS_ENET=y >>> -CONFIG_SSD0303=y >>> -CONFIG_SSD0323=y >>> CONFIG_DDC=y >>> CONFIG_SII9022=y >>> CONFIG_ADS7846=y >>> CONFIG_MAX111X=y >>> -CONFIG_SSI_SD=y >>> CONFIG_SSI_M25P80=y >>> CONFIG_ALLWINNER_EMAC=y >>> CONFIG_IMX_FEC=y >>> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig >>> index 71126254ff..b91503f5a6 100644 >>> --- a/hw/arm/Kconfig >>> +++ b/hw/arm/Kconfig >>> @@ -91,6 +91,16 @@ config REALVIEW >>> >>> config STELLARIS >>> bool >>> +select ARM_V7M >>> +select I2C >>> +select PL011 # UART >>> +select PL022 # Serial port >>> +select PL061 # GPIO >>> +select SSD0303 # OLED display >>> +select SSD0323 # OLED display >>> +select SSI_SD >>> +select STELLARIS_INPUT >>> +select STELLARIS_ENET # ethernet >> >> This one misses CMSDK_APB_WATCHDOG: >> >> $ qemu-system-aarch64 -M lm3s811evb >> qemu-system-aarch64: Unknown device 'luminary-watchdog' for default sysbus >> Aborted (core dumped) > > Oh, well, looks like this has just been added recently in commit > 566528f823d1a2e9e, likely after I assembled and tested the initial > version of this patch... Ah yes, correct! This happens when we take too long to review a series, and since this one is huge, I was keeping procrastinating... > Thanks for catching it, I'll apply your fix in v6! > > Thomas >
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
On 25/04/2019 23.41, Philippe Mathieu-Daudé wrote: > Hi Thomas, > > On 4/18/19 8:00 PM, Thomas Huth wrote: >> This patch is slightly based on earlier work by Ákos Kovács (i.e. >> his "hw/arm/Kconfig: Add ARM Kconfig" patch). >> >> Signed-off-by: Thomas Huth >> --- >> default-configs/arm-softmmu.mak | 7 +-- >> hw/arm/Kconfig | 10 ++ >> 2 files changed, 11 insertions(+), 6 deletions(-) >> >> diff --git a/default-configs/arm-softmmu.mak >> b/default-configs/arm-softmmu.mak >> index b7ed3c530b..3f82d635e4 100644 >> --- a/default-configs/arm-softmmu.mak >> +++ b/default-configs/arm-softmmu.mak >> @@ -16,6 +16,7 @@ CONFIG_MUSCA=y >> CONFIG_CHEETAH=y >> CONFIG_SX1=y >> CONFIG_NSERIES=y >> +CONFIG_STELLARIS=y >> >> CONFIG_VGA=y >> CONFIG_NAND=y >> @@ -24,16 +25,10 @@ CONFIG_SERIAL=y >> CONFIG_MAX7310=y >> CONFIG_TMP421=y >> CONFIG_PCA9552=y >> -CONFIG_STELLARIS=y >> -CONFIG_STELLARIS_INPUT=y >> -CONFIG_STELLARIS_ENET=y >> -CONFIG_SSD0303=y >> -CONFIG_SSD0323=y >> CONFIG_DDC=y >> CONFIG_SII9022=y >> CONFIG_ADS7846=y >> CONFIG_MAX111X=y >> -CONFIG_SSI_SD=y >> CONFIG_SSI_M25P80=y >> CONFIG_ALLWINNER_EMAC=y >> CONFIG_IMX_FEC=y >> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig >> index 71126254ff..b91503f5a6 100644 >> --- a/hw/arm/Kconfig >> +++ b/hw/arm/Kconfig >> @@ -91,6 +91,16 @@ config REALVIEW >> >> config STELLARIS >> bool >> +select ARM_V7M >> +select I2C >> +select PL011 # UART >> +select PL022 # Serial port >> +select PL061 # GPIO >> +select SSD0303 # OLED display >> +select SSD0323 # OLED display >> +select SSI_SD >> +select STELLARIS_INPUT >> +select STELLARIS_ENET # ethernet > > This one misses CMSDK_APB_WATCHDOG: > > $ qemu-system-aarch64 -M lm3s811evb > qemu-system-aarch64: Unknown device 'luminary-watchdog' for default sysbus > Aborted (core dumped) Oh, well, looks like this has just been added recently in commit 566528f823d1a2e9e, likely after I assembled and tested the initial version of this patch... Thanks for catching it, I'll apply your fix in v6! Thomas
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
Hi Thomas, On 4/18/19 8:00 PM, Thomas Huth wrote: > This patch is slightly based on earlier work by Ákos Kovács (i.e. > his "hw/arm/Kconfig: Add ARM Kconfig" patch). > > Signed-off-by: Thomas Huth > --- > default-configs/arm-softmmu.mak | 7 +-- > hw/arm/Kconfig | 10 ++ > 2 files changed, 11 insertions(+), 6 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index b7ed3c530b..3f82d635e4 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -16,6 +16,7 @@ CONFIG_MUSCA=y > CONFIG_CHEETAH=y > CONFIG_SX1=y > CONFIG_NSERIES=y > +CONFIG_STELLARIS=y > > CONFIG_VGA=y > CONFIG_NAND=y > @@ -24,16 +25,10 @@ CONFIG_SERIAL=y > CONFIG_MAX7310=y > CONFIG_TMP421=y > CONFIG_PCA9552=y > -CONFIG_STELLARIS=y > -CONFIG_STELLARIS_INPUT=y > -CONFIG_STELLARIS_ENET=y > -CONFIG_SSD0303=y > -CONFIG_SSD0323=y > CONFIG_DDC=y > CONFIG_SII9022=y > CONFIG_ADS7846=y > CONFIG_MAX111X=y > -CONFIG_SSI_SD=y > CONFIG_SSI_M25P80=y > CONFIG_ALLWINNER_EMAC=y > CONFIG_IMX_FEC=y > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 71126254ff..b91503f5a6 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -91,6 +91,16 @@ config REALVIEW > > config STELLARIS > bool > +select ARM_V7M > +select I2C > +select PL011 # UART > +select PL022 # Serial port > +select PL061 # GPIO > +select SSD0303 # OLED display > +select SSD0323 # OLED display > +select SSI_SD > +select STELLARIS_INPUT > +select STELLARIS_ENET # ethernet This one misses CMSDK_APB_WATCHDOG: $ qemu-system-aarch64 -M lm3s811evb qemu-system-aarch64: Unknown device 'luminary-watchdog' for default sysbus Aborted (core dumped) (gdb) bt #1 0x7fbee955d895 in abort () at /lib64/libc.so.6 #2 0x560905068f6a in qdev_create (bus=0x0, name=0x5609053b9e5a "luminary-watchdog") at /source/qemu/hw/core/qdev.c:131 #3 0x560904ec1afc in stellaris_init (ms=0x560906d82c00, board=0x5609056e79e0 ) at /source/qemu/hw/arm/stellaris.c:1344 #4 0x560904ec22ff in lm3s811evb_init (machine=0x560906d82c00) at /source/qemu/hw/arm/stellaris.c:1468 #5 0x56090507326a in machine_run_board_init (machine=0x560906d82c00) at /source/qemu/hw/core/machine.c:1030 It works with the following snippet: -- >8 -- diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig @@ -200,6 +200,7 @@ config STELLARIS select SSI_SD select STELLARIS_INPUT select STELLARIS_ENET # ethernet +select CMSDK_APB_WATCHDOG # Luminary --- > > config STRONGARM > bool >
[Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch). Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 7 +-- hw/arm/Kconfig | 10 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index b7ed3c530b..3f82d635e4 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -16,6 +16,7 @@ CONFIG_MUSCA=y CONFIG_CHEETAH=y CONFIG_SX1=y CONFIG_NSERIES=y +CONFIG_STELLARIS=y CONFIG_VGA=y CONFIG_NAND=y @@ -24,16 +25,10 @@ CONFIG_SERIAL=y CONFIG_MAX7310=y CONFIG_TMP421=y CONFIG_PCA9552=y -CONFIG_STELLARIS=y -CONFIG_STELLARIS_INPUT=y -CONFIG_STELLARIS_ENET=y -CONFIG_SSD0303=y -CONFIG_SSD0323=y CONFIG_DDC=y CONFIG_SII9022=y CONFIG_ADS7846=y CONFIG_MAX111X=y -CONFIG_SSI_SD=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 71126254ff..b91503f5a6 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -91,6 +91,16 @@ config REALVIEW config STELLARIS bool +select ARM_V7M +select I2C +select PL011 # UART +select PL022 # Serial port +select PL061 # GPIO +select SSD0303 # OLED display +select SSD0323 # OLED display +select SSI_SD +select STELLARIS_INPUT +select STELLARIS_ENET # ethernet config STRONGARM bool -- 2.21.0
