diff mbox series

[6/6] configs: defconfig for QEMU RISC-V with ACPI

Message ID 20231115142355.123038-7-heinrich.schuchardt@canonical.com
State Superseded, archived
Delegated to: Andes
Headers show
Series risc-v: add ACPI support on QEMU | expand

Commit Message

Heinrich Schuchardt Nov. 15, 2023, 2:23 p.m. UTC
Provide a defconfig for testing ACPI on RISC-V.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
 board/emulation/qemu-riscv/MAINTAINERS    |  1 +
 configs/qemu-riscv64_acpi_smode_defconfig | 27 +++++++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 configs/qemu-riscv64_acpi_smode_defconfig

Comments

Tom Rini Nov. 16, 2023, 6:37 p.m. UTC | #1
On Wed, Nov 15, 2023 at 03:23:55PM +0100, Heinrich Schuchardt wrote:

> Provide a defconfig for testing ACPI on RISC-V.
> 
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
>  board/emulation/qemu-riscv/MAINTAINERS    |  1 +
>  configs/qemu-riscv64_acpi_smode_defconfig | 27 +++++++++++++++++++++++
>  2 files changed, 28 insertions(+)
>  create mode 100644 configs/qemu-riscv64_acpi_smode_defconfig

This feels like a case where we should start using fragments rather than
a cp'd defconfig.
Heinrich Schuchardt Nov. 16, 2023, 8:04 p.m. UTC | #2
On 11/16/23 19:37, Tom Rini wrote:
> On Wed, Nov 15, 2023 at 03:23:55PM +0100, Heinrich Schuchardt wrote:
> 
>> Provide a defconfig for testing ACPI on RISC-V.
>>
>> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
>> ---
>>   board/emulation/qemu-riscv/MAINTAINERS    |  1 +
>>   configs/qemu-riscv64_acpi_smode_defconfig | 27 +++++++++++++++++++++++
>>   2 files changed, 28 insertions(+)
>>   create mode 100644 configs/qemu-riscv64_acpi_smode_defconfig
> 
> This feels like a case where we should start using fragments rather than
> a cp'd defconfig.
> 

Do our CI scripts support Kconfig fragments?

Best regards

Heinrich
Tom Rini Nov. 16, 2023, 8:17 p.m. UTC | #3
On Thu, Nov 16, 2023 at 09:04:27PM +0100, Heinrich Schuchardt wrote:
> On 11/16/23 19:37, Tom Rini wrote:
> > On Wed, Nov 15, 2023 at 03:23:55PM +0100, Heinrich Schuchardt wrote:
> > 
> > > Provide a defconfig for testing ACPI on RISC-V.
> > > 
> > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> > > ---
> > >   board/emulation/qemu-riscv/MAINTAINERS    |  1 +
> > >   configs/qemu-riscv64_acpi_smode_defconfig | 27 +++++++++++++++++++++++
> > >   2 files changed, 28 insertions(+)
> > >   create mode 100644 configs/qemu-riscv64_acpi_smode_defconfig
> > 
> > This feels like a case where we should start using fragments rather than
> > a cp'd defconfig.
> 
> Do our CI scripts support Kconfig fragments?

With some other patches, yes we could have build coverage. Or if this
moves to the point where we'll be running pytest on the configuration as
well it would be handled that way instead.
diff mbox series

Patch

diff --git a/board/emulation/qemu-riscv/MAINTAINERS b/board/emulation/qemu-riscv/MAINTAINERS
index 3d7453f1b4..80c75a18f8 100644
--- a/board/emulation/qemu-riscv/MAINTAINERS
+++ b/board/emulation/qemu-riscv/MAINTAINERS
@@ -7,6 +7,7 @@  F:	include/configs/qemu-riscv.h
 F:	configs/qemu-riscv32_defconfig
 F:	configs/qemu-riscv32_smode_defconfig
 F:	configs/qemu-riscv32_spl_defconfig
+F:	configs/qemu-riscv64_acpi_smode_defconfig
 F:	configs/qemu-riscv64_defconfig
 F:	configs/qemu-riscv64_smode_defconfig
 F:	configs/qemu-riscv64_spl_defconfig
diff --git a/configs/qemu-riscv64_acpi_smode_defconfig b/configs/qemu-riscv64_acpi_smode_defconfig
new file mode 100644
index 0000000000..0227d1dfe0
--- /dev/null
+++ b/configs/qemu-riscv64_acpi_smode_defconfig
@@ -0,0 +1,27 @@ 
+CONFIG_RISCV=y
+CONFIG_SYS_MALLOC_LEN=0x800000
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
+CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_ENV_SIZE=0x20000
+CONFIG_DEFAULT_DEVICE_TREE="qemu-virt64"
+CONFIG_SYS_LOAD_ADDR=0x80200000
+CONFIG_TARGET_QEMU_VIRT=y
+CONFIG_ARCH_RV64I=y
+CONFIG_RISCV_SMODE=y
+CONFIG_FIT=y
+CONFIG_DISTRO_DEFAULTS=y
+CONFIG_USE_PREBOOT=y
+CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"
+CONFIG_DISPLAY_CPUINFO=y
+CONFIG_DISPLAY_BOARDINFO=y
+CONFIG_SYS_BOOTM_LEN=0x4000000
+CONFIG_CMD_BOOTEFI_SELFTEST=y
+CONFIG_CMD_NVEDIT_EFI=y
+# CONFIG_CMD_MII is not set
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+CONFIG_DM_MTD=y
+CONFIG_FLASH_SHOW_PROGRESS=0
+CONFIG_SYS_MAX_FLASH_BANKS=2
+CONFIG_ACPI=y
+CONFIG_GENERATE_ACPI_TABLE=y