diff --git a/u-boot/arch/arm/cpu/arm1136/start.S b/u-boot/arch/arm/cpu/arm1136/start.S
index 1cfcca9fa6..1ec79a6f35 100644
--- a/u-boot/arch/arm/cpu/arm1136/start.S
+++ b/u-boot/arch/arm/cpu/arm1136/start.S
@@ -14,7 +14,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 
 /*
  *************************************************************************
diff --git a/u-boot/arch/arm/cpu/arm1176/start.S b/u-boot/arch/arm/cpu/arm1176/start.S
index 0704bdde27..141576a42d 100644
--- a/u-boot/arch/arm/cpu/arm1176/start.S
+++ b/u-boot/arch/arm/cpu/arm1176/start.S
@@ -16,7 +16,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 
 #ifndef CONFIG_SYS_PHY_UBOOT_BASE
 #define CONFIG_SYS_PHY_UBOOT_BASE	CONFIG_SYS_UBOOT_BASE
diff --git a/u-boot/arch/arm/cpu/arm720t/start.S b/u-boot/arch/arm/cpu/arm720t/start.S
index 01c85be64b..ec8e88d4b3 100644
--- a/u-boot/arch/arm/cpu/arm720t/start.S
+++ b/u-boot/arch/arm/cpu/arm720t/start.S
@@ -9,7 +9,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 #include <asm/hardware.h>
 
 /*
diff --git a/u-boot/arch/arm/cpu/arm926ejs/mxs/start.S b/u-boot/arch/arm/cpu/arm926ejs/mxs/start.S
index 9b60436539..48abcd5260 100644
--- a/u-boot/arch/arm/cpu/arm926ejs/mxs/start.S
+++ b/u-boot/arch/arm/cpu/arm926ejs/mxs/start.S
@@ -22,7 +22,6 @@
 #include <asm-offsets.h>
 #include <config.h>
 #include <common.h>
-#include <version.h>
 
 /*
  *************************************************************************
diff --git a/u-boot/arch/arm/cpu/arm926ejs/start.S b/u-boot/arch/arm/cpu/arm926ejs/start.S
index 8eb249475e..82cc1c9477 100644
--- a/u-boot/arch/arm/cpu/arm926ejs/start.S
+++ b/u-boot/arch/arm/cpu/arm926ejs/start.S
@@ -18,7 +18,6 @@
 #include <asm-offsets.h>
 #include <config.h>
 #include <common.h>
-#include <version.h>
 
 /*
  *************************************************************************
diff --git a/u-boot/arch/arm/cpu/arm946es/start.S b/u-boot/arch/arm/cpu/arm946es/start.S
index 41123716a7..b55395aa53 100644
--- a/u-boot/arch/arm/cpu/arm946es/start.S
+++ b/u-boot/arch/arm/cpu/arm946es/start.S
@@ -17,7 +17,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 
 /*
  *************************************************************************
diff --git a/u-boot/arch/arm/cpu/armv7/exynos/clock_init_exynos4.c b/u-boot/arch/arm/cpu/armv7/exynos/clock_init_exynos4.c
index 31610909f8..584e4bac09 100644
--- a/u-boot/arch/arm/cpu/armv7/exynos/clock_init_exynos4.c
+++ b/u-boot/arch/arm/cpu/armv7/exynos/clock_init_exynos4.c
@@ -25,7 +25,6 @@
 
 #include <common.h>
 #include <config.h>
-#include <version.h>
 #include <asm/io.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clk.h>
diff --git a/u-boot/arch/arm/cpu/armv7/exynos/exynos4_setup.h b/u-boot/arch/arm/cpu/armv7/exynos/exynos4_setup.h
index b633e56603..9f29d94c10 100644
--- a/u-boot/arch/arm/cpu/armv7/exynos/exynos4_setup.h
+++ b/u-boot/arch/arm/cpu/armv7/exynos/exynos4_setup.h
@@ -10,7 +10,6 @@
 #define _ORIGEN_SETUP_H
 
 #include <config.h>
-#include <version.h>
 #include <asm/arch/cpu.h>
 
 #ifdef CONFIG_CLK_800_330_165
diff --git a/u-boot/arch/arm/cpu/armv7/omap3/lowlevel_init.S b/u-boot/arch/arm/cpu/armv7/omap3/lowlevel_init.S
index 78577b1d1c..9eff95683e 100644
--- a/u-boot/arch/arm/cpu/armv7/omap3/lowlevel_init.S
+++ b/u-boot/arch/arm/cpu/armv7/omap3/lowlevel_init.S
@@ -12,7 +12,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/clocks_omap3.h>
 #include <linux/linkage.h>
diff --git a/u-boot/arch/arm/cpu/armv7/socfpga/lowlevel_init.S b/u-boot/arch/arm/cpu/armv7/socfpga/lowlevel_init.S
index 2f2e9fcc7c..cdc621dd26 100644
--- a/u-boot/arch/arm/cpu/armv7/socfpga/lowlevel_init.S
+++ b/u-boot/arch/arm/cpu/armv7/socfpga/lowlevel_init.S
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 
 /* Save the parameter pass in by previous boot loader */
 .global save_boot_params
