summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-02-12 07:16:46 -0500
committerTom Rini <trini@konsulko.com>2019-02-12 07:16:46 -0500
commit49a97162ea573b8646ba29162b71fc2c29e9c5d4 (patch)
treefe3d66153227486bb1cc925f00a5c428687f8ebf /configs
parentf94fa0e94f36c740d3c7aa314c89a750c742185b (diff)
parent24b56e2bf369ac003ccaac37d8bb80e08b743e16 (diff)
Merge git://git.denx.de/u-boot-x86
- Edison switch to CONFIG_OF_SEPARATE. - Tangier initial ACPI support for PMIC device. - TSC timer driver update to support native calibration. - Fixes to 64-bit U-Boot proper.
Diffstat (limited to 'configs')
-rw-r--r--configs/edison_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index 234dbac4e8..8b6df817ed 100644
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -25,7 +25,7 @@ CONFIG_CMD_EXT4=y
CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
-CONFIG_OF_EMBED=y
+CONFIG_OF_SEPARATE=y
CONFIG_DEFAULT_DEVICE_TREE="edison"
CONFIG_ENV_IS_IN_MMC=y
CONFIG_CPU=y