4.14.98.2.0.0 ga

CleanSpec.mk

@@ -0,0 +1,51 @@
+# Copyright (C) 2018 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+$(call add-clean-step, rm -rf $(TARGET_OUT_INTERMEDIATES)/UBOOT_OBJ)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************

Kconfig

@@ -59,6 +59,13 @@ config CC_OPTIMIZE_FOR_SIZE
 
 	  This option is enabled by default for U-Boot.
 
+config XEN
+	bool "Select U-Boot be run as a bootloader for XEN Virtual Machine"
+	default n
+	help
+	  Enabling this option will make U-Boot be run as a bootloader
+	  for XEN Virtual Machine.
+
 config DISTRO_DEFAULTS
 	bool "Select defaults suitable for booting general purpose Linux distributions"
 	default y if ARCH_SUNXI || TEGRA

Makefile

@@ -678,6 +678,7 @@ libs-$(CONFIG_SYS_FSL_DDR) += drivers/ddr/fsl/
 libs-$(CONFIG_SYS_FSL_MMDC) += drivers/ddr/fsl/
 libs-$(CONFIG_ALTERA_SDRAM) += drivers/ddr/altera/
 libs-y += drivers/serial/
+libs-y += drivers/usb/cdns3/
 libs-y += drivers/usb/dwc3/
 libs-y += drivers/usb/common/
 libs-y += drivers/usb/emul/

arch/arm/Kconfig

@@ -602,11 +602,21 @@ config ARCH_MESON
 	  targeted at media players and tablet computers. We currently
 	  support the S905 (GXBaby) 64-bit SoC.
 
-config ARCH_MX8M
+config ARCH_IMX8
+	bool "Support NXP i.MX8 platform"
+	select ARM64
+	select DM
+	select OF_CONTROL
+
+config ARCH_IMX8M
 	bool "NXP i.MX8M platform"
 	select ARM64
+	select SYS_FSL_HAS_SEC if SECURE_BOOT
+	select SYS_FSL_SEC_COMPAT_4
+	select SYS_FSL_SEC_LE
 	select DM
 	select SUPPORT_SPL
+	select IMX_SEC_INIT if HAS_CAAM
 
 config ARCH_MX23
 	bool "NXP i.MX23 family"
@@ -626,10 +636,14 @@ config ARCH_MX28
 	select SUPPORT_SPL
 
 config ARCH_MX7ULP
-        bool "NXP MX7ULP"
-        select CPU_V7
+	bool "NXP MX7ULP"
+	select CPU_V7
+	select SYS_FSL_HAS_SEC if SECURE_BOOT
+	select SYS_FSL_SEC_COMPAT_4
+	select SYS_FSL_SEC_LE
 	select ROM_UNIFIED_SECTIONS
 	imply MXC_GPIO
+	select IMX_SEC_INIT if HAS_CAAM
 
 config ARCH_MX7
 	bool "Freescale MX7"
@@ -639,6 +653,7 @@ config ARCH_MX7
 	select SYS_FSL_SEC_LE
 	select BOARD_EARLY_INIT_F
 	select ARCH_MISC_INIT
+	select IMX_SEC_INIT if HAS_CAAM
 	imply MXC_GPIO
 
 config ARCH_MX6
@@ -647,6 +662,7 @@ config ARCH_MX6
 	select SYS_FSL_HAS_SEC if SECURE_BOOT
 	select SYS_FSL_SEC_COMPAT_4
 	select SYS_FSL_SEC_LE
+	select IMX_SEC_INIT if HAS_CAAM
 	select SYS_THUMB_BUILD if SPL
 	imply MXC_GPIO
 
@@ -1232,7 +1248,9 @@ source "arch/arm/mach-imx/mx7/Kconfig"
 
 source "arch/arm/mach-imx/mx7ulp/Kconfig"
 
-source "arch/arm/mach-imx/mx8m/Kconfig"
+source "arch/arm/mach-imx/imx8/Kconfig"
+
+source "arch/arm/mach-imx/imx8m/Kconfig"
 
 source "arch/arm/mach-imx/mxs/Kconfig"
 

arch/arm/Makefile

@@ -18,7 +18,7 @@ arch-$(CONFIG_CPU_ARM1136)	=-march=armv5
 arch-$(CONFIG_CPU_ARM1176)	=-march=armv5t
 arch-$(CONFIG_CPU_V7)		=$(call cc-option, -march=armv7-a, \
 				 $(call cc-option, -march=armv7, -march=armv5))
-arch-$(CONFIG_ARM64)		=-march=armv8-a
+arch-$(CONFIG_ARM64)		=-march=armv8-a -mgeneral-regs-only
 
 # On Tegra systems we must build SPL for the armv4 core on the device
 # but otherwise we can use the value in CONFIG_SYS_ARM_ARCH
@@ -95,11 +95,11 @@ libs-y += arch/arm/cpu/
 libs-y += arch/arm/lib/
 
 ifeq ($(CONFIG_SPL_BUILD),y)
-ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35 mx8m))
+ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35 imx8m imx8))
 libs-y += arch/arm/mach-imx/
 endif
 else
-ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs mx8m vf610))
+ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs imx8 imx8m vf610))
 libs-y += arch/arm/mach-imx/
 endif
 endif