diff --git a/u-boot/arch/arm/cpu/armv7/socfpga/spl.c b/u-boot/arch/arm/cpu/armv7/socfpga/spl.c
index bd9f338301..6a8c15d91f 100644
--- a/u-boot/arch/arm/cpu/armv7/socfpga/spl.c
+++ b/u-boot/arch/arm/cpu/armv7/socfpga/spl.c
@@ -8,7 +8,6 @@
 #include <asm/io.h>
 #include <asm/u-boot.h>
 #include <asm/utils.h>
-#include <version.h>
 #include <image.h>
 #include <asm/arch/reset_manager.h>
 #include <spl.h>
diff --git a/u-boot/arch/arm/cpu/armv7/start.S b/u-boot/arch/arm/cpu/armv7/start.S
index 7805c24fb7..60f0102ef0 100644
--- a/u-boot/arch/arm/cpu/armv7/start.S
+++ b/u-boot/arch/arm/cpu/armv7/start.S
@@ -15,7 +15,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 #include <asm/system.h>
 #include <linux/linkage.h>
 
diff --git a/u-boot/arch/arm/cpu/armv8/cache.S b/u-boot/arch/arm/cpu/armv8/cache.S
index 4b3ee6ed6f..2712fa389b 100644
--- a/u-boot/arch/arm/cpu/armv8/cache.S
+++ b/u-boot/arch/arm/cpu/armv8/cache.S
@@ -9,7 +9,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 #include <asm/macro.h>
 #include <linux/linkage.h>
 
diff --git a/u-boot/arch/arm/cpu/armv8/exceptions.S b/u-boot/arch/arm/cpu/armv8/exceptions.S
index 7d72203e2a..f76219a23c 100644
--- a/u-boot/arch/arm/cpu/armv8/exceptions.S
+++ b/u-boot/arch/arm/cpu/armv8/exceptions.S
@@ -7,7 +7,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 #include <asm/ptrace.h>
 #include <asm/macro.h>
 #include <linux/linkage.h>
diff --git a/u-boot/arch/arm/cpu/armv8/start.S b/u-boot/arch/arm/cpu/armv8/start.S
index 556945de0a..0e30d6b1ac 100644
--- a/u-boot/arch/arm/cpu/armv8/start.S
+++ b/u-boot/arch/arm/cpu/armv8/start.S
@@ -7,7 +7,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 #include <linux/linkage.h>
 #include <asm/macro.h>
 #include <asm/armv8/mmu.h>
