diff options
| author | Tom Rini <[email protected]> | 2021-11-12 18:33:12 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-11-12 18:33:12 -0500 |
| commit | e0d7d06f393a4d56917844210a5da44fef20a944 (patch) | |
| tree | 97c9a45d67738c326e14c17e815218dfba281f90 /arch | |
| parent | 515bf78ff975d474f895bf86b4e16eade51c8dbd (diff) | |
| parent | 82cd1e3da0e15fc19b9eb95c333b6764f6fff061 (diff) | |
Merge branch '2021-11-12-Kconfig-migrations'
- An assortment of "finish migrating .." symbol patches. This will help
make it harder for migrated symbols to end up again in board config.h
files.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-bcmcygnus/configs.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index c0223d2dbc1..1a057f7059b 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -233,6 +233,7 @@ config ARCH_LS2080A config ARCH_LX2162A bool select ARMV8_SET_SMPEN + select FSL_LAYERSCAPE select FSL_LSCH3 select GICV3 select NXP_LSCH3_2 @@ -266,6 +267,7 @@ config ARCH_LX2162A config ARCH_LX2160A bool select ARMV8_SET_SMPEN + select FSL_LAYERSCAPE select FSL_LSCH3 select GICV3 select HAS_FSL_XHCI_USB if USB_HOST diff --git a/arch/arm/include/asm/arch-bcmcygnus/configs.h b/arch/arm/include/asm/arch-bcmcygnus/configs.h index bf05cb3a72a..27f30d1d2e2 100644 --- a/arch/arm/include/asm/arch-bcmcygnus/configs.h +++ b/arch/arm/include/asm/arch-bcmcygnus/configs.h @@ -17,7 +17,6 @@ #define CONFIG_SYS_NS16550_CLK 100000000 #define CONFIG_SYS_NS16550_CLK_DIV 54 -#define CONFIG_SERIAL_MULTI #define CONFIG_SYS_NS16550_COM3 0x18023000 /* Ethernet */ |