arch/arm/config.mk

@@ -68,8 +68,7 @@ endif
 checkgcc6:
 	@if test "$(call cc-name)" = "gcc" -a \
 			"$(call cc-version)" -lt "0600"; then \
-		echo '*** Your GCC is older than 6.0 and is not supported'; \
-		false; \
+		echo '*** Your GCC is older than 6.0 and will not be supported'; \
 	fi
 
 
@@ -154,6 +153,10 @@ ifdef CONFIG_EFI_LOADER
 OBJCOPYFLAGS += -j .efi_runtime -j .efi_runtime_rel
 endif
 
+ifdef CONFIG_IMX_M4_BIND
+OBJCOPYFLAGS += -j .firmware_image
+endif
+
 ifneq ($(CONFIG_IMX_CONFIG),)
 ifdef CONFIG_SPL
 ifndef CONFIG_SPL_BUILD

arch/arm/cpu/arm926ejs/mxs/clock.c

@@ -5,7 +5,7 @@
  * on behalf of DENX Software Engineering GmbH
  *
  * Based on code from LTIB:
- * Copyright (C) 2010 Freescale Semiconductor, Inc.
+ * Copyright (C) 2010-2014 Freescale Semiconductor, Inc.
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */

arch/arm/cpu/armv8/Kconfig

@@ -94,7 +94,8 @@ config PSCI_RESET
 		   !TARGET_LS1043ARDB && !TARGET_LS1043AQDS && \
 		   !TARGET_LS1046ARDB && !TARGET_LS1046AQDS && \
 		   !TARGET_LS2081ARDB && \
-		   !ARCH_UNIPHIER && !TARGET_S32V234EVB
+		   !ARCH_UNIPHIER && !TARGET_S32V234EVB && \
+		   !ARCH_IMX8M
 	help
 	  Most armv8 systems have PSCI support enabled in EL3, either through
 	  ARM Trusted Firmware or other firmware.

arch/arm/cpu/armv8/Makefile

@@ -31,3 +31,4 @@ obj-$(CONFIG_ARCH_ZYNQMP) += zynqmp/
 obj-$(CONFIG_TARGET_HIKEY) += hisilicon/
 obj-$(CONFIG_ARMV8_PSCI) += psci.o
 obj-$(CONFIG_ARCH_SUNXI) += lowlevel_init.o
+obj-$(CONFIG_XEN) += xen/

arch/arm/cpu/armv8/u-boot-spl.lds

@@ -39,6 +39,14 @@ SECTIONS
 		*(.data*)
 	} >.sram
 
+#ifdef CONFIG_RECOVER_SPL_DATA_SECTION
+	.data_save : {
+		*(.__data_save_start)
+		. = SIZEOF(.data);
+		*(.__data_save_end)
+	} >.sram
+#endif
+
 	.u_boot_list : {
 		. = ALIGN(8);
 		KEEP(*(SORT(.u_boot_list*)));

arch/arm/cpu/armv8/xen/Makefile

@@ -0,0 +1 @@
+obj-y += hypercall.o print.o

arch/arm/cpu/armv8/xen/hypercall.S

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2018 NXP
+
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <xen.h>
+
+.globl HYPERVISOR_console_io;
+.globl HYPERVISOR_event_channel_op;
+.globl HYPERVISOR_hvm_op;
+.globl HYPERVISOR_sched_op;
+
+.align 4;
+HYPERVISOR_console_io:
+	mov x16, __HYPERVISOR_console_io;
+	hvc 0xEA1;
+	ret;
+
+HYPERVISOR_event_channel_op:
+	mov x16, __HYPERVISOR_event_channel_op;
+	hvc 0xEA1;
+	ret;
+
+HYPERVISOR_hvm_op:
+	mov x16, __HYPERVISOR_hvm_op;
+	hvc 0xEA1;
+	ret;
+
+HYPERVISOR_sched_op:
+	mov x16, __HYPERVISOR_sched_op;
+	hvc 0xEA1;
+	ret;

arch/arm/cpu/armv8/xen/print.c

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2018 NXP
+ *
+ * Peng Fan <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <hypercall.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+#include <xen.h>
+
+/*
+ * To non privileged domain, need CONFIG_VERBOSE_DEBUG in XEN to 
+ * get output.
+ */
+void xenprintf(const char *buf)
+{
+	(void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(buf), buf);
+	return;
+}
+
+void xenprintc(const char c)
+{
+	(void)HYPERVISOR_console_io(CONSOLEIO_write, 1, &c);
+	return;
+}

arch/arm/cpu/u-boot.lds

@@ -172,6 +172,22 @@ SECTIONS
 		*(.__image_copy_end)
 	}
 
+#ifdef CONFIG_IMX_M4_BIND
+	.firmware_image_start : {
+                *(.__firmware_image_start)
+        }
+
+	.firmware_image : {
+		KEEP(*(.firmware_image))
+        }
+
+	.firmware_image_end : {
+                *(.__firmware_image_end)
+        }
+
+	. = ALIGN(4);
+#endif
+
 	.rel_dyn_start :
 	{
 		*(.__rel_dyn_start)