diff --git a/u-boot/arch/arm/cpu/armv8/tlb.S b/u-boot/arch/arm/cpu/armv8/tlb.S
index f840b04df5..945445bc37 100644
--- a/u-boot/arch/arm/cpu/armv8/tlb.S
+++ b/u-boot/arch/arm/cpu/armv8/tlb.S
@@ -7,7 +7,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 #include <linux/linkage.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/arch/arm/cpu/armv8/transition.S b/u-boot/arch/arm/cpu/armv8/transition.S
index ade1cdead8..253a39bd11 100644
--- a/u-boot/arch/arm/cpu/armv8/transition.S
+++ b/u-boot/arch/arm/cpu/armv8/transition.S
@@ -7,7 +7,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 #include <linux/linkage.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/arch/arm/cpu/pxa/start.S b/u-boot/arch/arm/cpu/pxa/start.S
index c77d51e6d8..879390be2d 100644
--- a/u-boot/arch/arm/cpu/pxa/start.S
+++ b/u-boot/arch/arm/cpu/pxa/start.S
@@ -21,7 +21,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 
 /*
  *************************************************************************
diff --git a/u-boot/arch/arm/cpu/sa1100/start.S b/u-boot/arch/arm/cpu/sa1100/start.S
index 78e0cb8868..eebff661f8 100644
--- a/u-boot/arch/arm/cpu/sa1100/start.S
+++ b/u-boot/arch/arm/cpu/sa1100/start.S
@@ -11,7 +11,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 
 /*
  *************************************************************************
diff --git a/u-boot/arch/arm/cpu/tegra-common/lowlevel_init.S b/u-boot/arch/arm/cpu/tegra-common/lowlevel_init.S
index a211bb3b1a..4bc0a3f5a1 100644
--- a/u-boot/arch/arm/cpu/tegra-common/lowlevel_init.S
+++ b/u-boot/arch/arm/cpu/tegra-common/lowlevel_init.S
@@ -8,7 +8,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <linux/linkage.h>
 
 	.align	5
diff --git a/u-boot/arch/microblaze/cpu/spl.c b/u-boot/arch/microblaze/cpu/spl.c
index 091226133e..8453d37eed 100644
--- a/u-boot/arch/microblaze/cpu/spl.c
+++ b/u-boot/arch/microblaze/cpu/spl.c
@@ -9,7 +9,6 @@
 #include <common.h>
 #include <image.h>
 #include <spl.h>
-#include <version.h>
 #include <asm/io.h>
 #include <asm/u-boot.h>
 
diff --git a/u-boot/arch/nds32/cpu/n1213/start.S b/u-boot/arch/nds32/cpu/n1213/start.S
index 34db79dd5c..0d96c52cd5 100644
--- a/u-boot/arch/nds32/cpu/n1213/start.S
+++ b/u-boot/arch/nds32/cpu/n1213/start.S
@@ -13,7 +13,6 @@
 #include <config.h>
 #include <common.h>
 #include <asm/macro.h>
-#include <version.h>
 
 /*
  * Jump vector table for EVIC mode
diff --git a/u-boot/arch/powerpc/config.mk b/u-boot/arch/powerpc/config.mk
index fec02f2b82..411039649a 100644
--- a/u-boot/arch/powerpc/config.mk
+++ b/u-boot/arch/powerpc/config.mk
@@ -12,10 +12,11 @@ endif
 CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
 LDFLAGS_FINAL += --gc-sections
 LDFLAGS_FINAL += --bss-plt
-PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections \
-								-meabi
-PLATFORM_CPPFLAGS += -D__powerpc__ -ffixed-r2
-PLATFORM_LDFLAGS  += -n
+PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \
+-fdata-sections -mcall-linux
+
+PLATFORM_CPPFLAGS += -D__powerpc__ -ffixed-r2 -m32
+PLATFORM_LDFLAGS  += -m32 -melf32ppclinux
 
 # Support generic board on PPC
 __HAVE_ARCH_GENERIC_BOARD := y
diff --git a/u-boot/arch/powerpc/cpu/mpc8260/kgdb.S b/u-boot/arch/powerpc/cpu/mpc8260/kgdb.S
index 1432344bcc..bc9c62852c 100644
--- a/u-boot/arch/powerpc/cpu/mpc8260/kgdb.S
+++ b/u-boot/arch/powerpc/cpu/mpc8260/kgdb.S
@@ -7,7 +7,6 @@
 #include <config.h>
 #include <command.h>
 #include <mpc8260.h>
-#include <version.h>
 
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
diff --git a/u-boot/arch/powerpc/cpu/mpc85xx/release.S b/u-boot/arch/powerpc/cpu/mpc85xx/release.S
index a2c0ad4244..0e0daf5a44 100644
--- a/u-boot/arch/powerpc/cpu/mpc85xx/release.S
+++ b/u-boot/arch/powerpc/cpu/mpc85xx/release.S
@@ -8,7 +8,6 @@
 #include <asm-offsets.h>
 #include <config.h>
 #include <mpc85xx.h>
-#include <version.h>
 
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
diff --git a/u-boot/arch/powerpc/cpu/mpc86xx/cache.S b/u-boot/arch/powerpc/cpu/mpc86xx/cache.S
index 0bb058b043..536d9b9d73 100644
--- a/u-boot/arch/powerpc/cpu/mpc86xx/cache.S
+++ b/u-boot/arch/powerpc/cpu/mpc86xx/cache.S
@@ -1,6 +1,5 @@
 #include <config.h>
 #include <mpc86xx.h>
-#include <version.h>
 
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
diff --git a/u-boot/arch/powerpc/cpu/mpc86xx/release.S b/u-boot/arch/powerpc/cpu/mpc86xx/release.S
index 461f6ec7df..3977049dc3 100644
--- a/u-boot/arch/powerpc/cpu/mpc86xx/release.S
+++ b/u-boot/arch/powerpc/cpu/mpc86xx/release.S
@@ -6,7 +6,6 @@
  */
 #include <config.h>
 #include <mpc86xx.h>
-#include <version.h>
 
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
diff --git a/u-boot/arch/powerpc/cpu/mpc8xx/kgdb.S b/u-boot/arch/powerpc/cpu/mpc8xx/kgdb.S
index e774d1e70a..0ea1a06c7a 100644
--- a/u-boot/arch/powerpc/cpu/mpc8xx/kgdb.S
+++ b/u-boot/arch/powerpc/cpu/mpc8xx/kgdb.S
@@ -7,7 +7,6 @@
 #include <config.h>
 #include <command.h>
 #include <mpc8xx.h>
-#include <version.h>
 
 #include <ppc_asm.tmpl>
 #include <ppc_defs.h>
diff --git a/u-boot/arch/powerpc/cpu/ppc4xx/kgdb.S b/u-boot/arch/powerpc/cpu/ppc4xx/kgdb.S
index f274c5d564..31abd69896 100644
--- a/u-boot/arch/powerpc/cpu/ppc4xx/kgdb.S
+++ b/u-boot/arch/powerpc/cpu/ppc4xx/kgdb.S
@@ -7,7 +7,6 @@
 #include <config.h>
 #include <command.h>
 #include <asm/ppc4xx.h>
-#include <version.h>
 
 #define CONFIG_405GP 1		/* needed for Linux kernel header files */
 
diff --git a/u-boot/arch/sh/cpu/sh2/start.S b/u-boot/arch/sh/cpu/sh2/start.S
index 5b92a01571..ebf731a3ab 100644
--- a/u-boot/arch/sh/cpu/sh2/start.S
+++ b/u-boot/arch/sh/cpu/sh2/start.S
@@ -7,7 +7,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 
 	.text
 	.align	2
diff --git a/u-boot/arch/sh/cpu/sh3/start.S b/u-boot/arch/sh/cpu/sh3/start.S
index c26a0b6a2c..7a934e24d4 100644
--- a/u-boot/arch/sh/cpu/sh3/start.S
+++ b/u-boot/arch/sh/cpu/sh3/start.S
@@ -10,7 +10,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 
 	.text
 	.align	2
diff --git a/u-boot/arch/sh/cpu/sh4/start.S b/u-boot/arch/sh/cpu/sh4/start.S
index 238aa43662..21644b5e67 100644
--- a/u-boot/arch/sh/cpu/sh4/start.S
+++ b/u-boot/arch/sh/cpu/sh4/start.S
@@ -7,7 +7,6 @@
 
 #include <asm-offsets.h>
 #include <config.h>
-#include <version.h>
 
 	.text
 	.align	2
diff --git a/u-boot/arch/x86/cpu/start.S b/u-boot/arch/x86/cpu/start.S
index 329bb3ab35..0774237421 100644
--- a/u-boot/arch/x86/cpu/start.S
+++ b/u-boot/arch/x86/cpu/start.S
@@ -11,7 +11,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/processor-flags.h>
diff --git a/u-boot/board/alphaproject/ap_sh4a_4a/lowlevel_init.S b/u-boot/board/alphaproject/ap_sh4a_4a/lowlevel_init.S
index d5900a8c99..0c40a3ce4d 100644
--- a/u-boot/board/alphaproject/ap_sh4a_4a/lowlevel_init.S
+++ b/u-boot/board/alphaproject/ap_sh4a_4a/lowlevel_init.S
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/board/armadeus/apf27/lowlevel_init.S b/u-boot/board/armadeus/apf27/lowlevel_init.S
index 4293cb1080..2f795e460a 100644
--- a/u-boot/board/armadeus/apf27/lowlevel_init.S
+++ b/u-boot/board/armadeus/apf27/lowlevel_init.S
@@ -6,7 +6,6 @@
 
 #include <config.h>
 #include <generated/asm-offsets.h>
-#include <version.h>
 #include <asm/macro.h>
 #include <asm/arch/imx-regs.h>
 #include "apf27.h"
diff --git a/u-boot/board/armltd/integrator/lowlevel_init.S b/u-boot/board/armltd/integrator/lowlevel_init.S
index 0fb42adc6f..b50ba9878c 100644
--- a/u-boot/board/armltd/integrator/lowlevel_init.S
+++ b/u-boot/board/armltd/integrator/lowlevel_init.S
@@ -8,7 +8,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 
 	/* Reset using CM control register */
 .global reset_cpu
diff --git a/u-boot/board/armltd/versatile/lowlevel_init.S b/u-boot/board/armltd/versatile/lowlevel_init.S
index 902d646efb..539ba41e66 100644
--- a/u-boot/board/armltd/versatile/lowlevel_init.S
+++ b/u-boot/board/armltd/versatile/lowlevel_init.S
@@ -8,7 +8,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 
 /* Set up the platform, once the cpu has been initialized */
 .globl lowlevel_init
diff --git a/u-boot/board/espt/lowlevel_init.S b/u-boot/board/espt/lowlevel_init.S
index c1d09663d4..ec9fb883f5 100644
--- a/u-boot/board/espt/lowlevel_init.S
+++ b/u-boot/board/espt/lowlevel_init.S
@@ -8,7 +8,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/board/logicpd/imx27lite/lowlevel_init.S b/u-boot/board/logicpd/imx27lite/lowlevel_init.S
index c286d0dfe1..9cb702f30f 100644
--- a/u-boot/board/logicpd/imx27lite/lowlevel_init.S
+++ b/u-boot/board/logicpd/imx27lite/lowlevel_init.S
@@ -10,7 +10,6 @@
 
 
 #include <config.h>
-#include <version.h>
 #include <asm/macro.h>
 #include <asm/arch/imx-regs.h>
 #include <generated/asm-offsets.h>
diff --git a/u-boot/board/mpl/vcma9/lowlevel_init.S b/u-boot/board/mpl/vcma9/lowlevel_init.S
index ee9b7a9d3e..c0d6cc8923 100644
--- a/u-boot/board/mpl/vcma9/lowlevel_init.S
+++ b/u-boot/board/mpl/vcma9/lowlevel_init.S
@@ -13,8 +13,6 @@
 
 
 #include <config.h>
-#include <version.h>
-
 
 /* register definitions */
 
diff --git a/u-boot/board/ms7722se/lowlevel_init.S b/u-boot/board/ms7722se/lowlevel_init.S
index db859f48ad..a62404fdc1 100644
--- a/u-boot/board/ms7722se/lowlevel_init.S
+++ b/u-boot/board/ms7722se/lowlevel_init.S
@@ -11,7 +11,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 
 #include <asm/processor.h>
 #include <asm/macro.h>
diff --git a/u-boot/board/ms7750se/lowlevel_init.S b/u-boot/board/ms7750se/lowlevel_init.S
index c02306fb24..d61640df6c 100644
--- a/u-boot/board/ms7750se/lowlevel_init.S
+++ b/u-boot/board/ms7750se/lowlevel_init.S
@@ -10,7 +10,6 @@
 */
 
 #include <config.h>
-#include <version.h>
 
 #include <asm/processor.h>
 #include <asm/macro.h>
diff --git a/u-boot/board/renesas/MigoR/lowlevel_init.S b/u-boot/board/renesas/MigoR/lowlevel_init.S
index 63ea70aa37..322e17779e 100644
--- a/u-boot/board/renesas/MigoR/lowlevel_init.S
+++ b/u-boot/board/renesas/MigoR/lowlevel_init.S
@@ -11,7 +11,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 
 #include <asm/processor.h>
 #include <asm/macro.h>
diff --git a/u-boot/board/renesas/ap325rxa/lowlevel_init.S b/u-boot/board/renesas/ap325rxa/lowlevel_init.S
index ead5310a4b..867ca51225 100644
--- a/u-boot/board/renesas/ap325rxa/lowlevel_init.S
+++ b/u-boot/board/renesas/ap325rxa/lowlevel_init.S
@@ -8,7 +8,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/board/renesas/ecovec/lowlevel_init.S b/u-boot/board/renesas/ecovec/lowlevel_init.S
index e4c40c8616..ab604c7fef 100644
--- a/u-boot/board/renesas/ecovec/lowlevel_init.S
+++ b/u-boot/board/renesas/ecovec/lowlevel_init.S
@@ -8,7 +8,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 #include <configs/ecovec.h>
diff --git a/u-boot/board/renesas/r0p7734/lowlevel_init.S b/u-boot/board/renesas/r0p7734/lowlevel_init.S
index 62668a76b9..c2fa5656a4 100644
--- a/u-boot/board/renesas/r0p7734/lowlevel_init.S
+++ b/u-boot/board/renesas/r0p7734/lowlevel_init.S
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/board/renesas/r2dplus/lowlevel_init.S b/u-boot/board/renesas/r2dplus/lowlevel_init.S
index f3392f097d..33f6e07826 100644
--- a/u-boot/board/renesas/r2dplus/lowlevel_init.S
+++ b/u-boot/board/renesas/r2dplus/lowlevel_init.S
@@ -5,7 +5,6 @@
 */
 
 #include <config.h>
-#include <version.h>
 
 #include <asm/processor.h>
 #include <asm/macro.h>
diff --git a/u-boot/board/renesas/r7780mp/lowlevel_init.S b/u-boot/board/renesas/r7780mp/lowlevel_init.S
index 471af1d967..b27fe29143 100644
--- a/u-boot/board/renesas/r7780mp/lowlevel_init.S
+++ b/u-boot/board/renesas/r7780mp/lowlevel_init.S
@@ -7,7 +7,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/board/renesas/rsk7203/lowlevel_init.S b/u-boot/board/renesas/rsk7203/lowlevel_init.S
index c8494ccf38..ee472a42ba 100644
--- a/u-boot/board/renesas/rsk7203/lowlevel_init.S
+++ b/u-boot/board/renesas/rsk7203/lowlevel_init.S
@@ -5,7 +5,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <config.h>
-#include <version.h>
 
 #include <asm/processor.h>
 #include <asm/macro.h>
diff --git a/u-boot/board/renesas/rsk7264/lowlevel_init.S b/u-boot/board/renesas/rsk7264/lowlevel_init.S
index 1a7d27d179..eae270377f 100644
--- a/u-boot/board/renesas/rsk7264/lowlevel_init.S
+++ b/u-boot/board/renesas/rsk7264/lowlevel_init.S
@@ -8,7 +8,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <config.h>
-#include <version.h>
 
 #include <asm/processor.h>
 #include <asm/macro.h>
diff --git a/u-boot/board/renesas/rsk7269/lowlevel_init.S b/u-boot/board/renesas/rsk7269/lowlevel_init.S
index a2b174bbc1..120bc6b325 100644
--- a/u-boot/board/renesas/rsk7269/lowlevel_init.S
+++ b/u-boot/board/renesas/rsk7269/lowlevel_init.S
@@ -9,7 +9,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <config.h>
-#include <version.h>
 
 #include <asm/processor.h>
 #include <asm/macro.h>
diff --git a/u-boot/board/renesas/sh7752evb/lowlevel_init.S b/u-boot/board/renesas/sh7752evb/lowlevel_init.S
index 5643a697eb..cc8b8c0aca 100644
--- a/u-boot/board/renesas/sh7752evb/lowlevel_init.S
+++ b/u-boot/board/renesas/sh7752evb/lowlevel_init.S
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/board/renesas/sh7753evb/lowlevel_init.S b/u-boot/board/renesas/sh7753evb/lowlevel_init.S
index 21987a51e8..98551e1055 100644
--- a/u-boot/board/renesas/sh7753evb/lowlevel_init.S
+++ b/u-boot/board/renesas/sh7753evb/lowlevel_init.S
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/board/renesas/sh7757lcr/lowlevel_init.S b/u-boot/board/renesas/sh7757lcr/lowlevel_init.S
index e4c5ea815e..6db26d9450 100644
--- a/u-boot/board/renesas/sh7757lcr/lowlevel_init.S
+++ b/u-boot/board/renesas/sh7757lcr/lowlevel_init.S
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/board/renesas/sh7763rdp/lowlevel_init.S b/u-boot/board/renesas/sh7763rdp/lowlevel_init.S
index e45fbbe9c7..e8e3d6fae3 100644
--- a/u-boot/board/renesas/sh7763rdp/lowlevel_init.S
+++ b/u-boot/board/renesas/sh7763rdp/lowlevel_init.S
@@ -9,7 +9,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 
 #include <asm/processor.h>
 #include <asm/macro.h>
diff --git a/u-boot/board/renesas/sh7785lcr/lowlevel_init.S b/u-boot/board/renesas/sh7785lcr/lowlevel_init.S
index 8b729ac392..4bda38cfad 100644
--- a/u-boot/board/renesas/sh7785lcr/lowlevel_init.S
+++ b/u-boot/board/renesas/sh7785lcr/lowlevel_init.S
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 #include <config.h>
-#include <version.h>
 #include <asm/processor.h>
 #include <asm/macro.h>
 
diff --git a/u-boot/board/samsung/goni/lowlevel_init.S b/u-boot/board/samsung/goni/lowlevel_init.S
index d52bc09f8d..fdb83e457a 100644
--- a/u-boot/board/samsung/goni/lowlevel_init.S
+++ b/u-boot/board/samsung/goni/lowlevel_init.S
@@ -8,7 +8,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/power.h>
diff --git a/u-boot/board/samsung/smdk2410/lowlevel_init.S b/u-boot/board/samsung/smdk2410/lowlevel_init.S
index 5de04f10e9..c3f41875de 100644
--- a/u-boot/board/samsung/smdk2410/lowlevel_init.S
+++ b/u-boot/board/samsung/smdk2410/lowlevel_init.S
@@ -13,8 +13,6 @@
 
 
 #include <config.h>
-#include <version.h>
-
 
 /* some parameters for the board */
 
diff --git a/u-boot/board/samsung/smdkc100/lowlevel_init.S b/u-boot/board/samsung/smdkc100/lowlevel_init.S
index 65e6b7a73a..91e5357691 100644
--- a/u-boot/board/samsung/smdkc100/lowlevel_init.S
+++ b/u-boot/board/samsung/smdkc100/lowlevel_init.S
@@ -7,7 +7,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/arch/cpu.h>
 #include <asm/arch/power.h>
 
diff --git a/u-boot/board/samsung/trats/setup.h b/u-boot/board/samsung/trats/setup.h
index 2f5ccb14c6..990e5e2dff 100644
--- a/u-boot/board/samsung/trats/setup.h
+++ b/u-boot/board/samsung/trats/setup.h
@@ -11,7 +11,6 @@
 #define _TRATS_SETUP_H
 
 #include <config.h>
-#include <version.h>
 #include <asm/arch/cpu.h>
 
 /* CLK_SRC_CPU: APLL(1), MPLL(1), CORE(0), HPM(0) */
diff --git a/u-boot/board/scb9328/lowlevel_init.S b/u-boot/board/scb9328/lowlevel_init.S
index 2475ae8efb..d5727248db 100644
--- a/u-boot/board/scb9328/lowlevel_init.S
+++ b/u-boot/board/scb9328/lowlevel_init.S
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 #include <asm/arch/imx-regs.h>
 
 .globl lowlevel_init
diff --git a/u-boot/board/shmin/lowlevel_init.S b/u-boot/board/shmin/lowlevel_init.S
index 35c0945196..53b3123849 100644
--- a/u-boot/board/shmin/lowlevel_init.S
+++ b/u-boot/board/shmin/lowlevel_init.S
@@ -5,7 +5,6 @@
  */
 
 #include <config.h>
-#include <version.h>
 
 #include <asm/processor.h>
 #include <asm/macro.h>
diff --git a/u-boot/common/spl/spl_mmc.c b/u-boot/common/spl/spl_mmc.c
index fa6f891bc8..071d2664da 100644
--- a/u-boot/common/spl/spl_mmc.c
+++ b/u-boot/common/spl/spl_mmc.c
@@ -10,7 +10,6 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <mmc.h>
-#include <version.h>
 #include <image.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/u-boot/common/spl/spl_sata.c b/u-boot/common/spl/spl_sata.c
index 12e16d9603..e024364b2d 100644
--- a/u-boot/common/spl/spl_sata.c
+++ b/u-boot/common/spl/spl_sata.c
@@ -14,7 +14,6 @@
 #include <asm/u-boot.h>
 #include <sata.h>
 #include <fat.h>
-#include <version.h>
 #include <image.h>
 
 DECLARE_GLOBAL_DATA_PTR;
diff --git a/u-boot/drivers/video/mpc8xx_lcd.c b/u-boot/drivers/video/mpc8xx_lcd.c
index 68c3d07c31..84cba9333d 100644
--- a/u-boot/drivers/video/mpc8xx_lcd.c
+++ b/u-boot/drivers/video/mpc8xx_lcd.c
@@ -15,7 +15,6 @@
 #include <common.h>
 #include <command.h>
 #include <watchdog.h>
-#include <version.h>
 #include <stdarg.h>
 #include <lcdvideo.h>
 #include <linux/types.h>
diff --git a/u-boot/drivers/video/pxa_lcd.c b/u-boot/drivers/video/pxa_lcd.c
index f66f615df5..f061b7818c 100644
--- a/u-boot/drivers/video/pxa_lcd.c
+++ b/u-boot/drivers/video/pxa_lcd.c
@@ -13,7 +13,6 @@
 
 #include <config.h>
 #include <common.h>
-#include <version.h>
 #include <stdarg.h>
 #include <linux/types.h>
 #include <stdio_dev.h>