From 66356b4c06c934021f6cb58d93877427162b369f Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Mon, 27 Sep 2021 17:42:36 +0200
Subject: WS cleanup: remove trailing empty lines

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 scripts/dtc/treesource.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'scripts')

diff --git a/scripts/dtc/treesource.c b/scripts/dtc/treesource.c
index 2461a3d068a..b36cb41902a 100644
--- a/scripts/dtc/treesource.c
+++ b/scripts/dtc/treesource.c
@@ -281,4 +281,3 @@ void dt_to_source(FILE *f, struct dt_info *dti)
 
 	write_tree_source_node(f, dti->dt, 0);
 }
-
-- 
cgit v1.3.1


From 0a50b3c97b3408e52589d873d4c7b54ad365a76c Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Mon, 27 Sep 2021 17:42:38 +0200
Subject: WS cleanup: remove trailing white space

Signed-off-by: Wolfgang Denk <wd@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
---
 Licenses/lgpl-2.0.txt                            |  2 +-
 Makefile                                         |  4 ++--
 arch/arm/include/asm/arch-am33xx/cpu.h           |  2 +-
 arch/arm/lib/lib1funcs.S                         |  6 +++---
 arch/xtensa/include/asm/arch-de212/core.h        |  2 +-
 board/freescale/common/sys_eeprom.c              |  2 +-
 board/qualcomm/dragonboard820c/dragonboard820c.c |  6 +++---
 board/warp7/README                               |  2 +-
 common/spl/spl_mmc.c                             |  2 +-
 doc/README.distro                                |  2 +-
 doc/imx/common/imx6.txt                          |  2 +-
 drivers/misc/atsha204a-i2c.c                     |  2 +-
 drivers/mtd/mtdcore.c                            |  4 ++--
 drivers/mtd/nand/raw/nand_base.c                 |  2 +-
 drivers/mtd/nand/raw/nand_util.c                 |  2 +-
 drivers/mtd/ubi/build.c                          |  2 +-
 drivers/net/phy/meson-gxl.c                      |  2 +-
 drivers/ram/stm32_sdram.c                        |  2 +-
 drivers/reset/reset-meson.c                      | 10 +++++-----
 drivers/serial/serial_msm.c                      |  2 +-
 drivers/usb/dwc3/dwc3-meson-gxl.c                |  2 +-
 drivers/usb/musb-new/musb_regs.h                 |  2 +-
 drivers/usb/musb-new/musb_uboot.c                |  2 +-
 drivers/usb/musb/musb_hcd.c                      |  2 +-
 drivers/video/anx9804.c                          | 10 +++++-----
 drivers/video/tdo-tl070wsh30.c                   |  2 +-
 include/configs/imx6-engicam.h                   |  2 +-
 include/linux/mtd/rawnand.h                      |  2 +-
 include/linux/serial_reg.h                       |  4 ++--
 scripts/kconfig/gconf.c                          |  2 +-
 tools/asn1_compiler.c                            |  2 +-
 tools/patman/test/test01.txt                     | 20 ++++++++++----------
 32 files changed, 56 insertions(+), 56 deletions(-)

(limited to 'scripts')

diff --git a/Licenses/lgpl-2.0.txt b/Licenses/lgpl-2.0.txt
index 5bc8fb2c8f7..12735e6c219 100644
--- a/Licenses/lgpl-2.0.txt
+++ b/Licenses/lgpl-2.0.txt
@@ -133,7 +133,7 @@ such a program is covered only if its contents constitute a work based
 on the Library (independent of the use of the Library in a tool for
 writing it).  Whether that is true depends on what the Library does
 and what the program that uses the Library does.
-  
+
   1. You may copy and distribute verbatim copies of the Library's
 complete source code as you receive it, in any medium, provided that
 you conspicuously and appropriately publish on each copy an
diff --git a/Makefile b/Makefile
index cf9466cec91..4392df6280d 100644
--- a/Makefile
+++ b/Makefile
@@ -327,14 +327,14 @@ os_x_before	= $(shell if [ $(DARWIN_MAJOR_VERSION) -le $(1) -a \
 	$(DARWIN_MINOR_VERSION) -le $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)
 
 os_x_after = $(shell if [ $(DARWIN_MAJOR_VERSION) -ge $(1) -a \
-	$(DARWIN_MINOR_VERSION) -ge $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)	
+	$(DARWIN_MINOR_VERSION) -ge $(2) ] ; then echo "$(3)"; else echo "$(4)"; fi ;)
 
 # Snow Leopards build environment has no longer restrictions as described above
 HOSTCC       = $(call os_x_before, 10, 5, "cc", "gcc")
 KBUILD_HOSTCFLAGS  += $(call os_x_before, 10, 4, "-traditional-cpp")
 KBUILD_HOSTLDFLAGS += $(call os_x_before, 10, 5, "-multiply_defined suppress")
 
-# macOS Mojave (10.14.X) 
+# macOS Mojave (10.14.X)
 # Undefined symbols for architecture x86_64: "_PyArg_ParseTuple"
 KBUILD_HOSTLDFLAGS += $(call os_x_after, 10, 14, "-lpython -dynamclib", "")
 endif
diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h
index 79081de700b..b33e6f7fd1b 100644
--- a/arch/arm/include/asm/arch-am33xx/cpu.h
+++ b/arch/arm/include/asm/arch-am33xx/cpu.h
@@ -408,7 +408,7 @@ struct cm_dpll {
 	unsigned int resv1;
 	unsigned int clktimer2clk;	/* offset 0x04 */
 	unsigned int resv2[11];
-	unsigned int clkselmacclk;	/* offset 0x34 */ 
+	unsigned int clkselmacclk;	/* offset 0x34 */
 };
 #endif /* CONFIG_AM43XX */
 
diff --git a/arch/arm/lib/lib1funcs.S b/arch/arm/lib/lib1funcs.S
index 0798d098afe..700eee5fbbe 100644
--- a/arch/arm/lib/lib1funcs.S
+++ b/arch/arm/lib/lib1funcs.S
@@ -34,7 +34,7 @@
 	mov	\divisor, \divisor, lsl \result
 	mov	\curbit, \curbit, lsl \result
 	mov	\result, #0
-	
+
 #else
 
 	@ Initially shift the divisor left 3 bits if possible,
@@ -48,7 +48,7 @@
 
 	@ Unless the divisor is very big, shift it up in multiples of
 	@ four bits, since this is the amount of unwinding in the main
-	@ division loop.  Continue shifting until the divisor is 
+	@ division loop.  Continue shifting until the divisor is
 	@ larger than the dividend.
 1:	cmp	\divisor, #0x10000000
 	cmplo	\divisor, \dividend
@@ -135,7 +135,7 @@
 
 	@ Unless the divisor is very big, shift it up in multiples of
 	@ four bits, since this is the amount of unwinding in the main
-	@ division loop.  Continue shifting until the divisor is 
+	@ division loop.  Continue shifting until the divisor is
 	@ larger than the dividend.
 1:	cmp	\divisor, #0x10000000
 	cmplo	\divisor, \dividend
diff --git a/arch/xtensa/include/asm/arch-de212/core.h b/arch/xtensa/include/asm/arch-de212/core.h
index 443fd459ca6..32714062914 100644
--- a/arch/xtensa/include/asm/arch-de212/core.h
+++ b/arch/xtensa/include/asm/arch-de212/core.h
@@ -89,7 +89,7 @@
 #define XCHAL_HAVE_HIFI3_VFPU		0	/* HiFi3 Audio Engine VFPU option */
 #define XCHAL_HAVE_HIFI2		0	/* HiFi2 Audio Engine pkg */
 #define XCHAL_HAVE_HIFI2EP		0	/* HiFi2EP */
-#define XCHAL_HAVE_HIFI_MINI		0	
+#define XCHAL_HAVE_HIFI_MINI		0
 
 
 #define XCHAL_HAVE_VECTORFPU2005	0	/* vector or user floating-point pkg */
diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c
index 35df8ba389e..431f8caeb03 100644
--- a/board/freescale/common/sys_eeprom.c
+++ b/board/freescale/common/sys_eeprom.c
@@ -62,7 +62,7 @@ static struct __attribute__ ((__packed__)) eeprom {
 	u8 mac_count;     /* 0x40        Number of MAC addresses */
 	u8 mac_flag;      /* 0x41        MAC table flags */
 	u8 mac[MAX_NUM_PORTS][6];     /* 0x42 - 0xa1 MAC addresses */
-	u8 res_2[90];     /* 0xa2 - 0xfb Reserved */	
+	u8 res_2[90];     /* 0xa2 - 0xfb Reserved */
 	u32 crc;          /* 0xfc - 0xff CRC32 checksum */
 #endif
 } e;
