Merge branch '2019-01-18-master-imports'

- Bugfix for SPI environment optimization
- Spelling fixes
- Remove some defconfigs per various maintainers
- Minor db410, bananapi r2 fixes
- Bump QEMU to v3.1.0 for most platforms

4 files changed, 7 insertions, 7 deletions

diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig
index 046b87a3337..ddf2fb3fb82 100644
--- a/drivers/core/Kconfig
+++ b/drivers/core/Kconfig
@@ -232,7 +232,7 @@ config OF_ISA_BUS
 	  Is this option is enabled then support for the ISA bus will
 	  be included for addresses read from DT. This is something that
 	  should be known to be required or not based upon the board
-	  being targetted, and whether or not it makes use of an ISA bus.
+	  being targeted, and whether or not it makes use of an ISA bus.
 
 	  The bus is matched based upon its node name equalling "isa". The
 	  busses #address-cells should equal 2, with the first cell being
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig
index 7579eb8755c..d83afe4dc6e 100644
--- a/drivers/i2c/Kconfig
+++ b/drivers/i2c/Kconfig
@@ -157,9 +157,9 @@ config SYS_I2C_MESON
 config SYS_I2C_MXC
 	bool "NXP MXC I2C driver"
 	help
-	  Add support for the NXP I2C driver. This supports upto for bus
-	  channels and operating on standard mode upto 100 kbits/s and fast
-	  mode upto 400 kbits/s.
+	  Add support for the NXP I2C driver. This supports up to four bus
+	  channels and operating on standard mode up to 100 kbits/s and fast
+	  mode up to 400 kbits/s.
 
 if SYS_I2C_MXC
 config SYS_I2C_MXC_I2C1
@@ -363,7 +363,7 @@ config SYS_I2C_ROCKCHIP
 	help
 	  Add support for the Rockchip I2C driver. This is used with various
 	  Rockchip parts such as RK3126, RK3128, RK3036 and RK3288. All chips
-	  have several I2C ports and all are provided, controled by the
+	  have several I2C ports and all are provided, controlled by the
 	  device tree.
 
 config SYS_I2C_SANDBOX
diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 30a6aa6ee8e..fb441b3bf1b 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -146,7 +146,7 @@ config PINCTRL_PIC32
 	  Supports individual pin selection and configuration for each
 	  remappable peripheral available on Microchip PIC32
 	  SoCs. This driver is controlled by a device tree node which
-	  contains both GPIO defintion and pin control functions.
+	  contains both GPIO definition and pin control functions.
 
 config PINCTRL_QCA953X
 	bool "QCA/Athores qca953x pin control driver"
diff --git a/drivers/video/rockchip/Kconfig b/drivers/video/rockchip/Kconfig
index b1d7c62fcad..10182d0b66c 100644
--- a/drivers/video/rockchip/Kconfig
+++ b/drivers/video/rockchip/Kconfig
@@ -65,6 +65,6 @@ config DISPLAY_ROCKCHIP_MIPI
 	help
 	  This enables Mobile Industry Processor Interface(MIPI) display
 	  support. The mipi controller and dphy on rk3288& rk3399 support
-	  16,18, 24 bits per pixel with upto 2k resolution ratio.
+	  16,18, 24 bits per pixel with up to 2k resolution ratio.
 
 endif