From: Henry Beberman henry.beberman@microsoft.com

This patch enables i.MX platforms to easily add a boot script to their U-Boot Proper environment to automatically load and execute an EFI firmware from the first FAT partition of an MMC device.

This is a portion of enabling the Windows 10 IoT Core boot path.

The go command is overridden when CONFIG_UEFI_BOOT is specified. This new go will perform a cache flush/disable, disable interrupts, then jump to the address where UEFI was loaded.

This patch adds two new Kconfig options: CONFIG_UEFI_BOOT: Selects the UEFI bootcmd and overrides go to flush caches and disable interrupts. CONFIG_UEFI_LOAD_ADDR: Specifies the load address for the UEFI image

Signed-off-by: Henry Beberman henry.beberman@microsoft.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Tom Rini trini@konsulko.com --- arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/boot.c | 19 +++++++++++++++++++ common/Kconfig | 17 +++++++++++++++++ include/config_uefi_bootcmd.h | 29 +++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 arch/arm/mach-imx/boot.c create mode 100644 include/config_uefi_bootcmd.h

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 733c308670..a81af51f03 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -42,6 +42,7 @@ endif obj-$(CONFIG_SATA) += sata.o obj-$(CONFIG_SECURE_BOOT) += hab.o obj-$(CONFIG_SYSCOUNTER_TIMER) += syscounter.o +obj-$(CONFIG_UEFI_BOOT) += boot.o endif ifeq ($(SOC),$(filter $(SOC),mx7ulp)) obj-y += cache.o diff --git a/arch/arm/mach-imx/boot.c b/arch/arm/mach-imx/boot.c new file mode 100644 index 0000000000..457a323fa2 --- /dev/null +++ b/arch/arm/mach-imx/boot.c @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Microsoft Corporation + */ + +#include <common.h> +#include <command.h> + +DECLARE_GLOBAL_DATA_PTR; + +#if defined(CONFIG_UEFI_BOOT) +unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc, + char * const argv[]) +{ + cleanup_before_linux(); + + return entry(argc, argv); +} +#endif /* CONFIG_UEFI_BOOT */ diff --git a/common/Kconfig b/common/Kconfig index 4c7a1a9af8..35362b629c 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -217,6 +217,23 @@ config BOOTCOMMAND This is the string of commands that will be used as bootcmd and if AUTOBOOT is set, automatically run.

+config UEFI_BOOT + bool "Boot a UEFI firmware loaded from the first FAT partition on the mmc" + default n + help + Override the CONFIG_BOOTCOMMAND to load a UEFI firmware image from the + first FAT partition on the mmc. Override the go command to make it disable + interrupts and flush the cache before jumping to the specified address. + +config UEFI_LOAD_ADDR + hex "Load address for the UEFI image" + depends on UEFI_BOOT + help + CONFIG_UEFI_BOOT uses this as the address to load the UEFI image. + The uefi_bootcmd script in the environment will fatload efi from the mmc + to this location, then use an overridden go command to disable caches and + interrupts then jump to this location. + menu "Console"

config MENU diff --git a/include/config_uefi_bootcmd.h b/include/config_uefi_bootcmd.h new file mode 100644 index 0000000000..03903abf8f --- /dev/null +++ b/include/config_uefi_bootcmd.h @@ -0,0 +1,29 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2018 Microsoft Corporation + */ + +#ifndef _CONFIG_UEFI_BOOTCMD_H +#define _CONFIG_UEFI_BOOTCMD_H + +#define BOOTENV \ + "uefi_image_name=imxboard_efi.fd\0" \ + "uefi_addr=" __stringify(CONFIG_UEFI_LOAD_ADDR) "\0" \ + "uefi_bootcmd=" \ + "part list mmc ${mmcdev} -bootable devplist; " \ + "env exists devplist || setenv devplist 1; " \ + "for bootpart in ${devplist}; do " \ + "if fatload mmc ${mmcdev}:${bootpart} " \ + "${uefi_addr} ${uefi_image_name}; then " \ + "echo "Jumping to ${uefi_image_name} at " \ + "${uefi_addr}"; " \ + "go ${uefi_addr}; " \ + "fi; " \ + "done; " \ + "echo "Could not find ${uefi_image_name} on mmc ${mmcdev}";\0" + +#ifdef CONFIG_UEFI_BOOT +#define CONFIG_BOOTCOMMAND "run uefi_bootcmd" +#endif + +#endif /* _CONFIG_UEFI_BOOTCMD_H */

From: Henry Beberman henry.beberman@microsoft.com

This patch is a part of the i.MX Windows 10 IoT Core boot flow.

It adds an entry path for OP-TEE when loaded from a FIT blob when loadable has the OS type IH_OS_TEE. This booth path flushes and disables caches, disables interrupts, and jumps into OP-TEE passing the entry point for U-Boot Proper in one of the registers.

