diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-16 17:29:40 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-16 17:29:40 +0300 |
| commit | 6674edaabfd271471608146806f5b6540bc76a1b (patch) | |
| tree | 574f8b5265002ad046aa1b81725a9483feb48a8d /include/configs/MPC8349EMDS.h | |
| parent | 4f8bf67f9c7fec8c5c1ae57c6ba24d337a19c578 (diff) | |
| parent | bb92678ced0b1594b93ab2f10b2c17750c789c96 (diff) | |
| download | u-boot-6674edaabfd271471608146806f5b6540bc76a1b.tar.xz | |
Merge tag 'v2021.10-rc4' into next
Prepare v2021.10-rc4
Signed-off-by: Tom Rini <trini@konsulko.com>
# gpg: Signature made Tue 14 Sep 2021 06:58:32 PM EDT
# gpg: using RSA key 1A3C7F70E08FAB1707809BBF147C39FF9634B72C
# gpg: Good signature from "Thomas Rini <trini@konsulko.com>" [ultimate]
# Conflicts:
# board/Arcturus/ucp1020/spl.c
# cmd/mvebu/Kconfig
# common/Kconfig.boot
# common/image-fit.c
# configs/UCP1020_defconfig
# configs/sifive_unmatched_defconfig
# drivers/pci/Kconfig
# include/configs/UCP1020.h
# include/configs/sifive-unmatched.h
# lib/Makefile
# scripts/config_whitelist.txt
Diffstat (limited to 'include/configs/MPC8349EMDS.h')
| -rw-r--r-- | include/configs/MPC8349EMDS.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 2f1fc6a6a2..dd11e9841e 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -251,10 +251,6 @@ #define CONFIG_SYS_SICRH 0 #define CONFIG_SYS_SICRL SICRL_LDP_A -#ifdef CONFIG_PCI -#define CONFIG_PCI_INDIRECT_BRIDGE -#endif - #if defined(CONFIG_CMD_KGDB) #define CONFIG_KGDB_BAUDRATE 230400 /* speed of kgdb serial port */ #endif |