diff --git a/board/qualcomm/dragonboard820c/dragonboard820c.c b/board/qualcomm/dragonboard820c/dragonboard820c.c
index 4ccb1a07508..f9cc762a25c 100644
--- a/board/qualcomm/dragonboard820c/dragonboard820c.c
+++ b/board/qualcomm/dragonboard820c/dragonboard820c.c
@@ -73,7 +73,7 @@ static void sdhci_power_init(void)
 
 	/* drive strength configs for sdhc pins */
 	const struct tlmm_cfg hdrv[] = {
-	
+
 		{ SDC1_CLK_HDRV,  TLMM_CUR_VAL_16MA, TLMM_HDRV_MASK, },
 		{ SDC1_CMD_HDRV,  TLMM_CUR_VAL_10MA, TLMM_HDRV_MASK, },
 		{ SDC1_DATA_HDRV, TLMM_CUR_VAL_10MA, TLMM_HDRV_MASK, },
@@ -81,14 +81,14 @@ static void sdhci_power_init(void)
 
 	/* pull configs for sdhc pins */
 	const struct tlmm_cfg pull[] = {
-	
+
 		{ SDC1_CLK_PULL,  TLMM_NO_PULL, TLMM_PULL_MASK, },
 		{ SDC1_CMD_PULL,  TLMM_PULL_UP, TLMM_PULL_MASK, },
 		{ SDC1_DATA_PULL, TLMM_PULL_UP, TLMM_PULL_MASK, },
 	};
 
 	const struct tlmm_cfg rclk[] = {
-	
+
 		{ SDC1_RCLK_PULL, TLMM_PULL_DOWN, TLMM_PULL_MASK,},
 	};
 
diff --git a/board/warp7/README b/board/warp7/README
index 579bb2de38a..05cdfd00275 100644
--- a/board/warp7/README
+++ b/board/warp7/README
@@ -19,7 +19,7 @@ $ make
 
 This will generate the U-Boot binary called u-boot-dtb.imx.
 
-Put warp7 board in USB download mode: 
+Put warp7 board in USB download mode:
 
 Remove the CPU board from the base board then put switch 2 in the upper
 position
diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index 212a2b09928..d52f8a3eefe 100644
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -194,7 +194,7 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image,
 		err = part_get_info(mmc_get_blk_desc(mmc), type_part, &info);
 		if (err)
 			continue;
-		if (info.sys_ind == 
+		if (info.sys_ind ==
 			CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE) {
 			partition = type_part;
 			break;
diff --git a/doc/README.distro b/doc/README.distro
index c4f041ca712..fa8cec11028 100644
--- a/doc/README.distro
+++ b/doc/README.distro
@@ -233,7 +233,7 @@ fdtfile:
   the DTB with a different DTB. fdtfile will automatically be set for you if
   it matches the format ${soc}-${board}.dtb which covers most 32 bit use cases.
   AArch64 generally does not match as the Linux kernel put the dtb files under
-  SoC vendor directories. 
+  SoC vendor directories.
 
 ramdisk_addr_r:
 
diff --git a/doc/imx/common/imx6.txt b/doc/imx/common/imx6.txt
index 0b5061128c4..9007cfbf587 100644
--- a/doc/imx/common/imx6.txt
+++ b/doc/imx/common/imx6.txt
@@ -9,7 +9,7 @@ SoC.
 1.1 MAC Address: It is stored in fuse bank 4, with the 32 lsbs in word 2 and the
     16 msbs in word 3[15:0].
     For i.MX6SX and i.MX6UL, they have two MAC addresses. The second MAC address
-    is stored in fuse bank 4, with the 16 lsb in word 3[31:16] and the 32 msbs in 
+    is stored in fuse bank 4, with the 16 lsb in word 3[31:16] and the 32 msbs in
     word 4.
 
 Example:
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index af65c559dc6..52d9eadf49e 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -339,7 +339,7 @@ int atsha204a_read(struct udevice *dev, enum atsha204a_zone zone, bool read32,
 		retry--;
 		atsha204a_wakeup(dev);
 	} while (retry >= 0);
-	
+
 	if (res) {
 		debug("ATSHA204A read failed\n");
 		return res;
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index 582129d0df1..d0351b2c6ac 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -4,7 +4,7 @@
  * drivers and users.
  *
  * Copyright © 1999-2010 David Woodhouse <dwmw2@infradead.org>
- * Copyright © 2006      Red Hat UK Limited 
+ * Copyright © 2006      Red Hat UK Limited
  *
  */
 
@@ -123,7 +123,7 @@ void *idr_get_next(struct idr *idp, int *next)
 	} else {
 		*next = 0;
 	}
-	
+
 	return ret;
 }
 
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index b1fd779884f..0c26e1d9e63 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -907,7 +907,7 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)
 
  	u32 timer = (CONFIG_SYS_HZ * timeo) / 1000;
  	u32 time_start;
- 
+
  	time_start = get_timer(0);
  	while (get_timer(time_start) < timer) {
 		if (chip->dev_ready) {
diff --git a/drivers/mtd/nand/raw/nand_util.c b/drivers/mtd/nand/raw/nand_util.c
index 5cc256bf20d..d03b8645c44 100644
--- a/drivers/mtd/nand/raw/nand_util.c
+++ b/drivers/mtd/nand/raw/nand_util.c
@@ -189,7 +189,7 @@ int nand_erase_opts(struct mtd_info *mtd,
 
 #define NAND_CMD_LOCK_TIGHT     0x2c
 #define NAND_CMD_LOCK_STATUS    0x7a
- 
+
 /******************************************************************************
  * Support for locking / unlocking operations of some NAND devices
  *****************************************************************************/
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 61e38ba1ab7..e2bd32697ea 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -115,7 +115,7 @@ static struct ubi_device *ubi_devices[UBI_MAX_DEVICES];
 #else
 struct ubi_device *ubi_devices[UBI_MAX_DEVICES];
 #endif
- 
+
 #ifndef __UBOOT__
 /* Serializes UBI devices creations and removals */
 DEFINE_MUTEX(ubi_devices_mutex);
diff --git a/drivers/net/phy/meson-gxl.c b/drivers/net/phy/meson-gxl.c
index ffb1a61402e..753ca727686 100644
--- a/drivers/net/phy/meson-gxl.c
+++ b/drivers/net/phy/meson-gxl.c
@@ -73,7 +73,7 @@ restart_aneg:
 
 		if (!(wol & BIT(12)) ||
 			((exp & EXPANSION_NWAY) && !(lpa & LPA_LPACK))) {
-			
+
 			/* Looks like aneg failed after all */
 			if (!retries) {
 				printf("%s LPA corruption max attempts\n",
diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c
index 3e25cc7a018..47a930ee954 100644
--- a/drivers/ram/stm32_sdram.c
+++ b/drivers/ram/stm32_sdram.c
@@ -286,7 +286,7 @@ static int stm32_fmc_of_to_plat(struct udevice *dev)
 		} else {
 			dev_dbg(dev, "cannot find st,mem_remap property\n");
 		}
-		
+
 		swp_fmc = dev_read_u32_default(dev, "st,swp_fmc", NOT_FOUND);
 		if (swp_fmc != NOT_FOUND) {
 			/* set fmc swapping selection */
diff --git a/drivers/reset/reset-meson.c b/drivers/reset/reset-meson.c
index d4e0745d0e0..5896bcb4218 100644
--- a/drivers/reset/reset-meson.c
+++ b/drivers/reset/reset-meson.c
@@ -70,16 +70,16 @@ struct reset_ops meson_reset_ops = {
 	.rst_deassert = meson_reset_deassert,
 };
 
-static const struct udevice_id meson_reset_ids[] = {                          
-	{ .compatible = "amlogic,meson-gxbb-reset" },                                  
+static const struct udevice_id meson_reset_ids[] = {
+	{ .compatible = "amlogic,meson-gxbb-reset" },
 	{ .compatible = "amlogic,meson-axg-reset" },
-	{ }                                                                     
-};  
+	{ }
+};
 
 static int meson_reset_probe(struct udevice *dev)
 {
 	struct meson_reset_priv *priv = dev_get_priv(dev);
-	
+
 	return regmap_init_mem(dev_ofnode(dev), &priv->regmap);
 }
 
diff --git a/drivers/serial/serial_msm.c b/drivers/serial/serial_msm.c
index ac4d0824b98..a22623c316e 100644
--- a/drivers/serial/serial_msm.c
+++ b/drivers/serial/serial_msm.c
@@ -233,7 +233,7 @@ static int msm_serial_of_to_plat(struct udevice *dev)
 	if (priv->base == FDT_ADDR_T_NONE)
 		return -EINVAL;
 
-	priv->clk_bit_rate = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), 
+	priv->clk_bit_rate = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
 							"bit-rate", UART_DM_CLK_RX_TX_BIT_RATE);
 
 	return 0;
diff --git a/drivers/usb/dwc3/dwc3-meson-gxl.c b/drivers/usb/dwc3/dwc3-meson-gxl.c
index 08467d6210b..7c26290c15c 100644
--- a/drivers/usb/dwc3/dwc3-meson-gxl.c
+++ b/drivers/usb/dwc3/dwc3-meson-gxl.c
@@ -170,7 +170,7 @@ static int dwc3_meson_gxl_usb2_init(struct dwc3_meson_gxl *priv)
 static int dwc3_meson_gxl_usb_init(struct dwc3_meson_gxl *priv)
 {
 	int ret;
-	
+
 	ret = dwc3_meson_gxl_usb2_init(priv);
 	if (ret)
 		return ret;
diff --git a/drivers/usb/musb-new/musb_regs.h b/drivers/usb/musb-new/musb_regs.h
index e9362f6def3..9fd01fafdf7 100644
--- a/drivers/usb/musb-new/musb_regs.h
+++ b/drivers/usb/musb-new/musb_regs.h
@@ -190,7 +190,7 @@
 
 
 /* SUNXI has different reg addresses, but identical r/w functions */
-#ifndef CONFIG_ARCH_SUNXI 
+#ifndef CONFIG_ARCH_SUNXI
 
 /*
  * Common USB registers
diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c
index 8ac2f0a78ad..61ff68def2f 100644
--- a/drivers/usb/musb-new/musb_uboot.c
+++ b/drivers/usb/musb-new/musb_uboot.c
@@ -159,7 +159,7 @@ static struct int_queue *_musb_create_int_queue(struct musb_host_data *host,
 static int _musb_destroy_int_queue(struct musb_host_data *host,
 	struct usb_device *dev, struct int_queue *queue)
 {
-	int index = usb_pipein(queue->urb.pipe) * 16 + 
+	int index = usb_pipein(queue->urb.pipe) * 16 +
 		    usb_pipeendpoint(queue->urb.pipe);
 
 	if (queue->urb.status == -EINPROGRESS)
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index afbc648883b..ffed3b82bed 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -327,7 +327,7 @@ static int ctrlreq_out_data_phase(struct usb_device *dev, u32 len, void *buffer)
 
 		/* Set TXPKTRDY bit */
 		csr = readw(&musbr->txcsr);
-			
+
 		csr |= MUSB_CSR0_TXPKTRDY;
 		csr |= MUSB_CSR0_H_DIS_PING;
 		writew(csr, &musbr->txcsr);
diff --git a/drivers/video/anx9804.c b/drivers/video/anx9804.c
index b050c4292f6..3037ff39b41 100644
--- a/drivers/video/anx9804.c
+++ b/drivers/video/anx9804.c
@@ -67,11 +67,11 @@ void anx9804_init(unsigned int i2c_bus, u8 lanes, u8 data_rate, int bpp)
 		printf("Error anx9804 clock is not stable\n");
 
 	i2c_reg_write(0x39, ANX9804_VID_CTRL2_REG, colordepth);
-	
+
 	/* Set a bunch of analog related register values */
-	i2c_reg_write(0x38, ANX9804_PLL_CTRL_REG, 0x07); 
-	i2c_reg_write(0x39, ANX9804_PLL_FILTER_CTRL3, 0x19); 
-	i2c_reg_write(0x39, ANX9804_PLL_CTRL3, 0xd9); 
+	i2c_reg_write(0x38, ANX9804_PLL_CTRL_REG, 0x07);
+	i2c_reg_write(0x39, ANX9804_PLL_FILTER_CTRL3, 0x19);
+	i2c_reg_write(0x39, ANX9804_PLL_CTRL3, 0xd9);
 	i2c_reg_write(0x39, ANX9804_RST_CTRL2_REG, ANX9804_RST_CTRL2_AC_MODE);
 	i2c_reg_write(0x39, ANX9804_ANALOG_DEBUG_REG1, 0xf0);
 	i2c_reg_write(0x39, ANX9804_ANALOG_DEBUG_REG3, 0x99);
@@ -105,7 +105,7 @@ void anx9804_init(unsigned int i2c_bus, u8 lanes, u8 data_rate, int bpp)
 	i2c_reg_write(0x38, ANX9804_LINK_BW_SET_REG, data_rate);
 	i2c_reg_write(0x38, ANX9804_LANE_COUNT_SET_REG, lanes);
 
-	/* Link training */	
+	/* Link training */
 	i2c_reg_write(0x38, ANX9804_LINK_TRAINING_CTRL_REG,
 		      ANX9804_LINK_TRAINING_CTRL_EN);
 	mdelay(5);
diff --git a/drivers/video/tdo-tl070wsh30.c b/drivers/video/tdo-tl070wsh30.c
index 813b87a6817..7ad0af73f05 100644
--- a/drivers/video/tdo-tl070wsh30.c
+++ b/drivers/video/tdo-tl070wsh30.c
@@ -118,7 +118,7 @@ static int tl070wsh30_panel_probe(struct udevice *dev)
 
 	/* reset panel */
 	dm_gpio_set_value(&priv->reset, true);
-	
+
 	mdelay(10);
 
 	dm_gpio_set_value(&priv->reset, false);
diff --git a/include/configs/imx6-engicam.h b/include/configs/imx6-engicam.h
index cf46b54718a..4b45e33ad15 100644
--- a/include/configs/imx6-engicam.h
+++ b/include/configs/imx6-engicam.h
@@ -105,7 +105,7 @@
 #ifdef CONFIG_MX6UL
 # define DRAM_OFFSET(x)			0x87##x
 # define FDT_ADDR			__stringify(DRAM_OFFSET(800000))
-#else 
+#else
 # define DRAM_OFFSET(x)			0x1##x
 # define FDT_ADDR			__stringify(DRAM_OFFSET(8000000))
 #endif
diff --git a/include/linux/mtd/rawnand.h b/include/linux/mtd/rawnand.h
index 2fba9dc317e..3417ca2a0d2 100644
--- a/include/linux/mtd/rawnand.h
+++ b/include/linux/mtd/rawnand.h
@@ -945,7 +945,7 @@ struct nand_chip {
 	int jedec_version;
 	struct nand_onfi_params	onfi_params;
 	struct nand_jedec_params jedec_params;
- 
+
 	struct nand_data_interface *data_interface;
 
 	int read_retries;
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
index dca7efa1426..20ea54397f2 100644
--- a/include/linux/serial_reg.h
+++ b/include/linux/serial_reg.h
@@ -3,7 +3,7 @@
  * include/linux/serial_reg.h
  *
  * Copyright (C) 1992, 1994 by Theodore Ts'o.
- * 
+ *
  * These are the UART port assignments, expressed as offsets from the base
  * register.  These assignments should hold for any serial port based on
  * a 8250, 16450, or 16550(A).
@@ -88,7 +88,7 @@
 
 #define UART_LCR	3	/* Out: Line Control Register */
 /*
- * Note: if the word length is 5 bits (UART_LCR_WLEN5), then setting 
+ * Note: if the word length is 5 bits (UART_LCR_WLEN5), then setting
  * UART_LCR_STOP will select 1.5 stop bits, not 2 stop bits.
  */
 #define UART_LCR_DLAB		0x80 /* Divisor latch access bit */
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index a9e48cc7b50..2ec7419301d 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -639,7 +639,7 @@ on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data)
 void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
 	GtkWidget *dialog;
-	const gchar *intro_text = 
+	const gchar *intro_text =
 	    "Welcome to gkc, the GTK+ graphical configuration tool\n"
 	    "For each option, a blank box indicates the feature is disabled, a\n"
 	    "check indicates it is enabled, and a dot indicates that it is to\n"
diff --git a/tools/asn1_compiler.c b/tools/asn1_compiler.c
index adabd414526..03fb7e03758 100644
--- a/tools/asn1_compiler.c
+++ b/tools/asn1_compiler.c
@@ -427,7 +427,7 @@ static void tokenise(char *buffer, char *end)
 				}
 				memcpy(tokens[tix].content, start, tokens[tix].size);
 				tokens[tix].content[tokens[tix].size] = 0;
-				
+
 				/* If it begins with a lowercase letter then
 				 * it's an element name
 				 */
diff --git a/tools/patman/test/test01.txt b/tools/patman/test/test01.txt
index b238a8b4bab..de2d9e4d284 100644
--- a/tools/patman/test/test01.txt
+++ b/tools/patman/test/test01.txt
@@ -3,15 +3,15 @@ Author: Simon Glass <sjg@chromium.org>
 Date:   Sat Apr 15 15:39:08 2017 -0600
 
     pci: Correct cast for sandbox
-    
+
     This gives a warning with some native compilers:
-    
+
     cmd/pci.c:152:11: warning: format ‘%llx’ expects argument of type
        ‘long long unsigned int’, but argument 3 has type
        ‘u64 {aka long unsigned int}’ [-Wformat=]
-    
+
     Fix it with a cast.
-    
+
     Signed-off-by: Simon Glass <sjg@chromium.org>
     Commit-changes: 2
     - second revision change
@@ -21,7 +21,7 @@ Date:   Sat Apr 15 15:39:08 2017 -0600
     about some things
     from the first commit
     END
-    
+
     Commit-notes:
     Some notes about
     the first commit
@@ -32,15 +32,15 @@ Author: Simon Glass <sjg@chromium.org>
 Date:   Sat Apr 15 15:39:08 2017 -0600
 
     fdt: Correct cast for sandbox in fdtdec_setup_mem_size_base()
-    
+
     This gives a warning with some native compilers:
-    
+
     lib/fdtdec.c:1203:8: warning: format ‘%llx’ expects argument of type
        ‘long long unsigned int’, but argument 3 has type
        ‘long unsigned int’ [-Wformat=]
-    
+
     Fix it with a cast.
-    
+
     Signed-off-by: Simon Glass <sjg@chromium.org>
     Series-to: u-boot
     Series-prefix: RFC
@@ -60,7 +60,7 @@ Date:   Sat Apr 15 15:39:08 2017 -0600
 
     Cover-changes: 4
     - Some notes for the cover letter
-    
+
     Cover-letter:
     test: A test patch series
     This is a test of how the cover
-- 
cgit v1.3.1


From 0cf207ec01cbacae47585fcc26591dd2296507d6 Mon Sep 17 00:00:00 2001
From: Wolfgang Denk <wd@denx.de>
Date: Mon, 27 Sep 2021 17:42:39 +0200
Subject: WS cleanup: remove SPACE(s) followed by TAB

Signed-off-by: Wolfgang Denk <wd@denx.de>
---
 Makefile                                           |   2 +-
 arch/arc/lib/libgcc2.h                             |   2 +-
 arch/arm/cpu/arm926ejs/armada100/timer.c           |   2 +-
 arch/arm/cpu/armv8/fel_utils.S                     |  20 +-
 arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3 |  36 +-
 arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S       |   4 +-
 arch/arm/dts/vf610-pinfunc.h                       |   2 +-
 arch/arm/include/asm/arch-armada100/mfp.h          |   2 +-
 arch/arm/include/asm/arch-mx25/imx-regs.h          |  22 +-
 arch/arm/include/asm/arch-mx5/imx-regs.h           |   4 +-
 arch/arm/include/asm/arch-mx6/mx6_plugin.S         |   4 +-
 arch/arm/include/asm/arch-mx7/mx7_plugin.S         |   2 +-
 arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S   |   2 +-
 arch/arm/include/asm/arch-rockchip/cru_rk3368.h    |  16 +-
 arch/arm/include/asm/arch-vf610/iomux-vf610.h      |   8 +-
 arch/arm/include/asm/macro.h                       |   2 +-
 arch/arm/include/asm/ti-common/davinci_nand.h      |   6 +-
 arch/arm/lib/ccn504.S                              |   2 +-
 arch/arm/lib/div64.S                               |  10 +-
 arch/arm/mach-at91/include/mach/at91_mc.h          |  24 +-
 arch/arm/mach-at91/include/mach/at91_st.h          |   2 +-
 arch/arm/mach-davinci/include/mach/da8xx-usb.h     |  36 +-
 arch/arm/mach-davinci/include/mach/davinci_misc.h  |   2 +-
 arch/arm/mach-imx/Makefile                         |   4 +-
 arch/arm/mach-keystone/include/mach/hardware.h     |   6 +-
 arch/arm/mach-omap2/clocks-common.c                |   2 +-
 arch/arm/mach-omap2/omap5/prcm-regs.c              |   2 +-
 arch/arm/mach-orion5x/timer.c                      |   2 +-
 arch/arm/mach-rmobile/pfc-r8a7790.h                |   2 +-
 arch/arm/mach-rockchip/rk3368/Makefile             |   2 +-
 arch/arm/mach-s5pc1xx/include/mach/sromc.h         |   4 +-
 .../include/mach/fpga_manager_arria10.h            |  16 +-
 arch/arm/mach-sunxi/dram_sun4i.c                   |   2 +-
 arch/arm/mach-sunxi/dram_sun8i_a33.c               |   4 +-
 arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c    |   2 +-
 arch/m68k/cpu/mcf5227x/start.S                     |   4 +-
 arch/m68k/cpu/mcf523x/cpu.c                        |   2 +-
 arch/m68k/cpu/mcf52x2/cpu.c                        |   2 +-
 arch/m68k/cpu/mcf532x/cpu.c                        |   2 +-
 arch/m68k/cpu/mcf5445x/cpu.c                       |   2 +-
 arch/m68k/cpu/mcf5445x/start.S                     |   6 +-
 arch/m68k/include/asm/m5271.h                      |   2 +-
 arch/m68k/lib/muldi3.c                             |   2 +-
 arch/mips/include/asm/mipsregs.h                   |  32 +-
 arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S         |   6 +-
 arch/nds32/cpu/n1213/ag101/lowlevel_init.S         |   6 +-
 arch/nds32/cpu/n1213/ag101/watchdog.S              |   2 +-
 arch/nds32/cpu/n1213/start.S                       |   8 +-
 arch/powerpc/cpu/mpc85xx/start.S                   |   8 +-
 arch/powerpc/include/asm/fsl_lbc.h                 |   4 +-
 arch/powerpc/include/asm/immap_85xx.h              |   4 +-
 arch/powerpc/include/asm/processor.h               |   2 +-
 arch/sandbox/include/asm/gpio.h                    |   2 +-
 arch/x86/cpu/intel_common/car2.S                   |   2 +-
 arch/x86/lib/bios_asm.S                            |   4 +-
 arch/xtensa/include/asm/arch-dc233c/core.h         |  44 +-
 arch/xtensa/include/asm/arch-de212/core.h          |  52 +--
 arch/xtensa/lib/Makefile                           |   2 +-
 board/Marvell/guruplug/guruplug.c                  |   2 +-
 board/boundary/nitrogen6x/README                   |   2 +-
 board/freescale/ls1012afrdm/README                 |   4 +-
 board/freescale/ls1012aqds/README                  |   4 +-
 board/freescale/ls1012ardb/README                  |   8 +-
 board/freescale/ls1046afrwy/README                 |   4 +-
 board/freescale/ls1046aqds/README                  |   4 +-
 board/freescale/ls1046ardb/README                  |   6 +-
 board/freescale/m53017evb/README                   |   2 +-
 board/logicpd/am3517evm/am3517evm.h                |   2 +-
 board/logicpd/omap3som/omap3logic.h                |   2 +-
 board/sysam/stmark2/sbf_dram_init.S                |   2 +-
 board/ti/am57xx/board.c                            |  24 +-
 board/ti/am57xx/mux_data.h                         |   4 +-
 cmd/cramfs.c                                       |   2 +-
 cmd/spi.c                                          |   6 +-
 common/hash.c                                      |   2 +-
 common/hwconfig.c                                  |   2 +-
 common/usb_storage.c                               |   2 +-
 disk/Makefile                                      |   2 +-
 doc/README.commands.spl                            |   6 +-
 doc/README.falcon                                  |   4 +-
 doc/README.odroid                                  |   4 +-
 .../mailbox/k3-secure-proxy.txt                    |   2 +-
 .../memory-controller/k3-j721e-ddrss.txt           |   2 +-
 .../memory-controllers/k3-am654-ddrss.txt          |   2 +-
 doc/device-tree-bindings/net/altera_tse.txt        |   2 +-
 doc/device-tree-bindings/net/fsl,mcf-dma-fec.txt   |   2 +-
 doc/device-tree-bindings/net/fsl,mcf-fec.txt       |   2 +-
 .../pinctrl/bcm6838-pinctrl.txt                    |   2 +-
 .../pinctrl/marvell,armada-apn806-pinctrl.txt      |  14 +-
 .../pinctrl/marvell,mvebu-pinctrl.txt              |   2 +-
 .../regulator/fsl,anatop-regulator.txt             |  14 +-
 doc/device-tree-bindings/spi/spi-bus.txt           |  14 +-
 doc/device-tree-bindings/spi/spi-qup.txt           |   2 +-
 doc/device-tree-bindings/tpm2/sandbox.txt          |   2 +-
 drivers/cache/cache-v5l2.c                         |   4 +-
 drivers/cache/sandbox_cache.c                      |   2 +-
 drivers/clk/imx/clk-pllv3.c                        |   2 +-
 drivers/crypto/Makefile                            |   2 +-
 drivers/ddr/fsl/ddr3_dimm_params.c                 |  18 +-
 drivers/ddr/marvell/axp/ddr3_spd.c                 |   2 +-
 drivers/firmware/scmi/Makefile                     |   2 +-
 drivers/i2c/designware_i2c.h                       |   2 +-
 drivers/misc/atsha204a-i2c.c                       |  30 +-
 drivers/misc/cros_ec.c                             |   2 +-
 drivers/mmc/Makefile                               |   2 +-
 drivers/mmc/mmc.c                                  |   2 +-
 drivers/mtd/mtdcore.c                              |   4 +-
 drivers/mtd/nand/raw/davinci_nand.c                |   2 +-
 drivers/mtd/nand/raw/fsl_elbc_nand.c               |   2 +-
 drivers/mtd/nand/raw/nand_base.c                   |  10 +-
 drivers/mtd/nand/raw/nand_ids.c                    |   2 +-
 drivers/mtd/onenand/onenand_base.c                 |   4 +-
 drivers/mtd/spi/spi-nor-ids.c                      |   2 +-
 drivers/mtd/ubi/crc32.c                            |  32 +-
 drivers/net/calxedaxgmac.c                         |   2 +-
 drivers/net/dm9000x.c                              |   4 +-
 drivers/net/e1000.h                                |   2 +-
 drivers/net/smc911x.h                              |   4 +-
 drivers/net/sun8i_emac.c                           |   2 +-
 drivers/pci/fsl_pci_init.c                         |   2 +-
 drivers/pinctrl/meson/pinctrl-meson-axg.c          |   2 +-
 drivers/pinctrl/meson/pinctrl-meson-g12a.c         |   2 +-
 drivers/pinctrl/renesas/pfc-r8a77970.c             |   2 +-
 drivers/pinctrl/renesas/pfc-r8a77980.c             |   6 +-
 drivers/power/pmic/pmic_tps65910.c                 |   2 +-
 drivers/pwm/pwm-meson.c                            |   2 +-
 drivers/ram/k3-ddrss/k3-ddrss.c                    |   4 +-
 drivers/spi/atcspi200_spi.c                        |   2 +-
 drivers/thermal/imx_tmu.c                          |   4 +-
 drivers/timer/atmel_pit_timer.c                    |   2 +-
 drivers/usb/dwc3/core.h                            |  12 +-
 drivers/usb/dwc3/gadget.c                          |   2 +-
 drivers/usb/gadget/at91_udc.h                      |   2 +-
 drivers/usb/gadget/pxa27x_udc.c                    |   2 +-
 drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h       |   2 +-
 drivers/usb/musb-new/musb_gadget.c                 |   4 +-
 drivers/usb/musb/musb_core.h                       |  10 +-
 drivers/usb/musb/musb_hcd.c                        |   2 +-
 drivers/video/bus_vcxk.c                           |  10 +-
 drivers/video/mxsfb.c                              |   2 +-
 drivers/watchdog/orion_wdt.c                       |   4 +-
 fs/btrfs/btrfs.c                                   |   2 +-
 fs/jffs2/summary.h                                 |  10 +-
 fs/ubifs/ubifs.h                                   |  10 +-
 include/atsha204a-i2c.h                            |   4 +-
 include/configs/at91sam9263ek.h                    |   4 +-
 include/configs/corenet_ds.h                       |   2 +-
 include/configs/imx7-cm.h                          |   6 +-
 include/configs/ls1043a_common.h                   |   2 +-
 include/configs/novena.h                           |   2 +-
 include/configs/omap3_beagle.h                     |   2 +-
 include/configs/opos6uldev.h                       |   2 +-
 include/configs/socrates.h                         |  10 +-
 include/div64.h                                    |   2 +-
 include/dt-bindings/mfd/dbx500-prcmu.h             | 104 ++---
 include/environment/distro/sf.h                    |  14 +-
 include/faraday/ftpmu010.h                         |   2 +-
 include/fsl_qe.h                                   |   2 +-
 include/fsl_wdog.h                                 |   2 +-
 include/generic-phy.h                              |   2 +-
 include/imximage.h                                 |   2 +-
 include/linux/apm_bios.h                           |   2 +-
 include/linux/compiler.h                           |   2 +-
 include/linux/ioport.h                             |   2 +-
 include/linux/list.h                               |   4 +-
 include/linux/mtd/doc2000.h                        |   6 +-
 include/linux/mtd/partitions.h                     |  10 +-
 include/linux/screen_info.h                        |   4 +-
 include/linux/serial_reg.h                         |   2 +-
 include/linux/usb/gadget.h                         |   6 +-
 include/mc13783.h                                  |   2 +-
 include/mpc85xx.h                                  |   6 +-
 include/mtd/mtd-abi.h                              |   2 +-
 include/mvmfp.h                                    |   2 +-
 include/part.h                                     |   2 +-
 include/phy.h                                      |   4 +-
 include/tsec.h                                     |   2 +-
 include/video_font_4x6.h                           | 512 ++++++++++-----------
 scripts/basic/Makefile                             |   2 +-
 scripts/kconfig/Makefile                           |   2 +-
 scripts/kconfig/expr.c                             |   2 +-
 scripts/kconfig/list.h                             |   2 +-
 tools/kwbimage.h                                   |   4 +-
 183 files changed, 807 insertions(+), 807 deletions(-)

(limited to 'scripts')

diff --git a/Makefile b/Makefile
index 4392df6280d..b23c2cea912 100644
--- a/Makefile
+++ b/Makefile
@@ -1739,7 +1739,7 @@ endif
 # May be overridden by arch/$(ARCH)/config.mk
 ifdef CONFIG_LTO
 quiet_cmd_u-boot__ ?= LTO     $@
-      cmd_u-boot__ ?= 								\
+      cmd_u-boot__ ?=								\
 		$(CC) -nostdlib -nostartfiles					\
 		$(LTO_FINAL_LDFLAGS) $(c_flags)					\
 		$(KBUILD_LDFLAGS:%=-Wl,%) $(LDFLAGS_u-boot:%=-Wl,%) -o $@	\
diff --git a/arch/arc/lib/libgcc2.h b/arch/arc/lib/libgcc2.h
index 9c3ce998927..95eb9b05241 100644
--- a/arch/arc/lib/libgcc2.h
+++ b/arch/arc/lib/libgcc2.h
@@ -35,7 +35,7 @@ typedef		 int HItype	__attribute__ ((mode (HI)));
 typedef unsigned int UHItype	__attribute__ ((mode (HI)));
 #if MIN_UNITS_PER_WORD > 1
 /* These typedefs are usually forbidden on dsp's with UNITS_PER_WORD 1.  */
-typedef 	 int SItype	__attribute__ ((mode (SI)));
+typedef		 int SItype	__attribute__ ((mode (SI)));
 typedef unsigned int USItype	__attribute__ ((mode (SI)));
 #if __SIZEOF_LONG_LONG__ > 4
 /* These typedefs are usually forbidden on archs with UNITS_PER_WORD 2.  */
diff --git a/arch/arm/cpu/arm926ejs/armada100/timer.c b/arch/arm/cpu/arm926ejs/armada100/timer.c
index 6d77ad3b6da..4b96d4aa918 100644
--- a/arch/arm/cpu/arm926ejs/armada100/timer.c
+++ b/arch/arm/cpu/arm926ejs/armada100/timer.c
@@ -45,7 +45,7 @@ struct armd1tmr_registers {
 #define TIMER			0	/* Use TIMER 0 */
 /* Each timer has 3 match registers */
 #define MATCH_CMP(x)		((3 * TIMER) + x)
-#define TIMER_LOAD_VAL 		0xffffffff
+#define TIMER_LOAD_VAL		0xffffffff
 #define	COUNT_RD_REQ		0x1
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/arch/arm/cpu/armv8/fel_utils.S b/arch/arm/cpu/armv8/fel_utils.S
index 7def44ad1d3..5266515f145 100644
--- a/arch/arm/cpu/armv8/fel_utils.S
+++ b/arch/arm/cpu/armv8/fel_utils.S
@@ -64,18 +64,18 @@ ENTRY(return_to_fel)
 
 /* AArch32 code to restore the state from fel_stash and return back to FEL. */
 back_in_32:
-	.word	0xe59f0028 	// ldr	r0, [pc, #40]	; load fel_stash address
-	.word	0xe5901008 	// ldr	r1, [r0, #8]
-	.word	0xe129f001 	// msr	CPSR_fc, r1
+	.word	0xe59f0028	// ldr	r0, [pc, #40]	; load fel_stash address
+	.word	0xe5901008	// ldr	r1, [r0, #8]
+	.word	0xe129f001	// msr	CPSR_fc, r1
 	.word	0xf57ff06f	// isb
-	.word	0xe590d000 	// ldr	sp, [r0]
-	.word	0xe590e004 	// ldr	lr, [r0, #4]
-	.word	0xe5901010 	// ldr	r1, [r0, #16]
-	.word	0xee0c1f10 	// mcr	15, 0, r1, cr12, cr0, {0} ; VBAR
-	.word	0xe590100c 	// ldr	r1, [r0, #12]
-	.word	0xee011f10 	// mcr	15, 0, r1, cr1, cr0, {0}  ; SCTLR
+	.word	0xe590d000	// ldr	sp, [r0]
+	.word	0xe590e004	// ldr	lr, [r0, #4]
+	.word	0xe5901010	// ldr	r1, [r0, #16]
+	.word	0xee0c1f10	// mcr	15, 0, r1, cr12, cr0, {0} ; VBAR
+	.word	0xe590100c	// ldr	r1, [r0, #12]
+	.word	0xee011f10	// mcr	15, 0, r1, cr1, cr0, {0}  ; SCTLR
 	.word	0xf57ff06f	// isb
-	.word	0xe12fff1e 	// bx	lr		; return to FEL
+	.word	0xe12fff1e	// bx	lr		; return to FEL
 fel_stash_addr:
 	.word   0x00000000	// receives fel_stash addr, by AA64 code above
 ENDPROC(return_to_fel)
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3 b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3
index 6c98d99d0cc..9119d60ffb3 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3
+++ b/arch/arm/cpu/armv8/fsl-layerscape/doc/README.lsch3
@@ -42,22 +42,22 @@ Flash Layout
    pre-silicon platforms (simulator and emulator):
 
 	-------------------------
-	| 	FIT Image	|
+	|	FIT Image	|
 	| (linux + DTB + RFS)	|
 	------------------------- ----> 0x0120_0000
-	| 	Debug Server FW |
+	|	Debug Server FW |
 	------------------------- ----> 0x00C0_0000
-	|	AIOP FW 	|
+	|	AIOP FW		|
 	------------------------- ----> 0x0070_0000
-	|	MC FW 		|
+	|	MC FW		|
 	------------------------- ----> 0x006C_0000
-	| 	MC DPL Blob 	|
+	|	MC DPL Blob	|
 	------------------------- ----> 0x0020_0000
-	| 	BootLoader + Env|
+	|	BootLoader + Env|
 	------------------------- ----> 0x0000_1000
-	|	PBI 		|
+	|	PBI		|
 	------------------------- ----> 0x0000_0080
-	|	RCW 		|
+	|	RCW		|
 	------------------------- ----> 0x0000_0000
 
 	32-MB NOR flash layout for pre-silicon platforms (simulator and emulator)
@@ -70,45 +70,45 @@ Flash Layout
 	----------------------------------------- ----> 0x5_8790_0000	|
 	| FIT Image (linux + DTB + RFS)	(40M)	|			|
 	----------------------------------------- ----> 0x5_8510_0000	|
-	|	PHY firmware (2M)	 	|			|
+	|	PHY firmware (2M)		|			|
 	----------------------------------------- ----> 0x5_84F0_0000	| 64K
 	|	Debug Server FW (2M)		|			| Alt
 	----------------------------------------- ----> 0x5_84D0_0000	| Bank
 	|	AIOP FW (4M)			|			|
 	----------------------------------------- ----> 0x5_8490_0000 (vbank4)
-	|	MC DPC Blob (1M) 		|			|
+	|	MC DPC Blob (1M)		|			|
 	----------------------------------------- ----> 0x5_8480_0000	|
 	|	MC DPL Blob (1M)		|			|
 	----------------------------------------- ----> 0x5_8470_0000	|
-	| 	MC FW (4M)			|			|
+	|	MC FW (4M)			|			|
 	----------------------------------------- ----> 0x5_8430_0000	|
-	|	BootLoader Environment (1M) 	|			|
+	|	BootLoader Environment (1M)	|			|
 	----------------------------------------- ----> 0x5_8420_0000	|
 	|	BootLoader (1M)			|			|
 	----------------------------------------- ----> 0x5_8410_0000	|
-	|	RCW and PBI (1M) 		|			|
+	|	RCW and PBI (1M)		|			|
 	----------------------------------------- ----> 0x5_8400_0000 ---
 	|	.. Unused .. (7M)		|			|
 	----------------------------------------- ----> 0x5_8390_0000	|
 	| FIT Image (linux + DTB + RFS)	(40M)	|			|
 	----------------------------------------- ----> 0x5_8110_0000	|
-	|	PHY firmware (2M)	 	|			|
+	|	PHY firmware (2M)		|			|
 	----------------------------------------- ----> 0x5_80F0_0000	| 64K
 	|	Debug Server FW (2M)		|			| Bank
 	----------------------------------------- ----> 0x5_80D0_0000	|
 	|	AIOP FW (4M)			|			|
 	----------------------------------------- ----> 0x5_8090_0000 (vbank0)
-	|	MC DPC Blob (1M) 		|			|
+	|	MC DPC Blob (1M)		|			|
 	----------------------------------------- ----> 0x5_8080_0000	|
 	|	MC DPL Blob (1M)		|			|
 	----------------------------------------- ----> 0x5_8070_0000	|
-	| 	MC FW (4M)			|			|
+	|	MC FW (4M)			|			|
 	----------------------------------------- ----> 0x5_8030_0000	|
-	|	BootLoader Environment (1M) 	|			|
+	|	BootLoader Environment (1M)	|			|
 	----------------------------------------- ----> 0x5_8020_0000	|
 	|	BootLoader (1M)			|			|
 	----------------------------------------- ----> 0x5_8010_0000	|
-	|	RCW and PBI (1M) 		|			|
+	|	RCW and PBI (1M)		|			|
 	----------------------------------------- ----> 0x5_8000_0000 ---
 
 	128-MB NOR flash layout for QDS and RDB boards
diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S
index d8803738f10..3aa1a9c3e5c 100644
--- a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S
+++ b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S
@@ -250,7 +250,7 @@ ENTRY(lowlevel_init)
 	 * b. We use only Region0 whose NSAID write/read is EN
 	 *
 	 * NOTE: As per the CCSR map doc, TZASC 3 and TZASC 4 are just
-	 * 	 placeholders.
+	 *	 placeholders.
 	 */
 
 .macro tzasc_prog, xreg
@@ -259,7 +259,7 @@ ENTRY(lowlevel_init)
 	mov     x16, #0x10000
 	mul     x14, \xreg, x16
 	add     x14, x14,x12
-	mov 	x1, #0x8
+	mov	x1, #0x8
 	add     x1, x1, x14
 
 	ldr     w0, [x1]		/* Filter 0 Gate Keeper Register */
diff --git a/arch/arm/dts/vf610-pinfunc.h b/arch/arm/dts/vf610-pinfunc.h
index 94567190746..e079edf3067 100644
--- a/arch/arm/dts/vf610-pinfunc.h
+++ b/arch/arm/dts/vf610-pinfunc.h
@@ -424,7 +424,7 @@
 #define VF610_PAD_PTD29__FTM3_CH2		0x104 0x000 ALT4 0x0
 #define VF610_PAD_PTD29__DSPI2_SIN		0x104 0x000 ALT5 0x0
 #define VF610_PAD_PTD29__DEBUG_OUT11		0x104 0x000 ALT7 0x0
-#define VF610_PAD_PTD28__GPIO_66	 	0x108 0x000 ALT0 0x0
+#define VF610_PAD_PTD28__GPIO_66		0x108 0x000 ALT0 0x0
 #define VF610_PAD_PTD28__FB_AD28		0x108 0x000 ALT1 0x0
 #define VF610_PAD_PTD28__NF_IO12		0x108 0x000 ALT2 0x0
 #define VF610_PAD_PTD28__I2C2_SCL		0x108 0x34C ALT3 0x1
diff --git a/arch/arm/include/asm/arch-armada100/mfp.h b/arch/arm/include/asm/arch-armada100/mfp.h
index a808ee85745..cd837eaef45 100644
--- a/arch/arm/include/asm/arch-armada100/mfp.h
+++ b/arch/arm/include/asm/arch-armada100/mfp.h
@@ -17,7 +17,7 @@
 /*
  * Frequently used MFP Configuration macros for all ARMADA100 family of SoCs
  *
- * 				    offset, pull,pF, drv,dF, edge,eF ,afn,aF
+ *				    offset, pull,pF, drv,dF, edge,eF ,afn,aF
  */
 /* UART1 */
 #define MFP107_UART1_TXD	(MFP_REG(0x01ac) | MFP_AF1 | MFP_DRIVE_FAST)
diff --git a/arch/arm/include/asm/arch-mx25/imx-regs.h b/arch/arm/include/asm/arch-mx25/imx-regs.h
index 57809697c1a..d5ea868c45e 100644
--- a/arch/arm/include/asm/arch-mx25/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx25/imx-regs.h
@@ -50,11 +50,11 @@ struct ccm_regs {
 
 /* Enhanced SDRAM Controller (ESDRAMC) registers */
 struct esdramc_regs {
-	u32 ctl0; 	/* control 0 */
-	u32 cfg0; 	/* configuration 0 */
-	u32 ctl1; 	/* control 1 */
-	u32 cfg1; 	/* configuration 1 */
-	u32 misc; 	/* miscellaneous */
+	u32 ctl0;	/* control 0 */
+	u32 cfg0;	/* configuration 0 */
+	u32 ctl1;	/* control 1 */
+	u32 cfg1;	/* configuration 1 */
+	u32 misc;	/* miscellaneous */
 	u32 pad[3];
 	u32 cdly1;	/* Delay Line 1 configuration debug */
 	u32 cdly2;	/* delay line 2 configuration debug */
@@ -66,11 +66,11 @@ struct esdramc_regs {
 
 /* General Purpose Timer (GPT) registers */
 struct gpt_regs {
-	u32 ctrl;   	/* control */
-	u32 pre;    	/* prescaler */
-	u32 stat;   	/* status */
-	u32 intr;   	/* interrupt */
-	u32 cmp[3]; 	/* output compare 1-3 */
+	u32 ctrl;	/* control */
+	u32 pre;	/* prescaler */
+	u32 stat;	/* status */
+	u32 intr;	/* interrupt */
+	u32 cmp[3];	/* output compare 1-3 */
 	u32 capt[2];	/* input capture 1-2 */
 	u32 counter;	/* counter */
 };
@@ -456,7 +456,7 @@ struct epit_regs {
 #define GPT_CTRL_TEN		1		/* Timer enable	*/
 
 /* WDOG enable */
-#define WCR_WDE 		0x04
+#define WCR_WDE			0x04
 #define WSR_UNLOCK1		0x5555
 #define WSR_UNLOCK2		0xAAAA
 
diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h
index 2731b7fb59b..f763749b03c 100644
--- a/arch/arm/include/asm/arch-mx5/imx-regs.h
+++ b/arch/arm/include/asm/arch-mx5/imx-regs.h
@@ -43,7 +43,7 @@
 #define MMC_SDHC1_BASE_ADDR	(SPBA0_BASE_ADDR + 0x00004000)
 #define MMC_SDHC2_BASE_ADDR	(SPBA0_BASE_ADDR + 0x00008000)
 #define UART3_BASE		(SPBA0_BASE_ADDR + 0x0000C000)
-#define CSPI1_BASE_ADDR 	(SPBA0_BASE_ADDR + 0x00010000)
+#define CSPI1_BASE_ADDR		(SPBA0_BASE_ADDR + 0x00010000)
 #define SSI2_BASE_ADDR		(SPBA0_BASE_ADDR + 0x00014000)
 #define MMC_SDHC3_BASE_ADDR	(SPBA0_BASE_ADDR + 0x00020000)
 #define MMC_SDHC4_BASE_ADDR	(SPBA0_BASE_ADDR + 0x00024000)
@@ -97,7 +97,7 @@
 #define IIM_BASE_ADDR		(AIPS2_BASE_ADDR + 0x00098000)
 #define CSU_BASE_ADDR		(AIPS2_BASE_ADDR + 0x0009C000)
 #define ARM_BASE_ADDR		(AIPS2_BASE_ADDR + 0x000A0000)
-#define OWIRE_BASE_ADDR 	(AIPS2_BASE_ADDR + 0x000A4000)
+#define OWIRE_BASE_ADDR		(AIPS2_BASE_ADDR + 0x000A4000)
 #define FIRI_BASE_ADDR		(AIPS2_BASE_ADDR + 0x000A8000)
 #define CSPI2_BASE_ADDR		(AIPS2_BASE_ADDR + 0x000AC000)
 #define SDMA_BASE_ADDR		(AIPS2_BASE_ADDR + 0x000B0000)
diff --git a/arch/arm/include/asm/arch-mx6/mx6_plugin.S b/arch/arm/include/asm/arch-mx6/mx6_plugin.S
index 7e61d22ca79..4d12c6873b3 100644
--- a/arch/arm/include/asm/arch-mx6/mx6_plugin.S
+++ b/arch/arm/include/asm/arch-mx6/mx6_plugin.S
@@ -7,10 +7,10 @@
 
 #ifdef CONFIG_ROM_UNIFIED_SECTIONS
 #define ROM_API_TABLE_BASE_ADDR_LEGACY		0x180
-#define ROM_VERSION_OFFSET               	0x80
+#define ROM_VERSION_OFFSET			0x80
 #else
 #define ROM_API_TABLE_BASE_ADDR_LEGACY		0xC0
-#define ROM_VERSION_OFFSET               	0x48
+#define ROM_VERSION_OFFSET			0x48
 #endif
 #define ROM_API_TABLE_BASE_ADDR_MX6DQ_TO15	0xC4
 #define ROM_API_TABLE_BASE_ADDR_MX6DL_TO12	0xC4
diff --git a/arch/arm/include/asm/arch-mx7/mx7_plugin.S b/arch/arm/include/asm/arch-mx7/mx7_plugin.S
index c7a84e8caa1..b552542e281 100644
--- a/arch/arm/include/asm/arch-mx7/mx7_plugin.S
+++ b/arch/arm/include/asm/arch-mx7/mx7_plugin.S
@@ -6,7 +6,7 @@
 #include <config.h>
 
 #define ROM_API_TABLE_BASE_ADDR_LEGACY		0x180
-#define ROM_VERSION_OFFSET               	0x80
+#define ROM_VERSION_OFFSET			0x80
 #define ROM_API_HWCNFG_SETUP_OFFSET		0x08
 
 plugin_start:
diff --git a/arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S b/arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S
index bcc804b58fa..5089b1d5177 100644
--- a/arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S
+++ b/arch/arm/include/asm/arch-mx7ulp/mx7ulp_plugin.S
@@ -6,7 +6,7 @@
 #include <config.h>
 
 #define ROM_API_TABLE_BASE_ADDR_LEGACY		0x180
-#define ROM_VERSION_OFFSET               	0x80
+#define ROM_VERSION_OFFSET			0x80
 #define ROM_API_HWCNFG_SETUP_OFFSET		0x08
 
 plugin_start:
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
index 316c67c62f9..ed2a6121855 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3368.h
@@ -126,17 +126,17 @@ enum {
 	/* GLB_RST_CON */
 	PMU_GLB_SRST_CTRL_SHIFT		= 2,
 	PMU_GLB_SRST_CTRL_MASK		= GENMASK(3, 2),
-	PMU_RST_BY_FST_GLB_SRST 	= 0,
-	PMU_RST_BY_SND_GLB_SRST 	= 1,
+	PMU_RST_BY_FST_GLB_SRST		= 0,
+	PMU_RST_BY_SND_GLB_SRST		= 1,
 	PMU_RST_DISABLE			= 2,
 	WDT_GLB_SRST_CTRL_SHIFT		= 1,
 	WDT_GLB_SRST_CTRL_MASK		= BIT(1),
-	WDT_TRIGGER_SND_GLB_SRST 	= 0,
-	WDT_TRIGGER_FST_GLB_SRST 	= 1,
-	TSADC_GLB_SRST_CTRL_SHIFT 	= 0,
-	TSADC_GLB_SRST_CTRL_MASK  	= BIT(0),
-	TSADC_TRIGGER_SND_GLB_SRST 	= 0,
-	TSADC_TRIGGER_FST_GLB_SRST 	= 1,
+	WDT_TRIGGER_SND_GLB_SRST	= 0,
+	WDT_TRIGGER_FST_GLB_SRST	= 1,
+	TSADC_GLB_SRST_CTRL_SHIFT	= 0,
+	TSADC_GLB_SRST_CTRL_MASK	= BIT(0),
+	TSADC_TRIGGER_SND_GLB_SRST	= 0,
+	TSADC_TRIGGER_FST_GLB_SRST	= 1,
 
 };
 #endif
diff --git a/arch/arm/include/asm/arch-vf610/iomux-vf610.h b/arch/arm/include/asm/arch-vf610/iomux-vf610.h
index 8ba03e5a17f..94ab059745e 100644
--- a/arch/arm/include/asm/arch-vf610/iomux-vf610.h
+++ b/arch/arm/include/asm/arch-vf610/iomux-vf610.h
@@ -163,13 +163,13 @@ enum {
 	VF610_PAD_PTB24__NF_WE_B		= IOMUX_PAD(0x0178, 0x0178, 5, __NA_, 0, VF610_NFC_CN_PAD_CTRL),
 	VF610_PAD_PTB25__NF_CE0_B		= IOMUX_PAD(0x017c, 0x017c, 5, __NA_, 0, VF610_NFC_CN_PAD_CTRL),
 
-	VF610_PAD_PTB27__NF_RE_B 		= IOMUX_PAD(0x0184, 0x0184, 6, __NA_, 0, VF610_NFC_CN_PAD_CTRL),
+	VF610_PAD_PTB27__NF_RE_B		= IOMUX_PAD(0x0184, 0x0184, 6, __NA_, 0, VF610_NFC_CN_PAD_CTRL),
 
-	VF610_PAD_PTC26__NF_RB_B 		= IOMUX_PAD(0x018C, 0x018C, 5, __NA_, 0, VF610_NFC_RB_PAD_CTRL),
+	VF610_PAD_PTC26__NF_RB_B		= IOMUX_PAD(0x018C, 0x018C, 5, __NA_, 0, VF610_NFC_RB_PAD_CTRL),
 
-	VF610_PAD_PTC27__NF_ALE  		= IOMUX_PAD(0x0190, 0x0190, 6, __NA_, 0, VF610_NFC_CN_PAD_CTRL),
+	VF610_PAD_PTC27__NF_ALE			= IOMUX_PAD(0x0190, 0x0190, 6, __NA_, 0, VF610_NFC_CN_PAD_CTRL),
 
-	VF610_PAD_PTC28__NF_CLE  		= IOMUX_PAD(0x0194, 0x0194, 6, __NA_, 0, VF610_NFC_CN_PAD_CTRL),
+	VF610_PAD_PTC28__NF_CLE			= IOMUX_PAD(0x0194, 0x0194, 6, __NA_, 0, VF610_NFC_CN_PAD_CTRL),
 
 	VF610_PAD_PTE0__DCU0_HSYNC		= IOMUX_PAD(0x01a4, 0x01a4, 1, __NA_, 0, VF610_DCU_PAD_CTRL),
 	VF610_PAD_PTE1__DCU0_VSYNC		= IOMUX_PAD(0x01a8, 0x01a8, 1, __NA_, 0, VF610_DCU_PAD_CTRL),
diff --git a/arch/arm/include/asm/macro.h b/arch/arm/include/asm/macro.h
index e1eefc283f9..ec0171e0e6c 100644
--- a/arch/arm/include/asm/macro.h
+++ b/arch/arm/include/asm/macro.h
@@ -154,7 +154,7 @@ lr	.req	x30
 	orr	\xreg1, \xreg1, \xreg2
 	cbz	\xreg1, \master_label
 #else
-	b 	\master_label
+	b	\master_label
 #endif
 .endm
 
diff --git a/arch/arm/include/asm/ti-common/davinci_nand.h b/arch/arm/include/asm/ti-common/davinci_nand.h
index 28842c3b155..ffaac6840ba 100644
--- a/arch/arm/include/asm/ti-common/davinci_nand.h
+++ b/arch/arm/include/asm/ti-common/davinci_nand.h
@@ -12,9 +12,9 @@
 #include <linux/mtd/rawnand.h>
 #include <asm/arch/hardware.h>
 
-#define NAND_READ_START  	0x00
-#define NAND_READ_END    	0x30
-#define NAND_STATUS      	0x70
+#define NAND_READ_START		0x00
+#define NAND_READ_END		0x30
+#define NAND_STATUS		0x70
 
 #define MASK_CLE		0x10
 #define MASK_ALE		0x08
diff --git a/arch/arm/lib/ccn504.S b/arch/arm/lib/ccn504.S
index f2245872fc5..c6ea3e3afc9 100644
--- a/arch/arm/lib/ccn504.S
+++ b/arch/arm/lib/ccn504.S
@@ -12,7 +12,7 @@
 /*************************************************************************
  *
  * void ccn504_add_masters_to_dvm(CCI_MN_BASE, CCI_MN_RNF_NODEID_LIST,
- * 				  CCI_MN_DVM_DOMAIN_CTL_SET);
+ *				  CCI_MN_DVM_DOMAIN_CTL_SET);
  *
  * Add fully-coherent masters to DVM domain
  *
diff --git a/arch/arm/lib/div64.S b/arch/arm/lib/div64.S
index 3ef1ce1fff5..a83e3372149 100644
--- a/arch/arm/lib/div64.S
+++ b/arch/arm/lib/div64.S
@@ -34,12 +34,12 @@
  *       This is meant to be used by do_div() from include/asm/div64.h only.
  *
  * Input parameters:
- * 	xh-xl	= dividend (clobbered)
- * 	r4	= divisor (preserved)
+ *	xh-xl	= dividend (clobbered)
+ *	r4	= divisor (preserved)
  *
  * Output values:
- * 	yh-yl	= result
- * 	xh	= remainder
+ *	yh-yl	= result
+ *	xh	= remainder
  *
  * Clobbered regs: xl, ip
  */
@@ -85,7 +85,7 @@ UNWIND(.fnstart)
 #endif
 
 	@ The division loop for needed upper bit positions.
- 	@ Break out early if dividend reaches 0.
+	@ Break out early if dividend reaches 0.
 2:	cmp	xh, yl
 	orrcs	yh, yh, ip
 	subscs	xh, xh, yl
diff --git a/arch/arm/mach-at91/include/mach/at91_mc.h b/arch/arm/mach-at91/include/mach/at91_mc.h
index 18b0e163c09..7cf6cdf3102 100644
--- a/arch/arm/mach-at91/include/mach/at91_mc.h
+++ b/arch/arm/mach-at91/include/mach/at91_mc.h
@@ -16,7 +16,7 @@
 #ifndef __ASSEMBLY__
 
 typedef struct at91_ebi {
-	u32 	csa;		/* 0x00 Chip Select Assignment Register */
+	u32	csa;		/* 0x00 Chip Select Assignment Register */
 	u32	cfgr;		/* 0x04 Configuration Register */
 	u32	reserved[2];
 } at91_ebi_t;
@@ -28,20 +28,20 @@ typedef struct at91_ebi {
 #define AT91_EBI_CSA_CS4A	0x0010
 
 typedef struct at91_sdramc {
-	u32	mr; 	/* 0x00 SDRAMC Mode Register */
-	u32	tr; 	/* 0x04 SDRAMC Refresh Timer Register */
-	u32	cr; 	/* 0x08 SDRAMC Configuration Register */
-	u32	ssr; 	/* 0x0C SDRAMC Self Refresh Register */
-	u32	lpr; 	/* 0x10 SDRAMC Low Power Register */
-	u32	ier; 	/* 0x14 SDRAMC Interrupt Enable Register */
-	u32	idr; 	/* 0x18 SDRAMC Interrupt Disable Register */
-	u32	imr; 	/* 0x1C SDRAMC Interrupt Mask Register */
-	u32	icr; 	/* 0x20 SDRAMC Interrupt Status Register */
+	u32	mr;	/* 0x00 SDRAMC Mode Register */
+	u32	tr;	/* 0x04 SDRAMC Refresh Timer Register */
+	u32	cr;	/* 0x08 SDRAMC Configuration Register */
+	u32	ssr;	/* 0x0C SDRAMC Self Refresh Register */
+	u32	lpr;	/* 0x10 SDRAMC Low Power Register */
+	u32	ier;	/* 0x14 SDRAMC Interrupt Enable Register */
+	u32	idr;	/* 0x18 SDRAMC Interrupt Disable Register */
+	u32	imr;	/* 0x1C SDRAMC Interrupt Mask Register */
+	u32	icr;	/* 0x20 SDRAMC Interrupt Status Register */
 	u32	reserved[3];
 } at91_sdramc_t;
 
 typedef struct at91_smc {
-	u32	csr[8]; 	/* 0x00 SDRAMC Mode Register */
+	u32	csr[8];		/* 0x00 SDRAMC Mode Register */
 } at91_smc_t;
 
 #define AT91_SMC_CSR_RWHOLD(x)		((x & 0x7) << 28)
@@ -60,7 +60,7 @@ typedef struct at91_smc {
 #define AT91_SMC_CSR_NWS(x)		(x & 0x7F)
 
 typedef struct at91_bfc {
-	u32	mr; 	/* 0x00 SDRAMC Mode Register */
+	u32	mr;	/* 0x00 SDRAMC Mode Register */
 } at91_bfc_t;
 
 typedef struct at91_mc {
diff --git a/arch/arm/mach-at91/include/mach/at91_st.h b/arch/arm/mach-at91/include/mach/at91_st.h
index ec4658a3917..f91cec98c93 100644
--- a/arch/arm/mach-at91/include/mach/at91_st.h
+++ b/arch/arm/mach-at91/include/mach/at91_st.h
@@ -24,6 +24,6 @@ typedef struct at91_st {
 
 #define AT91_ST_WDMR_WDV(x)	(x & 0xFFFF)
 #define AT91_ST_WDMR_RSTEN	0x00010000
-#define AT91_ST_WDMR_EXTEN 	0x00020000
+#define AT91_ST_WDMR_EXTEN	0x00020000
 
 #endif
diff --git a/arch/arm/mach-davinci/include/mach/da8xx-usb.h b/arch/arm/mach-davinci/include/mach/da8xx-usb.h
index 215706e1729..99d403cef7e 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx-usb.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx-usb.h
@@ -29,22 +29,22 @@
 struct da8xx_usb_regs {
 	dv_reg	revision;
 	dv_reg	control;
-	dv_reg 	status;
-	dv_reg 	emulation;
-	dv_reg 	mode;
-	dv_reg 	autoreq;
-	dv_reg 	srpfixtime;
-	dv_reg 	teardown;
-	dv_reg 	intsrc;
-	dv_reg 	intsrc_set;
-	dv_reg 	intsrc_clr;
-	dv_reg 	intmsk;
-	dv_reg 	intmsk_set;
-	dv_reg 	intmsk_clr;
-	dv_reg 	intsrcmsk;
-	dv_reg 	eoi;
-	dv_reg 	intvector;
-	dv_reg 	grndis_size[4];
+	dv_reg	status;
+	dv_reg	emulation;
+	dv_reg	mode;
+	dv_reg	autoreq;
+	dv_reg	srpfixtime;
+	dv_reg	teardown;
+	dv_reg	intsrc;
+	dv_reg	intsrc_set;
+	dv_reg	intsrc_clr;
+	dv_reg	intmsk;
+	dv_reg	intmsk_set;
+	dv_reg	intmsk_clr;
+	dv_reg	intsrcmsk;
+	dv_reg	eoi;
+	dv_reg	intvector;
+	dv_reg	grndis_size[4];
 };
 
 #define da8xx_usb_regs ((struct da8xx_usb_regs *)DA8XX_USB_OTG_BASE)
@@ -68,13 +68,13 @@ struct da8xx_usb_regs {
 #define CFGCHIP2_OTGMODE	(3 << 13)
 #define CFGCHIP2_NO_OVERRIDE	(0 << 13)
 #define CFGCHIP2_FORCE_HOST	(1 << 13)
-#define CFGCHIP2_FORCE_DEVICE 	(2 << 13)
+#define CFGCHIP2_FORCE_DEVICE	(2 << 13)
 #define CFGCHIP2_FORCE_HOST_VBUS_LOW (3 << 13)
 #define CFGCHIP2_USB1PHYCLKMUX	(1 << 12)
 #define CFGCHIP2_USB2PHYCLKMUX	(1 << 11)
 #define CFGCHIP2_PHYPWRDN	(1 << 10)
 #define CFGCHIP2_OTGPWRDN	(1 << 9)
-#define CFGCHIP2_DATPOL 	(1 << 8)
+#define CFGCHIP2_DATPOL		(1 << 8)
 #define CFGCHIP2_USB1SUSPENDM	(1 << 7)
 #define CFGCHIP2_PHY_PLLON	(1 << 6)	/* override PLL suspend */
 #define CFGCHIP2_SESENDEN	(1 << 5)	/* Vsess_end comparator */
diff --git a/arch/arm/mach-davinci/include/mach/davinci_misc.h b/arch/arm/mach-davinci/include/mach/davinci_misc.h
index a40de0cc9c3..1133a23bdee 100644
--- a/arch/arm/mach-davinci/include/mach/davinci_misc.h
+++ b/arch/arm/mach-davinci/include/mach/davinci_misc.h
@@ -23,7 +23,7 @@ struct pinmux_config {
 /* pin table definition */
 struct pinmux_resource {
 	const struct pinmux_config	*pins;
-	const int 			n_pins;
+	const int			n_pins;
 };
 
 #define PINMUX_ITEM(item) { \
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 0ef269563da..63e28c635e3 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -34,7 +34,7 @@ obj-$(CONFIG_CMD_PRIBLOB) += priblob.o
 obj-$(CONFIG_SPL_BUILD)	+= spl.o
 endif
 ifeq ($(SOC),$(filter $(SOC),mx7))
-obj-y 	+= cpu.o
+obj-y	+= cpu.o
 obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o
 obj-$(CONFIG_ENV_IS_IN_MMC) += mmc_env.o
 obj-$(CONFIG_FSL_MFGPROT) += cmd_mfgprot.o
@@ -43,7 +43,7 @@ ifeq ($(SOC),$(filter $(SOC),mx5 mx6 mx7))
 obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
 endif
 ifeq ($(SOC),$(filter $(SOC),mx6 mx7))
-obj-y 	+= cache.o init.o
+obj-y	+= cache.o init.o
 obj-$(CONFIG_FEC_MXC) += mac.o
 obj-$(CONFIG_IMX_RDC) += rdc-sema.o
 ifneq ($(CONFIG_SPL_BUILD),y)
diff --git a/arch/arm/mach-keystone/include/mach/hardware.h b/arch/arm/mach-keystone/include/mach/hardware.h
index 0c5dc6a7395..98a8f058df4 100644
--- a/arch/arm/mach-keystone/include/mach/hardware.h
+++ b/arch/arm/mach-keystone/include/mach/hardware.h
@@ -148,8 +148,8 @@ typedef volatile unsigned int   *dv_reg_p;
 #define KS2_CIC_HOST_ENABLE_IDX_SET	0x34
 #define KS2_CIC_CHAN_MAP(n)		(0x0400 + (n << 2))
 
-#define KS2_UART0_BASE                	0x02530c00
-#define KS2_UART1_BASE                	0x02531000
+#define KS2_UART0_BASE			0x02530c00
+#define KS2_UART1_BASE			0x02531000
 
 /* Boot Config */
 #define KS2_DEVICE_STATE_CTRL_BASE	0x02620000
@@ -210,7 +210,7 @@ typedef volatile unsigned int   *dv_reg_p;
 #endif
 
 /* AEMIF */
-#define KS2_AEMIF_CNTRL_BASE       	0x21000a00
+#define KS2_AEMIF_CNTRL_BASE		0x21000a00
 #define DAVINCI_ASYNC_EMIF_CNTRL_BASE   KS2_AEMIF_CNTRL_BASE
 
 /* Flag from ks2_debug options to check if DSPs need to stay ON */
diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c
index 73ab5fbfaeb..1d8eab2dab5 100644
--- a/arch/arm/mach-omap2/clocks-common.c
+++ b/arch/arm/mach-omap2/clocks-common.c
@@ -552,7 +552,7 @@ void scale_vcores(struct vcores_data const *vcores)
 		if (pv->value[opp]) {
 			/* Handle non-empty members only */
 			pv->value[opp] = optimize_vcore_voltage(pv, opp);
-     			px = (struct volts *)vcores;
+			px = (struct volts *)vcores;
 			j = 0;
 			while (px < pv) {
 				/*
diff --git a/arch/arm/mach-omap2/omap5/prcm-regs.c b/arch/arm/mach-omap2/omap5/prcm-regs.c
index b5baebc0692..28c4f4f7374 100644
--- a/arch/arm/mach-omap2/omap5/prcm-regs.c
+++ b/arch/arm/mach-omap2/omap5/prcm-regs.c
@@ -300,7 +300,7 @@ struct omap_sys_ctrl_regs const omap5_ctrl = {
 	.control_std_fuse_die_id_1		= 0x4A002208,
 	.control_std_fuse_die_id_2		= 0x4A00220C,
 	.control_std_fuse_die_id_3		= 0x4A002210,
-	.control_phy_power_usb 			= 0x4A002370,
+	.control_phy_power_usb			= 0x4A002370,
 	.control_phy_power_sata			= 0x4A002374,
 	.control_padconf_core_base		= 0x4A002800,
 	.control_paconf_global			= 0x4A002DA0,
diff --git a/arch/arm/mach-orion5x/timer.c b/arch/arm/mach-orion5x/timer.c
index 0adf3dcc648..d7ea2e3943f 100644
--- a/arch/arm/mach-orion5x/timer.c
+++ b/arch/arm/mach-orion5x/timer.c
@@ -69,7 +69,7 @@ struct orion5x_tmr_registers *orion5x_tmr_regs =
 #define TVR_ARM_TIMER_OFFS		0
 #define TVR_ARM_TIMER_MASK		0xffffffff
 #define TVR_ARM_TIMER_MAX		0xffffffff
-#define TIMER_LOAD_VAL 			0xffffffff
+#define TIMER_LOAD_VAL			0xffffffff
 
 static inline ulong read_timer(void)
 {
diff --git a/arch/arm/mach-rmobile/pfc-r8a7790.h b/arch/arm/mach-rmobile/pfc-r8a7790.h
index e911be4039d..3b36548aec9 100644
--- a/arch/arm/mach-rmobile/pfc-r8a7790.h
+++ b/arch/arm/mach-rmobile/pfc-r8a7790.h
@@ -82,7 +82,7 @@
 	PORT_1(fn, pfx##26, sfx), PORT_1(fn, pfx##27, sfx)
 
 #define CPU_32_PORT0_16(fn, pfx, sfx)				\
-	PORT_10(fn, pfx, sfx), 					\
+	PORT_10(fn, pfx, sfx),					\
 	PORT_1(fn, pfx##10, sfx),PORT_1(fn, pfx##11, sfx),	\
 	PORT_1(fn, pfx##12, sfx), PORT_1(fn, pfx##13, sfx),	\
 	PORT_1(fn, pfx##14, sfx), PORT_1(fn, pfx##15, sfx),	\
diff --git a/arch/arm/mach-rockchip/rk3368/Makefile b/arch/arm/mach-rockchip/rk3368/Makefile
index 3bddc104a74..5910f20bff7 100644
--- a/arch/arm/mach-rockchip/rk3368/Makefile
+++ b/arch/arm/mach-rockchip/rk3368/Makefile
@@ -3,4 +3,4 @@
 # Copyright (c) 2016 Andreas Färber
 obj-y		+= clk_rk3368.o
 obj-y		+= rk3368.o
-obj-y 		+= syscon_rk3368.o
+obj-y		+= syscon_rk3368.o
diff --git a/arch/arm/mach-s5pc1xx/include/mach/sromc.h b/arch/arm/mach-s5pc1xx/include/mach/sromc.h
index 45de4a799d3..a8eb2a38b0f 100644
--- a/arch/arm/mach-s5pc1xx/include/mach/sromc.h
+++ b/arch/arm/mach-s5pc1xx/include/mach/sromc.h
@@ -4,9 +4,9 @@
  * Naveen Krishna Ch <ch.naveen@samsung.com>
  *
  * Note: This file contains the register description for Memory subsystem
- * 	 (SROM, NAND Flash, OneNand, DDR, OneDRAM) on S5PC1XX.
+ *	 (SROM, NAND Flash, OneNand, DDR, OneDRAM) on S5PC1XX.
  *
- * 	 Only SROMC is defined as of now
+ *	 Only SROMC is defined as of now
  */
 
 #ifndef __ASM_ARCH_SROMC_H_
diff --git a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
index 048708202cc..7ab95170071 100644
--- a/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
+++ b/arch/arm/mach-socfpga/include/mach/fpga_manager_arria10.h
@@ -14,8 +14,8 @@
 
 #define ALT_FPGAMGR_IMGCFG_STAT_F2S_CRC_ERROR_SET_MSK		BIT(0)
 #define ALT_FPGAMGR_IMGCFG_STAT_F2S_EARLY_USERMODE_SET_MSK	BIT(1)
-#define ALT_FPGAMGR_IMGCFG_STAT_F2S_USERMODE_SET_MSK 		BIT(2)
-#define ALT_FPGAMGR_IMGCFG_STAT_F2S_INITDONE_OE_SET_MSK 	BIT(3)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_USERMODE_SET_MSK		BIT(2)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_INITDONE_OE_SET_MSK		BIT(3)
 #define ALT_FPGAMGR_IMGCFG_STAT_F2S_NSTATUS_PIN_SET_MSK		BIT(4)
 #define ALT_FPGAMGR_IMGCFG_STAT_F2S_NSTATUS_OE_SET_MSK		BIT(5)
 #define ALT_FPGAMGR_IMGCFG_STAT_F2S_CONDONE_PIN_SET_MSK		BIT(6)
@@ -26,9 +26,9 @@
 #define ALT_FPGAMGR_IMGCFG_STAT_F2S_PR_ERROR_SET_MSK		BIT(11)
 #define ALT_FPGAMGR_IMGCFG_STAT_F2S_NCONFIG_PIN_SET_MSK		BIT(12)
 #define ALT_FPGAMGR_IMGCFG_STAT_F2S_NCEO_OE_SET_MSK		BIT(13)
-#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL0_SET_MSK    		BIT(16)
-#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL1_SET_MSK    		BIT(17)
-#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL2_SET_MSK    		BIT(18)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL0_SET_MSK		BIT(16)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL1_SET_MSK		BIT(17)
+#define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL2_SET_MSK		BIT(18)
 #define ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL_SET_MSD (\
 	ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL0_SET_MSK |\
 	ALT_FPGAMGR_IMGCFG_STAT_F2S_MSEL1_SET_MSK |\
@@ -50,9 +50,9 @@
 #define ALT_FPGAMGR_IMGCFG_CTL_01_S2F_PR_REQUEST_SET_MSK	BIT(16)
 #define ALT_FPGAMGR_IMGCFG_CTL_01_S2F_NCE_SET_MSK		BIT(24)
 
-#define ALT_FPGAMGR_IMGCFG_CTL_02_EN_CFG_CTRL_SET_MSK    	BIT(0)
-#define ALT_FPGAMGR_IMGCFG_CTL_02_EN_CFG_DATA_SET_MSK    	BIT(8)
-#define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_SET_MSK    		0x00030000
+#define ALT_FPGAMGR_IMGCFG_CTL_02_EN_CFG_CTRL_SET_MSK		BIT(0)
+#define ALT_FPGAMGR_IMGCFG_CTL_02_EN_CFG_DATA_SET_MSK		BIT(8)
+#define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_SET_MSK		0x00030000
 #define ALT_FPGAMGR_IMGCFG_CTL_02_CFGWIDTH_SET_MSK		BIT(24)
 #define ALT_FPGAMGR_IMGCFG_CTL_02_CDRATIO_LSB			16
 
diff --git a/arch/arm/mach-sunxi/dram_sun4i.c b/arch/arm/mach-sunxi/dram_sun4i.c
index 76d698214da..80a6c4bc0fd 100644
--- a/arch/arm/mach-sunxi/dram_sun4i.c
+++ b/arch/arm/mach-sunxi/dram_sun4i.c
@@ -279,7 +279,7 @@ static void mctl_setup_dram_clock(u32 clk, u32 mbus_clk)
 		reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2));
 		reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(3));
 		reg_val |= CCM_PLL5_CTRL_N(CCM_PLL5_CTRL_N_X(11));
-	} else 	{
+	} else {
 		/* any other frequency that is a multiple of 24 */
 		reg_val |= CCM_PLL5_CTRL_M(CCM_PLL5_CTRL_M_X(2));
 		reg_val |= CCM_PLL5_CTRL_K(CCM_PLL5_CTRL_K_X(2));
diff --git a/arch/arm/mach-sunxi/dram_sun8i_a33.c b/arch/arm/mach-sunxi/dram_sun8i_a33.c
index d99a38b10aa..367b74061ed 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_a33.c
+++ b/arch/arm/mach-sunxi/dram_sun8i_a33.c
@@ -126,8 +126,8 @@ static void auto_set_timing_para(struct dram_para *para)
 	u32 tdinit3	= (1 * CONFIG_DRAM_CLK) + 1;		/* 1us */
 
 	u8 twtp		= tcwl + 2 + twr;	/* WL + BL / 2 + tWR */
-	u8 twr2rd	= tcwl + 2 + twtr; 	/* WL + BL / 2 + tWTR */
-	u8 trd2wr	= tcl + 2 + 1 - tcwl; 	/* RL + BL / 2 + 2 - WL */
+	u8 twr2rd	= tcwl + 2 + twtr;	/* WL + BL / 2 + tWTR */
+	u8 trd2wr	= tcl + 2 + 1 - tcwl;	/* RL + BL / 2 + 2 - WL */
 
 	/* Set work mode register */
 	mctl_set_cr(para);
diff --git a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
index 611eaa3024c..2136ca3a4cb 100644
--- a/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
+++ b/arch/arm/mach-sunxi/dram_timings/h6_ddr3_1333.c
@@ -30,7 +30,7 @@
  * MR1: DLL enabled, output strength RZQ/6, Rtt_norm RZQ/2,
  *	write levelling disabled, TDQS disabled, output buffer enabled
  * MR2: manual full array self refresh, dynamic ODT off,
- * 	CAS write latency (CWL): 8
+ *	CAS write latency (CWL): 8
  */
 static u32 mr_ddr3[7] = {
 	0x00001c70, 0x00000040, 0x00000018, 0x00000000,
diff --git a/arch/m68k/cpu/mcf5227x/start.S b/arch/m68k/cpu/mcf5227x/start.S
index 5415c51edd4..632f1b1f38c 100644
--- a/arch/m68k/cpu/mcf5227x/start.S
+++ b/arch/m68k/cpu/mcf5227x/start.S
@@ -37,10 +37,10 @@
 _vectors:
 #if defined(CONFIG_CF_SBF)
 INITSP:	.long	0			/* Initial SP	*/
-INITPC:	.long	ASM_DRAMINIT		/* Initial PC 	*/
+INITPC:	.long	ASM_DRAMINIT		/* Initial PC	*/
 #else
 INITSP:	.long	0			/* Initial SP	*/
-INITPC:	.long	_START			/* Initial PC 	*/
+INITPC:	.long	_START			/* Initial PC	*/
 #endif
 
 vector02_0F:
diff --git a/arch/m68k/cpu/mcf523x/cpu.c b/arch/m68k/cpu/mcf523x/cpu.c
index 8d3ab6f3fb2..e44656db5f2 100644
--- a/arch/m68k/cpu/mcf523x/cpu.c
+++ b/arch/m68k/cpu/mcf523x/cpu.c
@@ -106,7 +106,7 @@ int watchdog_init(void)
 #if defined(CONFIG_MCFFEC)
 /* Default initializations for MCFFEC controllers.  To override,
  * create a board-specific function called:
- * 	int board_eth_init(struct bd_info *bis)
+ *	int board_eth_init(struct bd_info *bis)
  */
 
 int cpu_eth_init(struct bd_info *bis)
diff --git a/arch/m68k/cpu/mcf52x2/cpu.c b/arch/m68k/cpu/mcf52x2/cpu.c
index 0676e391410..8f72ef567fe 100644
--- a/arch/m68k/cpu/mcf52x2/cpu.c
+++ b/arch/m68k/cpu/mcf52x2/cpu.c
@@ -421,7 +421,7 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
 #if defined(CONFIG_MCFFEC)
 /* Default initializations for MCFFEC controllers.  To override,
  * create a board-specific function called:
- * 	int board_eth_init(struct bd_info *bis)
+ *	int board_eth_init(struct bd_info *bis)
  */
 
 int cpu_eth_init(struct bd_info *bis)
diff --git a/arch/m68k/cpu/mcf532x/cpu.c b/arch/m68k/cpu/mcf532x/cpu.c
index d37dd3defb7..1dadffd4ca3 100644
--- a/arch/m68k/cpu/mcf532x/cpu.c
+++ b/arch/m68k/cpu/mcf532x/cpu.c
@@ -148,7 +148,7 @@ int watchdog_init(void)
 #if defined(CONFIG_MCFFEC)
 /* Default initializations for MCFFEC controllers.  To override,
  * create a board-specific function called:
- * 	int board_eth_init(struct bd_info *bis)
+ *	int board_eth_init(struct bd_info *bis)
  */
 int cpu_eth_init(struct bd_info *bis)
 {
diff --git a/arch/m68k/cpu/mcf5445x/cpu.c b/arch/m68k/cpu/mcf5445x/cpu.c
index ac1e5916816..d9a71c6b920 100644
--- a/arch/m68k/cpu/mcf5445x/cpu.c
+++ b/arch/m68k/cpu/mcf5445x/cpu.c
@@ -110,7 +110,7 @@ int print_cpuinfo(void)
 #if defined(CONFIG_MCFFEC)
 /* Default initializations for MCFFEC controllers.  To override,
  * create a board-specific function called:
- * 	int board_eth_init(struct bd_info *bis)
+ *	int board_eth_init(struct bd_info *bis)
  */
 
 int cpu_eth_init(struct bd_info *bis)
diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S
index e010ac0cf7d..27bcd40c5c1 100644
--- a/arch/m68k/cpu/mcf5445x/start.S
+++ b/arch/m68k/cpu/mcf5445x/start.S
@@ -44,16 +44,16 @@ _vectors:
 
 INITSP:	.long	0			/* Initial SP	*/
 #ifdef CONFIG_CF_SBF
-INITPC:	.long	ASM_DRAMINIT		/* Initial PC 	*/
+INITPC:	.long	ASM_DRAMINIT		/* Initial PC	*/
 #endif
 #ifdef CONFIG_SYS_NAND_BOOT
-INITPC:	.long	ASM_DRAMINIT_N		/* Initial PC 	*/
+INITPC:	.long	ASM_DRAMINIT_N		/* Initial PC	*/
 #endif
 
 #else
 
 INITSP:	.long	0			/* Initial SP	*/
-INITPC:	.long	_START			/* Initial PC 	*/
+INITPC:	.long	_START			/* Initial PC	*/
 
 #endif
 
diff --git a/arch/m68k/include/asm/m5271.h b/arch/m68k/include/asm/m5271.h
index dce0d26a0f9..7ebeddbb683 100644
--- a/arch/m68k/include/asm/m5271.h
+++ b/arch/m68k/include/asm/m5271.h
@@ -115,7 +115,7 @@
 #define MCF_GPIO_PAR_TIMER			0x10004C
 
 #define MCF_DSCR_EIM				0x100050
-#define MCF_DCSR_FEC12C 			0x100052
+#define MCF_DCSR_FEC12C				0x100052
 #define MCF_DCSR_UART				0x100053
 #define MCF_DCSR_QSPI				0x100054
 #define MCF_DCSR_TIMER				0x100055
diff --git a/arch/m68k/lib/muldi3.c b/arch/m68k/lib/muldi3.c
index 23ef4b732af..c42ca1d753e 100644
--- a/arch/m68k/lib/muldi3.c
+++ b/arch/m68k/lib/muldi3.c
@@ -41,7 +41,7 @@
     umul_ppmm (__w.s.high, __w.s.low, u, v);				\
     __w.ll; })
 
-typedef 	 int SItype	__attribute__ ((mode (SI)));
+typedef		 int SItype	__attribute__ ((mode (SI)));
 typedef unsigned int USItype	__attribute__ ((mode (SI)));
 typedef		 int DItype	__attribute__ ((mode (DI)));
 typedef int word_type __attribute__ ((mode (__word__)));
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index e65485b4fff..3db3965fcff 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -2307,8 +2307,8 @@ do {									\
 	"	.set " MIPS_ISA_LEVEL "				\n"	\
 	"	.set dsp					\n"	\
 	"	mflo %0, $ac0					\n"	\
-	"	.set pop					\n" 	\
-	: "=r" (mflo0)); 						\
+	"	.set pop					\n"	\
+	: "=r" (mflo0));						\
 	mflo0;								\
 })
 
@@ -2320,8 +2320,8 @@ do {									\
 	"	.set " MIPS_ISA_LEVEL "				\n"	\
 	"	.set dsp					\n"	\
 	"	mflo %0, $ac1					\n"	\
-	"	.set pop					\n" 	\
-	: "=r" (mflo1)); 						\
+	"	.set pop					\n"	\
+	: "=r" (mflo1));						\
 	mflo1;								\
 })
 
@@ -2333,8 +2333,8 @@ do {									\
 	"	.set " MIPS_ISA_LEVEL "				\n"	\
 	"	.set dsp					\n"	\
 	"	mflo %0, $ac2					\n"	\
-	"	.set pop					\n" 	\
-	: "=r" (mflo2)); 						\
+	"	.set pop					\n"	\
+	: "=r" (mflo2));						\
 	mflo2;								\
 })
 
@@ -2346,8 +2346,8 @@ do {									\
 	"	.set " MIPS_ISA_LEVEL "				\n"	\
 	"	.set dsp					\n"	\
 	"	mflo %0, $ac3					\n"	\
-	"	.set pop					\n" 	\
-	: "=r" (mflo3)); 						\
+	"	.set pop					\n"	\
+	: "=r" (mflo3));						\
 	mflo3;								\
 })
 
@@ -2359,8 +2359,8 @@ do {									\
 	"	.set " MIPS_ISA_LEVEL "				\n"	\
 	"	.set dsp					\n"	\
 	"	mfhi %0, $ac0					\n"	\
-	"	.set pop					\n" 	\
-	: "=r" (mfhi0)); 						\
+	"	.set pop					\n"	\
+	: "=r" (mfhi0));						\
 	mfhi0;								\
 })
 
@@ -2372,8 +2372,8 @@ do {									\
 	"	.set " MIPS_ISA_LEVEL "				\n"	\
 	"	.set dsp					\n"	\
 	"	mfhi %0, $ac1					\n"	\
-	"	.set pop					\n" 	\
-	: "=r" (mfhi1)); 						\
+	"	.set pop					\n"	\
+	: "=r" (mfhi1));						\
 	mfhi1;								\
 })
 
