summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-06-12 09:55:16 -0400
committerTom Rini <trini@konsulko.com>2016-06-12 09:55:16 -0400
commitb57129dbdade13ee152daf15a4221d8582f48387 (patch)
tree6f3930a8a77cb163233e0cd6b1dcbe9784e776ec /configs
parenta646f6698173ef4ff34c414f91541b4b8f014de1 (diff)
parent9769e05bcf79939bad23a719982dd1f85a110f3c (diff)
downloadblackbird-obmc-uboot-b57129dbdade13ee152daf15a4221d8582f48387.tar.gz
blackbird-obmc-uboot-b57129dbdade13ee152daf15a4221d8582f48387.zip
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'configs')
-rw-r--r--configs/coreboot-x86_defconfig2
-rw-r--r--configs/qemu-x86_defconfig2
2 files changed, 4 insertions, 0 deletions
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 2fa11fd442..b18d80dea6 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -24,6 +24,8 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_GIGADEVICE=y
CONFIG_SPI_FLASH_MACRONIX=y
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 45bb3ec0e9..a03cff8e3f 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -28,6 +28,8 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_CONTROL=y
+CONFIG_REGMAP=y
+CONFIG_SYSCON=y
CONFIG_CPU=y
CONFIG_SPI_FLASH=y
CONFIG_SPI_FLASH_GIGADEVICE=y
OpenPOWER on IntegriCloud