aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-08-12 23:03:44 -0400
committerTom Rini <trini@konsulko.com>2019-08-12 23:03:44 -0400
commit88c7a0a8c2ce6b503ff5d5509effb2a9f844993e (patch)
treee3c57d6e9c0cdeb438ba8f96c19f93fe14336654 /arch
parent60f38d82c45fef55ac04ee52b234e6dd07e31935 (diff)
parent193a1e9f196b7fb7e913a70936c8a49060a1859c (diff)
downloadu-boot-88c7a0a8c2ce6b503ff5d5509effb2a9f844993e.zip
u-boot-88c7a0a8c2ce6b503ff5d5509effb2a9f844993e.tar.gz
u-boot-88c7a0a8c2ce6b503ff5d5509effb2a9f844993e.tar.bz2
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell
- Various improvements to Keymile boards - mostly DT conversation (Pascal & Holger) - Removal of now unsupported Keymile boards (Pascal & Holger) - Small MVEBU PCI fix (Marek) - Turris Omnia defconfig update (Marek) - Misc Allied Telesis defconfig updates (Chris)
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/dts/kirkwood-km_common.dtsi1
-rw-r--r--arch/powerpc/cpu/mpc83xx/Kconfig4
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/dts/kirkwood-km_common.dtsi b/arch/arm/dts/kirkwood-km_common.dtsi
index 75dc839..9d0fc51 100644
--- a/arch/arm/dts/kirkwood-km_common.dtsi
+++ b/arch/arm/dts/kirkwood-km_common.dtsi
@@ -22,6 +22,7 @@
serial@12000 {
status = "okay";
+ clock-frequency = <200000000>;
};
};
diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig
index 3f68b6f..72053ce 100644
--- a/arch/powerpc/cpu/mpc83xx/Kconfig
+++ b/arch/powerpc/cpu/mpc83xx/Kconfig
@@ -110,10 +110,6 @@ config TARGET_SUVD3
bool "Support suvd3"
select VENDOR_KM
-config TARGET_KMVECT1
- bool "Support kmvect1"
- select VENDOR_KM
-
config TARGET_KMTEGR1
bool "Support kmtegr1"
select VENDOR_KM