diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-15 21:44:46 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-15 21:44:46 -0400 |
| commit | 515f613253cf0a892c3a321770ab927fa3d925cf (patch) | |
| tree | 8385db76a60ea1ed2c3169b71b28e438557d2725 /include | |
| parent | 585da32f4cedcad5a86534f45d397f352af7da0a (diff) | |
| parent | c60f6d668dd6c439f4a88bdce3398ac05e5f8843 (diff) | |
| download | u-boot-515f613253cf0a892c3a321770ab927fa3d925cf.tar.gz u-boot-515f613253cf0a892c3a321770ab927fa3d925cf.tar.xz u-boot-515f613253cf0a892c3a321770ab927fa3d925cf.zip | |
Merge branch '2020-05-15-kconfig-migrations'
- Convert CONFIG_DELAY_ENVIRONMENT to Kconfig and update initr_pci to be
Kconfig'd.
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/qemu-x86.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h index 49e307b430..52c33600b3 100644 --- a/include/configs/qemu-x86.h +++ b/include/configs/qemu-x86.h @@ -22,8 +22,6 @@ #include <config_distro_bootcmd.h> #include <configs/x86-common.h> -#define CONFIG_PREBOOT "pci enum" - #define CONFIG_SYS_MONITOR_LEN (1 << 20) #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \ |