February 2018 - U-Boot

[U-Boot] [PATCH 0/8] Migrate SPI drivers to Kconfig
by Tuomas Tynkkynen 14 Feb '18

14 Feb '18

2 16

[U-Boot] [PATCH] mx5: Add HAB boot support
by andrej.rosano＠f-secure.com 14 Feb '18

14 Feb '18

From: Andrej Rosano <andrej.rosano(a)f-secure.com> Add SEC_CONFIG[1] fuse checking. Signed-off-by: Andrej Rosano <andrej.rosano(a)f-secure.com> --- arch/arm/mach-imx/Makefile | 5 +++++ arch/arm/mach-imx/hab.c | 5 +++++ arch/arm/mach-imx/mx5/soc.c | 8 ++++++++ drivers/crypto/fsl/Makefile | 2 ++ 4 files changed, 20 insertions(+) diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 95a542fa01..687c28c932 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -49,14 +49,19 @@ ifeq ($(SOC),$(filter $(SOC),mx7ulp)) obj-y += cache.o obj-$(CONFIG_SECURE_BOOT) += hab.o endif +ifeq ($(SOC),$(filter $(SOC),mx5)) +obj-$(CONFIG_SECURE_BOOT) += hab.o +endif ifeq ($(SOC),$(filter $(SOC),vf610)) obj-y += ddrmc-vf610.o endif ifneq ($(CONFIG_SPL_BUILD),y) obj-$(CONFIG_CMD_BMODE) += cmd_bmode.o obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o +ifneq ($(SOC),$(filter $(SOC),mx5)) obj-$(CONFIG_CMD_DEKBLOB) += cmd_dek.o endif +endif PLUGIN = board/$(BOARDDIR)/plugin diff --git a/arch/arm/mach-imx/hab.c b/arch/arm/mach-imx/hab.c index 5f197775c1..a2b91af7d5 100644 --- a/arch/arm/mach-imx/hab.c +++ b/arch/arm/mach-imx/hab.c @@ -498,7 +498,9 @@ int imx_hab_authenticate_image(uint32_t ddr_start, uint32_t image_size, printf("\nAuthenticate image from DDR location 0x%x...\n", ddr_start); +#if !defined(CONFIG_MX5) hab_caam_clock_enable(1); +#endif /* Calculate IVT address header */ ivt_addr = ddr_start + ivt_offset; @@ -592,7 +594,10 @@ hab_exit_failure_print_status: #endif hab_caam_clock_disable: + +#if !defined(CONFIG_MX5) hab_caam_clock_enable(0); +#endif if (load_addr != 0) result = 0; diff --git a/arch/arm/mach-imx/mx5/soc.c b/arch/arm/mach-imx/mx5/soc.c index 2b63871bc4..fab3958702 100644 --- a/arch/arm/mach-imx/mx5/soc.c +++ b/arch/arm/mach-imx/mx5/soc.c @@ -15,11 +15,19 @@ #include <linux/errno.h> #include <asm/io.h> #include <asm/mach-imx/boot_mode.h> +#include <asm/mach-imx/hab.h> #if !(defined(CONFIG_MX51) || defined(CONFIG_MX53)) #error "CPU_TYPE not defined" #endif +#if defined(CONFIG_SECURE_BOOT) +struct imx_sec_config_fuse_t const imx_sec_config_fuse = { + .bank = 0, + .word = 4, +}; +#endif + u32 get_cpu_rev(void) { #ifdef CONFIG_MX51 diff --git a/drivers/crypto/fsl/Makefile b/drivers/crypto/fsl/Makefile index ea878e1822..13e4a95459 100644 --- a/drivers/crypto/fsl/Makefile +++ b/drivers/crypto/fsl/Makefile @@ -6,6 +6,8 @@ obj-y += sec.o obj-$(CONFIG_FSL_CAAM) += jr.o fsl_hash.o jobdesc.o error.o +ifneq ($(SOC),$(filter $(SOC),mx5)) obj-$(CONFIG_CMD_BLOB) += fsl_blob.o obj-$(CONFIG_CMD_DEKBLOB) += fsl_blob.o +endif obj-$(CONFIG_RSA_FREESCALE_EXP) += fsl_rsa.o -- 2.16.1

1 0

[U-Boot] [RFC] usb: host: xhci-omap: Remove redundant board_usb_init and board_usb_cleanup functions
by Faiz Abbas 14 Feb '18

14 Feb '18

board_usb_init()/_cleanup() should be in board files and don't have a place in the xhci-omap driver. Weak versions for board_usb_init()/_cleanup() already exist in common/usb.c (for host mode) and drivers/usb/gadget/g_dnl.c (for gadget mode). Signed-off-by: Faiz Abbas <faiz_abbas(a)ti.com> --- Since 1a9a5f7 ("fix double weak board_usb_init functions") the board_usb_init()/_cleanup() a prefix omap_xhci_* was added to the board files and in omap-xhci.c because there was a duplicate implementation in common/usb.c. However, this broke the gadget mode path which uses the same board_usb_init/cleanup() in the board specific files. I think a better way would be to just remove the functions from xhci-omap like in this patch. Any issues with this? board/ti/am43xx/board.c | 4 ++-- board/ti/am57xx/board.c | 4 ++-- board/ti/dra7xx/evm.c | 4 ++-- drivers/usb/host/xhci-omap.c | 22 ---------------------- 4 files changed, 6 insertions(+), 28 deletions(-) diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 06082f1..6286af4 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -744,7 +744,7 @@ int usb_gadget_handle_interrupts(int index) #endif /* CONFIG_USB_DWC3 */ #if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) -int omap_xhci_board_usb_init(int index, enum usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); #ifdef CONFIG_USB_DWC3 @@ -775,7 +775,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init) return 0; } -int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { #ifdef CONFIG_USB_DWC3 switch (index) { diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 1128784..c3f60f6 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -867,7 +867,7 @@ int usb_gadget_handle_interrupts(int index) #endif /* CONFIG_USB_DWC3 */ #if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) -int omap_xhci_board_usb_init(int index, enum usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); switch (index) { @@ -901,7 +901,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init) return 0; } -int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { #ifdef CONFIG_USB_DWC3 switch (index) { diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 6ecf971..519475e 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -907,7 +907,7 @@ static struct ti_usb_phy_device usb_phy2_device = { .index = 1, }; -int omap_xhci_board_usb_init(int index, enum usb_init_type init) +int board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); switch (index) { @@ -944,7 +944,7 @@ int omap_xhci_board_usb_init(int index, enum usb_init_type init) return 0; } -int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) +int board_usb_cleanup(int index, enum usb_init_type init) { switch (index) { case 0: diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index d6c5744..b814500 100644 --- a/drivers/usb/host/xhci-omap.c +++ b/drivers/usb/host/xhci-omap.c @@ -27,28 +27,6 @@ DECLARE_GLOBAL_DATA_PTR; static struct omap_xhci omap; -__weak int omap_xhci_board_usb_init(int index, enum usb_init_type init) -{ - enable_usb_clocks(index); - return 0; -} - -int board_usb_init(int index, enum usb_init_type init) -{ - return omap_xhci_board_usb_init(index, init); -} - -__weak int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) -{ - disable_usb_clocks(index); - return 0; -} - -int board_usb_cleanup(int index, enum usb_init_type init) -{ - return omap_xhci_board_usb_cleanup(index, init); -} - static int omap_xhci_core_init(struct omap_xhci *omap) { int ret = 0; -- 2.7.4

4 9

[U-Boot] [PATCH] dfu: Limit dfu_mmc to non-SPL case
by Faiz Abbas 14 Feb '18

14 Feb '18

Since 82b9dc63 ("Only build cli_readline.o for CMDLINE on non-SPL"), cli_simple.c is only being built for non-SPL case. However, dfu_mmc requires cli_simple.c to build and dfu fails to build for SPL when CONFIG_HUSH_PARSER is disabled. Therefore, limit dfu_mmc to non-SPL case only. Signed-off-by: Faiz Abbas <faiz_abbas(a)ti.com> --- drivers/dfu/Makefile | 2 ++ drivers/dfu/dfu.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/drivers/dfu/Makefile b/drivers/dfu/Makefile index 61f2b71..5628734 100644 --- a/drivers/dfu/Makefile +++ b/drivers/dfu/Makefile @@ -6,7 +6,9 @@ # obj-$(CONFIG_USB_FUNCTION_DFU) += dfu.o +ifndef CONFIG_SPL_BUILD obj-$(CONFIG_DFU_MMC) += dfu_mmc.o +endif obj-$(CONFIG_DFU_NAND) += dfu_nand.o obj-$(CONFIG_DFU_RAM) += dfu_ram.o obj-$(CONFIG_DFU_SF) += dfu_sf.o diff --git a/drivers/dfu/dfu.c b/drivers/dfu/dfu.c index 2c22b62..a16e10e 100644 --- a/drivers/dfu/dfu.c +++ b/drivers/dfu/dfu.c @@ -398,8 +398,10 @@ static int dfu_fill_entity(struct dfu_entity *dfu, char *s, int alt, /* Specific for mmc device */ if (strcmp(interface, "mmc") == 0) { +#ifndef CONFIG_SPL_BUILD if (dfu_fill_entity_mmc(dfu, devstr, s)) return -1; +#endif } else if (strcmp(interface, "nand") == 0) { if (dfu_fill_entity_nand(dfu, devstr, s)) return -1; -- 2.7.4

3 4

[U-Boot] rk3288: broken boot
by Jagan Teki 14 Feb '18

14 Feb '18

Hi Philipp/Kever, Issue observed on rk3288 TPL supported board (vyasa), worked on previous release v2017.11. Tried to bisect but i couldn't do it because of changes in many files any help? thanks! -- Jagan Teki Senior Linux Kernel Engineer | Amarula Solutions U-Boot, Linux | Upstream Maintainer Hyderabad, India.

4 9

[U-Boot] [PATCH] script: Make the get_default_envs.sh script working with newest u-boot
by Lukasz Majewski 14 Feb '18

14 Feb '18

This commit fixes several issues: - After moving env related code to ./env directory the env_common.o file is no longer present in the system (has been replaced with built-in.o). - Use ${OBJCOPY} if available, fallback to system default's objcopy if not present. - Extend the script to accept different build directory than current one. It is extremely handy with OE usage, where source code is separated from build. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- scripts/get_default_envs.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/get_default_envs.sh b/scripts/get_default_envs.sh index 7955db60e5..bbb6d0a6ef 100755 --- a/scripts/get_default_envs.sh +++ b/scripts/get_default_envs.sh @@ -6,16 +6,24 @@ # # This file extracts default envs from built u-boot -# usage: get_default_envs.sh > u-boot-env-default.txt +# usage: get_default_envs.sh [build dir] > u-boot-env-default.txt set -ue -ENV_OBJ_FILE="env_common.o" +: "${OBJCOPY:=objcopy}" + +ENV_OBJ_FILE="built-in.o" ENV_OBJ_FILE_COPY="copy_${ENV_OBJ_FILE}" echoerr() { echo "$@" 1>&2; } -path=$(readlink -f $0) -env_obj_file_path=$(find ${path%/scripts*} -not -path "*/spl/*" \ +if [ "$#" -eq 1 ]; then + path=${1} +else + path=$(readlink -f $0) + path=${path%/scripts*} +fi + +env_obj_file_path=$(find ${path} -path "*/env/*" -not -path "*/spl/*" \ -name "${ENV_OBJ_FILE}") [ -z "${env_obj_file_path}" ] && \ { echoerr "File '${ENV_OBJ_FILE}' not found!"; exit 1; } @@ -24,7 +32,8 @@ cp ${env_obj_file_path} ${ENV_OBJ_FILE_COPY} # NOTE: objcopy saves its output to file passed in # (copy_env_common.o in this case) -objcopy -O binary -j ".rodata.default_environment" ${ENV_OBJ_FILE_COPY} + +${OBJCOPY} -O binary -j ".rodata.default_environment" ${ENV_OBJ_FILE_COPY} # Replace default '\0' with '\n' and sort entries tr '\0' '\n' < ${ENV_OBJ_FILE_COPY} | sort -u -- 2.11.0

3 5

[U-Boot] [PATCH v2] script: Make the get_default_envs.sh script working with newest u-boot
by Lukasz Majewski 14 Feb '18

14 Feb '18

This commit fixes several issues: - After moving env related code to ./env directory the env_common.o file is no longer present in the system (has been replaced with built-in.o). - Use ${OBJCOPY} if available, fallback to system default's objcopy if not present. - Extend the script to accept different build directory than current one. It is extremely handy with OE usage, where source code is separated from build. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> Tested-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- Changes in v2: - Update comment information scripts/get_default_envs.sh | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/scripts/get_default_envs.sh b/scripts/get_default_envs.sh index 7955db60e5..3e532d12c4 100755 --- a/scripts/get_default_envs.sh +++ b/scripts/get_default_envs.sh @@ -6,16 +6,24 @@ # # This file extracts default envs from built u-boot -# usage: get_default_envs.sh > u-boot-env-default.txt +# usage: get_default_envs.sh [build dir] > u-boot-env-default.txt set -ue -ENV_OBJ_FILE="env_common.o" +: "${OBJCOPY:=objcopy}" + +ENV_OBJ_FILE="built-in.o" ENV_OBJ_FILE_COPY="copy_${ENV_OBJ_FILE}" echoerr() { echo "$@" 1>&2; } -path=$(readlink -f $0) -env_obj_file_path=$(find ${path%/scripts*} -not -path "*/spl/*" \ +if [ "$#" -eq 1 ]; then + path=${1} +else + path=$(readlink -f $0) + path=${path%/scripts*} +fi + +env_obj_file_path=$(find ${path} -path "*/env/*" -not -path "*/spl/*" \ -name "${ENV_OBJ_FILE}") [ -z "${env_obj_file_path}" ] && \ { echoerr "File '${ENV_OBJ_FILE}' not found!"; exit 1; } @@ -23,8 +31,9 @@ env_obj_file_path=$(find ${path%/scripts*} -not -path "*/spl/*" \ cp ${env_obj_file_path} ${ENV_OBJ_FILE_COPY} # NOTE: objcopy saves its output to file passed in -# (copy_env_common.o in this case) -objcopy -O binary -j ".rodata.default_environment" ${ENV_OBJ_FILE_COPY} +# (copy_${ENV_OBJ_FILE} in this case) + +${OBJCOPY} -O binary -j ".rodata.default_environment" ${ENV_OBJ_FILE_COPY} # Replace default '\0' with '\n' and sort entries tr '\0' '\n' < ${ENV_OBJ_FILE_COPY} | sort -u -- 2.11.0

1 0

[U-Boot] [PATCH] drivers/ddr/fsl: Dual-license DDR driver
by York Sun 14 Feb '18

14 Feb '18

To make this driver easier to be reused, dual-license DDR driver. Signed-off-by: York Sun <york.sun(a)nxp.com> CC: Simon Glass <sjg(a)chromium.org> CC: Tom Rini <trini(a)konsulko.com> CC: Heinrich Schuchardt <xypron.glpk(a)gmx.de> CC: Thomas Schaefer <thomas.schaefer(a)kontron.com> CC: Masahiro Yamada <yamada.masahiro(a)socionext.com> CC: Robert P. J. Day <rpjday(a)crashcourse.ca> CC: Alexander Merkle <alexander.merkle(a)lauterbach.com> CC: Joakim Tjernlund <joakim.tjernlund(a)transmode.se> CC: Curt Brune <curt(a)cumulusnetworks.com> CC: Valentin Longchamp <valentin.longchamp(a)keymile.com> CC: Wolfgang Denk <wd(a)denx.de> CC: Anatolij Gustschin <agust(a)denx.de> CC: Ira W. Snyder <iws(a)ovro.caltech.edu> CC: Marek Vasut <marek.vasut(a)gmail.com> CC: Kyle Moffett <Kyle.D.Moffett(a)boeing.com> CC: Sebastien Carlier <sebastien.carlier(a)gmail.com> CC: Stefan Roese <sr(a)denx.de> CC: Peter Tyser <ptyser(a)xes-inc.com> CC: Paul Gortmaker <paul.gortmaker(a)windriver.com> CC: Peter Tyser <ptyser(a)xes-inc.com> CC: Jean-Christophe PLAGNIOL-VILLARD <plagnioj(a)jcrosoft.com> --- drivers/ddr/fsl/arm_ddr_gen3.c | 2 +- drivers/ddr/fsl/ctrl_regs.c | 2 +- drivers/ddr/fsl/ddr1_dimm_params.c | 2 +- drivers/ddr/fsl/ddr2_dimm_params.c | 2 +- drivers/ddr/fsl/ddr3_dimm_params.c | 2 +- drivers/ddr/fsl/ddr4_dimm_params.c | 2 +- drivers/ddr/fsl/fsl_ddr_gen4.c | 2 +- drivers/ddr/fsl/fsl_mmdc.c | 2 +- drivers/ddr/fsl/interactive.c | 2 +- drivers/ddr/fsl/lc_common_dimm_params.c | 2 +- drivers/ddr/fsl/main.c | 2 +- drivers/ddr/fsl/mpc85xx_ddr_gen1.c | 2 +- drivers/ddr/fsl/mpc85xx_ddr_gen2.c | 2 +- drivers/ddr/fsl/mpc85xx_ddr_gen3.c | 2 +- drivers/ddr/fsl/mpc86xx_ddr.c | 2 +- drivers/ddr/fsl/options.c | 2 +- drivers/ddr/fsl/util.c | 2 +- include/common_timing_params.h | 2 +- include/fsl_ddr.h | 2 +- include/fsl_ddr_dimm_params.h | 2 +- include/fsl_ddrc_version.h | 2 +- include/fsl_immap.h | 2 +- include/fsl_mmdc.h | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c index aaf4dfb..4fa0d5d 100644 --- a/drivers/ddr/fsl/arm_ddr_gen3.c +++ b/drivers/ddr/fsl/arm_ddr_gen3.c @@ -1,7 +1,7 @@ /* * Copyright 2013 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause * * Derived from mpc85xx_ddr_gen3.c, removed all workarounds */ diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c index 8b87271..7308309 100644 --- a/drivers/ddr/fsl/ctrl_regs.c +++ b/drivers/ddr/fsl/ctrl_regs.c @@ -2,7 +2,7 @@ * Copyright 2008-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP Semiconductor * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ /* diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c index c02725e..8a8c17c 100644 --- a/drivers/ddr/fsl/ddr1_dimm_params.c +++ b/drivers/ddr/fsl/ddr1_dimm_params.c @@ -1,7 +1,7 @@ /* * Copyright 2008 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c index 062c849..3ff35aa 100644 --- a/drivers/ddr/fsl/ddr2_dimm_params.c +++ b/drivers/ddr/fsl/ddr2_dimm_params.c @@ -1,7 +1,7 @@ /* * Copyright 2008 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c index 8a0587a..d8f170e 100644 --- a/drivers/ddr/fsl/ddr3_dimm_params.c +++ b/drivers/ddr/fsl/ddr3_dimm_params.c @@ -6,7 +6,7 @@ * from ddr3 spd, please refer to the spec * JEDEC standard No.21-C 4_01_02_11R18.pdf * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c index 4867fbc..343b0ff 100644 --- a/drivers/ddr/fsl/ddr4_dimm_params.c +++ b/drivers/ddr/fsl/ddr4_dimm_params.c @@ -2,7 +2,7 @@ * Copyright 2014-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP Semiconductor * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause * * calculate the organization and timing parameter * from ddr3 spd, please refer to the spec diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c index c225c8e..1829aa4 100644 --- a/drivers/ddr/fsl/fsl_ddr_gen4.c +++ b/drivers/ddr/fsl/fsl_ddr_gen4.c @@ -1,7 +1,7 @@ /* * Copyright 2014-2015 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/fsl_mmdc.c b/drivers/ddr/fsl/fsl_mmdc.c index 52eec0f..1312c08 100644 --- a/drivers/ddr/fsl/fsl_mmdc.c +++ b/drivers/ddr/fsl/fsl_mmdc.c @@ -1,7 +1,7 @@ /* * Copyright 2016 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ /* diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c index 1fa35c3..f5c21e4 100644 --- a/drivers/ddr/fsl/interactive.c +++ b/drivers/ddr/fsl/interactive.c @@ -2,7 +2,7 @@ * Copyright 2010-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP Semiconductor * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ /* diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c index 6599901..3d28abd 100644 --- a/drivers/ddr/fsl/lc_common_dimm_params.c +++ b/drivers/ddr/fsl/lc_common_dimm_params.c @@ -2,7 +2,7 @@ * Copyright 2008-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP Semiconductor * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c index d0a7b3f..85897b1 100644 --- a/drivers/ddr/fsl/main.c +++ b/drivers/ddr/fsl/main.c @@ -1,7 +1,7 @@ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ /* diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c index c005f52..f74bf32 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c @@ -1,7 +1,7 @@ /* * Copyright 2008 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c index 898b0cd..6da4400 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c @@ -1,7 +1,7 @@ /* * Copyright 2008-2011 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c index afbed59..e58f76a 100644 --- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c +++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c @@ -1,7 +1,7 @@ /* * Copyright 2008-2012 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/mpc86xx_ddr.c b/drivers/ddr/fsl/mpc86xx_ddr.c index a65eb31..bda5b83 100644 --- a/drivers/ddr/fsl/mpc86xx_ddr.c +++ b/drivers/ddr/fsl/mpc86xx_ddr.c @@ -1,7 +1,7 @@ /* * Copyright 2008 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c index 85ec48c..1abea1d 100644 --- a/drivers/ddr/fsl/options.c +++ b/drivers/ddr/fsl/options.c @@ -2,7 +2,7 @@ * Copyright 2008, 2010-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP Semiconductor * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ #include <common.h> diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c index d6e6e78..11731cb 100644 --- a/drivers/ddr/fsl/util.c +++ b/drivers/ddr/fsl/util.c @@ -1,7 +1,7 @@ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #include <common.h> diff --git a/include/common_timing_params.h b/include/common_timing_params.h index 0700107..3881456 100644 --- a/include/common_timing_params.h +++ b/include/common_timing_params.h @@ -1,7 +1,7 @@ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #ifndef COMMON_TIMING_PARAMS_H diff --git a/include/fsl_ddr.h b/include/fsl_ddr.h index 261b94e..996723c 100644 --- a/include/fsl_ddr.h +++ b/include/fsl_ddr.h @@ -1,7 +1,7 @@ /* * Copyright 2008-2014 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #ifndef FSL_DDR_MAIN_H diff --git a/include/fsl_ddr_dimm_params.h b/include/fsl_ddr_dimm_params.h index 1632a8f..af673fd 100644 --- a/include/fsl_ddr_dimm_params.h +++ b/include/fsl_ddr_dimm_params.h @@ -2,7 +2,7 @@ * Copyright 2008-2016 Freescale Semiconductor, Inc. * Copyright 2017-2018 NXP Semiconductor * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0 BSD-3-Clause */ #ifndef DDR2_DIMM_PARAMS_H diff --git a/include/fsl_ddrc_version.h b/include/fsl_ddrc_version.h index 60ba98b..4c5aed4 100644 --- a/include/fsl_ddrc_version.h +++ b/include/fsl_ddrc_version.h @@ -1,7 +1,7 @@ /* * Copyright 2014 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ #ifndef __FSL_DDRC_VER_H diff --git a/include/fsl_immap.h b/include/fsl_immap.h index 4f5a19c..e210c4c 100644 --- a/include/fsl_immap.h +++ b/include/fsl_immap.h @@ -3,7 +3,7 @@ * * Copyright 2013-2014 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ #ifndef __FSL_IMMAP_H diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h index d5c4f8d..d364e07 100644 --- a/include/fsl_mmdc.h +++ b/include/fsl_mmdc.h @@ -1,7 +1,7 @@ /* * Copyright 2016 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ #ifndef FSL_MMDC_H -- 2.7.4

14 28

[U-Boot] [PATCH 1/1] fs: fat: avoid useless conversion when calling getcluster
by Heinrich Schuchardt 14 Feb '18

14 Feb '18

Parameter size of function get_cluster() is of type unsigned long. It makes no sense to convert actsize to int before passing it to get_cluster as size. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/fat/fat.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index dd7888cd6d4..a3c7bf604eb 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -353,7 +353,7 @@ static int get_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, if (pos) { actsize = min(filesize, (loff_t)bytesperclust); if (get_cluster(mydata, curclust, get_contents_vfatname_block, - (int)actsize) != 0) { + (unsigned long)actsize) != 0) { printf("Error reading cluster\n"); return -1; } @@ -393,14 +393,16 @@ static int get_contents(fsdata *mydata, dir_entry *dentptr, loff_t pos, /* get remaining bytes */ actsize = filesize; - if (get_cluster(mydata, curclust, buffer, (int)actsize) != 0) { + if (get_cluster(mydata, curclust, buffer, + (unsigned long)actsize) != 0) { printf("Error reading cluster\n"); return -1; } *gotsize += actsize; return 0; getit: - if (get_cluster(mydata, curclust, buffer, (int)actsize) != 0) { + if (get_cluster(mydata, curclust, buffer, + (unsigned long)actsize) != 0) { printf("Error reading cluster\n"); return -1; } -- 2.14.2

3 3

[U-Boot] [PATCH 1/3] video: ivybridge_igd: Fix compiler warning
by Bin Meng 14 Feb '18

14 Feb '18

Fix build warning in drivers/video/ivybridge_igd.c with gcc 7.3.0: warning: 'ivb_pm_gt2' defined but not used [-Wunused-const-variable=] Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- drivers/video/ivybridge_igd.c | 56 ------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/drivers/video/ivybridge_igd.c b/drivers/video/ivybridge_igd.c index d8af2e1..7c00c40 100644 --- a/drivers/video/ivybridge_igd.c +++ b/drivers/video/ivybridge_igd.c @@ -128,62 +128,6 @@ static const struct gt_powermeter ivb_pm_gt1[] = { { 0 } }; -static const struct gt_powermeter ivb_pm_gt2[] = { - { 0xa800, 0x10000000 }, - { 0xa804, 0x00033800 }, - { 0xa808, 0x00000902 }, - { 0xa80c, 0x0c002f00 }, - { 0xa810, 0x12000400 }, - { 0xa814, 0x00000000 }, - { 0xa818, 0x00d20800 }, - { 0xa81c, 0x00000002 }, - { 0xa820, 0x03004b02 }, - { 0xa824, 0x00000600 }, - { 0xa828, 0x07000773 }, - { 0xa82c, 0x00000000 }, - { 0xa830, 0x00010032 }, - { 0xa834, 0x1520040d }, - { 0xa838, 0x00020105 }, - { 0xa83c, 0x00083700 }, - { 0xa840, 0x0000151d }, - { 0xa844, 0x00000000 }, - { 0xa848, 0x20001b00 }, - { 0xa84c, 0x0a000010 }, - { 0xa850, 0x00000000 }, - { 0xa854, 0x00000008 }, - { 0xa858, 0x00000008 }, - { 0xa85c, 0x00000000 }, - { 0xa860, 0x00020000 }, - { 0xa248, 0x0000221e }, - { 0xa900, 0x00000000 }, - { 0xa904, 0x00003500 }, - { 0xa908, 0x00000000 }, - { 0xa90c, 0x0c000000 }, - { 0xa910, 0x12000500 }, - { 0xa914, 0x00000000 }, - { 0xa918, 0x00b20000 }, - { 0xa91c, 0x00000000 }, - { 0xa920, 0x08004b02 }, - { 0xa924, 0x00000200 }, - { 0xa928, 0x07000820 }, - { 0xa92c, 0x00000000 }, - { 0xa930, 0x00030000 }, - { 0xa934, 0x050f020d }, - { 0xa938, 0x00020300 }, - { 0xa93c, 0x00903900 }, - { 0xa940, 0x00000000 }, - { 0xa944, 0x00000000 }, - { 0xa948, 0x20001b00 }, - { 0xa94c, 0x0a000010 }, - { 0xa950, 0x00000000 }, - { 0xa954, 0x00000008 }, - { 0xa960, 0x00110000 }, - { 0xaa3c, 0x00003900 }, - { 0xaa54, 0x00000008 }, - { 0xaa60, 0x00110000 }, - { 0 } -}; - static const struct gt_powermeter ivb_pm_gt2_17w[] = { { 0xa800, 0x20000000 }, { 0xa804, 0x000e3800 }, -- 2.7.4

3 10