diff options
author | Tom Rini | 2018-11-16 07:37:50 -0600 |
---|---|---|
committer | Tom Rini | 2018-11-16 07:37:50 -0600 |
commit | 1d6edcbfed2af33c748f2beb399810a0441888da (patch) | |
tree | fe88d63e5ef1dbe1915f90e02429e8b6934859da /configs | |
parent | f6206f8587fc7ec82a57dbbeb5de0f94b3c2ef49 (diff) | |
parent | 4c6e27f63c88d065a98f438085dfc36af47d3a23 (diff) | |
download | u-boot-1d6edcbfed2af33c748f2beb399810a0441888da.tar.gz u-boot-1d6edcbfed2af33c748f2beb399810a0441888da.tar.xz u-boot-1d6edcbfed2af33c748f2beb399810a0441888da.zip |
Merge tag 'pull-14nov18' of git://git.denx.de/u-boot-dmHEADupstream-mastermaster
- virtio implementation and supporting patches
- DM_FLAG_PRE_RELOC fixes
- regmap improvements
- minor buildman and sandbox things
Diffstat (limited to 'configs')
-rw-r--r-- | configs/imx8qxp_mek_defconfig | 1 | ||||
-rw-r--r-- | configs/qemu_arm64_defconfig | 1 | ||||
-rw-r--r-- | configs/qemu_arm_defconfig | 1 | ||||
-rw-r--r-- | configs/sandbox_noblk_defconfig | 1 |
4 files changed, 1 insertions, 3 deletions
diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 518f7259f2..58b4ca0861 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig | |||
@@ -6,7 +6,6 @@ CONFIG_TARGET_IMX8QXP_MEK=y | |||
6 | CONFIG_NR_DRAM_BANKS=3 | 6 | CONFIG_NR_DRAM_BANKS=3 |
7 | CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg" | 7 | CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/imx8qxp_mek/imximage.cfg" |
8 | CONFIG_BOOTDELAY=3 | 8 | CONFIG_BOOTDELAY=3 |
9 | # CONFIG_DISPLAY_CPUINFO is not set | ||
10 | CONFIG_CMD_CPU=y | 9 | CONFIG_CMD_CPU=y |
11 | # CONFIG_CMD_IMPORTENV is not set | 10 | # CONFIG_CMD_IMPORTENV is not set |
12 | CONFIG_CMD_CLK=y | 11 | CONFIG_CMD_CLK=y |
diff --git a/configs/qemu_arm64_defconfig b/configs/qemu_arm64_defconfig index e9e2819272..f4502c9e9f 100644 --- a/configs/qemu_arm64_defconfig +++ b/configs/qemu_arm64_defconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | CONFIG_ARM=y | 1 | CONFIG_ARM=y |
2 | CONFIG_ARM_SMCCC=y | 2 | CONFIG_ARM_SMCCC=y |
3 | CONFIG_ARCH_QEMU=y | 3 | CONFIG_ARCH_QEMU=y |
4 | CONFIG_SYS_TEXT_BASE=0x00000000 | ||
5 | CONFIG_TARGET_QEMU_ARM_64BIT=y | 4 | CONFIG_TARGET_QEMU_ARM_64BIT=y |
6 | CONFIG_AHCI=y | 5 | CONFIG_AHCI=y |
7 | CONFIG_DISTRO_DEFAULTS=y | 6 | CONFIG_DISTRO_DEFAULTS=y |
diff --git a/configs/qemu_arm_defconfig b/configs/qemu_arm_defconfig index 04c9afdb02..acebdc5a4e 100644 --- a/configs/qemu_arm_defconfig +++ b/configs/qemu_arm_defconfig | |||
@@ -1,7 +1,6 @@ | |||
1 | CONFIG_ARM=y | 1 | CONFIG_ARM=y |
2 | CONFIG_ARM_SMCCC=y | 2 | CONFIG_ARM_SMCCC=y |
3 | CONFIG_ARCH_QEMU=y | 3 | CONFIG_ARCH_QEMU=y |
4 | CONFIG_SYS_TEXT_BASE=0x00000000 | ||
5 | CONFIG_TARGET_QEMU_ARM_32BIT=y | 4 | CONFIG_TARGET_QEMU_ARM_32BIT=y |
6 | CONFIG_AHCI=y | 5 | CONFIG_AHCI=y |
7 | CONFIG_DISTRO_DEFAULTS=y | 6 | CONFIG_DISTRO_DEFAULTS=y |
diff --git a/configs/sandbox_noblk_defconfig b/configs/sandbox_noblk_defconfig index 93b2240185..e71e2d3860 100644 --- a/configs/sandbox_noblk_defconfig +++ b/configs/sandbox_noblk_defconfig | |||
@@ -171,6 +171,7 @@ CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y | |||
171 | CONFIG_VIDEO_SANDBOX_SDL=y | 171 | CONFIG_VIDEO_SANDBOX_SDL=y |
172 | CONFIG_OSD=y | 172 | CONFIG_OSD=y |
173 | CONFIG_SANDBOX_OSD=y | 173 | CONFIG_SANDBOX_OSD=y |
174 | # CONFIG_VIRTIO_BLK is not set | ||
174 | CONFIG_FS_CBFS=y | 175 | CONFIG_FS_CBFS=y |
175 | CONFIG_FS_CRAMFS=y | 176 | CONFIG_FS_CRAMFS=y |
176 | CONFIG_CMD_DHRYSTONE=y | 177 | CONFIG_CMD_DHRYSTONE=y |