The CONFIG_SPL_OPTEE_BOOT option enables this boot path, and is also used to automatically set the CONFIG_SYS_NORMAL_WORLD Kconfig option while building U-Boot proper. This is because when OP-TEE returns to U-Boot proper's entry point, it will be in normal mode, so several secure world only initializations need to be omitted.

New Kconfig option: CONFIG_SPL_OPTEE_BOOT - Enables SPL FIT to boot in to OP-TEE, and will set the CONFIG_SYS_NORMAL_WORLD in U-Boot Proper to omit secure world only code.

Signed-off-by: Henry Beberman henry.beberman@microsoft.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Tom Rini trini@konsulko.com --- arch/arm/cpu/armv7/Makefile | 1 + arch/arm/cpu/armv7/optee_jump.S | 31 +++++++++++++++++++++++++++++++ arch/arm/lib/spl.c | 16 ++++++++++++++++ common/spl/Kconfig | 9 +++++++++ common/spl/spl.c | 6 ++++++ include/spl.h | 21 +++++++++++++++++++++ 6 files changed, 84 insertions(+) create mode 100644 arch/arm/cpu/armv7/optee_jump.S

diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 4f4647c90a..5bad36a8b8 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -27,6 +27,7 @@ obj-$(CONFIG_ARMV7_PSCI) += psci.o psci-common.o obj-$(CONFIG_IPROC) += iproc-common/ obj-$(CONFIG_KONA) += kona-common/ obj-$(CONFIG_SYS_ARCH_TIMER) += arch_timer.o +obj-$(CONFIG_SPL_OPTEE_BOOT) += optee_jump.o

ifneq (,$(filter s5pc1xx exynos,$(SOC))) obj-y += s5p-common/ diff --git a/arch/arm/cpu/armv7/optee_jump.S b/arch/arm/cpu/armv7/optee_jump.S new file mode 100644 index 0000000000..2a1d994bcc --- /dev/null +++ b/arch/arm/cpu/armv7/optee_jump.S @@ -0,0 +1,31 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2018 Microsoft Corporation + */ + +#include <asm-offsets.h> +#include <config.h> +#include <asm/system.h> +#include <linux/linkage.h> + +#ifdef CONFIG_SPL_OPTEE_BOOT + + .globl arch_jump_to_image_optee + +/* + void __noreturn arch_jump_to_image_optee( + u32 optee_entry_point, + u32 pageable_part, + u32 uboot_entry_point + ); +*/ +ENTRY(arch_jump_to_image_optee) + + mov r3, r0 + mov r0, r1 + mov lr, r2 + + bx r3 + +ENDPROC(arch_jump_to_image_optee) +#endif diff --git a/arch/arm/lib/spl.c b/arch/arm/lib/spl.c index 33cc76ba3d..ee311d9fe8 100644 --- a/arch/arm/lib/spl.c +++ b/arch/arm/lib/spl.c @@ -73,3 +73,19 @@ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image) } #endif /* CONFIG_ARM64 */ #endif + +#ifdef CONFIG_SPL_OPTEE_BOOT +void __noreturn arch_jump_to_image_optee(u32 optee_entry_point, + u32 pageable_part, + u32 uboot_entry_point); + +void __noreturn jump_to_image_optee(struct spl_image_info *spl_image) +{ + /* flush and turn off caches before jumping to OPTEE */ + cleanup_before_linux(); + + arch_jump_to_image_optee(spl_image->entry_point, + 0, + CONFIG_SYS_TEXT_BASE); +} +#endif diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 0bbf8d5b02..643484a4a4 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -792,6 +792,15 @@ config SPL_ATF_NO_PLATFORM_PARAM

If your ATF is affected, say Y.

+config SPL_OPTEE_BOOT + depends on SPL + bool "Enable support for loading OPTEE and jumping to it from SPL" + default n + help + Configure SPL to boot OPTEE. SPL passes the U-Boot proper entry + point as the return address when it jumps to OPTEE, allowing OPTEE + to start U-Boot proper in normal mode when it returns. + config SPL_AM33XX_ENABLE_RTC32K_OSC bool "Enable the RTC32K OSC on AM33xx based platforms" default y if AM33XX diff --git a/common/spl/spl.c b/common/spl/spl.c index a09ada37d7..237083b08d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -519,6 +519,12 @@ void board_init_r(gd_t *dummy1, ulong dummy2) spl_invoke_atf(&spl_image); break; #endif +#ifdef CONFIG_SPL_OPTEE_BOOT + case IH_OS_TEE: + debug("Jumping to OPTEE\n"); + jump_to_image_optee(&spl_image); + break; +#endif #ifdef CONFIG_SPL_OS_BOOT case IH_OS_LINUX: debug("Jumping to Linux\n"); diff --git a/include/spl.h b/include/spl.h index 8454ea7ad4..338b4b573d 100644 --- a/include/spl.h +++ b/include/spl.h @@ -125,6 +125,19 @@ int spl_board_ubi_load_image(u32 boot_device); */ void __noreturn jump_to_image_linux(struct spl_image_info *spl_image);

+#ifdef CONFIG_SPL_OPTEE_BOOT +/** + * jump_to_image_optee() - Jump to OP-TEE from SPL + * + * This jumps into OP-TEE using the information in @spl_image, passing + * it the entry point of U-Boot Proper so it can return there + * in non-secure mode + * + * @spl_image: Image description to set up + */ +void __noreturn jump_to_image_optee(struct spl_image_info *spl_image); +#endif + /** * spl_start_uboot() - Check if SPL should start the kernel or U-Boot * @@ -296,4 +309,12 @@ void spl_invoke_atf(struct spl_image_info *spl_image); * can implement 'board_return_to_bootrom'. */ void board_return_to_bootrom(void); + +#ifdef CONFIG_SPL_OPTEE_BOOT +#include <tee/optee.h> + +struct optee_image_info { + struct optee_header header; +}; +#endif #endif

From: Henry Beberman henry.beberman@microsoft.com

This patch is part of the i.MX Windows 10 IoT Core boot flow.

It adds a modified linker script for SPL to keep all segments in on-chip ram. This is to harden the device against potential leaks of device secrets by keeping them out of DRAM.

Additionally if CONFIG_SYS_SPL_MALLOC_START is defined, it will override the CONFIG_SPL_SYS_MALLOC_SIMPLE and allocate space in DRAM instead of on-chip ram. This patch prevents the definition of those values for i.MX6 and i.MX7 SPL if CONFIG_OPTEE_SPL_BOOT is selected.

Signed-off-by: Henry Beberman henry.beberman@microsoft.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com --- arch/arm/mach-imx/u-boot-spl-sram.lds | 59 +++++++++++++++++++++++++++++++++++ include/configs/imx6_spl.h | 2 ++ include/configs/imx7_spl.h | 2 ++ 3 files changed, 63 insertions(+) create mode 100644 arch/arm/mach-imx/u-boot-spl-sram.lds

diff --git a/arch/arm/mach-imx/u-boot-spl-sram.lds b/arch/arm/mach-imx/u-boot-spl-sram.lds new file mode 100644 index 0000000000..dfbb4aef5d --- /dev/null +++ b/arch/arm/mach-imx/u-boot-spl-sram.lds @@ -0,0 +1,59 @@ +/* + * (C) Copyright 2002 + * Gary Jennejohn, DENX Software Engineering, garyj@denx.de + * + * (C) Copyright 2010 + * Texas Instruments, <www.ti.com> + * Aneesh V aneesh@ti.com + * + * (C) Copyright 2018 Microsoft Corporation + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +MEMORY { .sram : ORIGIN = CONFIG_SPL_TEXT_BASE,\ + LENGTH = CONFIG_SPL_MAX_SIZE } + +OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") +OUTPUT_ARCH(arm) +ENTRY(_start) +SECTIONS +{ + .text : + { + __start = .; + *(.vectors) + arch/arm/cpu/armv7/start.o (.text*) + *(.text*) + } >.sram + + . = ALIGN(4); + .rodata : { *(SORT_BY_ALIGNMENT(.rodata*)) } >.sram + + . = ALIGN(4); + .data : { *(SORT_BY_ALIGNMENT(.data*)) } >.sram + + . = ALIGN(4); + .u_boot_list : { + KEEP(*(SORT(.u_boot_list*))); + } >.sram + + . = ALIGN(4); + __image_copy_end = .; + + .end : + { + *(.__end) + } + + _image_binary_end = .; + + .bss : + { + . = ALIGN(4); + __bss_start = .; + *(.bss*) + . = ALIGN(4); + __bss_end = .; + } >.sram +} diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index 720ff045a7..4088e8a936 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -51,6 +51,7 @@ # endif #endif

+#ifndef CONFIG_OPTEE_SPL_BOOT #if defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL) || \ defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) #define CONFIG_SPL_BSS_START_ADDR 0x88200000 @@ -63,6 +64,7 @@ #define CONFIG_SYS_SPL_MALLOC_START 0x18300000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */ #endif +#endif /* !CONFIG_OPTEE_SPL_BOOT */ #endif

#endif diff --git a/include/configs/imx7_spl.h b/include/configs/imx7_spl.h index 1eb6cd894d..5dd4aed652 100644 --- a/include/configs/imx7_spl.h +++ b/include/configs/imx7_spl.h @@ -46,10 +46,12 @@ # endif #endif

+#ifndef CONFIG_OPTEE_SPL_BOOT #define CONFIG_SPL_BSS_START_ADDR 0x88200000 #define CONFIG_SPL_BSS_MAX_SIZE 0x100000 /* 1 MB */ #define CONFIG_SYS_SPL_MALLOC_START 0x88300000 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 /* 1 MB */ +#endif /* !CONFIG_OPTEE_SPL_BOOT */

#endif /* CONFIG_SPL */

From: Henry Beberman henry.beberman@microsoft.com

This patch adds a new bootable configuration for Windows 10 IoT Core on the i.MX7 Dual Sabre board.

It enables SPL on the i.MX7 Sabre in order to support the FIT load of OP-TEE and U-Boot proper.

Signed-off-by: Henry Beberman henry.beberman@microsoft.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Adrian Alonso adrian.alonso@nxp.com --- arch/arm/mach-imx/mx7/Kconfig | 1 + board/freescale/mx7dsabresd/MAINTAINERS | 1 + board/freescale/mx7dsabresd/mx7dsabresd.c | 79 +++++++++++++++++++++++ configs/mx7dsabresd_nt_defconfig | 102 ++++++++++++++++++++++++++++++ drivers/gpio/Makefile | 3 + drivers/pinctrl/nxp/pinctrl-imx7.c | 4 +- include/configs/mx7dsabresd.h | 10 +++ 7 files changed, 199 insertions(+), 1 deletion(-) create mode 100644 configs/mx7dsabresd_nt_defconfig

diff --git a/arch/arm/mach-imx/mx7/Kconfig b/arch/arm/mach-imx/mx7/Kconfig index 2a3db860bb..0aaf246a79 100644 --- a/arch/arm/mach-imx/mx7/Kconfig +++ b/arch/arm/mach-imx/mx7/Kconfig @@ -33,6 +33,7 @@ config TARGET_MX7DSABRESD select MX7D select DM select DM_THERMAL + select SUPPORT_SPL

config TARGET_PICO_IMX7D bool "pico-imx7d" diff --git a/board/freescale/mx7dsabresd/MAINTAINERS b/board/freescale/mx7dsabresd/MAINTAINERS index b96642a568..1fc9b2a491 100644 --- a/board/freescale/mx7dsabresd/MAINTAINERS +++ b/board/freescale/mx7dsabresd/MAINTAINERS @@ -4,3 +4,4 @@ S: Maintained F: board/freescale/mx7dsabresd F: include/configs/mx7dsabresd.h F: configs/mx7dsabresd_defconfig +F: configs/mx7dsabresd_nt_defconfig \ No newline at end of file diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c index 90e2d1a92a..db34609caf 100644 --- a/board/freescale/mx7dsabresd/mx7dsabresd.c +++ b/board/freescale/mx7dsabresd/mx7dsabresd.c @@ -46,6 +46,9 @@ DECLARE_GLOBAL_DATA_PTR;

#define NAND_PAD_READY0_CTRL (PAD_CTL_DSE_3P3V_49OHM | PAD_CTL_PUS_PU5KOHM)

+#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \ + PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM) + #ifdef CONFIG_MXC_SPI static iomux_v3_cfg_t const ecspi3_pads[] = { MX7D_PAD_SAI2_RX_DATA__ECSPI3_SCLK | MUX_PAD_CTRL(SPI_PAD_CTRL), @@ -363,6 +366,75 @@ int power_init_board(void) } #endif

+#ifdef CONFIG_SPL_BUILD +#include <spl.h> + +#if !CONFIG_IS_ENABLED(DM_MMC) +static iomux_v3_cfg_t const usdhc1_pads[] = { + MX7D_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_CMD__SD1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_DATA0__SD1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_DATA1__SD1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_DATA2__SD1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_DATA3__SD1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + + MX7D_PAD_SD1_CD_B__GPIO5_IO0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_WP__GPIO5_IO1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_RESET_B__SD1_RESET_B | MUX_PAD_CTRL(USDHC_PAD_CTRL), +}; + +#define USDHC1_CD IMX_GPIO_NR(5, 0) +#define USDHC1_WP IMX_GPIO_NR(5, 1) + +int board_mmc_init(bd_t *bis) +{ + struct fsl_esdhc_cfg usdhc_cfg = {}; + + imx_iomux_v3_setup_multiple_pads(usdhc1_pads, ARRAY_SIZE(usdhc1_pads)); + gpio_direction_input(USDHC1_CD); + gpio_direction_input(USDHC1_WP); + + usdhc_cfg.esdhc_base = USDHC1_BASE_ADDR; + usdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); + usdhc_cfg.max_bus_width = 4; + + return fsl_esdhc_initialize(bis, &usdhc_cfg); +} + +int board_mmc_getcd(struct mmc *mmc) +{ + struct fsl_esdhc_cfg *cfg = (struct fsl_esdhc_cfg *)mmc->priv; + int ret = 0; + + switch (cfg->esdhc_base) { + case USDHC1_BASE_ADDR: + ret = !gpio_get_value(USDHC1_CD); + break; + } + + return ret; +} +#endif + +void board_init_f(ulong dummy) +{ + /* Clear the BSS. */ + memset(__bss_start, 0, __bss_end - __bss_start); + + setup_iomux_uart(); + + /* setup AIPS and disable watchdog */ + arch_cpu_init(); + + /* setup GP timer */ + timer_init(); + + preloader_console_init(); + + /* No need to initialize DRAM; handled by DCD script */ +} +#endif + int board_late_init(void) { struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR; @@ -393,3 +465,10 @@ int checkboard(void)

return 0; } + +#if defined(CONFIG_MULTI_DTB_FIT) || defined(CONFIG_SPL_LOAD_FIT) +int board_fit_config_name_match(const char *name) +{ + return 0; +} +#endif diff --git a/configs/mx7dsabresd_nt_defconfig b/configs/mx7dsabresd_nt_defconfig new file mode 100644 index 0000000000..9bb0fe1b54 --- /dev/null +++ b/configs/mx7dsabresd_nt_defconfig @@ -0,0 +1,102 @@ +CONFIG_ARM=y +CONFIG_ARCH_MX7=y +CONFIG_SYS_THUMB_BUILD=y +CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TARGET_MX7DSABRESD=y +CONFIG_DEFAULT_DEVICE_TREE="imx7d-sdb" +CONFIG_OF_CONTROL=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_OPTEE_BOOT=y +CONFIG_ARMV7_BOOT_SEC_DEFAULT=y +CONFIG_ARMV7_NONSEC=n +# CONFIG_ARMV7_VIRT is not set +CONFIG_BAUDRATE=115200 +CONFIG_BOOTDELAY=-2 +CONFIG_UEFI_BOOT=y +CONFIG_UEFI_LOAD_ADDR=0x82004000 +# CONFIG_CMD_BMODE is not set +# CONFIG_CMD_BOOTD is not set +CONFIG_CMD_BOOTM=y +CONFIG_CMD_BOOTZ=n +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_USB=y +CONFIG_CMD_BMP=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y +CONFIG_CMD_FAT=y +CONFIG_CMD_PART=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_CMD_SF=y +# CONFIG_CONSOLE_MUX is not set +CONFIG_SYS_CONSOLE_IS_IN_ENV=y +CONFIG_DEBUG_UART_MXC=y +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART_BASE=0x30860000 +CONFIG_SPI=y +CONFIG_DM_74X164=y +CONFIG_DM_GPIO=y +CONFIG_DM_I2C=y +CONFIG_DM_MMC=y +CONFIG_DM_PMIC_PFUZE100=y +CONFIG_DM_PMIC=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_DM_REGULATOR_GPIO=y +CONFIG_DM_REGULATOR_PFUZE100=y +CONFIG_DM_REGULATOR=y +CONFIG_DM_SERIAL=n +CONFIG_DM_SPI=y +CONFIG_DM_USB=y +CONFIG_ERRNO_STR=y +CONFIG_HUSH_PARSER=y +CONFIG_IMX_BOOTAUX=y +CONFIG_IMX_RDC=y +CONFIG_MXC_USB_OTG_HACTIVE=y +CONFIG_PHYLIB=y +CONFIG_PINCTRL_IMX7=y +CONFIG_PINCTRL=y +CONFIG_SECURE_BOOT=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SOFT_SPI=y +CONFIG_FSL_ESDHC=y +CONFIG_SPI_FLASH_EON=y +CONFIG_SPI_FLASH=y +CONFIG_EFI_LOADER=n +CONFIG_SPL=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_LEGACY_IMAGE_SUPPORT=n +CONFIG_SPL_DM=n +CONFIG_SPL_FIT=y +CONFIG_SPL_OF_LIBFDT=y +CONFIG_SPL_DM_SERIAL=n +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_USE_TINY_PRINTF=y +CONFIG_SPL_USE_ARCH_MEMCPY=n +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_ENV_IS_IN_MMC=n +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx7dsabresd/imximage.cfg" +CONFIG_SYS_MALLOC_F_LEN=0x0800 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x8A +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_KEYBOARD=y +CONFIG_USB_STORAGE=y +CONFIG_USB=y +CONFIG_VIDEO_MXS=y +CONFIG_VIDEO=y +CONFIG_GLOBAL_PAGE=y +CONFIG_STORE_MAC_IN_GLOBAL=y +CONFIG_ETH1ADDR_IN_GLOBAL=y +CONFIG_OF_LIBFDT=y \ No newline at end of file diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile index f186120684..3fb9b72703 100644 --- a/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile @@ -7,10 +7,13 @@ ifndef CONFIG_SPL_BUILD obj-$(CONFIG_DWAPB_GPIO) += dwapb_gpio.o obj-$(CONFIG_AXP_GPIO) += axp_gpio.o endif + +ifeq ($(CONFIG_$(SPL_TPL_)DM),y) obj-$(CONFIG_DM_GPIO) += gpio-uclass.o

obj-$(CONFIG_DM_PCA953X) += pca953x_gpio.o obj-$(CONFIG_DM_74X164) += 74x164_gpio.o +endif

obj-$(CONFIG_AT91_GPIO) += at91_gpio.o obj-$(CONFIG_ATMEL_PIO4) += atmel_pio4.o diff --git a/drivers/pinctrl/nxp/pinctrl-imx7.c b/drivers/pinctrl/nxp/pinctrl-imx7.c index 769d428dda..7ba97bae0d 100644 --- a/drivers/pinctrl/nxp/pinctrl-imx7.c +++ b/drivers/pinctrl/nxp/pinctrl-imx7.c @@ -9,7 +9,9 @@

#include "pinctrl-imx.h"

-static struct imx_pinctrl_soc_info imx7_pinctrl_soc_info; +static struct imx_pinctrl_soc_info imx7_pinctrl_soc_info = { + .flags = ZERO_OFFSET_VALID, +};

static struct imx_pinctrl_soc_info imx7_lpsr_pinctrl_soc_info = { .flags = ZERO_OFFSET_VALID, diff --git a/include/configs/mx7dsabresd.h b/include/configs/mx7dsabresd.h index 87d2b52ef1..a6793927ef 100644 --- a/include/configs/mx7dsabresd.h +++ b/include/configs/mx7dsabresd.h @@ -9,6 +9,7 @@ #define __MX7D_SABRESD_CONFIG_H

#include "mx7_common.h" +#include "imx7_spl.h"

#define CONFIG_DBG_MONITOR #define PHYS_SDRAM_SIZE SZ_1G @@ -65,6 +66,14 @@ #define UPDATE_M4_ENV "" #endif

+#ifdef CONFIG_UEFI_BOOT +#include <config_uefi_bootcmd.h> + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "mmcdev=0\0" \ + "console=ttymxc0\0" \ + BOOTENV +#else #define CONFIG_MFG_ENV_SETTINGS \ "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ "rdinit=/linuxrc " \ @@ -161,6 +170,7 @@ "fi; " \ "fi; " \ "else run netboot; fi" +#endif /* CONFIG_UEFI_BOOT */

#define CONFIG_SYS_MEMTEST_START 0x80000000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x20000000)

From: Henry Beberman henry.beberman@microsoft.com

This patch adds a new bootable configuration for Windows 10 IoT Core on the i.MX6 SoloX UDOO Neo.

It also adds a new device tree sources file for imx6sx-udoo-neo.dts. This is not required by Windows or UEFI but the build system requires a device tree when building SPL with flat image tree support.

Signed-off-by: Henry Beberman henry.beberman@microsoft.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com Cc: Breno Lima breno.lima@nxp.com Cc: Francesco Montefoschi francesco.montefoschi@udoo.org --- arch/arm/dts/Makefile | 1 + arch/arm/dts/imx6sx-udoo-neo.dts | 8 ++++++ board/udoo/neo/MAINTAINERS | 2 ++ board/udoo/neo/neo.c | 7 +++++ configs/udoo_neo_nt_defconfig | 55 ++++++++++++++++++++++++++++++++++++++++ include/configs/udoo_neo.h | 8 ++++++ 6 files changed, 81 insertions(+) create mode 100644 arch/arm/dts/imx6sx-udoo-neo.dts create mode 100644 configs/udoo_neo_nt_defconfig

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 109a00219d..1bbb9bf388 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -424,6 +424,7 @@ dtb-$(CONFIG_MX6SL) += imx6sll-evk.dtb

dtb-$(CONFIG_MX6SX) += \ imx6sx-sabreauto.dtb \ + imx6sx-udoo-neo.dtb \ imx6sx-sdb.dtb

dtb-$(CONFIG_MX6UL) += \ diff --git a/arch/arm/dts/imx6sx-udoo-neo.dts b/arch/arm/dts/imx6sx-udoo-neo.dts new file mode 100644 index 0000000000..f5b35a6175 --- /dev/null +++ b/arch/arm/dts/imx6sx-udoo-neo.dts @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2018 Microsoft Corporation + */ + +/dts-v1/; + +#include "imx6sx.dtsi" diff --git a/board/udoo/neo/MAINTAINERS b/board/udoo/neo/MAINTAINERS index 743fe33d05..4ab862e3dc 100644 --- a/board/udoo/neo/MAINTAINERS +++ b/board/udoo/neo/MAINTAINERS @@ -5,3 +5,5 @@ S: Maintained F: board/udoo/neo/ F: include/configs/udoo_neo.h F: configs/udoo_neo_defconfig +F: configs/udoo_neo_nt_defconfig +F: arch/arm/dts/imx6sx-udoo-neo.dts diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c index 828161360c..8429063bb0 100644 --- a/board/udoo/neo/neo.c +++ b/board/udoo/neo/neo.c @@ -593,3 +593,10 @@ void board_init_f(ulong dummy) }

#endif + +#if defined(CONFIG_MULTI_DTB_FIT) || defined(CONFIG_SPL_LOAD_FIT) +int board_fit_config_name_match(const char *name) +{ + return 0; +} +#endif diff --git a/configs/udoo_neo_nt_defconfig b/configs/udoo_neo_nt_defconfig new file mode 100644 index 0000000000..d5123369ca --- /dev/null +++ b/configs/udoo_neo_nt_defconfig @@ -0,0 +1,55 @@ +CONFIG_ARCH_MX6=y +CONFIG_ARM=y +CONFIG_SYS_TEXT_BASE=0x87800000 +CONFIG_TARGET_UDOO_NEO=y +CONFIG_DEFAULT_DEVICE_TREE="imx6sx-udoo-neo" +CONFIG_OF_CONTROL=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_SPL_OPTEE_BOOT=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_BOOTDELAY=-2 +CONFIG_UEFI_BOOT=y +CONFIG_UEFI_LOAD_ADDR=0x82004000 +CONFIG_EFI_LOADER=n +CONFIG_CMD_BOOTD=n +CONFIG_CMD_BOOTM=n +CONFIG_CMD_CACHE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_GPIO=y +CONFIG_CMD_I2C=n +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_SPL=n +CONFIG_DISTRO_DEFAULTS=n +CONFIG_ENV_IS_IN_MMC=n +CONFIG_HUSH_PARSER=y +CONFIG_PCI=n +CONFIG_FSL_ESDHC=y +CONFIG_PHYLIB=y +CONFIG_SECURE_BOOT=y +CONFIG_SPL=y +CONFIG_SPL_FIT=y +CONFIG_SPL_LOAD_FIT=y +CONFIG_SPL_LEGACY_IMAGE_SUPPORT=n +CONFIG_SPL_OF_LIBFDT=y +CONFIG_SPL_SYS_MALLOC_SIMPLE=y +CONFIG_SPL_CRYPTO_SUPPORT=y +CONFIG_SPL_EXT_SUPPORT=n +CONFIG_SPL_GPIO_SUPPORT=y +CONFIG_SPL_I2C_SUPPORT=n +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBDISK_SUPPORT=n +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y +CONFIG_SPL_SPI_SUPPORT=n +CONFIG_SPL_USE_ARCH_MEMCPY=n +CONFIG_SPL_WATCHDOG_SUPPORT=y +CONFIG_SPL_LDSCRIPT="arch/arm/mach-imx/u-boot-spl-sram.lds" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg" +CONFIG_SYS_L2CACHE_OFF=y +CONFIG_SYS_MALLOC_F_LEN=0x800 +CONFIG_USE_TINY_PRINTF=y +CONFIG_PHY_MICREL=y +CONFIG_OF_LIBFDT=y \ No newline at end of file diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 2924e3143a..a71e9d64b2 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -25,6 +25,13 @@ #define CONFIG_MXC_UART_BASE UART1_BASE #define CONFIG_SYS_MMC_ENV_DEV 0 /*USDHC2*/

+#ifdef CONFIG_UEFI_BOOT +#include <config_uefi_bootcmd.h> + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "mmcdev=0\0" \ + BOOTENV +#else /* Linux only */ #define CONFIG_EXTRA_ENV_SETTINGS \ "console=ttymxc0,115200\0" \ @@ -58,6 +65,7 @@ func(DHCP, dhcp, na)

#include <config_distro_bootcmd.h> +#endif /* CONFIG_UEFI_BOOT */

/* Miscellaneous configurable options */ #define CONFIG_SYS_MEMTEST_START 0x80000000

From: Henry Beberman henry.beberman@microsoft.com

U-Boot already has logic for determining the platform MAC address on many i.MX platforms, such as pulling it from fuses or SPI flash. This configuration option saves the MAC address from the ethaddr (and potentially ethaddr1) into the global page and marks it as valid. This value is then picked up in UEFI which will configure the LAN driver in Windows with the correct MAC address.

Signed-off-by: Henry Beberman henry.beberman@microsoft.com Cc: Stefano Babic sbabic@denx.de Cc: Fabio Estevam fabio.estevam@nxp.com --- arch/arm/mach-imx/Kconfig | 16 ++++++++++++++++ arch/arm/mach-imx/global_page.c | 26 +++++++++++++++++++++++++- configs/cl-som-imx7_nt_defconfig | 2 ++ configs/mx6cuboxi_nt_defconfig | 2 ++ configs/mx6sabresd_nt_defconfig | 2 ++ configs/udoo_neo_nt_defconfig | 2 ++ include/global_page.h | 8 ++++++++ 7 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index c88fa2ca1b..9bc0294d0c 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -85,3 +85,19 @@ config GLOBAL_PAGE help This option creates a global 4K page to store U-Boot environment data to pass to another environment such as UEFI or Windows. + +config STORE_MAC_IN_GLOBAL + bool "Store MAC address information in global page" + depends on GLOBAL_PAGE + default n + help + This option informs U-Boot to read the ethaddr environment + variable and store it in the global page for UEFI to use. + +config ETH1ADDR_IN_GLOBAL + bool "Store MAC Address for 2nd ethernet in global page" + depends on STORE_MAC_IN_GLOBAL + default n + help + This option informs U-Boot to read the eth1addr environment + variable and store it in the global page for UEFI to use. diff --git a/arch/arm/mach-imx/global_page.c b/arch/arm/mach-imx/global_page.c index 139e18f4bc..c753452ad6 100644 --- a/arch/arm/mach-imx/global_page.c +++ b/arch/arm/mach-imx/global_page.c @@ -20,9 +20,33 @@ void init_global_page(void) global_page->header.signature = 0x474c424c;

/* Set revision */ - global_page->header.revision = 0; + global_page->header.revision = 1; }

