Merge branch '2020-09-29-assorted-fixes'

- Assorted typo fixes
- Correctly migrate some CONFIG_PREBOOT cases to defconfig
- Coverity issues in squashfs

6 files changed, 10 insertions, 10 deletions

diff --git a/README b/README
index 6cb0567ba6..b23fcc1190 100644
--- a/README
+++ b/README
@@ -266,7 +266,7 @@ board_init_f():
 		version as needed.
 	- preloader_console_init() can be called here in extremis
 	- should set up SDRAM, and anything needed to make the UART work
-	- these is no need to clear BSS, it will be done by crt0.S
+	- there is no need to clear BSS, it will be done by crt0.S
 	- for specific scenarios on certain architectures an early BSS *can*
 	  be made available (via CONFIG_SPL_EARLY_BSS by moving the clearing
 	  of BSS prior to entering board_init_f()) but doing so is discouraged.
diff --git a/common/Kconfig b/common/Kconfig
index b1934b3a9c..9c20a9738e 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -403,7 +403,6 @@ config BOOTCOMMAND
 
 config USE_PREBOOT
 	bool "Enable preboot"
-	default "usb start" if USB_KEYBOARD
 	help
 	  When this option is enabled, the existence of the environment
 	  variable "preboot" will be checked immediately before starting the
@@ -417,6 +416,7 @@ config USE_PREBOOT
 config PREBOOT
 	string "preboot default value"
 	depends on USE_PREBOOT && !USE_DEFAULT_ENV_FILE
+	default "usb start" if USB_KEYBOARD || USB_STORAGE
 	default ""
 	help
 	  This is the default of "preboot" environment variable.
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 348b43e653..ad50c5e870 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -6,8 +6,8 @@ config MTD_PARTITIONS
 config MTD
 	bool "Enable MTD layer"
 	help
-	  Enable the MTD stack, necessary to interract with NAND, NOR,
-	  SPI-NOR, SPI-NAND, onenand, etc.
+	  Enable the MTD stack, necessary to interact with NAND, NOR,
+	  SPI-NOR, SPI-NAND, OneNAND, etc.
 
 config DM_MTD
 	bool "Enable Driver Model for MTD drivers"
@@ -95,10 +95,10 @@ config FLASH_PIC32
 	  chips through PIC32 Non-Volatile-Memory Controller.
 
 config RENESAS_RPC_HF
-	bool "Renesas RCar Gen3 RPC Hyperflash driver"
+	bool "Renesas RCar Gen3 RPC HyperFlash driver"
 	depends on RCAR_GEN3 && DM_MTD
 	help
-	  This enables access to Hyperflash memory through the Renesas
+	  This enables access to HyperFlash memory through the Renesas
 	  RCar Gen3 RPC controller.
 
 config HBMC_AM654
diff --git a/drivers/mtd/renesas_rpc_hf.c b/drivers/mtd/renesas_rpc_hf.c
index 65320c7ed9..8a644ad9b3 100644
--- a/drivers/mtd/renesas_rpc_hf.c
+++ b/drivers/mtd/renesas_rpc_hf.c
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Renesas RCar Gen3 RPC Hyperflash driver
+ * Renesas RCar Gen3 RPC HyperFlash driver
  *
  * Copyright (C) 2016 Renesas Electronics Corporation
  * Copyright (C) 2016 Cogent Embedded, Inc.
diff --git a/drivers/video/console_truetype.c b/drivers/video/console_truetype.c
index 22b2ea7191..8205413d2a 100644
--- a/drivers/video/console_truetype.c
+++ b/drivers/video/console_truetype.c
@@ -432,7 +432,7 @@ static int console_truetype_backspace(struct udevice *dev)
 	pos = &priv->pos[--priv->pos_ptr];
 
 	/*
-	 * Figure out the end position for clearing. Normlly it is the current
+	 * Figure out the end position for clearing. Normally it is the current
 	 * cursor position, but if we are clearing a character on the previous
 	 * line, we clear from the end of the line.
 	 */
diff --git a/fs/squashfs/sqfs_inode.c b/fs/squashfs/sqfs_inode.c
index 1368f3063c..14d70cf678 100644
--- a/fs/squashfs/sqfs_inode.c
+++ b/fs/squashfs/sqfs_inode.c
@@ -141,9 +141,9 @@ int sqfs_read_metablock(unsigned char *file_mapping, int offset,
 	const unsigned char *data;
 	u16 header;
 
-	data = file_mapping + offset;
-	if (!data)
+	if (!file_mapping)
 		return -EFAULT;
+	data = file_mapping + offset;
 
 	header = get_unaligned((u16 *)data);
 	if (!header)