@@ -2385,8 +2385,8 @@ do {									\
 	"	.set " MIPS_ISA_LEVEL "				\n"	\
 	"	.set dsp					\n"	\
 	"	mfhi %0, $ac2					\n"	\
-	"	.set pop					\n" 	\
-	: "=r" (mfhi2)); 						\
+	"	.set pop					\n"	\
+	: "=r" (mfhi2));						\
 	mfhi2;								\
 })
 
@@ -2398,8 +2398,8 @@ do {									\
 	"	.set " MIPS_ISA_LEVEL "				\n"	\
 	"	.set dsp					\n"	\
 	"	mfhi %0, $ac3					\n"	\
-	"	.set pop					\n" 	\
-	: "=r" (mfhi3)); 						\
+	"	.set pop					\n"	\
+	: "=r" (mfhi3));						\
 	mfhi3;								\
 })
 
diff --git a/arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S b/arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S
index 25ec185d69d..d1c5b87f7e9 100644
--- a/arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S
+++ b/arch/nds32/cpu/n1213/ae3xx/lowlevel_init.S
@@ -38,9 +38,9 @@
  * for Orca and Emerald
  */
 #define BOARD_ID_REG		0x104
-#define BOARD_ID_FAMILY_MASK 	0xfff000
-#define BOARD_ID_FAMILY_V5   	0x556000
-#define BOARD_ID_FAMILY_K7   	0x74b000
+#define BOARD_ID_FAMILY_MASK	0xfff000
+#define BOARD_ID_FAMILY_V5	0x556000
+#define BOARD_ID_FAMILY_K7	0x74b000
 
 /*
  * parameters for the static memory controller
diff --git a/arch/nds32/cpu/n1213/ag101/lowlevel_init.S b/arch/nds32/cpu/n1213/ag101/lowlevel_init.S
index ce5fefda765..c423b38f896 100644
--- a/arch/nds32/cpu/n1213/ag101/lowlevel_init.S
+++ b/arch/nds32/cpu/n1213/ag101/lowlevel_init.S
@@ -38,9 +38,9 @@
  * for Orca and Emerald
  */
 #define BOARD_ID_REG		0x104
-#define BOARD_ID_FAMILY_MASK 	0xfff000
-#define BOARD_ID_FAMILY_V5   	0x556000
-#define BOARD_ID_FAMILY_K7   	0x74b000
+#define BOARD_ID_FAMILY_MASK	0xfff000
+#define BOARD_ID_FAMILY_V5	0x556000
+#define BOARD_ID_FAMILY_K7	0x74b000
 
 /*
  * parameters for the static memory controller
diff --git a/arch/nds32/cpu/n1213/ag101/watchdog.S b/arch/nds32/cpu/n1213/ag101/watchdog.S
index 243096a663e..8e7399d0df7 100644
--- a/arch/nds32/cpu/n1213/ag101/watchdog.S
+++ b/arch/nds32/cpu/n1213/ag101/watchdog.S
@@ -16,7 +16,7 @@ ENTRY(turnoff_watchdog)
 #define WD_ENABLE	0x1
 
 	! Turn off the watchdog, according to Faraday FTWDT010 spec
-	li 	$p0, (CONFIG_FTWDT010_BASE+WD_CR)	! Get the addr of WD CR
+	li	$p0, (CONFIG_FTWDT010_BASE+WD_CR)	! Get the addr of WD CR
 	lwi	$p1, [$p0]				! Get the config of WD
 	andi	$p1, $p1, 0x1f				! Wipe out useless bits
 	li	$r0, ~WD_ENABLE
diff --git a/arch/nds32/cpu/n1213/start.S b/arch/nds32/cpu/n1213/start.S
index f02508f04f6..93ea5e4ad48 100644
--- a/arch/nds32/cpu/n1213/start.S
+++ b/arch/nds32/cpu/n1213/start.S
@@ -20,7 +20,7 @@
  */
 #define ENA_DCAC		2UL
 #define DIS_DCAC		~ENA_DCAC
-#define ICAC_MEM_KBF_ISET	(0x07)	 	! I Cache sets per way
+#define ICAC_MEM_KBF_ISET	(0x07)		! I Cache sets per way
 #define ICAC_MEM_KBF_IWAY	(0x07<<3)	! I cache ways
 #define ICAC_MEM_KBF_ISZ	(0x07<<6)	! I cache line size
 #define DCAC_MEM_KBF_DSET	(0x07)		! D Cache sets per way
@@ -434,21 +434,21 @@ tlb_fill:
 	SAVE_ALL
 	move	$r0, $sp			! To get the kernel stack
 	li	$r1, 1				! Determine interruption type
-	bal 	do_interruption
+	bal	do_interruption
 
 	.align	5
 tlb_not_present:
 	SAVE_ALL
 	move	$r0, $sp			! To get the kernel stack
 	li	$r1, 2				! Determine interruption type
-	bal 	do_interruption
+	bal	do_interruption
 
 	.align	5
 tlb_misc:
 	SAVE_ALL
 	move	$r0, $sp			! To get the kernel stack
 	li	$r1, 3				! Determine interruption type
-	bal 	do_interruption
+	bal	do_interruption
 
 	.align	5
 tlb_vlpt_miss:
diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S
index aca31b24c07..656cc6ec802 100644
--- a/arch/powerpc/cpu/mpc85xx/start.S
+++ b/arch/powerpc/cpu/mpc85xx/start.S
@@ -76,7 +76,7 @@
 _start_e500:
 /* Enable debug exception */
 	li	r1,MSR_DE
-	mtmsr 	r1
+	mtmsr	r1
 
 	/*
 	 * If we got an ePAPR device tree pointer passed in as r3, we need that
@@ -1159,9 +1159,9 @@ _start_cont:
 
 	li	r0,0
 
-1: 	subi 	r4,r4,4
-	stw 	r0,0(r4)
-	cmplw 	r4,r3
+1:	subi	r4,r4,4
+	stw	r0,0(r4)
+	cmplw	r4,r3
 	bne	1b
 
 #if CONFIG_VAL(SYS_MALLOC_F_LEN)
diff --git a/arch/powerpc/include/asm/fsl_lbc.h b/arch/powerpc/include/asm/fsl_lbc.h
index 3b26451928a..5038cb9f590 100644
--- a/arch/powerpc/include/asm/fsl_lbc.h
+++ b/arch/powerpc/include/asm/fsl_lbc.h
@@ -294,8 +294,8 @@ void lbc_sdram_init(void);
 #define LBCR_EPAR_SHIFT			16
 #define LBCR_BMT			0x0000FF00
 #define LBCR_BMT_SHIFT			8
-#define LBCR_BMTPS	 		0x0000000F
-#define LBCR_BMTPS_SHIFT 		0
+#define LBCR_BMTPS			0x0000000F
+#define LBCR_BMTPS_SHIFT		0
 
 /* LCRR - Clock Ratio Register
  */
diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h
index f539c0be71e..770705a8794 100644
--- a/arch/powerpc/include/asm/immap_85xx.h
+++ b/arch/powerpc/include/asm/immap_85xx.h
@@ -1510,7 +1510,7 @@ typedef struct par_io {
  */
 
 typedef struct cpc_corenet {
-	u32 	cpccsr0;	/* Config/status reg */
+	u32	cpccsr0;	/* Config/status reg */
 	u32	res1;
 	u32	cpccfg0;	/* Configuration register */
 	u32	res2;
@@ -1573,7 +1573,7 @@ typedef struct cpc_corenet {
 #define CPC_SRCR0_SRAMSZ_16_WAY	0x00000008
 #define CPC_SRCR0_SRAMSZ_32_WAY	0x0000000a
 #define CPC_SRCR0_SRAMEN	0x00000001
-#define	CPC_ERRDIS_TMHITDIS  	0x00000080	/* multi-way hit disable */
+#define	CPC_ERRDIS_TMHITDIS	0x00000080	/* multi-way hit disable */
 #define CPC_HDBCR0_CDQ_SPEC_DIS	0x08000000
 #define CPC_HDBCR0_TAG_ECC_SCRUB_DIS	0x01000000
 #define CPC_HDBCR0_DATA_ECC_SCRUB_DIS	0x00400000
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index b6944d88ebe..19e63ebf38c 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -748,7 +748,7 @@
 #define MAS5	SPRN_MAS5
 #define MAS6	SPRN_MAS6
 #define MAS7	SPRN_MAS7
-#define MAS8 	SPRN_MAS8
+#define MAS8	SPRN_MAS8
 
 #if defined(CONFIG_MPC85xx)
 #define DAR_DEAR DEAR
diff --git a/arch/sandbox/include/asm/gpio.h b/arch/sandbox/include/asm/gpio.h
index 9e10052667d..9542fdee67e 100644
--- a/arch/sandbox/include/asm/gpio.h
+++ b/arch/sandbox/include/asm/gpio.h
@@ -65,7 +65,7 @@ int sandbox_gpio_get_direction(struct udevice *dev, unsigned int offset);
  *
  * @param dev		device to use
  * @param offset	GPIO offset within bank
- * @param output 	0 to set as input, 1 to set as output
+ * @param output	0 to set as input, 1 to set as output
  * @return -1 on error, 0 if ok
  */
 int sandbox_gpio_set_direction(struct udevice *dev, unsigned int offset,
diff --git a/arch/x86/cpu/intel_common/car2.S b/arch/x86/cpu/intel_common/car2.S
index 086f987477e..f8cf78586d0 100644
--- a/arch/x86/cpu/intel_common/car2.S
+++ b/arch/x86/cpu/intel_common/car2.S
@@ -88,7 +88,7 @@ clear_var_mtrr:
 	 *  MTRR_PHYS_MASK_HIGH = 0000000FFh  For 40 bit addressing
 	 */
 
-	movl	$0x80000008, %eax 	/* Address sizes leaf */
+	movl	$0x80000008, %eax	/* Address sizes leaf */
 	cpuid
 	sub	$32, %al
 	movzx	%al, %eax
diff --git a/arch/x86/lib/bios_asm.S b/arch/x86/lib/bios_asm.S
index 62dc5652dba..9e2a02658ba 100644
--- a/arch/x86/lib/bios_asm.S
+++ b/arch/x86/lib/bios_asm.S
@@ -22,8 +22,8 @@
 	.globl __idt_handler
 __idt_handler:
 	pushal
-	movb 	$0, %al /* This instruction gets modified */
-	ljmp 	$0, $__interrupt_handler_16bit
+	movb	$0, %al /* This instruction gets modified */
+	ljmp	$0, $__interrupt_handler_16bit
 	.globl __idt_handler_size
 __idt_handler_size:
 	.long  . - __idt_handler
diff --git a/arch/xtensa/include/asm/arch-dc233c/core.h b/arch/xtensa/include/asm/arch-dc233c/core.h
index 4646cdbfb46..cd3c8c115f5 100644
--- a/arch/xtensa/include/asm/arch-dc233c/core.h
+++ b/arch/xtensa/include/asm/arch-dc233c/core.h
@@ -263,28 +263,28 @@
 						   EXCSAVE/EPS/EPC_n, RFI n) */
 
 /*  Type of each interrupt:  */
-#define XCHAL_INT0_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT1_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT2_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT3_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT4_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT5_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT6_TYPE 	XTHAL_INTTYPE_TIMER
-#define XCHAL_INT7_TYPE 	XTHAL_INTTYPE_SOFTWARE
-#define XCHAL_INT8_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT9_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT10_TYPE 	XTHAL_INTTYPE_TIMER
-#define XCHAL_INT11_TYPE 	XTHAL_INTTYPE_SOFTWARE
-#define XCHAL_INT12_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT13_TYPE 	XTHAL_INTTYPE_TIMER
-#define XCHAL_INT14_TYPE 	XTHAL_INTTYPE_NMI
-#define XCHAL_INT15_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT16_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT17_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT18_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT19_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT20_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT21_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT0_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT1_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT2_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT3_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT4_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT5_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT6_TYPE		XTHAL_INTTYPE_TIMER
+#define XCHAL_INT7_TYPE		XTHAL_INTTYPE_SOFTWARE
+#define XCHAL_INT8_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT9_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT10_TYPE	XTHAL_INTTYPE_TIMER
+#define XCHAL_INT11_TYPE	XTHAL_INTTYPE_SOFTWARE
+#define XCHAL_INT12_TYPE	XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT13_TYPE	XTHAL_INTTYPE_TIMER
+#define XCHAL_INT14_TYPE	XTHAL_INTTYPE_NMI
+#define XCHAL_INT15_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT16_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT17_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT18_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT19_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT20_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT21_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
 
 /*  Masks of interrupts for each type of interrupt:  */
 #define XCHAL_INTTYPE_MASK_UNCONFIGURED	0xFFC00000
diff --git a/arch/xtensa/include/asm/arch-de212/core.h b/arch/xtensa/include/asm/arch-de212/core.h
index 32714062914..60c6efba7d2 100644
--- a/arch/xtensa/include/asm/arch-de212/core.h
+++ b/arch/xtensa/include/asm/arch-de212/core.h
@@ -108,8 +108,8 @@
 #define XCHAL_HAVE_DFP_ACCEL		0	/* double precision FP acceleration pkg */
 #define XCHAL_HAVE_DFP_accel		XCHAL_HAVE_DFP_ACCEL				/* for backward compatibility */
 
-#define XCHAL_HAVE_DFPU_SINGLE_ONLY    0                 	/* DFPU Coprocessor, single precision only */
-#define XCHAL_HAVE_DFPU_SINGLE_DOUBLE  0               	/* DFPU Coprocessor, single and double precision */
+#define XCHAL_HAVE_DFPU_SINGLE_ONLY	0	/* DFPU Coprocessor, single precision only */
+#define XCHAL_HAVE_DFPU_SINGLE_DOUBLE	0	/* DFPU Coprocessor, single and double precision */
 #define XCHAL_HAVE_VECTRA1		0	/* Vectra I  pkg */
 #define XCHAL_HAVE_VECTRALX		0	/* Vectra LX pkg */
 #define XCHAL_HAVE_PDX4		        0	/* PDX4 */
@@ -127,8 +127,8 @@
 #define XCHAL_HAVE_TURBO16		0	/* ConnX Turbo16 pkg */
 #define XCHAL_HAVE_BBP16		0	/* ConnX BBP16 pkg */
 #define XCHAL_HAVE_FLIX3		0	/* basic 3-way FLIX option */
-#define XCHAL_HAVE_GRIVPEP              0   /*  GRIVPEP is General Release of IVPEP */
-#define XCHAL_HAVE_GRIVPEP_HISTOGRAM    0   /* Histogram option on GRIVPEP */
+#define XCHAL_HAVE_GRIVPEP              0	/*  GRIVPEP is General Release of IVPEP */
+#define XCHAL_HAVE_GRIVPEP_HISTOGRAM    0	/* Histogram option on GRIVPEP */
 
 
 /*----------------------------------------------------------------------
@@ -348,28 +348,28 @@
 						   EXCSAVE/EPS/EPC_n, RFI n) */
 
 /*  Type of each interrupt:  */
-#define XCHAL_INT0_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT1_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT2_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT3_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT4_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT5_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT6_TYPE 	XTHAL_INTTYPE_TIMER
-#define XCHAL_INT7_TYPE 	XTHAL_INTTYPE_SOFTWARE
-#define XCHAL_INT8_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT9_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT10_TYPE 	XTHAL_INTTYPE_TIMER
-#define XCHAL_INT11_TYPE 	XTHAL_INTTYPE_SOFTWARE
-#define XCHAL_INT12_TYPE 	XTHAL_INTTYPE_EXTERN_LEVEL
-#define XCHAL_INT13_TYPE 	XTHAL_INTTYPE_TIMER
-#define XCHAL_INT14_TYPE 	XTHAL_INTTYPE_NMI
-#define XCHAL_INT15_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT16_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT17_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT18_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT19_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT20_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
-#define XCHAL_INT21_TYPE 	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT0_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT1_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT2_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT3_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT4_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT5_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT6_TYPE		XTHAL_INTTYPE_TIMER
+#define XCHAL_INT7_TYPE		XTHAL_INTTYPE_SOFTWARE
+#define XCHAL_INT8_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT9_TYPE		XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT10_TYPE	XTHAL_INTTYPE_TIMER
+#define XCHAL_INT11_TYPE	XTHAL_INTTYPE_SOFTWARE
+#define XCHAL_INT12_TYPE	XTHAL_INTTYPE_EXTERN_LEVEL
+#define XCHAL_INT13_TYPE	XTHAL_INTTYPE_TIMER
+#define XCHAL_INT14_TYPE	XTHAL_INTTYPE_NMI
+#define XCHAL_INT15_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT16_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT17_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT18_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT19_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT20_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
+#define XCHAL_INT21_TYPE	XTHAL_INTTYPE_EXTERN_EDGE
 
 /*  Masks of interrupts for each type of interrupt:  */
 #define XCHAL_INTTYPE_MASK_UNCONFIGURED	0xFFC00000
diff --git a/arch/xtensa/lib/Makefile b/arch/xtensa/lib/Makefile
index c59df7d3721..ad4fe32cb69 100644
--- a/arch/xtensa/lib/Makefile
+++ b/arch/xtensa/lib/Makefile
@@ -5,4 +5,4 @@
 
 obj-$(CONFIG_CMD_BOOTM) += bootm.o
 
-obj-y 	+= cache.o misc.o relocate.o time.o
+obj-y	+= cache.o misc.o relocate.o time.o
diff --git a/board/Marvell/guruplug/guruplug.c b/board/Marvell/guruplug/guruplug.c
index 8e7dbb3f3f6..ea87ded222e 100644
--- a/board/Marvell/guruplug/guruplug.c
+++ b/board/Marvell/guruplug/guruplug.c
@@ -77,7 +77,7 @@ int board_early_init_f(void)
 		MPP43_GPIO,
 		MPP44_GPIO,
 		MPP45_GPIO,
-		MPP46_GPIO, 	/* M_RLED */
+		MPP46_GPIO,	/* M_RLED */
 		MPP47_GPIO,	/* M_GLED */
 		MPP48_GPIO,	/* B_RLED */
 		MPP49_GPIO,	/* B_GLED */
diff --git a/board/boundary/nitrogen6x/README b/board/boundary/nitrogen6x/README
index 9d842650293..973b18fa93f 100644
--- a/board/boundary/nitrogen6x/README
+++ b/board/boundary/nitrogen6x/README
@@ -74,7 +74,7 @@ board configurations is shown in the boards.cfg file:
 	nitrogen6q		i.MX6Q/6D	1GB
 	nitrogen6dl		i.MX6DL		1GB
 	nitrogen6s		i.MX6S		512MB
-	nitrogen6q2g    	i.MX6Q/6D	2GB
+	nitrogen6q2g		i.MX6Q/6D	2GB
 	nitrogen6dl2g		i.MX6DL		2GB
 	nitrogen6s1g		i.MX6S		1GB
 
diff --git a/board/freescale/ls1012afrdm/README b/board/freescale/ls1012afrdm/README
index 181c4615a87..382b668fbec 100644
--- a/board/freescale/ls1012afrdm/README
+++ b/board/freescale/ls1012afrdm/README
@@ -52,7 +52,7 @@ QSPI flash map
 Images		| Size	|QSPI Flash Address
 ------------------------------------------
 RCW + PBI	| 1MB	| 0x4000_0000
-U-boot 		| 1MB	| 0x4010_0000
-U-boot Env 	| 1MB	| 0x4020_0000
+U-boot		| 1MB	| 0x4010_0000
+U-boot Env	| 1MB	| 0x4020_0000
 PPA FIT image	| 2MB	| 0x4050_0000
 Linux ITB	| ~53MB | 0x40A0_0000
diff --git a/board/freescale/ls1012aqds/README b/board/freescale/ls1012aqds/README
index dee4b302c14..c1956f9fd78 100644
--- a/board/freescale/ls1012aqds/README
+++ b/board/freescale/ls1012aqds/README
@@ -53,7 +53,7 @@ QSPI flash map
 Images		| Size	|QSPI Flash Address
 ------------------------------------------
 RCW + PBI	| 1MB	| 0x4000_0000
-U-boot 		| 1MB	| 0x4010_0000
-U-boot Env 	| 1MB	| 0x4020_0000
+U-boot		| 1MB	| 0x4010_0000
+U-boot Env	| 1MB	| 0x4020_0000
 PPA FIT image	| 2MB	| 0x4050_0000
 Linux ITB	| ~53MB | 0x40A0_0000
diff --git a/board/freescale/ls1012ardb/README b/board/freescale/ls1012ardb/README
index 572fd8c7d08..5b6f306a1d9 100644
--- a/board/freescale/ls1012ardb/README
+++ b/board/freescale/ls1012ardb/README
@@ -48,8 +48,8 @@ QSPI flash map
 Images		| Size	|QSPI Flash Address
 ------------------------------------------
 RCW + PBI	| 1MB	| 0x4000_0000
-U-boot 		| 1MB	| 0x4010_0000
-U-boot Env 	| 1MB	| 0x4020_0000
+U-boot		| 1MB	| 0x4010_0000
+U-boot Env	| 1MB	| 0x4020_0000
 PPA FIT image	| 2MB	| 0x4050_0000
 Linux ITB	| ~53MB | 0x40A0_0000
 
@@ -90,8 +90,8 @@ QSPI flash map
 Images		| Size	|QSPI Flash Address
 ------------------------------------------
 RCW + PBI	| 1MB	| 0x4000_0000
-U-boot 		| 1MB	| 0x4010_0000
-U-boot Env 	| 1MB	| 0x4030_0000
+U-boot		| 1MB	| 0x4010_0000
+U-boot Env	| 1MB	| 0x4030_0000
 PPA FIT image	| 2MB	| 0x4040_0000
 PFE firmware	| 20K	| 0x00a0_0000
 Linux ITB	| ~53MB | 0x4100_0000
diff --git a/board/freescale/ls1046afrwy/README b/board/freescale/ls1046afrwy/README
index d7b5a7794f6..2c7c797a879 100644
--- a/board/freescale/ls1046afrwy/README
+++ b/board/freescale/ls1046afrwy/README
@@ -42,8 +42,8 @@ Memory map from core's view
 Start Address	 End Address	 Description		Size
 0x00_0000_0000 - 0x00_000F_FFFF  Secure Boot ROM	1MB
 0x00_0100_0000 - 0x00_0FFF_FFFF  CCSRBAR		240MB
-0x00_1000_0000 - 0x00_1000_FFFF  OCRAM0 		64KB
-0x00_1001_0000 - 0x00_1001_FFFF  OCRAM1 		64KB
+0x00_1000_0000 - 0x00_1000_FFFF  OCRAM0			64KB
+0x00_1001_0000 - 0x00_1001_FFFF  OCRAM1			64KB
 0x00_2000_0000 - 0x00_20FF_FFFF  DCSR			16MB
 0x00_7E80_0000 - 0x00_7E80_FFFF  IFC - NAND Flash	64KB
 0x00_7FB0_0000 - 0x00_7FB0_0FFF  IFC - CPLD		4KB
diff --git a/board/freescale/ls1046aqds/README b/board/freescale/ls1046aqds/README
index d6469019bd2..cb694735a46 100644
--- a/board/freescale/ls1046aqds/README
+++ b/board/freescale/ls1046aqds/README
@@ -47,8 +47,8 @@ Memory map from core's view
 Start Address    End Address     Description		Size
 0x00_0000_0000 - 0x00_000F_FFFF  Secure Boot ROM	1MB
 0x00_0100_0000 - 0x00_0FFF_FFFF  CCSRBAR		240MB
-0x00_1000_0000 - 0x00_1000_FFFF  OCRAM0 		64KB
-0x00_1001_0000 - 0x00_1001_FFFF  OCRAM1 		64KB
+0x00_1000_0000 - 0x00_1000_FFFF  OCRAM0			64KB
+0x00_1001_0000 - 0x00_1001_FFFF  OCRAM1			64KB
 0x00_2000_0000 - 0x00_20FF_FFFF  DCSR			16MB
 0x00_6000_0000 - 0x00_67FF_FFFF  IFC - NOR Flash	128MB
 0x00_7E80_0000 - 0x00_7E80_FFFF  IFC - NAND Flash	64KB
diff --git a/board/freescale/ls1046ardb/README b/board/freescale/ls1046ardb/README
index 1660f7c7cf9..90c44f4bce3 100644
--- a/board/freescale/ls1046ardb/README
+++ b/board/freescale/ls1046ardb/README
@@ -43,8 +43,8 @@ Memory map from core's view
 Start Address	 End Address	 Description		Size
 0x00_0000_0000 - 0x00_000F_FFFF  Secure Boot ROM	1MB
 0x00_0100_0000 - 0x00_0FFF_FFFF  CCSRBAR		240MB
-0x00_1000_0000 - 0x00_1000_FFFF  OCRAM0 		64KB
-0x00_1001_0000 - 0x00_1001_FFFF  OCRAM1 		64KB
+0x00_1000_0000 - 0x00_1000_FFFF  OCRAM0			64KB
+0x00_1001_0000 - 0x00_1001_FFFF  OCRAM1			64KB
 0x00_2000_0000 - 0x00_20FF_FFFF  DCSR			16MB
 0x00_7E80_0000 - 0x00_7E80_FFFF  IFC - NAND Flash	64KB
 0x00_7FB0_0000 - 0x00_7FB0_0FFF  IFC - CPLD		4KB
@@ -59,7 +59,7 @@ Start Address	 End Address	 Description		Size
 QSPI flash map:
 Start Address    End Address     Description		Size
 0x00_4000_0000 - 0x00_400F_FFFF  RCW + PBI		1MB
-0x00_4010_0000 - 0x00_402F_FFFF  U-Boot 		2MB
+0x00_4010_0000 - 0x00_402F_FFFF  U-Boot			2MB
 0x00_4030_0000 - 0x00_403F_FFFF  U-Boot Env		1MB
 0x00_4040_0000 - 0x00_405F_FFFF  PPA			2MB
 0x00_4060_0000 - 0x00_408F_FFFF  Secure boot header
diff --git a/board/freescale/m53017evb/README b/board/freescale/m53017evb/README
index c4b019e2a91..8a7d8cadf02 100644
--- a/board/freescale/m53017evb/README
+++ b/board/freescale/m53017evb/README
@@ -98,7 +98,7 @@ CONFIG_SYS_IMMR			-- define for MBAR offset
 
 CONFIG_SYS_MBAR			-- define MBAR offset
 
-CONFIG_MONITOR_IS_IN_RAM 	-- Not support
+CONFIG_MONITOR_IS_IN_RAM	-- Not support
 
 CONFIG_SYS_INIT_RAM_ADDR	-- defines the base address of the MCF5301x internal SRAM
 
diff --git a/board/logicpd/am3517evm/am3517evm.h b/board/logicpd/am3517evm/am3517evm.h
index 0e5b8326bac..db2134bb9d4 100644
--- a/board/logicpd/am3517evm/am3517evm.h
+++ b/board/logicpd/am3517evm/am3517evm.h
@@ -314,7 +314,7 @@ const omap3_sysinfo sysinfo = {
 	MUX_VAL(CP(SYS_CLKREQ),		(IEN  | PTD | DIS | M0)) \
 	MUX_VAL(CP(SYS_NIRQ),		(IEN  | PTU | EN  | M0)) \
 	/*SYS_nRESWARM */\
-	MUX_VAL(CP(SYS_NRESWARM),     	(IDIS | PTU | EN | M4)) \
+	MUX_VAL(CP(SYS_NRESWARM),	(IDIS | PTU | EN | M4)) \
 							/* - GPIO30 */\
 	MUX_VAL(CP(SYS_BOOT0),		(IEN  | PTD | DIS | M4)) /*GPIO_2*/\
 							 /* - PEN_IRQ */\
diff --git a/board/logicpd/omap3som/omap3logic.h b/board/logicpd/omap3som/omap3logic.h
index 63c2141783e..0de1f2a54e5 100644
--- a/board/logicpd/omap3som/omap3logic.h
+++ b/board/logicpd/omap3som/omap3logic.h
@@ -243,7 +243,7 @@ void set_muxconf_regs(void)
 	MUX_VAL(CP(MCSPI2_SOMI),	(IEN  | PTD | DIS | M0));	/*HSUSB2_DATA5*/
 	MUX_VAL(CP(MCSPI2_CS0),		(IEN  | PTD | EN  | M0));	/*HSUSB2_DATA6*/
 	MUX_VAL(CP(MCSPI2_CLK),		(IEN  | PTD | DIS | M0));	/*HSUSB2_DATA7*/
-	MUX_VAL(CP(SYS_BOOT2),      (IEN  | PTD | DIS | M4)) 	/* GPIO_4 */
+	MUX_VAL(CP(SYS_BOOT2),		(IEN  | PTD | DIS | M4))	/* GPIO_4 */
 	MUX_VAL(CP(ETK_D10_ES2),	(IDIS | PTU | DIS | M3));	/*HSUSB2_CLK*/
 	MUX_VAL(CP(ETK_D11_ES2),	(IDIS | PTU | DIS | M3));	/*HSUSB2_STP*/
 	MUX_VAL(CP(ETK_D12_ES2),	(IEN  | PTU | DIS | M3));	/*HSUSB2_DIR*/
diff --git a/board/sysam/stmark2/sbf_dram_init.S b/board/sysam/stmark2/sbf_dram_init.S
index 984b31b9d02..b6f38731f11 100644
--- a/board/sysam/stmark2/sbf_dram_init.S
+++ b/board/sysam/stmark2/sbf_dram_init.S
@@ -5,7 +5,7 @@
  * (C) Copyright 2017 Angelo Dureghello <angelo@sysam.it>
  */
 
-.equ	PPMCR0, 	0xfc04002d
+.equ	PPMCR0,		0xfc04002d
 .equ	MSCR_SDRAMC,	0xec094060
 .equ	MISCCR2,	0xec09001a
 .equ	DDR_RCR,	0xfc0b8180
diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c
index 399a2e5d913..cfc825e52a3 100644
--- a/board/ti/am57xx/board.c
+++ b/board/ti/am57xx/board.c
@@ -144,13 +144,13 @@ static const struct emif_regs beagle_x15_emif1_ddr3_532mhz_emif_regs = {
 	.read_idle_ctrl			= 0x00050000,
 	.zq_config			= 0x5007190b,
 	.temp_alert_config		= 0x00000000,
-	.emif_ddr_phy_ctlr_1_init 	= 0x0024400b,
+	.emif_ddr_phy_ctlr_1_init	= 0x0024400b,
 	.emif_ddr_phy_ctlr_1		= 0x0e24400b,
-	.emif_ddr_ext_phy_ctrl_1 	= 0x10040100,
-	.emif_ddr_ext_phy_ctrl_2 	= 0x00910091,
-	.emif_ddr_ext_phy_ctrl_3 	= 0x00950095,
-	.emif_ddr_ext_phy_ctrl_4 	= 0x009b009b,
-	.emif_ddr_ext_phy_ctrl_5 	= 0x009e009e,
+	.emif_ddr_ext_phy_ctrl_1	= 0x10040100,
+	.emif_ddr_ext_phy_ctrl_2	= 0x00910091,
+	.emif_ddr_ext_phy_ctrl_3	= 0x00950095,
+	.emif_ddr_ext_phy_ctrl_4	= 0x009b009b,
+	.emif_ddr_ext_phy_ctrl_5	= 0x009e009e,
 	.emif_rd_wr_lvl_rmp_win		= 0x00000000,
 	.emif_rd_wr_lvl_rmp_ctl		= 0x80000000,
 	.emif_rd_wr_lvl_ctl		= 0x00000000,
@@ -208,13 +208,13 @@ static const struct emif_regs beagle_x15_emif2_ddr3_532mhz_emif_regs = {
 	.read_idle_ctrl			= 0x00050000,
 	.zq_config			= 0x5007190b,
 	.temp_alert_config		= 0x00000000,
-	.emif_ddr_phy_ctlr_1_init 	= 0x0024400b,
+	.emif_ddr_phy_ctlr_1_init	= 0x0024400b,
 	.emif_ddr_phy_ctlr_1		= 0x0e24400b,
-	.emif_ddr_ext_phy_ctrl_1 	= 0x10040100,
-	.emif_ddr_ext_phy_ctrl_2 	= 0x00910091,
-	.emif_ddr_ext_phy_ctrl_3 	= 0x00950095,
-	.emif_ddr_ext_phy_ctrl_4 	= 0x009b009b,
-	.emif_ddr_ext_phy_ctrl_5 	= 0x009e009e,
+	.emif_ddr_ext_phy_ctrl_1	= 0x10040100,
+	.emif_ddr_ext_phy_ctrl_2	= 0x00910091,
+	.emif_ddr_ext_phy_ctrl_3	= 0x00950095,
+	.emif_ddr_ext_phy_ctrl_4	= 0x009b009b,
+	.emif_ddr_ext_phy_ctrl_5	= 0x009e009e,
 	.emif_rd_wr_lvl_rmp_win		= 0x00000000,
 	.emif_rd_wr_lvl_rmp_ctl		= 0x80000000,
 	.emif_rd_wr_lvl_ctl		= 0x00000000,
diff --git a/board/ti/am57xx/mux_data.h b/board/ti/am57xx/mux_data.h
index 212799c93de..54b7050a459 100644
--- a/board/ti/am57xx/mux_data.h
+++ b/board/ti/am57xx/mux_data.h
@@ -539,7 +539,7 @@ const struct iodelay_cfg_entry iodelay_cfg_array_bbai[] = {
 	{0x0884, 0, 0},         /* CFG_UART2_RTSN_OUT */
 	{0x0888, 683, 0},       /* CFG_UART2_RXD_IN */
 	{0x088C, 0, 0},         /* CFG_UART2_RXD_OEN */
-	{0x0890, 0, 0},	 	/* CFG_UART2_RXD_OUT */
+	{0x0890, 0, 0},		/* CFG_UART2_RXD_OUT */
 	{0x0894, 835, 0},       /* CFG_UART2_TXD_IN */
 	{0x0898, 0, 0},         /* CFG_UART2_TXD_OEN */
 	{0x089C, 0, 0},         /* CFG_UART2_TXD_OUT */
@@ -553,7 +553,7 @@ const struct iodelay_cfg_entry iodelay_cfg_array_bbai[] = {
 	{0x0C48, 0, 404},       /* CFG_VOUT1_D22_IN */
 	{0x0C78, 0, 0},         /* CFG_VOUT1_D4_IN */
 	{0x0C84, 0, 365},       /* CFG_VOUT1_D5_IN */
-	{0x0C90, 0, 0},	 	/* CFG_VOUT1_D6_IN */
+	{0x0C90, 0, 0},		/* CFG_VOUT1_D6_IN */
 	{0x0C9C, 0, 218},       /* CFG_VOUT1_D7_IN */
 };
 
diff --git a/cmd/cramfs.c b/cmd/cramfs.c
index 44c0818d5d4..d79292bad55 100644
--- a/cmd/cramfs.c
+++ b/cmd/cramfs.c
@@ -3,7 +3,7 @@
  *
  * based on: cmd_jffs2.c
  *
- * 	Add support for a CRAMFS located in RAM
+ *	Add support for a CRAMFS located in RAM
  */
 
 
diff --git a/cmd/spi.c b/cmd/spi.c
index bdbdbacecd9..6dc32678da1 100644
--- a/cmd/spi.c
+++ b/cmd/spi.c
@@ -29,9 +29,9 @@ static unsigned int	bus;
 static unsigned int	cs;
 static unsigned int	mode;
 static unsigned int	freq;
-static int   		bitlen;
-static uchar 		dout[MAX_SPI_BYTES];
-static uchar 		din[MAX_SPI_BYTES];
+static int		bitlen;
+static uchar		dout[MAX_SPI_BYTES];
+static uchar		din[MAX_SPI_BYTES];
 
 static int do_spi_xfer(int bus, int cs)
 {
diff --git a/common/hash.c b/common/hash.c
index 6277fe65b3e..3884298edf2 100644
--- a/common/hash.c
+++ b/common/hash.c
@@ -228,7 +228,7 @@ static struct hash_algo hash_algo[] = {
 #endif
 #ifdef CONFIG_SHA1
 	{
-		.name 		= "sha1",
+		.name		= "sha1",
 		.digest_size	= SHA1_SUM_LEN,
 		.chunk_size	= CHUNKSZ_SHA1,
 #ifdef CONFIG_SHA_HW_ACCEL
diff --git a/common/hwconfig.c b/common/hwconfig.c
index 26a561c365b..63b3ccaf84e 100644
--- a/common/hwconfig.c
+++ b/common/hwconfig.c
@@ -179,7 +179,7 @@ int hwconfig_arg_cmp_f(const char *opt, const char *arg, char *buf)
  *
  * This call is similar to hwconfig_f(), except that it takes additional
  * argument @subopt. In this example:
- * 	"dr_usb:mode=peripheral"
+ *	"dr_usb:mode=peripheral"
  * "dr_usb" is an option, "mode" is a sub-option, and "peripheral" is its
  * argument.
  */
diff --git a/common/usb_storage.c b/common/usb_storage.c
index 946c6b2b323..c9e2d7343ce 100644
--- a/common/usb_storage.c
+++ b/common/usb_storage.c
@@ -94,7 +94,7 @@ struct us_data {
 	int		action;			/* what to do */
 	int		ip_wanted;		/* needed */
 	int		*irq_handle;		/* for USB int requests */
-	unsigned int	irqpipe;	 	/* pipe for release_irq */
+	unsigned int	irqpipe;		/* pipe for release_irq */
 	unsigned char	irqmaxp;		/* max packed for irq Pipe */
 	unsigned char	irqinterval;		/* Intervall for IRQ Pipe */
 	struct scsi_cmd	*srb;			/* current srb */
diff --git a/disk/Makefile b/disk/Makefile
index ccd03359590..6ce5a687b36 100644
--- a/disk/Makefile
+++ b/disk/Makefile
@@ -5,7 +5,7 @@
 
 #ccflags-y += -DET_DEBUG -DDEBUG
 
-obj-$(CONFIG_PARTITIONS) 	+= part.o
+obj-$(CONFIG_PARTITIONS)	+= part.o
 obj-$(CONFIG_$(SPL_)MAC_PARTITION)   += part_mac.o
 obj-$(CONFIG_$(SPL_)DOS_PARTITION)   += part_dos.o
 obj-$(CONFIG_$(SPL_)ISO_PARTITION)   += part_iso.o
diff --git a/doc/README.commands.spl b/doc/README.commands.spl
index cb3e0c8e0ac..ecfd3ca9ee5 100644
--- a/doc/README.commands.spl
+++ b/doc/README.commands.spl
@@ -17,14 +17,14 @@ TYPICAL CALL
 
 on OMAP3:
 nandecc hw
-nand read 0x82000000 0x280000 0x400000 	/* Read kernel image from NAND*/
-spl export atags 			/* export ATAGS */
+nand read 0x82000000 0x280000 0x400000	/* Read kernel image from NAND*/
+spl export atags			/* export ATAGS */
 nand erase 0x680000 0x20000		/* erase - one page */
 nand write 0x80000100 0x680000 0x20000	/* write the image - one page */
 
 call with FDT:
 nandecc hw
-nand read 0x82000000 0x280000 0x400000 	/* Read kernel image from NAND*/
+nand read 0x82000000 0x280000 0x400000	/* Read kernel image from NAND*/
 tftpboot 0x80000100 devkit8000.dtb /* Read fdt */
 spl export fdt 0x82000000 - 0x80000100	/* export FDT */
 nand erase 0x680000 0x20000		/* erase - one page */
diff --git a/doc/README.falcon b/doc/README.falcon
index 713d7063a1d..88218d35b93 100644
--- a/doc/README.falcon
+++ b/doc/README.falcon
@@ -69,7 +69,7 @@ CONFIG_CMD_SPL_NAND_OFS	Offset in NAND where the parameters area was saved.
 
 CONFIG_CMD_SPL_NOR_OFS	Offset in NOR where the parameters area was saved.
 
-CONFIG_CMD_SPL_WRITE_SIZE 	Size of the parameters area to be copied
+CONFIG_CMD_SPL_WRITE_SIZE	Size of the parameters area to be copied
 
 CONFIG_SPL_OS_BOOT	Activate Falcon Mode.
 
@@ -89,7 +89,7 @@ Environment variables
 A board may chose to look at the environment for decisions about falcon
 mode.  In this case the following variables may be supported:
 
-boot_os : 		Set to yes/Yes/true/True/1 to enable booting to OS,
+boot_os :		Set to yes/Yes/true/True/1 to enable booting to OS,
 			any other value to fall back to U-Boot (including
 			unset)
 falcon_args_file :	Filename to load as the 'args' portion of falcon mode
diff --git a/doc/README.odroid b/doc/README.odroid
index bc77ae31755..1090a0ea141 100644
--- a/doc/README.odroid
+++ b/doc/README.odroid
@@ -296,8 +296,8 @@ Odroid # usb part 0
 Partition Map for USB device 0  --   Partition Type: DOS
 
 Part	Start Sector	Num Sectors	UUID		Type
-  1	3072      	263168    	000c4046-01	06
-  2	266240    	13457408  	000c4046-02	83
+  1	3072		263168		000c4046-01	06
+  2	266240		13457408	000c4046-02	83
 
 Odroid # ls usb 0:2 /boot
 <DIR>       4096 .
diff --git a/doc/device-tree-bindings/mailbox/k3-secure-proxy.txt b/doc/device-tree-bindings/mailbox/k3-secure-proxy.txt
index f3add0d4e7a..c25d7091bfe 100644
--- a/doc/device-tree-bindings/mailbox/k3-secure-proxy.txt
+++ b/doc/device-tree-bindings/mailbox/k3-secure-proxy.txt
@@ -10,7 +10,7 @@ Secure Proxy Device Node:
 Required properties:
 --------------------
 - compatible:		Shall be: "ti,am654-secure-proxy"
-- reg-names 		data - Map the data region
+- reg-names		data - Map the data region
 			scfg - Map the secure configuration region
 			rt - Map the Realtime region.
 - reg:			Contains the register map per reg-names.
diff --git a/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt b/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt
index c4cf26eaa4c..dd0260b3940 100644
--- a/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt
+++ b/doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt
@@ -11,7 +11,7 @@ Required properties:
 --------------------
 - compatible:		Shall be: "ti,j721e-ddrss" for j721e, j7200
 				  "ti,am64-ddrss" for am642
-- reg-names 		cfg - Map the controller configuration region
+- reg-names		cfg - Map the controller configuration region
 			ctrl_mmr_lp4 - Map LP4 register region in ctrl mmr
 - reg:			Contains the register map per reg-names.
 - power-domains:	Should contain two entries:
diff --git a/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt b/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt
index 4ed731c5242..1e11edf7b19 100644
--- a/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt
+++ b/doc/device-tree-bindings/memory-controllers/k3-am654-ddrss.txt
@@ -14,7 +14,7 @@ DDRSS device node:
 Required properties:
 --------------------
 - compatible:		Shall be: "ti,am654-ddrss"
-- reg-names 		ss - Map the sub system wrapper logic region
+- reg-names		ss - Map the sub system wrapper logic region
 			ctl - Map the controller region
 			phy - Map the PHY region
 - reg:			Contains the register map per reg-names.
diff --git a/doc/device-tree-bindings/net/altera_tse.txt b/doc/device-tree-bindings/net/altera_tse.txt
index cb190df65fa..96ab1d6ebca 100644
--- a/doc/device-tree-bindings/net/altera_tse.txt
+++ b/doc/device-tree-bindings/net/altera_tse.txt
@@ -90,7 +90,7 @@ Example:
 
 	tse_sub_1_eth_tse_0: ethernet@0x1,00001000 {
 		compatible = "altr,tse-msgdma-1.0";
-		reg = 	<0x00000001 0x00001000 0x00000400>,
+		reg =	<0x00000001 0x00001000 0x00000400>,
 			<0x00000001 0x00001460 0x00000020>,
 			<0x00000001 0x00001480 0x00000020>,
 			<0x00000001 0x000014A0 0x00000008>,
diff --git a/doc/device-tree-bindings/net/fsl,mcf-dma-fec.txt b/doc/device-tree-bindings/net/fsl,mcf-dma-fec.txt
index e237825bac6..5c6d548caec 100644
--- a/doc/device-tree-bindings/net/fsl,mcf-dma-fec.txt
+++ b/doc/device-tree-bindings/net/fsl,mcf-dma-fec.txt
@@ -21,7 +21,7 @@ Example:
 
 fec0: ethernet@9000 {
 	compatible = "fsl,mcf-dma-fec";
- 	reg = <0x9000 0x800>;
+	reg = <0x9000 0x800>;
 	mii-base = <0>;
 	phy-addr = <0>;
 	timeout-loop = <5000>;
diff --git a/doc/device-tree-bindings/net/fsl,mcf-fec.txt b/doc/device-tree-bindings/net/fsl,mcf-fec.txt
index 39bbaa52f32..2699b5ac070 100644
--- a/doc/device-tree-bindings/net/fsl,mcf-fec.txt
+++ b/doc/device-tree-bindings/net/fsl,mcf-fec.txt
@@ -15,7 +15,7 @@ Example:
 
 fec0: ethernet@fc030000 {
 	compatible = "fsl,mcf-fec";
- 	reg = <0xfc030000 0x400>;
+	reg = <0xfc030000 0x400>;
 	mii-base = <0>;
 	phy-addr = <0>;
 	timeout-loop = <5000>;
diff --git a/doc/device-tree-bindings/pinctrl/bcm6838-pinctrl.txt b/doc/device-tree-bindings/pinctrl/bcm6838-pinctrl.txt
index 2034f059936..ace66ead5cd 100644
--- a/doc/device-tree-bindings/pinctrl/bcm6838-pinctrl.txt
+++ b/doc/device-tree-bindings/pinctrl/bcm6838-pinctrl.txt
@@ -2,7 +2,7 @@
 
 Required properties for the pinctrl driver:
 - compatible:	   "brcm,bcm6838-pinctrl"
-- regmap: 		   specify the gpio test port syscon
+- regmap:		   specify the gpio test port syscon
 - brcm,pins-count:      the number of pin
 - brcm,functions-count: the number of function
 
diff --git a/doc/device-tree-bindings/pinctrl/marvell,armada-apn806-pinctrl.txt b/doc/device-tree-bindings/pinctrl/marvell,armada-apn806-pinctrl.txt
index 51f2f2c79c5..0d6f8614455 100644
--- a/doc/device-tree-bindings/pinctrl/marvell,armada-apn806-pinctrl.txt
+++ b/doc/device-tree-bindings/pinctrl/marvell,armada-apn806-pinctrl.txt
@@ -3,19 +3,19 @@
 ----------------------------------------------------------------------
 MPP#	0x1			0x2		0x3		0x4
 ----------------------------------------------------------------------
-0	SDIO_CLK		-		SPI0_CLK 	-
+0	SDIO_CLK		-		SPI0_CLK	-
 1	SDIO_CMD		-		SPI0_MISO	-
-2	SDIO_D[0]		-		SPI0_MOSI 	-
-3	SDIO_D[1]		-		SPI0_CS0n 	-
+2	SDIO_D[0]		-		SPI0_MOSI	-
+3	SDIO_D[1]		-		SPI0_CS0n	-
 4	SDIO_D[2]		-		I2C0_SDA	SPI0_CS1n
 5	SDIO_D[3]		-		I2C0_SCK	-
 6	SDIO_DS			-		-		-
 7	SDIO_D[4]		-		UART1_RXD	-
-8	SDIO_D[5]		-		UART1_TXD 	-
-9	SDIO_D[6]		-		SPI0_CS1n 	-
+8	SDIO_D[5]		-		UART1_TXD	-
+9	SDIO_D[6]		-		SPI0_CS1n	-
 10	SDIO_D[7]		-		-		-
-11	-			-		UART0_TXD 	-
-12	SDIO_CARD_PW_OFF 	SDIO_HW_RST 	-		-
+11	-			-		UART0_TXD	-
+12	SDIO_CARD_PW_OFF	SDIO_HW_RST	-		-
 13	-			-		-		-
 14	-			-		-		-
 15	-			-		-		-
diff --git a/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt b/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt
index 1fc1bc66456..c6984ddd60b 100644
--- a/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt
+++ b/doc/device-tree-bindings/pinctrl/marvell,mvebu-pinctrl.txt
@@ -11,7 +11,7 @@ Required properties for the pinctrl driver:
 		"marvell,armada-8k-cpm-pinctrl",
 		"marvell,armada-8k-cps-pinctrl"
 - bank-name:	A string defining the pinc controller bank name
-- reg: 		A pair of values defining the pin controller base address
+- reg:		A pair of values defining the pin controller base address
 		and the address space
 - pin-count:	Numeric value defining the amount of multi purpose pins
 		included in this bank
diff --git a/doc/device-tree-bindings/regulator/fsl,anatop-regulator.txt b/doc/device-tree-bindings/regulator/fsl,anatop-regulator.txt
index 2a60e4941b6..bd272384afa 100644
--- a/doc/device-tree-bindings/regulator/fsl,anatop-regulator.txt
+++ b/doc/device-tree-bindings/regulator/fsl,anatop-regulator.txt
@@ -8,21 +8,21 @@ Required properties:
 - anatop-reg-offset:	u32 value representing the anatop MFD register offset.
 - anatop-vol-bit-shift:	u32 value representing the bit shift for the register.
 - anatop-vol-bit-width:	u32 value representing the number of bits used in the
-  			register.
+			register.
 - anatop-min-bit-val:	u32 value representing the minimum value of this
-  			register.
+			register.
 - anatop-min-voltage:	u32 value representing the minimum voltage of this
-  			regulator.
+			regulator.
 - anatop-max-voltage:	u32 value representing the maximum voltage of this
-  			regulator.
+			regulator.
 
 Optional properties:
 - anatop-delay-reg-offset: u32 value representing the anatop MFD step time
-  			   register offset.
+			   register offset.
 - anatop-delay-bit-shift: u32 value representing the bit shift for the step
-  			  time register.
+			  time register.
 - anatop-delay-bit-width: u32 value representing the number of bits used in
-  			  the step time register.
+			  the step time register.
 - anatop-enable-bit:	  u32 value representing regulator enable bit offset.
 - vin-supply:		  input supply phandle.
 
diff --git a/doc/device-tree-bindings/spi/spi-bus.txt b/doc/device-tree-bindings/spi/spi-bus.txt
index 420ec9529fb..e57897ac0c6 100644
--- a/doc/device-tree-bindings/spi/spi-bus.txt
+++ b/doc/device-tree-bindings/spi/spi-bus.txt
@@ -8,10 +8,10 @@ in slave mode.
 
 The SPI master node requires the following properties:
 - #address-cells  - number of cells required to define a chip select
-    		address on the SPI bus.
+		address on the SPI bus.
 - #size-cells     - should be zero.
 - compatible      - name of SPI bus controller following generic names
-    		recommended practice.
+		recommended practice.
 - cs-gpios	  - (optional) gpios chip select.
 No other properties are required in the SPI bus node.  It is assumed
 that a driver for an SPI bus device will understand that it is an SPI bus.
@@ -45,16 +45,16 @@ SPI slave nodes must be children of the SPI master node and can
 contain the following properties.
 - reg             - (required) chip select address of device.
 - compatible      - (required) name of SPI device following generic names
-    		recommended practice
+		recommended practice
 - spi-max-frequency - (required) Maximum SPI clocking speed of device in Hz
 - spi-cpol        - (optional) Empty property indicating device requires
-    		inverse clock polarity (CPOL) mode
+		inverse clock polarity (CPOL) mode
 - spi-cpha        - (optional) Empty property indicating device requires
-    		shifted clock phase (CPHA) mode
+		shifted clock phase (CPHA) mode
 - spi-cs-high     - (optional) Empty property indicating device requires
-    		chip select active high
+		chip select active high
 - spi-3wire       - (optional) Empty property indicating device requires
-    		    3-wire mode.
+		    3-wire mode.
 - spi-tx-bus-width - (optional) The bus width(number of data wires) that
                       used for MOSI. Defaults to 1 if not present.
 - spi-rx-bus-width - (optional) The bus width(number of data wires) that
diff --git a/doc/device-tree-bindings/spi/spi-qup.txt b/doc/device-tree-bindings/spi/spi-qup.txt
index 3697df26310..2f2f070c5ac 100644
--- a/doc/device-tree-bindings/spi/spi-qup.txt
+++ b/doc/device-tree-bindings/spi/spi-qup.txt
@@ -7,7 +7,7 @@ Required properties:
 - reg : Physical base address and size of SPI registers map.
 - clock	: Clock phandle (see clock bindings for details).
 - #address-cells : Number of cells required to define a chip select
-                	address on the SPI bus. Should be set to 1.
+			address on the SPI bus. Should be set to 1.
 - #size-cells : Should be zero.
 - pinctrl-names : Must be "default"
 - pinctrl-n : At least one pinctrl phandle
diff --git a/doc/device-tree-bindings/tpm2/sandbox.txt b/doc/device-tree-bindings/tpm2/sandbox.txt
index 3d0f727cc41..05a310e057f 100644
--- a/doc/device-tree-bindings/tpm2/sandbox.txt
+++ b/doc/device-tree-bindings/tpm2/sandbox.txt
@@ -7,5 +7,5 @@ Required properties:
 Example:
 
 	tpm {
- 		compatible = "sandbox,tpm2";
+		compatible = "sandbox,tpm2";
 	};
diff --git a/drivers/cache/cache-v5l2.c b/drivers/cache/cache-v5l2.c
index 2c7983d0cea..bbdb76bd574 100644
--- a/drivers/cache/cache-v5l2.c
+++ b/drivers/cache/cache-v5l2.c
@@ -68,8 +68,8 @@ struct v5l2_plat {
 	struct l2cache	*regs;
 	u32		iprefetch;
 	u32		dprefetch;
-	u32 		tram_ctl[2];
-	u32 		dram_ctl[2];
+	u32		tram_ctl[2];
+	u32		dram_ctl[2];
 };
 
 static int v5l2_enable(struct udevice *dev)
diff --git a/drivers/cache/sandbox_cache.c b/drivers/cache/sandbox_cache.c
index 0fb767e4339..955dfc8a0f8 100644
--- a/drivers/cache/sandbox_cache.c
+++ b/drivers/cache/sandbox_cache.c
@@ -31,7 +31,7 @@ static int snadbox_disable(struct udevice *dev)
 
 static const struct cache_ops sandbox_cache_ops = {
 	.get_info	= sandbox_get_info,
-	.enable 	= sandbox_enable,
+	.enable		= sandbox_enable,
 	.disable	= snadbox_disable,
 };
 
diff --git a/drivers/clk/imx/clk-pllv3.c b/drivers/clk/imx/clk-pllv3.c
index b5cbf800543..077757efcb8 100644
--- a/drivers/clk/imx/clk-pllv3.c
+++ b/drivers/clk/imx/clk-pllv3.c
@@ -160,7 +160,7 @@ static ulong clk_pllv3_sys_set_rate(struct clk *clk, ulong rate)
 }
 
 static const struct clk_ops clk_pllv3_sys_ops = {
-	.enable 	= clk_pllv3_generic_enable,
+	.enable		= clk_pllv3_generic_enable,
 	.disable	= clk_pllv3_generic_disable,
 	.get_rate	= clk_pllv3_sys_get_rate,
 	.set_rate	= clk_pllv3_sys_set_rate,
diff --git a/drivers/crypto/Makefile b/drivers/crypto/Makefile
index 4a12b56be6f..e8bae43e3f0 100644
--- a/drivers/crypto/Makefile
+++ b/drivers/crypto/Makefile
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0+
 #
 # Copyright (c) 2013 Samsung Electronics Co., Ltd.
-# 	http://www.samsung.com
+#	http://www.samsung.com
 
 obj-$(CONFIG_EXYNOS_ACE_SHA)	+= ace_sha.o
 obj-y += rsa_mod_exp/
diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index 8464438c544..1f8db90c45b 100644
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -36,18 +36,18 @@
  *	0110		16Gb		2GB
  *
  * SPD byte8 - module memory bus width
- * 	bit[2:0]	primary bus width
+ *	bit[2:0]	primary bus width
  *	000		8bits
- * 	001		16bits
- * 	010		32bits
- * 	011		64bits
+ *	001		16bits
+ *	010		32bits
+ *	011		64bits
  *
  * SPD byte7 - module organiztion
- * 	bit[2:0]	sdram device width
- * 	000		4bits
- * 	001		8bits
- * 	010		16bits
- * 	011		32bits
+ *	bit[2:0]	sdram device width
+ *	000		4bits
+ *	001		8bits
+ *	010		16bits
+ *	011		32bits
  *
  */
 static unsigned long long
diff --git a/drivers/ddr/marvell/axp/ddr3_spd.c b/drivers/ddr/marvell/axp/ddr3_spd.c
index e2305d88145..dd772e63ab1 100644
--- a/drivers/ddr/marvell/axp/ddr3_spd.c
+++ b/drivers/ddr/marvell/axp/ddr3_spd.c
@@ -46,7 +46,7 @@
 #define SPD_COL_NUM_MASK		(7 << SPD_COL_NUM_OFF)
 
 #define SPD_MODULE_ORG_BYTE		7
-#define SPD_MODULE_SDRAM_DEV_WIDTH_OFF 	0
+#define SPD_MODULE_SDRAM_DEV_WIDTH_OFF	0
 #define SPD_MODULE_SDRAM_DEV_WIDTH_MASK	(7 << SPD_MODULE_SDRAM_DEV_WIDTH_OFF)
 #define SPD_MODULE_BANK_NUM_MIN		1
 #define SPD_MODULE_BANK_NUM_OFF		3
diff --git a/drivers/firmware/scmi/Makefile b/drivers/firmware/scmi/Makefile
index e1e02240664..966475ec10a 100644
--- a/drivers/firmware/scmi/Makefile
+++ b/drivers/firmware/scmi/Makefile
@@ -1,5 +1,5 @@
 obj-y	+= scmi_agent-uclass.o
 obj-y	+= smt.o
-obj-$(CONFIG_ARM_SMCCC) 	+= smccc_agent.o
+obj-$(CONFIG_ARM_SMCCC)		+= smccc_agent.o
 obj-$(CONFIG_DM_MAILBOX)	+= mailbox_agent.o
 obj-$(CONFIG_SANDBOX)		+= sandbox-scmi_agent.o sandbox-scmi_devices.o
diff --git a/drivers/i2c/designware_i2c.h b/drivers/i2c/designware_i2c.h
index 9b2349a0a2c..b56d7dd22f7 100644
--- a/drivers/i2c/designware_i2c.h
+++ b/drivers/i2c/designware_i2c.h
@@ -112,7 +112,7 @@ struct i2c_regs {
 #define IC_TX_EMPTY		0x0010
 #define IC_TX_OVER		0x0008
 #define IC_RX_FULL		0x0004
-#define IC_RX_OVER 		0x0002
+#define IC_RX_OVER		0x0002
 #define IC_RX_UNDER		0x0001
 
 /* fifo threshold register definitions */
diff --git a/drivers/misc/atsha204a-i2c.c b/drivers/misc/atsha204a-i2c.c
index 52d9eadf49e..715dabb2799 100644
--- a/drivers/misc/atsha204a-i2c.c
+++ b/drivers/misc/atsha204a-i2c.c
@@ -2,8 +2,8 @@
  * I2C Driver for Atmel ATSHA204 over I2C
  *
  * Copyright (C) 2014 Josh Datko, Cryptotronix, jbd@cryptotronix.com
- * 		 2016 Tomas Hlavacek, CZ.NIC, tmshlvck@gmail.com
- * 		 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ *		 2016 Tomas Hlavacek, CZ.NIC, tmshlvck@gmail.com
+ *		 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under the terms of the GNU General Public License version 2 as
@@ -40,11 +40,11 @@ DECLARE_GLOBAL_DATA_PTR;
  *
  * int i, j;
  * for (i = 0; i < 256; ++i) {
- * 	u8 c = 0;
- * 	for (j = 0; j < 8; ++j) {
- * 		c = (c << 1) | ((i >> j) & 1);
- * 	}
- * 	bitreverse_table[i] = c;
+ *	u8 c = 0;
+ *	for (j = 0; j < 8; ++j) {
+ *		c = (c << 1) | ((i >> j) & 1);
+ *	}
+ *	bitreverse_table[i] = c;
  * }
  */
 
@@ -88,14 +88,14 @@ static u8 const bitreverse_table[256] = {
  *
  * int i, j;
  * for (i = 0; i < 256; ++i) {
- * 	u16 c = i << 8;
- * 	for (j = 0; j < 8; ++j) {
- * 		int b = c >> 15;
- * 		c <<= 1;
- * 		if (b)
- * 			c ^= 0x8005;
- * 	}
- * 	crc16_table[i] = c;
+ *	u16 c = i << 8;
+ *	for (j = 0; j < 8; ++j) {
+ *		int b = c >> 15;
+ *		c <<= 1;
+ *		if (b)
+ *			c ^= 0x8005;
+ *	}
+ *	crc16_table[i] = c;
  * }
  */
 static u16 const crc16_table[256] = {
diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c
index 1bbc0f98ae8..c627c1df6c2 100644
--- a/drivers/misc/cros_ec.c
+++ b/drivers/misc/cros_ec.c
@@ -414,7 +414,7 @@ static int ec_command(struct udevice *dev, uint cmd, int cmd_version,
 
 int cros_ec_scan_keyboard(struct udevice *dev, struct mbkp_keyscan *scan)
 {
- 	if (ec_command(dev, EC_CMD_MKBP_STATE, 0, NULL, 0, scan,
+	if (ec_command(dev, EC_CMD_MKBP_STATE, 0, NULL, 0, scan,
 		       sizeof(scan->data)) != sizeof(scan->data))
 		return -1;
 
diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index dde6cd563ff..7e819d2b3a2 100644
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -65,7 +65,7 @@ obj-$(CONFIG_MMC_SDHCI_PIC32)		+= pic32_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_ROCKCHIP)	+= rockchip_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_S5P)		+= s5p_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_SPEAR)		+= spear_sdhci.o
-obj-$(CONFIG_MMC_SDHCI_STI) 		+= sti_sdhci.o
+obj-$(CONFIG_MMC_SDHCI_STI)		+= sti_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_TANGIER)		+= tangier_sdhci.o
 obj-$(CONFIG_MMC_SDHCI_TEGRA)		+= tegra_mmc.o
 obj-$(CONFIG_MMC_SDHCI_XENON)		+= xenon_sdhci.o
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index d3babbfeb1c..ba54b19c140 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -699,7 +699,7 @@ static int mmc_send_op_cond(struct mmc *mmc)
 	mmc_go_idle(mmc);
 
 	start = get_timer(0);
- 	/* Asking to the card its capabilities */
+	/* Asking to the card its capabilities */
 	for (i = 0; ; i++) {
 		err = mmc_send_op_cond_iter(mmc, i != 0);
 		if (err)
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
index d0351b2c6ac..9496903e861 100644
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
@@ -799,8 +799,8 @@ static bool mtd_device_matches_name(struct mtd_info *mtd, const char *name)
  *	device name
  *	@name: MTD device name to open
  *
- * 	This function returns MTD device description structure in case of
- * 	success and an error code in case of failure.
+ *	This function returns MTD device description structure in case of
+ *	success and an error code in case of failure.
  */
 struct mtd_info *get_mtd_device_nm(const char *name)
 {
diff --git a/drivers/mtd/nand/raw/davinci_nand.c b/drivers/mtd/nand/raw/davinci_nand.c
index ef8e85a0021..e4860561f8e 100644
--- a/drivers/mtd/nand/raw/davinci_nand.c
+++ b/drivers/mtd/nand/raw/davinci_nand.c
@@ -39,7 +39,7 @@
 #define NAND_TIMEOUT			10240
 #define NAND_ECC_BUSY			0xC
 #define NAND_4BITECC_MASK		0x03FF03FF
-#define EMIF_NANDFSR_ECC_STATE_MASK  	0x00000F00
+#define EMIF_NANDFSR_ECC_STATE_MASK	0x00000F00
 #define ECC_STATE_NO_ERR		0x0
 #define ECC_STATE_TOO_MANY_ERRS		0x1
 #define ECC_STATE_ERR_CORR_COMP_P	0x2
diff --git a/drivers/mtd/nand/raw/fsl_elbc_nand.c b/drivers/mtd/nand/raw/fsl_elbc_nand.c
index 0c1bd7b4740..ddfd75d32d0 100644
--- a/drivers/mtd/nand/raw/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/raw/fsl_elbc_nand.c
@@ -716,7 +716,7 @@ static int fsl_elbc_chip_init(int devnum, u8 *addr)
 	nand->bbt_td = &bbt_main_descr;
 	nand->bbt_md = &bbt_mirror_descr;
 
-  	/* set up nand options */
+	/* set up nand options */
 	nand->options = NAND_NO_SUBPAGE_WRITE;
 	nand->bbt_options = NAND_BBT_USE_FLASH;
 
diff --git a/drivers/mtd/nand/raw/nand_base.c b/drivers/mtd/nand/raw/nand_base.c
index 0c26e1d9e63..b533683dfe6 100644
--- a/drivers/mtd/nand/raw/nand_base.c
+++ b/drivers/mtd/nand/raw/nand_base.c
@@ -263,7 +263,7 @@ static void ioread8_rep(void *addr, uint8_t *buf, int len)
 static void ioread16_rep(void *addr, void *buf, int len)
 {
 	int i;
- 	u16 *p = (u16 *) buf;
+	u16 *p = (u16 *) buf;
 
 	for (i = 0; i < len; i++)
 		p[i] = readw(addr);
@@ -905,11 +905,11 @@ static int nand_wait(struct mtd_info *mtd, struct nand_chip *chip)
 	if (ret)
 		return ret;
 
- 	u32 timer = (CONFIG_SYS_HZ * timeo) / 1000;
- 	u32 time_start;
+	u32 timer = (CONFIG_SYS_HZ * timeo) / 1000;
+	u32 time_start;
 
- 	time_start = get_timer(0);
- 	while (get_timer(time_start) < timer) {
+	time_start = get_timer(0);
+	while (get_timer(time_start) < timer) {
 		if (chip->dev_ready) {
 			if (chip->dev_ready(mtd))
 				break;
diff --git a/drivers/mtd/nand/raw/nand_ids.c b/drivers/mtd/nand/raw/nand_ids.c
index 3104f879f66..2a50f0b2144 100644
--- a/drivers/mtd/nand/raw/nand_ids.c
+++ b/drivers/mtd/nand/raw/nand_ids.c
@@ -30,7 +30,7 @@ struct nand_flash_dev nand_flash_ids[] = {
 	LEGACY_ID_NAND("NAND 1MiB 3,3V 8-bit",	0xe8, 1, SZ_4K, SP_OPTIONS),
 	LEGACY_ID_NAND("NAND 1MiB 3,3V 8-bit",	0xec, 1, SZ_4K, SP_OPTIONS),
 	LEGACY_ID_NAND("NAND 2MiB 3,3V 8-bit",	0xea, 2, SZ_4K, SP_OPTIONS),
-	LEGACY_ID_NAND("NAND 4MiB 3,3V 8-bit", 	0xd5, 4, SZ_8K, SP_OPTIONS),
+	LEGACY_ID_NAND("NAND 4MiB 3,3V 8-bit",	0xd5, 4, SZ_8K, SP_OPTIONS),
 
 	LEGACY_ID_NAND("NAND 8MiB 3,3V 8-bit",	0xe6, 8, SZ_8K, SP_OPTIONS),
 #endif
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 09daa0dd36e..46aeef258d9 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -2306,8 +2306,8 @@ static int flexonenand_get_boundary(struct mtd_info *mtd)
 
 /**
  * flexonenand_get_size - Fill up fields in onenand_chip and mtd_info
- * 			  boundary[], diesize[], mtd->size, mtd->erasesize,
- * 			  mtd->eraseregions
+ *			  boundary[], diesize[], mtd->size, mtd->erasesize,
+ *			  mtd->eraseregions
  * @param mtd		- MTD device structure
  */
 static void flexonenand_get_size(struct mtd_info *mtd)
diff --git a/drivers/mtd/spi/spi-nor-ids.c b/drivers/mtd/spi/spi-nor-ids.c
index 4aef1ddd6e2..0bff52d5f2a 100644
--- a/drivers/mtd/spi/spi-nor-ids.c
+++ b/drivers/mtd/spi/spi-nor-ids.c
@@ -76,7 +76,7 @@ const struct flash_info spi_nor_ids[] = {
 	{ INFO("at45db321d",	0x1f2700, 0, 64 * 1024,  64, SECT_4K) },
 	{ INFO("at45db641d",	0x1f2800, 0, 64 * 1024, 128, SECT_4K) },
 	{ INFO("at25sl321",	0x1f4216, 0, 64 * 1024,  64, SECT_4K) },
-	{ INFO("at26df081a", 	0x1f4501, 0, 64 * 1024,  16, SECT_4K) },
+	{ INFO("at26df081a",	0x1f4501, 0, 64 * 1024,  16, SECT_4K) },
 #endif
 #ifdef CONFIG_SPI_FLASH_EON		/* EON */
 	/* EON -- en25xxx */
diff --git a/drivers/mtd/ubi/crc32.c b/drivers/mtd/ubi/crc32.c
index 9ce061c8613..35820c753e1 100644
--- a/drivers/mtd/ubi/crc32.c
+++ b/drivers/mtd/ubi/crc32.c
@@ -293,8 +293,8 @@ EXPORT_SYMBOL(crc32_be);
  *
  * A big-endian CRC written this way would be coded like:
  * for (i = 0; i < input_bits; i++) {
- * 	multiple = remainder & 0x80000000 ? CRCPOLY : 0;
- * 	remainder = (remainder << 1 | next_input_bit()) ^ multiple;
+ *	multiple = remainder & 0x80000000 ? CRCPOLY : 0;
+ *	remainder = (remainder << 1 | next_input_bit()) ^ multiple;
  * }
  * Notice how, to get at bit 32 of the shifted remainder, we look
  * at bit 31 of the remainder *before* shifting it.
@@ -313,14 +313,14 @@ EXPORT_SYMBOL(crc32_be);
  * This changes the code to:
  * for (i = 0; i < input_bits; i++) {
  *      remainder ^= next_input_bit() << 31;
- * 	multiple = (remainder & 0x80000000) ? CRCPOLY : 0;
- * 	remainder = (remainder << 1) ^ multiple;
+ *	multiple = (remainder & 0x80000000) ? CRCPOLY : 0;
+ *	remainder = (remainder << 1) ^ multiple;
  * }
  * With this optimization, the little-endian code is simpler:
  * for (i = 0; i < input_bits; i++) {
  *      remainder ^= next_input_bit();
- * 	multiple = (remainder & 1) ? CRCPOLY : 0;
- * 	remainder = (remainder >> 1) ^ multiple;
+ *	multiple = (remainder & 1) ? CRCPOLY : 0;
+ *	remainder = (remainder >> 1) ^ multiple;
  * }
  *
  * Note that the other details of endianness have been hidden in CRCPOLY
@@ -330,19 +330,19 @@ EXPORT_SYMBOL(crc32_be);
  * order, we can actually do the merging 8 or more bits at a time rather
  * than one bit at a time:
  * for (i = 0; i < input_bytes; i++) {
- * 	remainder ^= next_input_byte() << 24;
- * 	for (j = 0; j < 8; j++) {
- * 		multiple = (remainder & 0x80000000) ? CRCPOLY : 0;
- * 		remainder = (remainder << 1) ^ multiple;
- * 	}
+ *	remainder ^= next_input_byte() << 24;
+ *	for (j = 0; j < 8; j++) {
+ *		multiple = (remainder & 0x80000000) ? CRCPOLY : 0;
+ *		remainder = (remainder << 1) ^ multiple;
+ *	}
  * }
  * Or in little-endian:
  * for (i = 0; i < input_bytes; i++) {
- * 	remainder ^= next_input_byte();
- * 	for (j = 0; j < 8; j++) {
- * 		multiple = (remainder & 1) ? CRCPOLY : 0;
- * 		remainder = (remainder << 1) ^ multiple;
- * 	}
+ *	remainder ^= next_input_byte();
+ *	for (j = 0; j < 8; j++) {
+ *		multiple = (remainder & 1) ? CRCPOLY : 0;
+ *		remainder = (remainder << 1) ^ multiple;
+ *	}
  * }
  * If the input is a multiple of 32 bits, you can even XOR in a 32-bit
  * word at a time and increase the inner loop count to 32.
diff --git a/drivers/net/calxedaxgmac.c b/drivers/net/calxedaxgmac.c
index b98d709117a..eb1e2a756cd 100644
--- a/drivers/net/calxedaxgmac.c
+++ b/drivers/net/calxedaxgmac.c
@@ -587,7 +587,7 @@ static const struct eth_ops xgmac_eth_ops = {
 	.start		= xgmac_eth_start,
 	.send		= xgmac_tx,
 	.recv		= xgmac_rx,
-	.free_pkt 	= xgmac_free_pkt,
+	.free_pkt	= xgmac_free_pkt,
 	.stop		= xgmac_eth_stop,
 	.write_hwaddr	= xgmac_eth_write_hwaddr,
 	.read_rom_hwaddr = xgmac_eth_read_rom_hwaddr,
diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c
index e46a269af90..4f062e99d9b 100644
--- a/drivers/net/dm9000x.c
+++ b/drivers/net/dm9000x.c
@@ -28,7 +28,7 @@ v1.2   03/18/2003       Weilun Huang <weilun_huang@davicom.com.tw>:
 --------------------------------------
 
        12/15/2003       Initial port to u-boot by
-       			Sascha Hauer <saschahauer@web.de>
+			Sascha Hauer <saschahauer@web.de>
 
        06/03/2008	Remy Bohmer <linux@bohmer.net>
 			- Fixed the driver to work with DM9000A.
@@ -66,7 +66,7 @@ TODO: external MII is not functional, only internal at the moment.
 #define DM9000_DBG(fmt,args...) printf(fmt, ##args)
 #define DM9000_DMP_PACKET(func,packet,length)  \
 	do { \
-		int i; 							\
+		int i;							\
 		printf("%s: length: %d\n", func, length);		\
 		for (i = 0; i < length; i++) {				\
 			if (i % 8 == 0)					\
diff --git a/drivers/net/e1000.h b/drivers/net/e1000.h
index 082154a997e..f96f12c8f44 100644
--- a/drivers/net/e1000.h
+++ b/drivers/net/e1000.h
@@ -249,7 +249,7 @@ struct e1000_phy_stats {
 #define E1000_ERR_MASTER_REQUESTS_PENDING	10
 #define E1000_ERR_HOST_INTERFACE_COMMAND	11
 #define E1000_BLK_PHY_RESET			12
-#define E1000_ERR_SWFW_SYNC 			13
+#define E1000_ERR_SWFW_SYNC			13
 
 /* PCI Device IDs */
 #define E1000_DEV_ID_82542	    0x1000
diff --git a/drivers/net/smc911x.h b/drivers/net/smc911x.h
index 0a27f3c43ef..59018f00b29 100644
--- a/drivers/net/smc911x.h
+++ b/drivers/net/smc911x.h
@@ -13,9 +13,9 @@
 /* Below are the register offsets and bit definitions
  * of the Lan911x memory space
  */
-#define RX_DATA_FIFO		 		0x00
+#define RX_DATA_FIFO				0x00
 
-#define TX_DATA_FIFO		 		0x20
+#define TX_DATA_FIFO				0x20
 #define	TX_CMD_A_INT_ON_COMP			0x80000000
 #define	TX_CMD_A_INT_BUF_END_ALGN		0x03000000
 #define	TX_CMD_A_INT_4_BYTE_ALGN		0x00000000
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c
index d7553fe1634..a6eb82bd166 100644
--- a/drivers/net/sun8i_emac.c
+++ b/drivers/net/sun8i_emac.c
@@ -403,7 +403,7 @@ static int sun8i_phy_init(struct emac_eth_dev *priv, void *dev)
 }
 
 #define cache_clean_descriptor(desc)					\
-	flush_dcache_range((uintptr_t)(desc), 				\
+	flush_dcache_range((uintptr_t)(desc),				\
 			   (uintptr_t)(desc) + sizeof(struct emac_dma_desc))
 
 #define cache_inv_descriptor(desc)					\
diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c
index fc3327ec539..c544af2a0b7 100644
--- a/drivers/pci/fsl_pci_init.c
+++ b/drivers/pci/fsl_pci_init.c
@@ -885,7 +885,7 @@ int fsl_pcie_init_board(int busno)
 	setbits_be32(addr, _DEVDISR_PCIE4); /* disable */
 #endif
 
- 	return busno;
+	return busno;
 }
 #else
 int fsl_pcie_init_ctrl(int busno, u32 devdisr, enum srds_prtcl dev,
diff --git a/drivers/pinctrl/meson/pinctrl-meson-axg.c b/drivers/pinctrl/meson/pinctrl-meson-axg.c
index 5d234bca3d4..820a6c9bb1a 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-axg.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-axg.c
@@ -908,7 +908,7 @@ static struct meson_bank meson_axg_aobus_banks[] = {
 };
 
 static struct meson_pmx_bank meson_axg_periphs_pmx_banks[] = {
-	/*	 name	 first			last	   	      reg  offset  */
+	/*	 name	 first			last		      reg  offset  */
 	BANK_PMX("Z",	 PIN(GPIOZ_0, EE_OFF),	PIN(GPIOZ_10, EE_OFF), 0x2, 0),
 	BANK_PMX("BOOT", PIN(BOOT_0, EE_OFF),	PIN(BOOT_14, EE_OFF),  0x0, 0),
 	BANK_PMX("A",	 PIN(GPIOA_0, EE_OFF),	PIN(GPIOA_20, EE_OFF), 0xb, 0),
diff --git a/drivers/pinctrl/meson/pinctrl-meson-g12a.c b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
index 8bd265ad952..90a4f8056cd 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-g12a.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-g12a.c
@@ -1220,7 +1220,7 @@ static struct meson_bank meson_g12a_aobus_banks[] = {
 };
 
 static struct meson_pmx_bank meson_g12a_periphs_pmx_banks[] = {
-	/*	 name	 first			last	   	       reg   offset  */
+	/*	 name	 first			last		       reg   offset  */
 	BANK_PMX("Z",    PIN(GPIOZ_0, EE_OFF),   PIN(GPIOZ_15, EE_OFF), 0x6, 0),
 	BANK_PMX("H",    PIN(GPIOH_0, EE_OFF),   PIN(GPIOH_8,  EE_OFF),  0xb, 0),
 	BANK_PMX("BOOT", PIN(BOOT_0,  EE_OFF),   PIN(BOOT_15,  EE_OFF),  0x0, 0),
diff --git a/drivers/pinctrl/renesas/pfc-r8a77970.c b/drivers/pinctrl/renesas/pfc-r8a77970.c
index 4e6f406214d..8cf133a2baf 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77970.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77970.c
@@ -161,7 +161,7 @@
 #define IP0_31_28	FM(DU_DG3)			FM(MSIOF3_SS2)		F_(0, 0)	FM(A7)		FM(PWMFSW0)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP1_3_0		FM(DU_DG4)			F_(0, 0)		F_(0, 0)	FM(A8)		FM(FSO_CFE_0_N_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP1_7_4		FM(DU_DG5)			F_(0, 0)		F_(0, 0)	FM(A9)		FM(FSO_CFE_1_N_A)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
-#define IP1_11_8	FM(DU_DG6)			F_(0, 0)		F_(0, 0)	FM(A10)		FM(FSO_TOE_N_A) 	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
+#define IP1_11_8	FM(DU_DG6)			F_(0, 0)		F_(0, 0)	FM(A10)		FM(FSO_TOE_N_A)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP1_15_12	FM(DU_DG7)			F_(0, 0)		F_(0, 0)	FM(A11)		FM(IRQ1)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP1_19_16	FM(DU_DB2)			F_(0, 0)		F_(0, 0)	FM(A12)		FM(IRQ2)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP1_23_20	FM(DU_DB3)			F_(0, 0)		F_(0, 0)	FM(A13)		FM(FXR_CLKOUT1)		F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
diff --git a/drivers/pinctrl/renesas/pfc-r8a77980.c b/drivers/pinctrl/renesas/pfc-r8a77980.c
index 2d15500f0f0..7cd4ef9830b 100644
--- a/drivers/pinctrl/renesas/pfc-r8a77980.c
+++ b/drivers/pinctrl/renesas/pfc-r8a77980.c
@@ -88,7 +88,7 @@
 #define GPSR1_0		F_(IRQ0,		IP2_27_24)
 
 /* GPSR2 */
-#define GPSR2_29	F_(FSO_TOE_N,  		IP10_19_16)
+#define GPSR2_29	F_(FSO_TOE_N,		IP10_19_16)
 #define GPSR2_28	F_(FSO_CFE_1_N,		IP10_15_12)
 #define GPSR2_27	F_(FSO_CFE_0_N,		IP10_11_8)
 #define GPSR2_26	F_(SDA3,		IP10_7_4)
@@ -253,11 +253,11 @@
 #define IP8_11_8	FM(CANFD0_RX_A)			FM(RXDA_EXTFXR)		FM(PWM1_B)		FM(DU_CDE)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP8_15_12	FM(CANFD1_TX)			FM(FXR_TXDB)		FM(PWM2_B)		FM(TCLK1_B)	FM(TX1_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP8_19_16	FM(CANFD1_RX)			FM(RXDB_EXTFXR)		FM(PWM3_B)		FM(TCLK2_B)	FM(RX1_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
-#define IP8_23_20	FM(CANFD_CLK_A) 		FM(CLK_EXTFXR)		FM(PWM4_B)		FM(SPEEDIN_B)	FM(SCIF_CLK_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
+#define IP8_23_20	FM(CANFD_CLK_A)			FM(CLK_EXTFXR)		FM(PWM4_B)		FM(SPEEDIN_B)	FM(SCIF_CLK_B)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP8_27_24	FM(DIGRF_CLKIN)			FM(DIGRF_CLKEN_IN)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP8_31_28	FM(DIGRF_CLKOUT)		FM(DIGRF_CLKEN_OUT)	F_(0, 0)		F_(0, 0)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP9_3_0		FM(IRQ4)			F_(0, 0)		F_(0, 0)		FM(VI0_DATA12)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
-#define IP9_7_4 	FM(IRQ5)			F_(0, 0)		F_(0, 0)		FM(VI0_DATA13)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
+#define IP9_7_4		FM(IRQ5)			F_(0, 0)		F_(0, 0)		FM(VI0_DATA13)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP9_11_8	FM(MSIOF0_RXD)			FM(DU_DR0)		F_(0, 0)		FM(VI0_DATA14)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP9_15_12	FM(MSIOF0_TXD)			FM(DU_DR1)		F_(0, 0)		FM(VI0_DATA15)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
 #define IP9_19_16	FM(MSIOF0_SCK)			FM(DU_DG0)		F_(0, 0)		FM(VI0_DATA16)	F_(0, 0)	F_(0, 0)	F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
diff --git a/drivers/power/pmic/pmic_tps65910.c b/drivers/power/pmic/pmic_tps65910.c
index fcd0a654a88..e3de7308215 100644
--- a/drivers/power/pmic/pmic_tps65910.c
+++ b/drivers/power/pmic/pmic_tps65910.c
@@ -51,7 +51,7 @@ int power_tps65910_init(unsigned char bus)
 
 /*
  * tps65910_set_i2c_control() - Set the TPS65910 to be controlled via the I2C
- * 				interface.
+ *				interface.
  * @return:		       0 on success, not 0 on failure
  */
 int tps65910_set_i2c_control(void)
diff --git a/drivers/pwm/pwm-meson.c b/drivers/pwm/pwm-meson.c
index 03eeacc286d..2311910a636 100644
--- a/drivers/pwm/pwm-meson.c
+++ b/drivers/pwm/pwm-meson.c
@@ -401,7 +401,7 @@ static const struct pwm_ops meson_pwm_ops = {
 	.set_invert	= meson_pwm_set_invert,
 };
 
-#define XTAL 			-1
+#define XTAL			-1
 
 /* Local clock ids aliases to avoid define conflicts */
 #define GXBB_CLKID_HDMI_PLL		2
diff --git a/drivers/ram/k3-ddrss/k3-ddrss.c b/drivers/ram/k3-ddrss/k3-ddrss.c
index cb8edcbc154..95b5cf9128b 100644
--- a/drivers/ram/k3-ddrss/k3-ddrss.c
+++ b/drivers/ram/k3-ddrss/k3-ddrss.c
@@ -27,8 +27,8 @@
 #define CTRLMMR_DDR4_FSP_CLKCHNG_REQ_OFFS	0x80
 #define CTRLMMR_DDR4_FSP_CLKCHNG_ACK_OFFS	0xc0
 
-#define DDRSS_V2A_R1_MAT_REG 			0x0020
-#define DDRSS_ECC_CTRL_REG 			0x0120
+#define DDRSS_V2A_R1_MAT_REG			0x0020
+#define DDRSS_ECC_CTRL_REG			0x0120
 
 struct k3_ddrss_desc {
 	struct udevice *dev;
diff --git a/drivers/spi/atcspi200_spi.c b/drivers/spi/atcspi200_spi.c
index 775b9ffc259..de9c14837cd 100644
--- a/drivers/spi/atcspi200_spi.c
+++ b/drivers/spi/atcspi200_spi.c
@@ -81,7 +81,7 @@ struct nds_spi_slave {
 	unsigned int	freq;
 	ulong		clock;
 	unsigned int	mode;
-	u8 		num_cs;
+	u8		num_cs;
 	unsigned int	mtiming;
 	size_t		cmd_len;
 	u8		cmd_buf[16];
diff --git a/drivers/thermal/imx_tmu.c b/drivers/thermal/imx_tmu.c
index 07766baf45a..ca45abbb8e1 100644
--- a/drivers/thermal/imx_tmu.c
+++ b/drivers/thermal/imx_tmu.c
@@ -22,8 +22,8 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #define SITES_MAX	16
-#define FLAGS_VER2 	0x1
-#define FLAGS_VER3 	0x2
+#define FLAGS_VER2	0x1
+#define FLAGS_VER3	0x2
 
 #define TMR_DISABLE	0x0
 #define TMR_ME		0x80000000
diff --git a/drivers/timer/atmel_pit_timer.c b/drivers/timer/atmel_pit_timer.c
index 3178e58884a..5cf46f224ab 100644
--- a/drivers/timer/atmel_pit_timer.c
+++ b/drivers/timer/atmel_pit_timer.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2017 Microchip Corporation
- * 		      Wenyou.Yang <wenyou.yang@microchip.com>
+ *		      Wenyou.Yang <wenyou.yang@microchip.com>
  */
 
 #include <common.h>
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h
index 44533fd7fed..1502cb859a5 100644
--- a/drivers/usb/dwc3/core.h
+++ b/drivers/usb/dwc3/core.h
@@ -691,8 +691,8 @@ struct dwc3_scratchpad_array {
  * @has_lpm_erratum: true when core was configured with LPM Erratum. Note that
  *			there's now way for software to detect this in runtime.
  * @is_utmi_l1_suspend: the core asserts output signal
- * 	0	- utmi_sleep_n
- * 	1	- utmi_l1_suspend_n
+ *	0	- utmi_sleep_n
+ *	1	- utmi_l1_suspend_n
  * @is_selfpowered: true when we are selfpowered
  * @is_fpga: true when we are using the FPGA board
  * @needs_fifo_resize: not all users might want fifo resizing, flag it
@@ -713,10 +713,10 @@ struct dwc3_scratchpad_array {
  * @dis_u2_susphy_quirk: set if we disable usb2 suspend phy
  * @tx_de_emphasis_quirk: set if we enable Tx de-emphasis quirk
  * @tx_de_emphasis: Tx de-emphasis value
- * 	0	- -6dB de-emphasis
- * 	1	- -3.5dB de-emphasis
- * 	2	- No de-emphasis
- * 	3	- Reserved
+ *	0	- -6dB de-emphasis
+ *	1	- -3.5dB de-emphasis
+ *	2	- No de-emphasis
+ *	3	- Reserved
  * @index: index of _this_ controller
  * @list: to maintain the list of dwc3 controllers
  */
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 4e68fb0a82f..eb416b832aa 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2209,7 +2209,7 @@ static void dwc3_gadget_conndone_interrupt(struct dwc3 *dwc)
 		 * BESL value in the LPM token is less than or equal to LPM
 		 * NYET threshold.
 		 */
-		if (dwc->revision < DWC3_REVISION_240A 	&& dwc->has_lpm_erratum)
+		if (dwc->revision < DWC3_REVISION_240A	&& dwc->has_lpm_erratum)
 			WARN(true, "LPM Erratum not available on dwc3 revisisions < 2.40a\n");
 
 		if (dwc->has_lpm_erratum && dwc->revision >= DWC3_REVISION_240A)
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
index 96a521ee08e..e18de0e2f0c 100644
--- a/drivers/usb/gadget/at91_udc.h
+++ b/drivers/usb/gadget/at91_udc.h
@@ -35,7 +35,7 @@
 
 #define AT91_UDP_ISR		0x1c		/* Interrupt Status Register */
 #define     AT91_UDP_EP(n)	(1 << (n))	/* Endpoint Interrupt Status */
-#define     AT91_UDP_RXSUSP	(1 <<  8) 	/* USB Suspend Interrupt Status */
+#define     AT91_UDP_RXSUSP	(1 <<  8)	/* USB Suspend Interrupt Status */
 #define     AT91_UDP_RXRSM	(1 <<  9)	/* USB Resume Interrupt Status */
 #define     AT91_UDP_EXTRSM	(1 << 10)	/* External Resume Interrupt Status [AT91RM9200 only] */
 #define     AT91_UDP_SOFINT	(1 << 11)	/* Start of Frame Interrupt Status */
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index ba362b8f258..583ceb4d55c 100644
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -472,7 +472,7 @@ void udc_irq(void)
  * so using '|=' isn't safe as it may ack an interrupt.
  */
 #define UDCCR_OEN		(1 << 31)   /* On-the-Go Enable */
-#define UDCCR_MASK_BITS     	(UDCCR_OEN | UDCCR_UDE)
+#define UDCCR_MASK_BITS		(UDCCR_OEN | UDCCR_UDE)
 
 static inline void udc_set_mask_UDCCR(int mask)
 {
diff --git a/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h b/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
index f0f48a3354c..8db88f0dcfa 100644
--- a/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
+++ b/drivers/usb/host/xhci-rcar-r8a779x_usb3_v3.h
@@ -40,7 +40,7 @@
  *
  * To generate the content of the array below, use ie. the following command:
  * $ hexdump -v -e '/4 "0x%08x, "' r8a779x_usb3_v3.dlmem | \
- * 	sed "s@\(.\{47\}\) @\1\n@g"
+ *	sed "s@\(.\{47\}\) @\1\n@g"
  *
  * [1] git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
  */
diff --git a/drivers/usb/musb-new/musb_gadget.c b/drivers/usb/musb-new/musb_gadget.c
index 5b149dac6dd..1fef00b292d 100644
--- a/drivers/usb/musb-new/musb_gadget.c
+++ b/drivers/usb/musb-new/musb_gadget.c
@@ -995,8 +995,8 @@ void musb_g_rx(struct musb *musb, u8 epnum)
 				&& (musb_ep->dma->actual_len
 					== musb_ep->packet_sz)) {
 			/* In double buffer case, continue to unload fifo if
- 			 * there is Rx packet in FIFO.
- 			 **/
+			 * there is Rx packet in FIFO.
+			 **/
 			csr = musb_readw(epio, MUSB_RXCSR);
 			if ((csr & MUSB_RXCSR_RXPKTRDY) &&
 				hw_ep->rx_double_buffered)
diff --git a/drivers/usb/musb/musb_core.h b/drivers/usb/musb/musb_core.h
index e5d8ac70288..47b839c0835 100644
--- a/drivers/usb/musb/musb_core.h
+++ b/drivers/usb/musb/musb_core.h
@@ -207,14 +207,14 @@ struct musb_regs {
 /* TxType/RxType */
 #define MUSB_TYPE_SPEED		0xc0
 #define MUSB_TYPE_SPEED_SHIFT	6
-#define MUSB_TYPE_SPEED_HIGH 	1
-#define MUSB_TYPE_SPEED_FULL 	2
+#define MUSB_TYPE_SPEED_HIGH	1
+#define MUSB_TYPE_SPEED_FULL	2
 #define MUSB_TYPE_SPEED_LOW	3
 #define MUSB_TYPE_PROTO		0x30	/* Implicitly zero for ep0 */
 #define MUSB_TYPE_PROTO_SHIFT	4
 #define MUSB_TYPE_REMOTE_END	0xf	/* Implicitly zero for ep0 */
-#define MUSB_TYPE_PROTO_BULK 	2
-#define MUSB_TYPE_PROTO_INTR 	3
+#define MUSB_TYPE_PROTO_BULK	2
+#define MUSB_TYPE_PROTO_INTR	3
 
 /* CONFIGDATA */
 #define MUSB_CONFIGDATA_MPRXE		0x80	/* Auto bulk pkt combining */
@@ -304,7 +304,7 @@ struct musb_regs {
  * values are not supported
  */
 struct musb_epinfo {
-	u8	epnum;	/* endpoint number 	*/
+	u8	epnum;	/* endpoint number	*/
 	u8	epdir;	/* endpoint direction	*/
 	u16	epsize;	/* endpoint FIFO size	*/
 };
diff --git a/drivers/usb/musb/musb_hcd.c b/drivers/usb/musb/musb_hcd.c
index ffed3b82bed..17901704f52 100644
--- a/drivers/usb/musb/musb_hcd.c
+++ b/drivers/usb/musb/musb_hcd.c
@@ -14,7 +14,7 @@
 #include "musb_hcd.h"
 
 /* MSC control transfers */
-#define USB_MSC_BBB_RESET 	0xFF
+#define USB_MSC_BBB_RESET	0xFF
 #define USB_MSC_BBB_GET_MAX_LUN	0xFE
 
 /* Endpoint configuration information */
diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c
index 2a72d23eb87..3863662d9f6 100644
--- a/drivers/video/bus_vcxk.c
+++ b/drivers/video/bus_vcxk.c
@@ -63,8 +63,8 @@ at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
 
 #ifndef CONFIG_SYS_VCXK_DOUBLEBUFFERED
 	#define VCXK_BWS(x, data)		vcxk_bws[x] = data;
-	#define VCXK_BWS_WORD_SET(x, mask) 	vcxk_bws_word[x] |= mask;
-	#define VCXK_BWS_WORD_CLEAR(x, mask) 	vcxk_bws_word[x] &= ~mask;
+	#define VCXK_BWS_WORD_SET(x, mask)	vcxk_bws_word[x] |= mask;
+	#define VCXK_BWS_WORD_CLEAR(x, mask)	vcxk_bws_word[x] &= ~mask;
 	#define VCXK_BWS_LONG(x, data)		vcxk_bws_long[x] = data;
 #else
 	u_char double_bws[16384];
@@ -83,7 +83,7 @@ at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
 #endif
 
 #define VC4K16_Bright1	vcxk_bws_word[0x20004 / 2]
-#define VC4K16_Bright2 	vcxk_bws_word[0x20006 / 2]
+#define VC4K16_Bright2	vcxk_bws_word[0x20006 / 2]
 #define VC2K_Bright	vcxk_bws[0x8000]
 #define VC8K_BrightH	vcxk_bws[0xC000]
 #define VC8K_BrightL	vcxk_bws[0xC001]
@@ -263,7 +263,7 @@ void vcxk_clear(void)
  * set the display brightness
  * PARAMETER
  * side	1	set front side brightness
- * 		2	set back  side brightness
+ *		2	set back  side brightness
  *		3	set brightness for both sides
  * brightness 0..1000
  ***
@@ -276,7 +276,7 @@ void vcxk_setbrightness(unsigned int side, short brightness)
 			VC4K16_Bright1 = brightness + 23;
 		if ((side == 0) || (side & 0x2))
 			VC4K16_Bright2 = brightness + 23;
-	} else 	{
+	} else	{
 		VC2K_Bright = (brightness >> 4) + 2;
 		VC8K_BrightH = (brightness + 23) >> 8;
 		VC8K_BrightL = (brightness + 23) & 0xFF;
diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 523d8a8d983..98d29657119 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -54,7 +54,7 @@ __weak void mxsfb_system_setup(void)
  * Freescale mx23evk/mx28evk with a Seiko 4.3'' WVGA panel:
  * setenv videomode
  * video=ctfb:x:800,y:480,depth:24,mode:0,pclk:29851,
- * 	 le:89,ri:164,up:23,lo:10,hs:10,vs:10,sync:0,vmode:0
+ *	 le:89,ri:164,up:23,lo:10,hs:10,vs:10,sync:0,vmode:0
  */
 
 static void mxs_lcd_init(struct udevice *dev, u32 fb_addr,
diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c
index cebea426fbb..c30ed822174 100644
--- a/drivers/watchdog/orion_wdt.c
+++ b/drivers/watchdog/orion_wdt.c
@@ -4,8 +4,8 @@
  * Watchdog driver for Orion/Kirkwood processors
  *
  * Authors:	Tomas Hlavacek <tmshlvck@gmail.com>
- * 		Sylver Bruneau <sylver.bruneau@googlemail.com>
- * 		Marek Behun <marek.behun@nic.cz>
+ *		Sylver Bruneau <sylver.bruneau@googlemail.com>
+ *		Marek Behun <marek.behun@nic.cz>
  *
  * This file is licensed under  the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index 52a243a659f..741c6e20f53 100644
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -23,7 +23,7 @@ static int show_dir(struct btrfs_root *root, struct extent_buffer *eb,
 	struct btrfs_key key;
 	static const char* dir_item_str[] = {
 		[BTRFS_FT_REG_FILE]	= "   ",
-		[BTRFS_FT_DIR] 		= "DIR",
+		[BTRFS_FT_DIR]		= "DIR",
 		[BTRFS_FT_CHRDEV]	= "CHR",
 		[BTRFS_FT_BLKDEV]	= "BLK",
 		[BTRFS_FT_FIFO]		= "FIF",
diff --git a/fs/jffs2/summary.h b/fs/jffs2/summary.h
index 834933cd158..c8cba885297 100644
--- a/fs/jffs2/summary.h
+++ b/fs/jffs2/summary.h
@@ -39,7 +39,7 @@ struct jffs2_sum_inode_flash
 	__u32 inode;		/* inode number */
 	__u32 version;	/* inode version */
 	__u32 offset;	/* offset on jeb */
-	__u32 totlen; 	/* record length */
+	__u32 totlen;	/* record length */
 } __attribute__((packed));
 
 struct jffs2_sum_dirent_flash
@@ -49,7 +49,7 @@ struct jffs2_sum_dirent_flash
 	__u32 offset;	/* offset on jeb */
 	__u32 pino;		/* parent inode */
 	__u32 version;	/* dirent version */
-	__u32 ino; 		/* == zero for unlink */
+	__u32 ino;		/* == zero for unlink */
 	uint8_t nsize;		/* dirent name size */
 	uint8_t type;		/* dirent type */
 	uint8_t name[0];	/* dirent name */
@@ -94,7 +94,7 @@ struct jffs2_sum_inode_mem
 	__u32 inode;		/* inode number */
 	__u32 version;	/* inode version */
 	__u32 offset;	/* offset on jeb */
-	__u32 totlen; 	/* record length */
+	__u32 totlen;	/* record length */
 } __attribute__((packed));
 
 struct jffs2_sum_dirent_mem
@@ -105,7 +105,7 @@ struct jffs2_sum_dirent_mem
 	__u32 offset;	/* ofset on jeb */
 	__u32 pino;		/* parent inode */
 	__u32 version;	/* dirent version */
-	__u32 ino; 		/* == zero for unlink */
+	__u32 ino;		/* == zero for unlink */
 	uint8_t nsize;		/* dirent name size */
 	uint8_t type;		/* dirent type */
 	uint8_t name[0];	/* dirent name */
@@ -155,7 +155,7 @@ struct jffs2_summary
 struct jffs2_sum_marker
 {
 	__u32 offset;	/* offset of the summary node in the jeb */
-	__u32 magic; 	/* == JFFS2_SUM_MAGIC */
+	__u32 magic;	/* == JFFS2_SUM_MAGIC */
 };
 
 #define JFFS2_SUMMARY_FRAME_SIZE (sizeof(struct jffs2_raw_summary) + sizeof(struct jffs2_sum_marker))
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h
index 512fdaa1444..46dfbd0b5ab 100644
--- a/fs/ubifs/ubifs.h
+++ b/fs/ubifs/ubifs.h
@@ -252,10 +252,10 @@ struct inode {
 };
 
 struct super_operations {
-   	struct inode *(*alloc_inode)(struct super_block *sb);
+	struct inode *(*alloc_inode)(struct super_block *sb);
 	void (*destroy_inode)(struct inode *);
 
-   	void (*dirty_inode) (struct inode *, int flags);
+	void (*dirty_inode) (struct inode *, int flags);
 	int (*write_inode) (struct inode *, struct writeback_control *wbc);
 	int (*drop_inode) (struct inode *);
 	void (*evict_inode) (struct inode *);
@@ -326,7 +326,7 @@ struct super_block {
 	char s_id[32];				/* Informational name */
 	u8 s_uuid[16];				/* UUID */
 
-	void 			*s_fs_info;	/* Filesystem private info */
+	void			*s_fs_info;	/* Filesystem private info */
 	unsigned int		s_max_links;
 #ifndef __UBOOT__
 	fmode_t			s_mode;
@@ -431,7 +431,7 @@ struct file {
 #define f_dentry	f_path.dentry
 #define f_vfsmnt	f_path.mnt
 	const struct file_operations	*f_op;
-	unsigned int 		f_flags;
+	unsigned int		f_flags;
 	loff_t			f_pos;
 	unsigned int		f_uid, f_gid;
 
@@ -466,7 +466,7 @@ struct file {
 #if BITS_PER_LONG==32
 #define MAX_LFS_FILESIZE	(((u64)PAGE_CACHE_SIZE << (BITS_PER_LONG-1))-1)
 #elif BITS_PER_LONG==64
-#define MAX_LFS_FILESIZE 	0x7fffffffffffffffUL
+#define MAX_LFS_FILESIZE	0x7fffffffffffffffUL
 #endif
 
 /*
diff --git a/include/atsha204a-i2c.h b/include/atsha204a-i2c.h
index 344fd8ace7d..39fc0e9ca72 100644
--- a/include/atsha204a-i2c.h
+++ b/include/atsha204a-i2c.h
@@ -2,8 +2,8 @@
  * I2C Driver for Atmel ATSHA204 over I2C
  *
  * Copyright (C) 2014 Josh Datko, Cryptotronix, jbd@cryptotronix.com
- * 		 2016 Tomas Hlavacek, CZ.NIC, tmshlvck@gmail.com
- * 		 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
+ *		 2016 Tomas Hlavacek, CZ.NIC, tmshlvck@gmail.com
+ *		 2017 Marek Behun, CZ.NIC, marek.behun@nic.cz
  *
  * This program is free software; you can redistribute  it and/or modify it
  * under the terms of the GNU General Public License version 2 as
diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h
index f8df5b0eb7e..e7fca468aa5 100644
--- a/include/configs/at91sam9263ek.h
+++ b/include/configs/at91sam9263ek.h
@@ -86,7 +86,7 @@
 	(AT91_PMC_PLLAR_29 |					\
 	AT91_PMC_PLLXR_OUT(MASTER_PLL_OUT) |			\
 	AT91_PMC_PLLXR_PLLCOUNT(63) |				\
-	AT91_PMC_PLLXR_MUL(MASTER_PLL_MUL - 1) | 		\
+	AT91_PMC_PLLXR_MUL(MASTER_PLL_MUL - 1) |		\
 	AT91_PMC_PLLXR_DIV(MASTER_PLL_DIV))
 
 /* PCK/2 = MCK Master Clock from PLLA */
@@ -96,7 +96,7 @@
 
 /* PCK/2 = MCK Master Clock from PLLA */
 #define	CONFIG_SYS_MCKR2_VAL		\
-	(AT91_PMC_MCKR_CSS_PLLA | AT91_PMC_MCKR_PRES_1 | 	\
+	(AT91_PMC_MCKR_CSS_PLLA | AT91_PMC_MCKR_PRES_1 |	\
 	AT91_PMC_MCKR_MDIV_2)
 
 /* define PDC[31:16] as DATA[31:16] */
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 2a0a6beaf62..01f4dba9e92 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -148,7 +148,7 @@
 #define PIXIS_LBMAP_ALTBANK	0x40
 
 #define CONFIG_SYS_FLASH_QUIET_TEST
-#define CONFIG_FLASH_SHOW_PROGRESS 	45 /* count down from 45/5: 9..1 */
+#define CONFIG_FLASH_SHOW_PROGRESS	45 /* count down from 45/5: 9..1 */
 
 #define CONFIG_SYS_MAX_FLASH_BANKS	2		/* number of banks */
 #define CONFIG_SYS_MAX_FLASH_SECT	1024		/* sectors per device */
diff --git a/include/configs/imx7-cm.h b/include/configs/imx7-cm.h
index 270c44eb028..4d4c94b74ea 100644
--- a/include/configs/imx7-cm.h
+++ b/include/configs/imx7-cm.h
@@ -20,9 +20,9 @@
 
 /*
  * Use:
- * 		boot-mode=mix
- * 		boot-mode=sd
- * 		boot-mode=net
+ *		boot-mode=mix
+ *		boot-mode=sd
+ *		boot-mode=net
  */
 #define MY_CONFIG_BOOT_MODE	"boot-mode=sd\0"
 
diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h
index f6909d05a04..6cae6c13960 100644
--- a/include/configs/ls1043a_common.h
+++ b/include/configs/ls1043a_common.h
@@ -219,7 +219,7 @@
 	"hwconfig=fsl_ddr:bank_intlv=auto\0"	\
 	"fdt_high=0xffffffffffffffff\0"		\
 	"initrd_high=0xffffffffffffffff\0"	\
-	"fdt_addr=0x64f00000\0"		 	\
+	"fdt_addr=0x64f00000\0"			\
 	"kernel_addr=0x61000000\0"		\
 	"scriptaddr=0x80000000\0"		\
 	"scripthdraddr=0x80080000\0"		\
diff --git a/include/configs/novena.h b/include/configs/novena.h
index 46c530161ac..28fb1b8d753 100644
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -104,7 +104,7 @@
 	"kernel_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0"		\
 	"pxefile_addr_r="__stringify(CONFIG_SYS_LOAD_ADDR)"\0"		\
 	"scriptaddr="__stringify(CONFIG_SYS_LOAD_ADDR)"\0"			\
-	"ramdisk_addr_r=0x28000000\0"		   			\
+	"ramdisk_addr_r=0x28000000\0"					\
 	"fdt_addr_r=0x18000000\0"					\
 	"fdtfile=imx6q-novena.dtb\0"					\
 	"stdout=serial,vidconsole\0"					\
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index 265b1e2197c..8c830d916c1 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -203,7 +203,7 @@
 		"${defargs} " \
 		"${optargs} " \
 		"root=${ramroot} ramdisk_size=${ramdisk_size} " \
-	 	"rootfstype=${ramrootfstype}\0" \
+		"rootfstype=${ramrootfstype}\0" \
 	"ramboot=run mmcbootenv; " \
 		"if run loadimage && run loaddtb && run loadramdisk; then " \
 			"echo Booting ${bootdir}/${bootfile} from mmc ${bootpart} w/ramdisk ...; " \
diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 33bc30e39d6..f9db8efd2fd 100644
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -75,7 +75,7 @@
 	"mmcrootfstype=ext4 rootwait\0"                                                         \
 	"kernelimg="           __stringify(CONFIG_BOARD_NAME)          "-linux.bin\0"           \
 	"splashpos=0,0\0"									\
-	"splashimage="		__stringify(CONFIG_SYS_LOAD_ADDR) 	"\0"			\
+	"splashimage="		__stringify(CONFIG_SYS_LOAD_ADDR)	"\0"			\
 	"videomode=video=ctfb:x:800,y:480,depth:18,pclk:33033,le:96,ri:96,up:20,lo:21,hs:64,vs:4,sync:0,vmode:0\0" \
 	"check_env=if test -n ${flash_env_version}; "                                           \
 		"then env default env_version; "                                                \
diff --git a/include/configs/socrates.h b/include/configs/socrates.h
index 400cea479ef..4fd119ce854 100644
--- a/include/configs/socrates.h
+++ b/include/configs/socrates.h
@@ -129,7 +129,7 @@
 #define CONFIG_SYS_FPGA_SIZE		0x00100000	/* 1 MB		*/
 #define CONFIG_SYS_HMI_BASE		0xc0010000
 #define CONFIG_SYS_BR3_PRELIM		0xc0001881	/* UPMA, 32-bit */
-#define CONFIG_SYS_OR3_PRELIM		0xfff00000	/* 1 MB 	*/
+#define CONFIG_SYS_OR3_PRELIM		0xfff00000	/* 1 MB		*/
 
 #define CONFIG_SYS_NAND_BASE		(CONFIG_SYS_FPGA_BASE + 0x70)
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
@@ -246,17 +246,17 @@
 		"era fe000000 fe1dffff;"				\
 		"cp.b 100000 fe000000 ${filesize};"			\
 		"setenv filesize;saveenv\0"				\
-	"update_fdt=tftp 100000 ${fdt_file};" 				\
+	"update_fdt=tftp 100000 ${fdt_file};"				\
 		"era fe1e0000 fe1fffff;"				\
 		"cp.b 100000 fe1e0000 ${filesize};"			\
 		"setenv filesize;saveenv\0"				\
-	"update_initrd=tftp 100000 ${initrd_file};" 			\
+	"update_initrd=tftp 100000 ${initrd_file};"			\
 		"era fe200000 fe9fffff;"				\
 		"cp.b 100000 fe200000 ${filesize};"			\
 		"setenv filesize;saveenv\0"				\
 	"clean_data=era fea00000 fff5ffff\0"				\
-	"usbargs=setenv bootargs root=/dev/sda1 rw\0" 			\
-	"load_usb=usb start;" 						\
+	"usbargs=setenv bootargs root=/dev/sda1 rw\0"			\
+	"load_usb=usb start;"						\
 		"ext2load usb 0:1 ${kernel_addr_r} /boot/uImage\0"	\
 	"boot_usb=run load_usb usbargs addcons;"			\
 		"bootm ${kernel_addr_r} - ${fdt_addr};"			\
diff --git a/include/div64.h b/include/div64.h
index 8b92d2b1834..66a2af4df05 100644
--- a/include/div64.h
+++ b/include/div64.h
@@ -220,7 +220,7 @@ extern u32 __div64_32(u64 *dividend, u32 divisor);
 	} else if (likely(((n) >> 32) == 0)) {		\
 		__rem = (u32)(n) % __base;		\
 		(n) = (u32)(n) / __base;		\
-	} else 						\
+	} else						\
 		__rem = __div64_32(&(n), __base);	\
 	__rem;						\
  })
diff --git a/include/dt-bindings/mfd/dbx500-prcmu.h b/include/dt-bindings/mfd/dbx500-prcmu.h
index 0404bcc47dd..7266ae67b03 100644
--- a/include/dt-bindings/mfd/dbx500-prcmu.h
+++ b/include/dt-bindings/mfd/dbx500-prcmu.h
@@ -12,64 +12,64 @@
  */
 #define ARMCLK			0
 #define PRCMU_ACLK		1
-#define PRCMU_SVAMMCSPCLK 	2
-#define PRCMU_SDMMCHCLK 	2  /* DBx540 only. */
-#define PRCMU_SIACLK 		3
-#define PRCMU_SIAMMDSPCLK 	3  /* DBx540 only. */
-#define PRCMU_SGACLK 		4
-#define PRCMU_UARTCLK 		5
-#define PRCMU_MSP02CLK 		6
-#define PRCMU_MSP1CLK 		7
-#define PRCMU_I2CCLK 		8
-#define PRCMU_SDMMCCLK 		9
-#define PRCMU_SLIMCLK 		10
-#define PRCMU_CAMCLK 		10 /* DBx540 only. */
-#define PRCMU_PER1CLK 		11
-#define PRCMU_PER2CLK 		12
-#define PRCMU_PER3CLK 		13
-#define PRCMU_PER5CLK 		14
-#define PRCMU_PER6CLK 		15
-#define PRCMU_PER7CLK 		16
-#define PRCMU_LCDCLK 		17
-#define PRCMU_BMLCLK 		18
-#define PRCMU_HSITXCLK 		19
-#define PRCMU_HSIRXCLK 		20
+#define PRCMU_SVAMMCSPCLK	2
+#define PRCMU_SDMMCHCLK		2  /* DBx540 only. */
+#define PRCMU_SIACLK		3
+#define PRCMU_SIAMMDSPCLK	3  /* DBx540 only. */
+#define PRCMU_SGACLK		4
+#define PRCMU_UARTCLK		5
+#define PRCMU_MSP02CLK		6
+#define PRCMU_MSP1CLK		7
+#define PRCMU_I2CCLK		8
+#define PRCMU_SDMMCCLK		9
+#define PRCMU_SLIMCLK		10
+#define PRCMU_CAMCLK		10 /* DBx540 only. */
+#define PRCMU_PER1CLK		11
+#define PRCMU_PER2CLK		12
+#define PRCMU_PER3CLK		13
+#define PRCMU_PER5CLK		14
+#define PRCMU_PER6CLK		15
+#define PRCMU_PER7CLK		16
+#define PRCMU_LCDCLK		17
+#define PRCMU_BMLCLK		18
+#define PRCMU_HSITXCLK		19
+#define PRCMU_HSIRXCLK		20
 #define PRCMU_HDMICLK		21
-#define PRCMU_APEATCLK 		22
-#define PRCMU_APETRACECLK 	23
-#define PRCMU_MCDECLK  	 	24
-#define PRCMU_IPI2CCLK  	25
-#define PRCMU_DSIALTCLK  	26
-#define PRCMU_DMACLK  	 	27
-#define PRCMU_B2R2CLK  	 	28
-#define PRCMU_TVCLK  	 	29
-#define SPARE_UNIPROCLK  	30
-#define PRCMU_SSPCLK  	 	31
-#define PRCMU_RNGCLK  	 	32
-#define PRCMU_UICCCLK  	 	33
+#define PRCMU_APEATCLK		22
+#define PRCMU_APETRACECLK	23
+#define PRCMU_MCDECLK		24
+#define PRCMU_IPI2CCLK		25
+#define PRCMU_DSIALTCLK		26
+#define PRCMU_DMACLK		27
+#define PRCMU_B2R2CLK		28
+#define PRCMU_TVCLK		29
+#define SPARE_UNIPROCLK		30
+#define PRCMU_SSPCLK		31
+#define PRCMU_RNGCLK		32
+#define PRCMU_UICCCLK		33
 #define PRCMU_G1CLK             34 /* DBx540 only. */
 #define PRCMU_HVACLK            35 /* DBx540 only. */
-#define PRCMU_SPARE1CLK	 	36
-#define PRCMU_SPARE2CLK	 	37
+#define PRCMU_SPARE1CLK		36
+#define PRCMU_SPARE2CLK		37
 
-#define PRCMU_NUM_REG_CLOCKS  	38
+#define PRCMU_NUM_REG_CLOCKS	38
 
-#define PRCMU_RTCCLK  	 	PRCMU_NUM_REG_CLOCKS
-#define PRCMU_SYSCLK  	 	39
-#define PRCMU_CDCLK  	 	40
-#define PRCMU_TIMCLK  	 	41
-#define PRCMU_PLLSOC0  	 	42
-#define PRCMU_PLLSOC1  	 	43
-#define PRCMU_ARMSS  	 	44
-#define PRCMU_PLLDDR  	 	45
+#define PRCMU_RTCCLK		PRCMU_NUM_REG_CLOCKS
+#define PRCMU_SYSCLK		39
+#define PRCMU_CDCLK		40
+#define PRCMU_TIMCLK		41
+#define PRCMU_PLLSOC0		42
+#define PRCMU_PLLSOC1		43
+#define PRCMU_ARMSS		44
+#define PRCMU_PLLDDR		45
 
 /* DSI Clocks */
-#define PRCMU_PLLDSI  	 	46
-#define PRCMU_DSI0CLK 	  	47
-#define PRCMU_DSI1CLK  	 	48
-#define PRCMU_DSI0ESCCLK  	49
-#define PRCMU_DSI1ESCCLK  	50
-#define PRCMU_DSI2ESCCLK  	51
+#define PRCMU_PLLDSI		46
+#define PRCMU_DSI0CLK		47
+#define PRCMU_DSI1CLK		48
+#define PRCMU_DSI0ESCCLK	49
+#define PRCMU_DSI1ESCCLK	50
+#define PRCMU_DSI2ESCCLK	51
 
 /* LCD DSI PLL - Ux540 only */
 #define PRCMU_PLLDSI_LCD        52
@@ -79,6 +79,6 @@
 #define PRCMU_DSI1ESCCLK_LCD    56
 #define PRCMU_DSI2ESCCLK_LCD    57
 
-#define PRCMU_NUM_CLKS  	58
+#define PRCMU_NUM_CLKS		58
 
 #endif
diff --git a/include/environment/distro/sf.h b/include/environment/distro/sf.h
index e793be06c6f..62624d553c0 100644
--- a/include/environment/distro/sf.h
+++ b/include/environment/distro/sf.h
@@ -10,16 +10,16 @@
 
 #if CONFIG_IS_ENABLED(CMD_SF)
 #define BOOTENV_SHARED_SF(devtypel)				\
-	#devtypel "_boot=" 					\
+	#devtypel "_boot="					\
 	"if " #devtypel " probe ${busnum}; then "		\
-		"devtype=" #devtypel "; "	  		\
-		"run scan_sf_for_scripts; "	  		\
+		"devtype=" #devtypel "; "			\
+		"run scan_sf_for_scripts; "			\
 	"fi\0"
-#define BOOTENV_DEV_SF(devtypeu, devtypel, instance) 		\
-	"bootcmd_" #devtypel #instance "=" 			\
-		"busnum=" #instance "; " 			\
+#define BOOTENV_DEV_SF(devtypeu, devtypel, instance)		\
+	"bootcmd_" #devtypel #instance "="			\
+		"busnum=" #instance "; "			\
 		"run " #devtypel "_boot\0"
-#define BOOTENV_DEV_NAME_SF(devtypeu, devtypel, instance) 	\
+#define BOOTENV_DEV_NAME_SF(devtypeu, devtypel, instance)	\
 	#devtypel #instance " "
 #else
 #define BOOTENV_SHARED_SF(devtypel)
diff --git a/include/faraday/ftpmu010.h b/include/faraday/ftpmu010.h
index 8fc81f902db..ccb7805375e 100644
--- a/include/faraday/ftpmu010.h
+++ b/include/faraday/ftpmu010.h
@@ -137,7 +137,7 @@ struct ftpmu010 {
  *  1. FTPMU010_PDLLCR0_HCLKOUTDIS:
  *	Datasheet indicated it starts at bit #21 which was wrong.
  *  2. FTPMU010_PDLLCR0_DLLFRAG:
- * 	Datasheet indicated it has 2 bit which was wrong.
+ *	Datasheet indicated it has 2 bit which was wrong.
  */
 #define FTPMU010_PDLLCR0_HCLKOUTDIS(cr0)	(((cr0) & 0xf) << 20)
 #define FTPMU010_PDLLCR0_DLLFRAG(cr0)		(1 << 19)
diff --git a/include/fsl_qe.h b/include/fsl_qe.h
index cd8fca95b4a..48accb8d891 100644
--- a/include/fsl_qe.h
+++ b/include/fsl_qe.h
@@ -40,7 +40,7 @@ typedef struct qe_snum {
 #define	QE_RISC_ALLOCATION_RISC2	0x2  /* RISC 2 */
 #define	QE_RISC_ALLOCATION_RISC3	0x4  /* RISC 3 */
 #define	QE_RISC_ALLOCATION_RISC4	0x8  /* RISC 4 */
-#define	QE_RISC_ALLOCATION_RISC1_AND_RISC2 	(QE_RISC_ALLOCATION_RISC1 | \
+#define	QE_RISC_ALLOCATION_RISC1_AND_RISC2	(QE_RISC_ALLOCATION_RISC1 | \
 						 QE_RISC_ALLOCATION_RISC2)
 #define	QE_RISC_ALLOCATION_FOUR_RISCS	(QE_RISC_ALLOCATION_RISC1 | \
 					 QE_RISC_ALLOCATION_RISC2 | \
diff --git a/include/fsl_wdog.h b/include/fsl_wdog.h
index 655f22ed9ac..29f00d3b9f8 100644
--- a/include/fsl_wdog.h
+++ b/include/fsl_wdog.h
@@ -14,6 +14,6 @@ struct watchdog_regs {
 #define WCR_WDE		0x04
 #define WCR_WDT		0x08
 #define WCR_SRS		0x10
-#define WCR_WDA 	0x20
+#define WCR_WDA		0x20
 #define SET_WCR_WT(x)	(x << 8)
 #define WCR_WT_MSK	SET_WCR_WT(0xFF)
diff --git a/include/generic-phy.h b/include/generic-phy.h
index a17d900e4bd..9a11659640c 100644
--- a/include/generic-phy.h
+++ b/include/generic-phy.h
@@ -201,7 +201,7 @@ int generic_phy_power_off(struct phy *phy);
  * generic_phy_configure() - configure a PHY device
  *
  * @phy:	PHY port to be configured
- * @params: 	PHY Parameters, underlying data is specific to the PHY function
+ * @params:	PHY Parameters, underlying data is specific to the PHY function
  * @return 0 if OK, or a negative error code
  */
 int generic_phy_configure(struct phy *phy, void *params);
diff --git a/include/imximage.h b/include/imximage.h
index 1ed3284f154..5a812f5a10c 100644
--- a/include/imximage.h
+++ b/include/imximage.h
@@ -124,7 +124,7 @@ typedef struct {
 } flash_header_v1_t;
 
 typedef struct {
-	uint32_t length; 	/* Length of data to be read from flash */
+	uint32_t length;	/* Length of data to be read from flash */
 } flash_cfg_parms_t;
 
 typedef struct {
diff --git a/include/linux/apm_bios.h b/include/linux/apm_bios.h
index 3dabc3f7704..32d14017701 100644
--- a/include/linux/apm_bios.h
+++ b/include/linux/apm_bios.h
@@ -34,7 +34,7 @@ struct apm_bios_info {
 #define APM_16_BIT_SUPPORT	0x0001
 #define APM_32_BIT_SUPPORT	0x0002
 #define APM_IDLE_SLOWS_CLOCK	0x0004
-#define APM_BIOS_DISABLED      	0x0008
+#define APM_BIOS_DISABLED	0x0008
 #define APM_BIOS_DISENGAGED     0x0010
 
 /*
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 98dd3fc4cc2..09cea0e95e2 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -203,7 +203,7 @@ void __read_once_size(const volatile void *p, void *res, int size)
 /*
  * We can't declare function 'inline' because __no_sanitize_address confilcts
  * with inlining. Attempt to inline it may cause a build failure.
- * 	https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
+ *	https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67368
  * '__maybe_unused' allows us to avoid defined-but-not-used warnings.
  */
 # define __no_kasan_or_inline __no_sanitize_address notrace __maybe_unused
diff --git a/include/linux/ioport.h b/include/linux/ioport.h
index 7129504e053..85288c3729a 100644
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
@@ -63,7 +63,7 @@ struct resource_list {
 #define IORESOURCE_IRQ_HIGHLEVEL	(1<<2)
 #define IORESOURCE_IRQ_LOWLEVEL		(1<<3)
 #define IORESOURCE_IRQ_SHAREABLE	(1<<4)
-#define IORESOURCE_IRQ_OPTIONAL 	(1<<5)
+#define IORESOURCE_IRQ_OPTIONAL		(1<<5)
 
 /* PnP DMA specific bits (IORESOURCE_BITS) */
 #define IORESOURCE_DMA_TYPE_MASK	(3<<0)
diff --git a/include/linux/list.h b/include/linux/list.h
index f62afa092c6..3eacf68e3a7 100644
--- a/include/linux/list.h
+++ b/include/linux/list.h
@@ -456,7 +456,7 @@ static inline void list_splice_tail_init(struct list_head *list,
  * Continue to iterate over list of given type, continuing after
  * the current position.
  */
-#define list_for_each_entry_continue(pos, head, member) 		\
+#define list_for_each_entry_continue(pos, head, member)			\
 	for (pos = list_entry(pos->member.next, typeof(*pos), member);	\
 	     prefetch(pos->member.next), &pos->member != (head);	\
 	     pos = list_entry(pos->member.next, typeof(*pos), member))
@@ -510,7 +510,7 @@ static inline void list_splice_tail_init(struct list_head *list,
  * Iterate over list of given type, continuing after current point,
  * safe against removal of list entry.
  */
-#define list_for_each_entry_safe_continue(pos, n, head, member) 		\
+#define list_for_each_entry_safe_continue(pos, n, head, member)			\
 	for (pos = list_entry(pos->member.next, typeof(*pos), member),		\
 		n = list_entry(pos->member.next, typeof(*pos), member);		\
 	     &pos->member != (head);						\
diff --git a/include/linux/mtd/doc2000.h b/include/linux/mtd/doc2000.h
index d57f8da8104..a72cb7d20b7 100644
--- a/include/linux/mtd/doc2000.h
+++ b/include/linux/mtd/doc2000.h
@@ -54,7 +54,7 @@
 #define DoC_Mplus_Configuration		0x100a
 #define DoC_Mplus_OutputControl		0x100c
 #define DoC_Mplus_FlashControl		0x1020
-#define DoC_Mplus_FlashSelect 		0x1022
+#define DoC_Mplus_FlashSelect		0x1022
 #define DoC_Mplus_FlashCmd		0x1024
 #define DoC_Mplus_FlashAddress		0x1026
 #define DoC_Mplus_FlashData0		0x1028
@@ -62,14 +62,14 @@
 #define DoC_Mplus_ReadPipeInit		0x102a
 #define DoC_Mplus_LastDataRead		0x102c
 #define DoC_Mplus_LastDataRead1		0x102d
-#define DoC_Mplus_WritePipeTerm 	0x102e
+#define DoC_Mplus_WritePipeTerm		0x102e
 #define DoC_Mplus_ECCSyndrome0		0x1040
 #define DoC_Mplus_ECCSyndrome1		0x1041
 #define DoC_Mplus_ECCSyndrome2		0x1042
 #define DoC_Mplus_ECCSyndrome3		0x1043
 #define DoC_Mplus_ECCSyndrome4		0x1044
 #define DoC_Mplus_ECCSyndrome5		0x1045
-#define DoC_Mplus_ECCConf 		0x1046
+#define DoC_Mplus_ECCConf		0x1046
 #define DoC_Mplus_Toggle		0x1046
 #define DoC_Mplus_DownloadStatus	0x1074
 #define DoC_Mplus_CtrlConfirm		0x1076
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h
index 3822237f2ad..0f5a2332663 100644
--- a/include/linux/mtd/partitions.h
+++ b/include/linux/mtd/partitions.h
@@ -21,16 +21,16 @@
  * For each partition, these fields are available:
  * name: string that will be used to label the partition's MTD device.
  * size: the partition size; if defined as MTDPART_SIZ_FULL, the partition
- * 	will extend to the end of the master MTD device.
+ *	will extend to the end of the master MTD device.
  * offset: absolute starting position within the master MTD device; if
- * 	defined as MTDPART_OFS_APPEND, the partition will start where the
+ *	defined as MTDPART_OFS_APPEND, the partition will start where the
  *	previous one ended; if MTDPART_OFS_NXTBLK, at the next erase block;
  *	if MTDPART_OFS_RETAIN, consume as much as possible, leaving size
  *	after the end of partition.
  * mask_flags: contains flags that have to be masked (removed) from the
- * 	master MTD flag set for the corresponding MTD partition.
- * 	For example, to force a read-only partition, simply adding
- * 	MTD_WRITEABLE to the mask_flags will do the trick.
+ *	master MTD flag set for the corresponding MTD partition.
+ *	For example, to force a read-only partition, simply adding
+ *	MTD_WRITEABLE to the mask_flags will do the trick.
  *
  * Note: writeable partitions require their size and offset be
  * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).
diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 899fbb487c9..46e7fff899f 100644
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -47,7 +47,7 @@ struct screen_info {
 } __attribute__((packed));
 
 #define VIDEO_TYPE_MDA		0x10	/* Monochrome Text Display	*/
-#define VIDEO_TYPE_CGA		0x11	/* CGA Display 			*/
+#define VIDEO_TYPE_CGA		0x11	/* CGA Display			*/
 #define VIDEO_TYPE_EGAM		0x20	/* EGA/VGA in Monochrome Mode	*/
 #define VIDEO_TYPE_EGAC		0x21	/* EGA in Color Mode		*/
 #define VIDEO_TYPE_VGAC		0x22	/* VGA+ in Color Mode		*/
@@ -74,7 +74,7 @@ extern struct screen_info screen_info;
 #define ORIG_X			(screen_info.orig_x)
 #define ORIG_Y			(screen_info.orig_y)
 #define ORIG_VIDEO_MODE		(screen_info.orig_video_mode)
-#define ORIG_VIDEO_COLS 	(screen_info.orig_video_cols)
+#define ORIG_VIDEO_COLS		(screen_info.orig_video_cols)
 #define ORIG_VIDEO_EGA_BX	(screen_info.orig_video_ega_bx)
 #define ORIG_VIDEO_LINES	(screen_info.orig_video_lines)
 #define ORIG_VIDEO_ISVGA	(screen_info.orig_video_isVGA)
diff --git a/include/linux/serial_reg.h b/include/linux/serial_reg.h
index 20ea54397f2..061371773c0 100644
--- a/include/linux/serial_reg.h
+++ b/include/linux/serial_reg.h
@@ -257,7 +257,7 @@
  */
 #define UART_ASR	0x01	/* Additional Status Register */
 #define UART_RFL	0x03	/* Receiver FIFO level */
-#define UART_TFL 	0x04	/* Transmitter FIFO level */
+#define UART_TFL	0x04	/* Transmitter FIFO level */
 #define UART_ICR	0x05	/* Index Control Register */
 
 /* The 16950 ICR registers */
diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index 7e6d329e542..b3f4b8d134c 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -160,14 +160,14 @@ struct usb_ep_caps {
  *	endpoint. It's set once by UDC driver when endpoint is initialized, and
  *	should not be changed. Should not be confused with maxpacket.
  * @max_streams: The maximum number of streams supported
- * 	by this EP (0 - 16, actual number is 2^n)
+ *	by this EP (0 - 16, actual number is 2^n)
  * @maxburst: the maximum number of bursts supported by this EP (for usb3)
  * @driver_data:for use by the gadget driver.  all other fields are
  *	read-only to gadget drivers.
  * @desc: endpoint descriptor.  This pointer is set before the endpoint is
- * 	enabled and remains valid until the endpoint is disabled.
+ *	enabled and remains valid until the endpoint is disabled.
  * @comp_desc: In case of SuperSpeed support, this is the endpoint companion
- * 	descriptor that is used to configure the endpoint
+ *	descriptor that is used to configure the endpoint
  *
  * the bus controller driver lists all the general purpose endpoints in
  * gadget->ep_list.  the control endpoint (gadget->ep0) is not in that list,
diff --git a/include/mc13783.h b/include/mc13783.h
index 47345f006fe..c7ee03b0f9f 100644
--- a/include/mc13783.h
+++ b/include/mc13783.h
@@ -18,7 +18,7 @@
 #define VIOLOEN		(1 << 6)
 #define VIOLOSTBY	(1 << 7)
 #define VIOLOMODE	(1 << 8)
-#define VDIGEN 		(1 << 9)
+#define VDIGEN		(1 << 9)
 #define VDIGSTBY	(1 << 10)
 #define VDIGMODE	(1 << 11)
 #define VGENEN		(1 << 12)
diff --git a/include/mpc85xx.h b/include/mpc85xx.h
index 3753e47edfb..ce6d083effa 100644
--- a/include/mpc85xx.h
+++ b/include/mpc85xx.h
@@ -42,7 +42,7 @@ CONFIG_SYS_CCSRBAR_PHYS_LOW and/or CONFIG_SYS_CCSRBAR_PHYS_HIGH instead."
 #endif
 
 #ifndef CONFIG_SYS_CCSRBAR
-#define CONFIG_SYS_CCSRBAR 		CONFIG_SYS_CCSRBAR_DEFAULT
+#define CONFIG_SYS_CCSRBAR		CONFIG_SYS_CCSRBAR_DEFAULT
 #endif
 
 #ifndef CONFIG_SYS_CCSRBAR_PHYS_HIGH
@@ -54,14 +54,14 @@ CONFIG_SYS_CCSRBAR_PHYS_LOW and/or CONFIG_SYS_CCSRBAR_PHYS_HIGH instead."
 #endif
 
 #ifndef CONFIG_SYS_CCSRBAR_PHYS_LOW
-#define CONFIG_SYS_CCSRBAR_PHYS_LOW 	CONFIG_SYS_CCSRBAR_DEFAULT
+#define CONFIG_SYS_CCSRBAR_PHYS_LOW	CONFIG_SYS_CCSRBAR_DEFAULT
 #endif
 
 #define CONFIG_SYS_CCSRBAR_PHYS ((CONFIG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
 				 CONFIG_SYS_CCSRBAR_PHYS_LOW)
 
 #ifndef CONFIG_SYS_IMMR
-#define CONFIG_SYS_IMMR 		CONFIG_SYS_CCSRBAR
+#define CONFIG_SYS_IMMR			CONFIG_SYS_CCSRBAR
 #endif
 
 #endif	/* __MPC85xx_H__ */
diff --git a/include/mtd/mtd-abi.h b/include/mtd/mtd-abi.h
index 8d9761050f0..ea244fbaeb0 100644
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -106,7 +106,7 @@ struct mtd_write_req {
 #define MTD_NANDECC_PLACE	1	// Use the given placement in the structure (YAFFS1 legacy mode)
 #define MTD_NANDECC_AUTOPLACE	2	// Use the default placement scheme
 #define MTD_NANDECC_PLACEONLY	3	// Use the given placement in the structure (Do not store ecc result on read)
-#define MTD_NANDECC_AUTOPL_USR 	4	// Use the given autoplacement scheme rather than using the default
+#define MTD_NANDECC_AUTOPL_USR	4	// Use the given autoplacement scheme rather than using the default
 
 /* OTP mode selection */
 #define MTD_OTP_OFF		0
diff --git a/include/mvmfp.h b/include/mvmfp.h
index 16f26841e20..de86ffd5e2d 100644
--- a/include/mvmfp.h
+++ b/include/mvmfp.h
@@ -45,7 +45,7 @@
 /*
  * to facilitate the definition, the following macros are provided
  *
- * 				    offset, pull,pF, drv,dF, edge,eF ,afn,aF
+ *				    offset, pull,pF, drv,dF, edge,eF ,afn,aF
  */
 #define MFP_OFFSET_MASK		MFP(0xffff,    0,    0,   0,   0,   0,   0)
 #define MFP_REG(x)		MFP(x,         0,    0,   0,   0,   0,   0)
diff --git a/include/part.h b/include/part.h
index 419c8597088..b66b07a1f04 100644
--- a/include/part.h
+++ b/include/part.h
@@ -75,7 +75,7 @@ struct disk_partition {
 	char	type_guid[UUID_STR_LEN + 1];	/* type GUID as string, if exists	*/
 #endif
 #ifdef CONFIG_DOS_PARTITION
-	uchar	sys_ind;	/* partition type 			*/
+	uchar	sys_ind;	/* partition type			*/
 #endif
 };
 
diff --git a/include/phy.h b/include/phy.h
index b9d8dc3a61e..c66fd43ea88 100644
--- a/include/phy.h
+++ b/include/phy.h
@@ -575,8 +575,8 @@ static inline bool phy_interface_is_sgmii(struct phy_device *phydev)
 }
 
 /* PHY UIDs for various PHYs that are referenced in external code */
-#define PHY_UID_CS4340  	0x13e51002
-#define PHY_UID_CS4223  	0x03e57003
+#define PHY_UID_CS4340		0x13e51002
+#define PHY_UID_CS4223		0x03e57003
 #define PHY_UID_TN2020		0x00a19410
 #define PHY_UID_IN112525_S03	0x02107440
 
diff --git a/include/tsec.h b/include/tsec.h
index 5433cfd9661..c301c28d3d5 100644
--- a/include/tsec.h
+++ b/include/tsec.h
@@ -25,7 +25,7 @@
 #define TSEC_SIZE		0x40000
 #define TSEC_MDIO_OFFSET	0x40000
 #else
-#define TSEC_SIZE 		0x01000
+#define TSEC_SIZE		0x01000
 #define TSEC_MDIO_OFFSET	0x01000
 #endif
 
diff --git a/include/video_font_4x6.h b/include/video_font_4x6.h
index 64c5ed2eda4..c7e6351b64c 100644
--- a/include/video_font_4x6.h
+++ b/include/video_font_4x6.h
@@ -49,7 +49,7 @@ __END__;
 static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 
 	/*{*/
-	  	/*   Char 0: ' '  */
+		/*   Char 0: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -58,7 +58,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 1: ' '  */
+		/*   Char 1: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -67,7 +67,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 2: ' '  */
+		/*   Char 2: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -76,7 +76,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 3: ' '  */
+		/*   Char 3: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -85,7 +85,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 4: ' '  */
+		/*   Char 4: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -94,7 +94,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 5: ' '  */
+		/*   Char 5: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -103,7 +103,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 6: ' '  */
+		/*   Char 6: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -112,7 +112,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 7: ' '  */
+		/*   Char 7: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -121,7 +121,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 8: ' '  */
+		/*   Char 8: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -130,7 +130,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 9: ' '  */
+		/*   Char 9: ' '  */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -139,7 +139,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 10: '' */
+		/*   Char 10: '' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -148,7 +148,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 11: ' ' */
+		/*   Char 11: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -157,7 +157,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 12: ' ' */
+		/*   Char 12: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -166,7 +166,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 13: ' ' */
+		/*   Char 13: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -175,7 +175,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 14: ' ' */
+		/*   Char 14: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -184,7 +184,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 15: ' ' */
+		/*   Char 15: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -193,7 +193,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 16: ' ' */
+		/*   Char 16: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -202,7 +202,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 17: ' ' */
+		/*   Char 17: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -211,7 +211,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 18: ' ' */
+		/*   Char 18: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -220,7 +220,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 19: ' ' */
+		/*   Char 19: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -229,7 +229,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 20: ' ' */
+		/*   Char 20: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -238,7 +238,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 21: ' ' */
+		/*   Char 21: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -247,7 +247,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 22: ' ' */
+		/*   Char 22: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -256,7 +256,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 23: ' ' */
+		/*   Char 23: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -265,7 +265,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 24: ' ' */
+		/*   Char 24: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -274,7 +274,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 25: ' ' */
+		/*   Char 25: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -283,7 +283,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 26: ' ' */
+		/*   Char 26: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -292,7 +292,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 27: ' ' */
+		/*   Char 27: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -301,7 +301,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 28: ' ' */
+		/*   Char 28: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -310,7 +310,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 29: ' ' */
+		/*   Char 29: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -319,7 +319,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 30: ' ' */
+		/*   Char 30: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -328,7 +328,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 31: ' ' */
+		/*   Char 31: ' ' */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -337,7 +337,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 32: ' ' */
+		/*   Char 32: ' ' */
 	0x00,	/*=  [    ]       */
 	0x00,	/*=  [    ]       */
 	0x00,	/*=  [    ]       */
@@ -346,7 +346,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 33: '!' */
+		/*   Char 33: '!' */
 	0x44,	/*=  [ *  ]       */
 	0x44,	/*=  [ *  ]       */
 	0x44,	/*=  [ *  ]       */
@@ -355,7 +355,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 34: '"' */
+		/*   Char 34: '"' */
 	0xaa,	/*=  [* * ]       */
 	0xaa,	/*=  [* * ]       */
 	0x00,	/*=  [    ]       */
@@ -364,7 +364,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 35: '#' */
+		/*   Char 35: '#' */
 	0xaa,	/*=  [* * ]       */
 	0xff,	/*=  [****]       */
 	0xff,	/*=  [****]       */
@@ -373,7 +373,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 36: '$' */
+		/*   Char 36: '$' */
 	0x44,	/*=  [ *  ]       */
 	0x66,	/*=  [ ** ]       */
 	0xee,	/*=  [*** ]       */
@@ -382,7 +382,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 37: '%' */
+		/*   Char 37: '%' */
 	0xaa,	/*=  [* * ]       */
 	0x22,	/*=  [  * ]       */
 	0x44,	/*=  [ *  ]       */
@@ -391,7 +391,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 38: '&' */
+		/*   Char 38: '&' */
 	0x66,	/*=  [ ** ]       */
 	0x99,	/*=  [*  *]       */
 	0x66,	/*=  [ ** ]       */
@@ -400,7 +400,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 39: ''' */
+		/*   Char 39: ''' */
 	0x22,	/*=  [  * ]       */
 	0x44,	/*=  [ *  ]       */
 	0x00,	/*=  [    ]       */
@@ -409,7 +409,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 40: '(' */
+		/*   Char 40: '(' */
 	0x22,	/*=  [  * ]       */
 	0x44,	/*=  [ *  ]       */
 	0x44,	/*=  [ *  ]       */
@@ -418,7 +418,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 41: ')' */
+		/*   Char 41: ')' */
 	0x44,	/*=  [ *  ]       */
 	0x22,	/*=  [  * ]       */
 	0x22,	/*=  [  * ]       */
@@ -427,7 +427,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 42: '*' */
+		/*   Char 42: '*' */
 	0x00,	/*=  [    ]       */
 	0xee,	/*=  [*** ]       */
 	0xee,	/*=  [*** ]       */
@@ -436,7 +436,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 43: '+' */
+		/*   Char 43: '+' */
 	0x00,	/*=  [    ]       */
 	0x44,	/*=  [ *  ]       */
 	0xee,	/*=  [*** ]       */
@@ -445,7 +445,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 44: ',' */
+		/*   Char 44: ',' */
 	0x00,	/*=  [    ]       */
 	0x00,	/*=  [    ]       */
 	0x00,	/*=  [    ]       */
@@ -454,7 +454,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 45: '-' */
+		/*   Char 45: '-' */
 	0x00,	/*=  [    ]       */
 	0x00,	/*=  [    ]       */
 	0xee,	/*=  [*** ]       */
@@ -463,7 +463,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 46: '.' */
+		/*   Char 46: '.' */
 	0x00,	/*=  [    ]       */
 	0x00,	/*=  [    ]       */
 	0x00,	/*=  [    ]       */
@@ -472,7 +472,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 47: '/' */
+		/*   Char 47: '/' */
 	0x00,	/*=  [    ]       */
 	0x22,	/*=  [  * ]       */
 	0x44,	/*=  [ *  ]       */
@@ -481,7 +481,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=  [    ]       */
 	/*}*/
 	/*{*/
-	  	/*   Char 48: '0'   */
+		/*   Char 48: '0'   */
 	0x44,	/*=   [ *  ]        */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
@@ -490,7 +490,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	/*}*/
 	/*{*/
-	  	/*   Char 49: '1'   */
+		/*   Char 49: '1'   */
 	0x44,	/*=   [ *  ]        */
 	0xcc,	/*=   [**  ]        */
 	0x44,	/*=   [ *  ]        */
@@ -499,7 +499,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	/*}*/
 	/*{*/
-	  	/*   Char 50: '2'   */
+		/*   Char 50: '2'   */
 	0xcc,	/*=   [**  ]        */
 	0x22,	/*=   [  * ]        */
 	0x44,	/*=   [ *  ]        */
@@ -508,7 +508,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	/*}*/
 	/*{*/
-	  	/*   Char 51: '3'   */
+		/*   Char 51: '3'   */
 	0xee,	/*=   [*** ]        */
 	0x22,	/*=   [  * ]        */
 	0x66,	/*=   [ ** ]        */
@@ -516,7 +516,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 52: '4'   */
+	/*{*/	/*   Char 52: '4'   */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
 	0xee,	/*=   [*** ]        */
@@ -524,7 +524,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x22,	/*=   [  * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 53: '5'   */
+	/*{*/	/*   Char 53: '5'   */
 	0xee,	/*=   [*** ]        */
 	0x88,	/*=   [*   ]        */
 	0xee,	/*=   [*** ]        */
@@ -532,7 +532,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 54: '6'   */
+	/*{*/	/*   Char 54: '6'   */
 	0xee,	/*=   [*** ]        */
 	0x88,	/*=   [*   ]        */
 	0xee,	/*=   [*** ]        */
@@ -540,7 +540,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 55: '7'   */
+	/*{*/	/*   Char 55: '7'   */
 	0xee,	/*=   [*** ]        */
 	0x22,	/*=   [  * ]        */
 	0x22,	/*=   [  * ]        */
@@ -548,7 +548,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x22,	/*=   [  * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 56: '8'   */
+	/*{*/	/*   Char 56: '8'   */
 	0xee,	/*=   [*** ]        */
 	0xaa,	/*=   [* * ]        */
 	0xee,	/*=   [*** ]        */
@@ -556,7 +556,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 57: '9'   */
+	/*{*/	/*   Char 57: '9'   */
 	0xee,	/*=   [*** ]        */
 	0xaa,	/*=   [* * ]        */
 	0xee,	/*=   [*** ]        */
@@ -564,7 +564,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x22,	/*=   [  * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 58: ':'   */
+	/*{*/	/*   Char 58: ':'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x44,	/*=   [ *  ]        */
@@ -572,7 +572,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 59: ';'   */
+	/*{*/	/*   Char 59: ';'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x44,	/*=   [ *  ]        */
@@ -580,7 +580,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x88,	/*=   [*   ]        */
 	/*}*/
-	/*{*/ 	/*   Char 60: '<'   */
+	/*{*/	/*   Char 60: '<'   */
 	0x22,	/*=   [  * ]        */
 	0x44,	/*=   [ *  ]        */
 	0x88,	/*=   [*   ]        */
@@ -588,7 +588,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x22,	/*=   [  * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 61: '='   */
+	/*{*/	/*   Char 61: '='   */
 	0x00,	/*=   [    ]        */
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
@@ -596,7 +596,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 62: '>'   */
+	/*{*/	/*   Char 62: '>'   */
 	0x88,	/*=   [*   ]        */
 	0x44,	/*=   [ *  ]        */
 	0x22,	/*=   [  * ]        */
@@ -604,7 +604,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x88,	/*=   [*   ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 63: '?'   */
+	/*{*/	/*   Char 63: '?'   */
 	0xee,	/*=   [*** ]        */
 	0x22,	/*=   [  * ]        */
 	0x66,	/*=   [ ** ]        */
@@ -612,7 +612,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 64: '@'   */
+	/*{*/	/*   Char 64: '@'   */
 	0x44,	/*=   [ *  ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -620,7 +620,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 65: 'A'   */
+	/*{*/	/*   Char 65: 'A'   */
 	0x44,	/*=   [ *  ]        */
 	0xaa,	/*=   [* * ]        */
 	0xee,	/*=   [*** ]        */
@@ -628,7 +628,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 66: 'B'   */
+	/*{*/	/*   Char 66: 'B'   */
 	0xcc,	/*=   [**  ]        */
 	0xaa,	/*=   [* * ]        */
 	0xcc,	/*=   [**  ]        */
@@ -636,7 +636,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xcc,	/*=   [**  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 67: 'C'   */
+	/*{*/	/*   Char 67: 'C'   */
 	0x66,	/*=   [ ** ]        */
 	0x88,	/*=   [*   ]        */
 	0x88,	/*=   [*   ]        */
@@ -644,7 +644,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 68: 'D'   */
+	/*{*/	/*   Char 68: 'D'   */
 	0xcc,	/*=   [**  ]        */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
@@ -652,7 +652,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xcc,	/*=   [**  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 69: 'E'   */
+	/*{*/	/*   Char 69: 'E'   */
 	0xee,	/*=   [*** ]        */
 	0x88,	/*=   [*   ]        */
 	0xee,	/*=   [*** ]        */
@@ -660,7 +660,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 70: 'F'   */
+	/*{*/	/*   Char 70: 'F'   */
 	0xee,	/*=   [*** ]        */
 	0x88,	/*=   [*   ]        */
 	0xee,	/*=   [*** ]        */
@@ -668,7 +668,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x88,	/*=   [*   ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 71: 'G'   */
+	/*{*/	/*   Char 71: 'G'   */
 	0x66,	/*=   [ ** ]        */
 	0x88,	/*=   [*   ]        */
 	0xee,	/*=   [*** ]        */
@@ -676,7 +676,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 72: 'H'   */
+	/*{*/	/*   Char 72: 'H'   */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
 	0xee,	/*=   [*** ]        */
@@ -684,7 +684,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 73: 'I'   */
+	/*{*/	/*   Char 73: 'I'   */
 	0xee,	/*=   [*** ]        */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
@@ -692,7 +692,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 74: 'J'   */
+	/*{*/	/*   Char 74: 'J'   */
 	0x22,	/*=   [  * ]        */
 	0x22,	/*=   [  * ]        */
 	0x22,	/*=   [  * ]        */
@@ -700,7 +700,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 75: 'K'   */
+	/*{*/	/*   Char 75: 'K'   */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
 	0xcc,	/*=   [**  ]        */
@@ -708,7 +708,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 76: 'L'   */
+	/*{*/	/*   Char 76: 'L'   */
 	0x88,	/*=   [*   ]        */
 	0x88,	/*=   [*   ]        */
 	0x88,	/*=   [*   ]        */
@@ -716,7 +716,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 77: 'M'   */
+	/*{*/	/*   Char 77: 'M'   */
 	0xaa,	/*=   [* * ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -724,7 +724,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 78: 'N'   */
+	/*{*/	/*   Char 78: 'N'   */
 	0xaa,	/*=   [* * ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -732,7 +732,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 79: 'O'   */
+	/*{*/	/*   Char 79: 'O'   */
 	0x44,	/*=   [ *  ]        */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
@@ -740,7 +740,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 80: 'P'   */
+	/*{*/	/*   Char 80: 'P'   */
 	0xcc,	/*=   [**  ]        */
 	0xaa,	/*=   [* * ]        */
 	0xcc,	/*=   [**  ]        */
@@ -748,7 +748,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x88,	/*=   [*   ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 81: 'Q'   */
+	/*{*/	/*   Char 81: 'Q'   */
 	0x44,	/*=   [ *  ]        */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
@@ -756,7 +756,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 82: 'R'   */
+	/*{*/	/*   Char 82: 'R'   */
 	0xcc,	/*=   [**  ]        */
 	0xaa,	/*=   [* * ]        */
 	0xee,	/*=   [*** ]        */
@@ -764,7 +764,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 83: 'S'   */
+	/*{*/	/*   Char 83: 'S'   */
 	0x66,	/*=   [ ** ]        */
 	0x88,	/*=   [*   ]        */
 	0x44,	/*=   [ *  ]        */
@@ -772,7 +772,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xcc,	/*=   [**  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 84: 'T'   */
+	/*{*/	/*   Char 84: 'T'   */
 	0xee,	/*=   [*** ]        */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
@@ -780,7 +780,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 85: 'U'   */
+	/*{*/	/*   Char 85: 'U'   */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
@@ -788,7 +788,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 86: 'V'   */
+	/*{*/	/*   Char 86: 'V'   */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
@@ -796,7 +796,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 87: 'W'   */
+	/*{*/	/*   Char 87: 'W'   */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
 	0xee,	/*=   [*** ]        */
@@ -804,7 +804,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 88: 'X'   */
+	/*{*/	/*   Char 88: 'X'   */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
 	0x44,	/*=   [ *  ]        */
@@ -812,7 +812,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 89: 'Y'   */
+	/*{*/	/*   Char 89: 'Y'   */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
 	0x44,	/*=   [ *  ]        */
@@ -820,7 +820,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 90: 'Z'   */
+	/*{*/	/*   Char 90: 'Z'   */
 	0xee,	/*=   [*** ]        */
 	0x22,	/*=   [  * ]        */
 	0x44,	/*=   [ *  ]        */
@@ -828,7 +828,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 91: '['   */
+	/*{*/	/*   Char 91: '['   */
 	0x66,	/*=   [ ** ]        */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
@@ -836,7 +836,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 92: '\'   */
+	/*{*/	/*   Char 92: '\'   */
 	0x00,	/*=   [    ]        */
 	0x88,	/*=   [*   ]        */
 	0x44,	/*=   [ *  ]        */
@@ -844,7 +844,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 93: ']'   */
+	/*{*/	/*   Char 93: ']'   */
 	0x66,	/*=   [ ** ]        */
 	0x22,	/*=   [  * ]        */
 	0x22,	/*=   [  * ]        */
@@ -852,7 +852,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 94: '^'   */
+	/*{*/	/*   Char 94: '^'   */
 	0x44,	/*=   [ *  ]        */
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
@@ -860,7 +860,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 95: '_'   */
+	/*{*/	/*   Char 95: '_'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
@@ -868,7 +868,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0xff,	/*=   [****]        */
 	/*}*/
-	/*{*/ 	/*   Char 96: '`'   */
+	/*{*/	/*   Char 96: '`'   */
 	0x88,	/*=   [*   ]        */
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
@@ -876,7 +876,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 97: 'a'   */
+	/*{*/	/*   Char 97: 'a'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x66,	/*=   [ ** ]        */
@@ -884,7 +884,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 98: 'b'   */
+	/*{*/	/*   Char 98: 'b'   */
 	0x88,	/*=   [*   ]        */
 	0x88,	/*=   [*   ]        */
 	0xcc,	/*=   [**  ]        */
@@ -892,7 +892,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xcc,	/*=   [**  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 99: 'c'   */
+	/*{*/	/*   Char 99: 'c'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x66,	/*=   [ ** ]        */
@@ -900,7 +900,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 100: 'd'   */
+	/*{*/	/*   Char 100: 'd'   */
 	0x22,	/*=   [  * ]        */
 	0x22,	/*=   [  * ]        */
 	0x66,	/*=   [ ** ]        */
@@ -908,7 +908,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 101: 'e'   */
+	/*{*/	/*   Char 101: 'e'   */
 	0x00,	/*=   [    ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -916,7 +916,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 102: 'f'   */
+	/*{*/	/*   Char 102: 'f'   */
 	0x22,	/*=   [  * ]        */
 	0x44,	/*=   [ *  ]        */
 	0xee,	/*=   [*** ]        */
@@ -924,7 +924,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 103: 'g'   */
+	/*{*/	/*   Char 103: 'g'   */
 	0x00,	/*=   [    ]        */
 	0x66,	/*=   [ ** ]        */
 	0xaa,	/*=   [* * ]        */
@@ -932,7 +932,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 104: 'h'   */
+	/*{*/	/*   Char 104: 'h'   */
 	0x88,	/*=   [*   ]        */
 	0x88,	/*=   [*   ]        */
 	0xcc,	/*=   [**  ]        */
@@ -940,7 +940,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 105: 'i'   */
+	/*{*/	/*   Char 105: 'i'   */
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	0x44,	/*=   [ *  ]        */
@@ -948,7 +948,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 106: 'j'   */
+	/*{*/	/*   Char 106: 'j'   */
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	0x44,	/*=   [ *  ]        */
@@ -956,7 +956,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x88,	/*=   [*   ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 107: 'k'   */
+	/*{*/	/*   Char 107: 'k'   */
 	0x00,	/*=   [    ]        */
 	0x88,	/*=   [*   ]        */
 	0xaa,	/*=   [* * ]        */
@@ -964,7 +964,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 108: 'l'   */
+	/*{*/	/*   Char 108: 'l'   */
 	0x00,	/*=   [    ]        */
 	0xcc,	/*=   [**  ]        */
 	0x44,	/*=   [ *  ]        */
@@ -972,7 +972,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 109: 'm'   */
+	/*{*/	/*   Char 109: 'm'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xee,	/*=   [*** ]        */
@@ -980,7 +980,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 110: 'n'   */
+	/*{*/	/*   Char 110: 'n'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xcc,	/*=   [**  ]        */
@@ -988,7 +988,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 111: 'o'   */
+	/*{*/	/*   Char 111: 'o'   */
 	0x00,	/*=   [    ]        */
 	0x44,	/*=   [ *  ]        */
 	0xaa,	/*=   [* * ]        */
@@ -996,7 +996,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 112: 'p'   */
+	/*{*/	/*   Char 112: 'p'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1004,7 +1004,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xcc,	/*=   [**  ]        */
 	0x88,	/*=   [*   ]        */
 	/*}*/
-	/*{*/ 	/*   Char 113: 'q'   */
+	/*{*/	/*   Char 113: 'q'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x66,	/*=   [ ** ]        */
@@ -1012,7 +1012,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x22,	/*=   [  * ]        */
 	/*}*/
-	/*{*/ 	/*   Char 114: 'r'   */
+	/*{*/	/*   Char 114: 'r'   */
 	0x00,	/*=   [    ]        */
 	0xcc,	/*=   [**  ]        */
 	0xaa,	/*=   [* * ]        */
@@ -1020,7 +1020,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x88,	/*=   [*   ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 115: 's'   */
+	/*{*/	/*   Char 115: 's'   */
 	0x00,	/*=   [    ]        */
 	0x66,	/*=   [ ** ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1028,7 +1028,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xcc,	/*=   [**  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 116: 't'   */
+	/*{*/	/*   Char 116: 't'   */
 	0x00,	/*=   [    ]        */
 	0x44,	/*=   [ *  ]        */
 	0xee,	/*=   [*** ]        */
@@ -1036,7 +1036,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 117: 'u'   */
+	/*{*/	/*   Char 117: 'u'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xaa,	/*=   [* * ]        */
@@ -1044,7 +1044,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 118: 'v'   */
+	/*{*/	/*   Char 118: 'v'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xaa,	/*=   [* * ]        */
@@ -1052,7 +1052,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 119: 'w'   */
+	/*{*/	/*   Char 119: 'w'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xaa,	/*=   [* * ]        */
@@ -1060,7 +1060,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 120: 'x'   */
+	/*{*/	/*   Char 120: 'x'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xaa,	/*=   [* * ]        */
@@ -1068,7 +1068,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 121: 'y'   */
+	/*{*/	/*   Char 121: 'y'   */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xaa,	/*=   [* * ]        */
@@ -1076,7 +1076,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x22,	/*=   [  * ]        */
 	0xcc,	/*=   [**  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 122: 'z' */
+	/*{*/	/*   Char 122: 'z' */
 	0x00,	/*=   [    ]        */
 	0xee,	/*=   [*** ]        */
 	0x66,	/*=   [ ** ]        */
@@ -1084,7 +1084,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 123: '{' */
+	/*{*/	/*   Char 123: '{' */
 	0x22,	/*=   [  * ]        */
 	0x44,	/*=   [ *  ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1092,7 +1092,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x22,	/*=   [  * ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 124: '|' */
+	/*{*/	/*   Char 124: '|' */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
@@ -1100,7 +1100,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 125: '}' */
+	/*{*/	/*   Char 125: '}' */
 	0x88,	/*=   [*   ]        */
 	0x44,	/*=   [ *  ]        */
 	0x66,	/*=   [ ** ]        */
@@ -1108,7 +1108,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x88,	/*=   [*   ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 126: '~' */
+	/*{*/	/*   Char 126: '~' */
 	0x55,	/*=   [ * *]        */
 	0xaa,	/*=   [* * ]        */
 	0x00,	/*=   [    ]        */
@@ -1116,7 +1116,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 127: '' */
+	/*{*/	/*   Char 127: '' */
 	0x44,	/*=   [ *  ]        */
 	0xaa,	/*=   [* * ]        */
 	0xaa,	/*=   [* * ]        */
@@ -1124,7 +1124,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 128:  */
+	/*{*/	/*   Char 128:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1132,7 +1132,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 129:  */
+	/*{*/	/*   Char 129:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1140,7 +1140,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 130:  */
+	/*{*/	/*   Char 130:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1148,7 +1148,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 131:  */
+	/*{*/	/*   Char 131:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1156,7 +1156,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 132:  */
+	/*{*/	/*   Char 132:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1164,7 +1164,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 133:  */
+	/*{*/	/*   Char 133:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1172,7 +1172,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 134:  */
+	/*{*/	/*   Char 134:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1180,7 +1180,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 135:  */
+	/*{*/	/*   Char 135:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1188,7 +1188,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 136:  */
+	/*{*/	/*   Char 136:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1196,7 +1196,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 137:  */
+	/*{*/	/*   Char 137:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1204,7 +1204,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 138:  */
+	/*{*/	/*   Char 138:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1212,7 +1212,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 139:  */
+	/*{*/	/*   Char 139:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1220,7 +1220,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 140:  */
+	/*{*/	/*   Char 140:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1228,7 +1228,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 141:  */
+	/*{*/	/*   Char 141:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1236,7 +1236,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 142:  */
+	/*{*/	/*   Char 142:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1244,7 +1244,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 143:  */
+	/*{*/	/*   Char 143:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1252,7 +1252,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 144:  */
+	/*{*/	/*   Char 144:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1260,7 +1260,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 145:  */
+	/*{*/	/*   Char 145:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1268,7 +1268,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 146:  */
+	/*{*/	/*   Char 146:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1276,7 +1276,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 147:  */
+	/*{*/	/*   Char 147:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1284,7 +1284,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 148:  */
+	/*{*/	/*   Char 148:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1292,7 +1292,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 149:  */
+	/*{*/	/*   Char 149:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1300,7 +1300,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 150:  */
+	/*{*/	/*   Char 150:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1308,7 +1308,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 151:  */
+	/*{*/	/*   Char 151:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1316,7 +1316,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 152:  */
+	/*{*/	/*   Char 152:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1324,7 +1324,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 153:  */
+	/*{*/	/*   Char 153:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1332,7 +1332,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 154:  */
+	/*{*/	/*   Char 154:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1340,7 +1340,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 155:  */
+	/*{*/	/*   Char 155:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1348,7 +1348,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 156:  */
+	/*{*/	/*   Char 156:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1356,7 +1356,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 157:  */
+	/*{*/	/*   Char 157:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1364,7 +1364,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 158:  */
+	/*{*/	/*   Char 158:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1372,7 +1372,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 159:  */
+	/*{*/	/*   Char 159:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1380,7 +1380,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 160:  */
+	/*{*/	/*   Char 160:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1388,7 +1388,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 161:  */
+	/*{*/	/*   Char 161:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1396,7 +1396,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 162:  */
+	/*{*/	/*   Char 162:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1404,7 +1404,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 163:  */
+	/*{*/	/*   Char 163:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1412,7 +1412,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 164:  */
+	/*{*/	/*   Char 164:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1420,7 +1420,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 165:  */
+	/*{*/	/*   Char 165:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1428,7 +1428,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 166:  */
+	/*{*/	/*   Char 166:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1436,7 +1436,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 167:  */
+	/*{*/	/*   Char 167:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1444,7 +1444,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 168:  */
+	/*{*/	/*   Char 168:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1452,7 +1452,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 169:  */
+	/*{*/	/*   Char 169:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1460,7 +1460,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 170:  */
+	/*{*/	/*   Char 170:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1468,7 +1468,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 171:  */
+	/*{*/	/*   Char 171:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1476,7 +1476,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 172:  */
+	/*{*/	/*   Char 172:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1484,7 +1484,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 173:  */
+	/*{*/	/*   Char 173:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1492,7 +1492,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 174:  */
+	/*{*/	/*   Char 174:  */
 	0x00,	/*=   [    ]        */
 	0x66,	/*=   [ ** ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1500,7 +1500,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 175:  */
+	/*{*/	/*   Char 175:  */
 	0x00,	/*=   [    ]        */
 	0xcc,	/*=   [**  ]        */
 	0x66,	/*=   [ ** ]        */
@@ -1508,7 +1508,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 176:  */
+	/*{*/	/*   Char 176:  */
 	0x88,	/*=   [*   ]        */
 	0x22,	/*=   [  * ]        */
 	0x88,	/*=   [*   ]        */
@@ -1516,7 +1516,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x88,	/*=   [*   ]        */
 	0x22,	/*=   [  * ]        */
 	/*}*/
-	/*{*/ 	/*   Char 177:  */
+	/*{*/	/*   Char 177:  */
 	0xaa,	/*=   [* * ]        */
 	0x55,	/*=   [ * *]        */
 	0xaa,	/*=   [* * ]        */
@@ -1524,7 +1524,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xaa,	/*=   [* * ]        */
 	0x55,	/*=   [ * *]        */
 	/*}*/
-	/*{*/ 	/*   Char 178:  */
+	/*{*/	/*   Char 178:  */
 	0xdd,	/*=   [** *]        */
 	0xbb,	/*=   [* **]        */
 	0xdd,	/*=   [** *]        */
@@ -1532,7 +1532,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xdd,	/*=   [** *]        */
 	0xbb,	/*=   [* **]        */
 	/*}*/
-	/*{*/ 	/*   Char 179:  */
+	/*{*/	/*   Char 179:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
@@ -1540,7 +1540,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 180:  */
+	/*{*/	/*   Char 180:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1548,7 +1548,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 181:  */
+	/*{*/	/*   Char 181:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1556,7 +1556,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 182:  */
+	/*{*/	/*   Char 182:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1564,7 +1564,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 183:  */
+	/*{*/	/*   Char 183:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xee,	/*=   [*** ]        */
@@ -1572,7 +1572,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 184:  */
+	/*{*/	/*   Char 184:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1580,7 +1580,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 185:  */
+	/*{*/	/*   Char 185:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1588,7 +1588,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 186:  */
+	/*{*/	/*   Char 186:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
@@ -1596,7 +1596,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 187:  */
+	/*{*/	/*   Char 187:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xee,	/*=   [*** ]        */
@@ -1604,7 +1604,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 188:  */
+	/*{*/	/*   Char 188:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1612,7 +1612,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 189:  */
+	/*{*/	/*   Char 189:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1620,7 +1620,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 190:  */
+	/*{*/	/*   Char 190:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1628,7 +1628,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 191:  */
+	/*{*/	/*   Char 191:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1636,7 +1636,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 192:  */
+	/*{*/	/*   Char 192:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0x77,	/*=   [ ***]        */
@@ -1644,7 +1644,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 193:  */
+	/*{*/	/*   Char 193:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0xff,	/*=   [****]        */
@@ -1652,7 +1652,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 194:  */
+	/*{*/	/*   Char 194:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xff,	/*=   [****]        */
@@ -1660,7 +1660,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 195:  */
+	/*{*/	/*   Char 195:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0x77,	/*=   [ ***]        */
@@ -1668,7 +1668,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 196:  */
+	/*{*/	/*   Char 196:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xff,	/*=   [****]        */
@@ -1676,7 +1676,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 197:  */
+	/*{*/	/*   Char 197:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0xff,	/*=   [****]        */
@@ -1684,7 +1684,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 198:  */
+	/*{*/	/*   Char 198:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0x77,	/*=   [ ***]        */
@@ -1692,7 +1692,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 199:  */
+	/*{*/	/*   Char 199:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0x77,	/*=   [ ***]        */
@@ -1700,7 +1700,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 200:  */
+	/*{*/	/*   Char 200:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0x77,	/*=   [ ***]        */
@@ -1708,7 +1708,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 201:  */
+	/*{*/	/*   Char 201:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x77,	/*=   [ ***]        */
@@ -1716,7 +1716,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 202:  */
+	/*{*/	/*   Char 202:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0xff,	/*=   [****]        */
@@ -1724,7 +1724,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 203:  */
+	/*{*/	/*   Char 203:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xff,	/*=   [****]        */
@@ -1732,7 +1732,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 204:  */
+	/*{*/	/*   Char 204:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0x77,	/*=   [ ***]        */
@@ -1740,7 +1740,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 205:  */
+	/*{*/	/*   Char 205:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xff,	/*=   [****]        */
@@ -1748,7 +1748,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 206:  */
+	/*{*/	/*   Char 206:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0xff,	/*=   [****]        */
@@ -1756,7 +1756,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 207:  */
+	/*{*/	/*   Char 207:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0xff,	/*=   [****]        */
@@ -1764,7 +1764,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 208:  */
+	/*{*/	/*   Char 208:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0xff,	/*=   [****]        */
@@ -1772,7 +1772,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 209:  */
+	/*{*/	/*   Char 209:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xff,	/*=   [****]        */
@@ -1780,7 +1780,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 210:  */
+	/*{*/	/*   Char 210:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0xff,	/*=   [****]        */
@@ -1788,7 +1788,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 211:  */
+	/*{*/	/*   Char 211:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0x77,	/*=   [ ***]        */
@@ -1796,7 +1796,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 212:  */
+	/*{*/	/*   Char 212:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0x77,	/*=   [ ***]        */
@@ -1804,7 +1804,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 213:  */
+	/*{*/	/*   Char 213:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x77,	/*=   [ ***]        */
@@ -1812,7 +1812,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 214:  */
+	/*{*/	/*   Char 214:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x77,	/*=   [ ***]        */
@@ -1820,7 +1820,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 215:  */
+	/*{*/	/*   Char 215:  */
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	0xff,	/*=   [****]        */
@@ -1828,7 +1828,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x66,	/*=   [ ** ]        */
 	0x66,	/*=   [ ** ]        */
 	/*}*/
-	/*{*/ 	/*   Char 216:  */
+	/*{*/	/*   Char 216:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0xff,	/*=   [****]        */
@@ -1836,7 +1836,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 217:  */
+	/*{*/	/*   Char 217:  */
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1844,7 +1844,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 218:  */
+	/*{*/	/*   Char 218:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x77,	/*=   [ ***]        */
@@ -1852,7 +1852,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x44,	/*=   [ *  ]        */
 	0x44,	/*=   [ *  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 219:  */
+	/*{*/	/*   Char 219:  */
 	0xff,	/*=   [****]        */
 	0xff,	/*=   [****]        */
 	0xff,	/*=   [****]        */
@@ -1860,7 +1860,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xff,	/*=   [****]        */
 	0xff,	/*=   [****]        */
 	/*}*/
-	/*{*/ 	/*   Char 220:  */
+	/*{*/	/*   Char 220:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
@@ -1868,7 +1868,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xff,	/*=   [****]        */
 	0xff,	/*=   [****]        */
 	/*}*/
-	/*{*/ 	/*   Char 221:  */
+	/*{*/	/*   Char 221:  */
 	0xcc,	/*=   [**  ]        */
 	0xcc,	/*=   [**  ]        */
 	0xcc,	/*=   [**  ]        */
@@ -1876,7 +1876,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xcc,	/*=   [**  ]        */
 	0xcc,	/*=   [**  ]        */
 	/*}*/
-	/*{*/ 	/*   Char 222:  */
+	/*{*/	/*   Char 222:  */
 	0x33,	/*=   [  **]        */
 	0x33,	/*=   [  **]        */
 	0x33,	/*=   [  **]        */
@@ -1884,7 +1884,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x33,	/*=   [  **]        */
 	0x33,	/*=   [  **]        */
 	/*}*/
-	/*{*/ 	/*   Char 223:  */
+	/*{*/	/*   Char 223:  */
 	0xff,	/*=   [****]        */
 	0xff,	/*=   [****]        */
 	0xff,	/*=   [****]        */
@@ -1892,7 +1892,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 224:  */
+	/*{*/	/*   Char 224:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1900,7 +1900,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 225:  */
+	/*{*/	/*   Char 225:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1908,7 +1908,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 226:  */
+	/*{*/	/*   Char 226:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1916,7 +1916,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 227:  */
+	/*{*/	/*   Char 227:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1924,7 +1924,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 228:  */
+	/*{*/	/*   Char 228:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1932,7 +1932,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 229:  */
+	/*{*/	/*   Char 229:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1940,7 +1940,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 230:  */
+	/*{*/	/*   Char 230:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1948,7 +1948,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 231:  */
+	/*{*/	/*   Char 231:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1956,7 +1956,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 232:  */
+	/*{*/	/*   Char 232:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1964,7 +1964,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 233:  */
+	/*{*/	/*   Char 233:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1972,7 +1972,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 234:  */
+	/*{*/	/*   Char 234:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1980,7 +1980,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 235:  */
+	/*{*/	/*   Char 235:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1988,7 +1988,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 236:  */
+	/*{*/	/*   Char 236:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -1996,7 +1996,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 237:  */
+	/*{*/	/*   Char 237:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2004,7 +2004,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 238:  */
+	/*{*/	/*   Char 238:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2012,7 +2012,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 239:  */
+	/*{*/	/*   Char 239:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2020,7 +2020,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 240:  */
+	/*{*/	/*   Char 240:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2028,7 +2028,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 241:  */
+	/*{*/	/*   Char 241:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2036,7 +2036,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 242:  */
+	/*{*/	/*   Char 242:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2044,7 +2044,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 243:  */
+	/*{*/	/*   Char 243:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2052,7 +2052,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 244:  */
+	/*{*/	/*   Char 244:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2060,7 +2060,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 245:  */
+	/*{*/	/*   Char 245:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2068,7 +2068,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 246:  */
+	/*{*/	/*   Char 246:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2076,7 +2076,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 247:  */
+	/*{*/	/*   Char 247:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2084,7 +2084,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 248:  */
+	/*{*/	/*   Char 248:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2092,7 +2092,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 249:  */
+	/*{*/	/*   Char 249:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2100,7 +2100,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 250:  */
+	/*{*/	/*   Char 250:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2108,7 +2108,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 251:  */
+	/*{*/	/*   Char 251:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2116,7 +2116,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 252:  */
+	/*{*/	/*   Char 252:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2124,7 +2124,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 253:  */
+	/*{*/	/*   Char 253:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
@@ -2132,7 +2132,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0xee,	/*=   [*** ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 254:  */
+	/*{*/	/*   Char 254:  */
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	0x66,	/*=   [ ** ]        */
@@ -2140,7 +2140,7 @@ static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
 	0x00,	/*=   [    ]        */
 	0x00,	/*=   [    ]        */
 	/*}*/
-	/*{*/ 	/*   Char 255:  */
+	/*{*/	/*   Char 255:  */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
 	0xee,	/*=   [*** ]        */
diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile
index 092a8876d60..848f16d3c4d 100644
--- a/scripts/basic/Makefile
+++ b/scripts/basic/Makefile
@@ -7,7 +7,7 @@
 # when kernel configuration changes (which is what happens when
 # .config is included by main Makefile.
 # ---------------------------------------------------------------------------
-# fixdep: 	 Used to generate dependency information during build process
+# fixdep:	 Used to generate dependency information during build process
 
 hostprogs-y	:= fixdep
 always		:= $(hostprogs-y)
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index d52128425ce..12e525ee31f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -50,7 +50,7 @@ build_xconfig: $(obj)/qconf
 
 localyesconfig localmodconfig: $(obj)/conf
 	$(Q)perl $(srctree)/$(src)/streamline_config.pl --$@ $(srctree) $(Kconfig) > .tmp.config
-	$(Q)if [ -f .config ]; then 					\
+	$(Q)if [ -f .config ]; then					\
 			cmp -s .tmp.config .config ||			\
 			(mv -f .config .config.old.1;			\
 			 mv -f .tmp.config .config;			\
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index e1a39e90841..9f79bdfaaa5 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -894,7 +894,7 @@ bool expr_depends_symbol(struct expr *dep, struct symbol *sym)
 	default:
 		;
 	}
- 	return false;
+	return false;
 }
 
 /*
diff --git a/scripts/kconfig/list.h b/scripts/kconfig/list.h
index 45cb237ab7e..06e8d555d8b 100644
--- a/scripts/kconfig/list.h
+++ b/scripts/kconfig/list.h
@@ -48,7 +48,7 @@ struct list_head {
  */
 #define list_for_each_entry(pos, head, member)				\
 	for (pos = list_entry((head)->next, typeof(*pos), member);	\
-	     &pos->member != (head); 	\
+	     &pos->member != (head);	\
 	     pos = list_entry(pos->member.next, typeof(*pos), member))
 
 /**
diff --git a/tools/kwbimage.h b/tools/kwbimage.h
index e063e3e41eb..10e3254a58f 100644
--- a/tools/kwbimage.h
+++ b/tools/kwbimage.h
@@ -23,8 +23,8 @@
 /* NAND ECC Mode */
 #define IBR_HDR_ECC_DEFAULT		0x00
 #define IBR_HDR_ECC_FORCED_HAMMING	0x01
-#define IBR_HDR_ECC_FORCED_RS  		0x02
-#define IBR_HDR_ECC_DISABLED  		0x03
+#define IBR_HDR_ECC_FORCED_RS		0x02
+#define IBR_HDR_ECC_DISABLED		0x03
 
 /* Boot Type - block ID */
 #define IBR_HDR_I2C_ID			0x4D
-- 
cgit v1.3.1