diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-06 15:46:38 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-06 15:46:38 -0400 |
| commit | 6e7d7aa2e2062995c1cbc3af81cf40c04c50ad30 (patch) | |
| tree | 3c560d567a76e9850e0195fb892d7e1fbaeed198 /configs/qemu-x86_64_defconfig | |
| parent | 2f5fbb5b39f7b67044dda5c35e4a4b31685a3109 (diff) | |
| parent | 621e09cb3bf7e6d4fce9dd5e6de97e057adebc3a (diff) | |
Merge branch 'next'
Merge all outstanding changes from the current next branch in now that
we have released.
Diffstat (limited to 'configs/qemu-x86_64_defconfig')
| -rw-r--r-- | configs/qemu-x86_64_defconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/configs/qemu-x86_64_defconfig b/configs/qemu-x86_64_defconfig index f69b4689b6..dd4ae62a30 100644 --- a/configs/qemu-x86_64_defconfig +++ b/configs/qemu-x86_64_defconfig @@ -3,6 +3,7 @@ CONFIG_SYS_TEXT_BASE=0x1110000 CONFIG_SYS_MALLOC_F_LEN=0x1000 CONFIG_ENV_SIZE=0x40000 CONFIG_MAX_CPUS=2 +CONFIG_SPL_DM_SPI=y CONFIG_SPL_TEXT_BASE=0xfffd0000 CONFIG_NR_DRAM_BANKS=8 CONFIG_DEBUG_UART_BASE=0x3f8 @@ -15,6 +16,7 @@ CONFIG_GENERATE_PIRQ_TABLE=y CONFIG_GENERATE_MP_TABLE=y CONFIG_GENERATE_ACPI_TABLE=y CONFIG_X86_OFFSET_U_BOOT=0xfff00000 +CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx" CONFIG_DISTRO_DEFAULTS=y CONFIG_BUILD_ROM=y CONFIG_FIT=y @@ -31,6 +33,7 @@ CONFIG_PCI_INIT_R=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_CPU_SUPPORT=y CONFIG_SPL_ENV_SUPPORT=y +CONFIG_SPL_DM_SPI_FLASH=y CONFIG_SPL_NET_SUPPORT=y CONFIG_SPL_PCI=y CONFIG_SPL_PCH_SUPPORT=y @@ -47,7 +50,6 @@ CONFIG_CMD_TIME=y CONFIG_CMD_QFW=y CONFIG_CMD_BOOTSTAGE=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx" CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_REGMAP=y CONFIG_SYSCON=y |