void publish_to_global_page(void) { +#ifdef CONFIG_STORE_MAC_IN_GLOBAL + publish_mac_to_global_page("ethaddr", 0); +#endif /* CONFIG_STORE_MAC_IN_GLOBAL */ + +#ifdef CONFIG_ETH1ADDR_IN_GLOBAL + publish_mac_to_global_page("eth1addr", 1); +#endif /* CONFIG_ETH1ADDR_IN_GLOBAL */ +} + +void publish_mac_to_global_page(const char *env_var, int mac) +{ + uchar mac_id[6]; + + if (mac > 1) + return; + + if (!(strcmp(env_var, "ethaddr") || strcmp(env_var, "eth1addr"))) + return; + + eth_env_get_enetaddr(env_var, mac_id); + + global_page->mac_entry[mac].enet_id = mac; + global_page->mac_entry[mac].valid = 1; + memcpy(global_page->mac_entry[mac].mac, mac_id, 6); } diff --git a/configs/cl-som-imx7_nt_defconfig b/configs/cl-som-imx7_nt_defconfig index 4fe8233f0f..048621874c 100644 --- a/configs/cl-som-imx7_nt_defconfig +++ b/configs/cl-som-imx7_nt_defconfig @@ -77,4 +77,6 @@ CONFIG_MXC_USB_OTG_HACTIVE=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_CI_UDC=y +CONFIG_GLOBAL_PAGE=y +CONFIG_STORE_MAC_IN_GLOBAL=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx6cuboxi_nt_defconfig b/configs/mx6cuboxi_nt_defconfig index 087569d2e9..b29084012f 100644 --- a/configs/mx6cuboxi_nt_defconfig +++ b/configs/mx6cuboxi_nt_defconfig @@ -59,4 +59,6 @@ CONFIG_USB_STORAGE=y CONFIG_USB=y CONFIG_USE_TINY_PRINTF=y CONFIG_VIDEO=y +CONFIG_GLOBAL_PAGE=y +CONFIG_STORE_MAC_IN_GLOBAL=y CONFIG_OF_LIBFDT=y \ No newline at end of file diff --git a/configs/mx6sabresd_nt_defconfig b/configs/mx6sabresd_nt_defconfig index 9d858a4418..47c6568e60 100644 --- a/configs/mx6sabresd_nt_defconfig +++ b/configs/mx6sabresd_nt_defconfig @@ -55,4 +55,6 @@ CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_USB=y CONFIG_USE_TINY_PRINTF=y CONFIG_VIDEO=y +CONFIG_GLOBAL_PAGE=y +CONFIG_STORE_MAC_IN_GLOBAL=y CONFIG_OF_LIBFDT=y \ No newline at end of file diff --git a/configs/udoo_neo_nt_defconfig b/configs/udoo_neo_nt_defconfig index d5123369ca..1be3180382 100644 --- a/configs/udoo_neo_nt_defconfig +++ b/configs/udoo_neo_nt_defconfig @@ -52,4 +52,6 @@ CONFIG_SYS_L2CACHE_OFF=y CONFIG_SYS_MALLOC_F_LEN=0x800 CONFIG_USE_TINY_PRINTF=y CONFIG_PHY_MICREL=y +CONFIG_GLOBAL_PAGE=y +CONFIG_STORE_MAC_IN_GLOBAL=y CONFIG_OF_LIBFDT=y \ No newline at end of file diff --git a/include/global_page.h b/include/global_page.h index a9ee6b67ad..2ba291019a 100644 --- a/include/global_page.h +++ b/include/global_page.h @@ -14,11 +14,19 @@ struct global_page_header { u8 reserved[3]; } __packed;

+struct global_mac_entry { + u8 enet_id; + u8 valid; + u8 mac[6]; +} __packed; + struct imx_global_page { struct global_page_header header; + struct global_mac_entry mac_entry[2]; } __packed;

void init_global_page(void); void publish_to_global_page(void); +void publish_mac_to_global_page(const char *env_var, int mac);

#endif