May 2018 - U-Boot

[U-Boot] [PATCH v3 3/3] spi: mxs_spi: DM conversion
by Akash Gajjar 11 May '18

11 May '18

This patch adds support for DM driver model to the mxs spi driver. Some TODOs are left over for later. These would be enhancements to the original functionality, and can come later. The legacy functionality is removed in this version. Signed-off-by: Akash Gajjar <akash(a)openedev.com> --- changes in v2: Register cs_info method Remove unused function __mxs_spi_setup Merged __spi_xfer function to spi_xfer printf replaced by debug changes in v3: changes made on top of previous patch is merged in v3 --- drivers/spi/Kconfig | 12 +- drivers/spi/mxs_spi.c | 258 +++++++++++++++++++++++-------------- include/dm/platform_data/spi_mxs.h | 18 +++ 3 files changed, 183 insertions(+), 105 deletions(-) create mode 100644 include/dm/platform_data/spi_mxs.h diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index ec92b84..5d3e152 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -106,6 +106,12 @@ config MVEBU_A3700_SPI used to access the SPI NOR flash on platforms embedding this Marvell IP core. +config MXS_SPI + bool "MXS SPI Driver" + help + Enable the MXS SPI controller driver. This driver can be used + on the i.MX23 and i.MX28 SoCs. + config PIC32_SPI bool "Microchip PIC32 SPI driver" depends on MACH_PIC32 @@ -299,12 +305,6 @@ config MXC_SPI Enable the MXC SPI controller driver. This driver can be used on various i.MX SoCs such as i.MX31/35/51/6/7. -config MXS_SPI - bool "MXS SPI Driver" - help - Enable the MXS SPI controller driver. This driver can be used - on the i.MX23 and i.MX28 SoCs. - config OMAP3_SPI bool "McSPI driver for OMAP" help diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c index 790db78..3054438 100644 --- a/drivers/spi/mxs_spi.c +++ b/drivers/spi/mxs_spi.c @@ -1,6 +1,9 @@ /* * Freescale i.MX28 SPI driver * + * Support for device model: + * Copyright (C) 2018 Akash Gajjar <akash(a)openedev.com> + * * Copyright (C) 2011 Marek Vasut <marek.vasut(a)gmail.com> * on behalf of DENX Software Engineering GmbH * @@ -20,6 +23,8 @@ #include <asm/arch/imx-regs.h> #include <asm/arch/sys_proto.h> #include <asm/mach-imx/dma.h> +#include <dm.h> +#include <dm/platform_data/spi_mxs.h> #define MXS_SPI_MAX_TIMEOUT 1000000 #define MXS_SPI_PORT_OFFSET 0x2000 @@ -28,93 +33,14 @@ #define MXSSSP_SMALL_TRANSFER 512 -struct mxs_spi_slave { - struct spi_slave slave; - uint32_t max_khz; - uint32_t mode; - struct mxs_ssp_regs *regs; +struct mxs_spi_priv { + struct mxs_ssp_regs *regs; + u32 max_khz; + u32 mode; + u32 bus; + u32 cs; }; -static inline struct mxs_spi_slave *to_mxs_slave(struct spi_slave *slave) -{ - return container_of(slave, struct mxs_spi_slave, slave); -} - -void spi_init(void) -{ -} - -int spi_cs_is_valid(unsigned int bus, unsigned int cs) -{ - /* MXS SPI: 4 ports and 3 chip selects maximum */ - if (!mxs_ssp_bus_id_valid(bus) || cs > 2) - return 0; - else - return 1; -} - -struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, - unsigned int max_hz, unsigned int mode) -{ - struct mxs_spi_slave *mxs_slave; - - if (!spi_cs_is_valid(bus, cs)) { - printf("mxs_spi: invalid bus %d / chip select %d\n", bus, cs); - return NULL; - } - - mxs_slave = spi_alloc_slave(struct mxs_spi_slave, bus, cs); - if (!mxs_slave) - return NULL; - - if (mxs_dma_init_channel(MXS_DMA_CHANNEL_AHB_APBH_SSP0 + bus)) - goto err_init; - - mxs_slave->max_khz = max_hz / 1000; - mxs_slave->mode = mode; - mxs_slave->regs = mxs_ssp_regs_by_bus(bus); - - return &mxs_slave->slave; - -err_init: - free(mxs_slave); - return NULL; -} - -void spi_free_slave(struct spi_slave *slave) -{ - struct mxs_spi_slave *mxs_slave = to_mxs_slave(slave); - free(mxs_slave); -} - -int spi_claim_bus(struct spi_slave *slave) -{ - struct mxs_spi_slave *mxs_slave = to_mxs_slave(slave); - struct mxs_ssp_regs *ssp_regs = mxs_slave->regs; - uint32_t reg = 0; - - mxs_reset_block(&ssp_regs->hw_ssp_ctrl0_reg); - - writel((slave->cs << MXS_SSP_CHIPSELECT_SHIFT) | - SSP_CTRL0_BUS_WIDTH_ONE_BIT, - &ssp_regs->hw_ssp_ctrl0); - - reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS; - reg |= (mxs_slave->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0; - reg |= (mxs_slave->mode & SPI_CPHA) ? SSP_CTRL1_PHASE : 0; - writel(reg, &ssp_regs->hw_ssp_ctrl1); - - writel(0, &ssp_regs->hw_ssp_cmd0); - - mxs_set_ssp_busclock(slave->bus, mxs_slave->max_khz); - - return 0; -} - -void spi_release_bus(struct spi_slave *slave) -{ -} - static void mxs_spi_start_xfer(struct mxs_ssp_regs *ssp_regs) { writel(SSP_CTRL0_LOCK_CS, &ssp_regs->hw_ssp_ctrl0_set); @@ -127,10 +53,10 @@ static void mxs_spi_end_xfer(struct mxs_ssp_regs *ssp_regs) writel(SSP_CTRL0_IGNORE_CRC, &ssp_regs->hw_ssp_ctrl0_set); } -static int mxs_spi_xfer_pio(struct mxs_spi_slave *slave, +static int mxs_spi_xfer_pio(struct mxs_spi_priv *priv, char *data, int length, int write, unsigned long flags) { - struct mxs_ssp_regs *ssp_regs = slave->regs; + struct mxs_ssp_regs *ssp_regs = priv->regs; if (flags & SPI_XFER_BEGIN) mxs_spi_start_xfer(ssp_regs); @@ -156,7 +82,7 @@ static int mxs_spi_xfer_pio(struct mxs_spi_slave *slave, if (mxs_wait_mask_set(&ssp_regs->hw_ssp_ctrl0_reg, SSP_CTRL0_RUN, MXS_SPI_MAX_TIMEOUT)) { - printf("MXS SPI: Timeout waiting for start\n"); + debug("MXS SPI: Timeout waiting for start\n"); return -ETIMEDOUT; } @@ -168,7 +94,7 @@ static int mxs_spi_xfer_pio(struct mxs_spi_slave *slave, if (!write) { if (mxs_wait_mask_clr(&ssp_regs->hw_ssp_status_reg, SSP_STATUS_FIFO_EMPTY, MXS_SPI_MAX_TIMEOUT)) { - printf("MXS SPI: Timeout waiting for data\n"); + debug("MXS SPI: Timeout waiting for data\n"); return -ETIMEDOUT; } @@ -178,7 +104,7 @@ static int mxs_spi_xfer_pio(struct mxs_spi_slave *slave, if (mxs_wait_mask_clr(&ssp_regs->hw_ssp_ctrl0_reg, SSP_CTRL0_RUN, MXS_SPI_MAX_TIMEOUT)) { - printf("MXS SPI: Timeout waiting for finish\n"); + debug("MXS SPI: Timeout waiting for finish\n"); return -ETIMEDOUT; } } @@ -186,12 +112,12 @@ static int mxs_spi_xfer_pio(struct mxs_spi_slave *slave, return 0; } -static int mxs_spi_xfer_dma(struct mxs_spi_slave *slave, +static int mxs_spi_xfer_dma(struct mxs_spi_priv *priv, char *data, int length, int write, unsigned long flags) { + struct mxs_ssp_regs *ssp_regs = priv->regs; const int xfer_max_sz = 0xff00; const int desc_count = DIV_ROUND_UP(length, xfer_max_sz) + 1; - struct mxs_ssp_regs *ssp_regs = slave->regs; struct mxs_dma_desc *dp; uint32_t ctrl0; uint32_t cache_data_count; @@ -230,7 +156,7 @@ static int mxs_spi_xfer_dma(struct mxs_spi_slave *slave, /* Invalidate the area, so no writeback into the RAM races with DMA */ invalidate_dcache_range(dstart, dstart + cache_data_count); - dmach = MXS_DMA_CHANNEL_AHB_APBH_SSP0 + slave->slave.bus; + dmach = MXS_DMA_CHANNEL_AHB_APBH_SSP0 + priv->bus; dp = desc; while (length) { @@ -307,11 +233,67 @@ static int mxs_spi_xfer_dma(struct mxs_spi_slave *slave, return ret; } -int spi_xfer(struct spi_slave *slave, unsigned int bitlen, - const void *dout, void *din, unsigned long flags) +static int mxs_spi_claim_bus(struct udevice *dev) +{ + struct udevice *bus = dev_get_parent(dev); + struct mxs_spi_priv *priv = dev_get_priv(bus); + struct mxs_ssp_regs *ssp_regs = priv->regs; + struct mxs_spi_platdata *plat = dev_get_platdata(bus); + + writel(((plat->cs) << MXS_SSP_CHIPSELECT_SHIFT) | + SSP_CTRL0_BUS_WIDTH_ONE_BIT, + &ssp_regs->hw_ssp_ctrl0); + + return 0; +} + +static int mxs_spi_release_bus(struct udevice *dev) { - struct mxs_spi_slave *mxs_slave = to_mxs_slave(slave); - struct mxs_ssp_regs *ssp_regs = mxs_slave->regs; + return 0; +} + +static int mxs_spi_set_speed(struct udevice *bus, uint speed) +{ + struct mxs_spi_priv *priv = dev_get_priv(bus); + struct mxs_spi_platdata *plat = dev_get_platdata(bus); + + if (speed > plat->max_khz) + speed = plat->max_khz; + + priv->max_khz = speed; + debug("%s speed %u\n", __func__, speed); + + mxs_set_ssp_busclock(plat->bus, priv->max_khz); + + return 0; +} + +static int mxs_spi_set_mode(struct udevice *bus, uint mode) +{ + struct mxs_spi_priv *priv = dev_get_priv(bus); + struct mxs_ssp_regs *ssp_regs = priv->regs; + u32 reg; + + priv->mode = mode; + debug("%s mode %u\n", __func__, mode); + + reg = SSP_CTRL1_SSP_MODE_SPI | SSP_CTRL1_WORD_LENGTH_EIGHT_BITS; + reg |= (priv->mode & SPI_CPOL) ? SSP_CTRL1_POLARITY : 0; + reg |= (priv->mode & SPI_CPHA) ? SSP_CTRL1_PHASE : 0; + writel(reg, &ssp_regs->hw_ssp_ctrl1); + + /* go in idle state */ + writel(0, &ssp_regs->hw_ssp_cmd0); + + return 0; +} + +static int mxs_spi_xfer(struct udevice *dev, unsigned int bitlen, + const void *dout, void *din, unsigned long flags) +{ + struct udevice *bus = dev_get_parent(dev); + struct mxs_spi_priv *priv = dev_get_priv(bus); + struct mxs_ssp_regs *ssp_regs = priv->regs; int len = bitlen / 8; char dummy; int write = 0; @@ -355,9 +337,87 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, if (!dma || (len < MXSSSP_SMALL_TRANSFER)) { writel(SSP_CTRL1_DMA_ENABLE, &ssp_regs->hw_ssp_ctrl1_clr); - return mxs_spi_xfer_pio(mxs_slave, data, len, write, flags); + return mxs_spi_xfer_pio(priv, data, len, write, flags); } else { writel(SSP_CTRL1_DMA_ENABLE, &ssp_regs->hw_ssp_ctrl1_set); - return mxs_spi_xfer_dma(mxs_slave, data, len, write, flags); + return mxs_spi_xfer_dma(priv, data, len, write, flags); } } + +static int mxs_spi_cs_info(struct udevice *bus, uint cs, + struct spi_cs_info *info) +{ + struct mxs_spi_priv *priv = dev_get_priv(bus); + + if (cs >= priv->cs) { + printf("%s: no cs %u\n", __func__, cs); + return -ENODEV; + } + + return 0; +} + +static int mxs_spi_probe(struct udevice *dev) +{ + struct mxs_spi_platdata *plat = dev_get_platdata(dev); + struct mxs_spi_priv *priv = dev_get_priv(bus); + int err; + + priv->max_khz = (plat->max_hz) / 1000; + priv->mode = plat->mode; + priv->bus = plat->bus; + + err = mxs_dma_init_channel(MXS_DMA_CHANNEL_AHB_APBH_SSP0 + priv->bus); + if (err) { + debug("%s: DMA init channel error %d\n", __func__, err); + return err; + } + + return 0; +} + +static const struct dm_spi_ops mxs_spi_ops = { + .claim_bus = mxs_spi_claim_bus, + .release_bus = mxs_spi_release_bus, + .xfer = mxs_spi_xfer, + .set_speed = mxs_spi_set_speed, + .set_mode = mxs_spi_set_mode, + .cs_info = mxs_spi_cs_info, +}; + +#if CONFIG_IS_ENABLED(OF_CONTROL) +static int mxs_ofdata_to_platadata(struct udevice *bus) +{ + struct mxs_spi_platdata *plat = bus->platdata; + fdt_addr_t addr; + + addr = devfdt_get_addr(bus); + if (addr == FDT_ADDR_T_NONE) + return -EINVAL; + + plat->regs = (struct mxs_ssp_regs *)addr; + plat->cs = fdtdec_get_int(gd->fdt_blob, + dev_of_offset(bus), "num-cs", 4); + + return 0; +} + +/* TODO: update compatible device tree */ +static const struct udevice_id mxs_spi_ids[] = { + { .compatible = " " }, + { } +}; +#endif + +U_BOOT_DRIVER(mxs_spi) = { + .name = "mxs_spi", + .id = UCLASS_SPI, +#if CONFIG_IS_ENABLED(OF_CONTROL) + .of_match = mxs_spi_ids, + .ofdata_to_platdata = mxs_ofdata_to_platadata, + .platdata_auto_alloc_size = sizeof(struct mxs_spi_platdata), +#endif + .ops = &mxs_spi_ops, + .priv_auto_alloc_size = sizeof(struct mxs_spi_priv), + .probe = mxs_spi_probe, +}; diff --git a/include/dm/platform_data/spi_mxs.h b/include/dm/platform_data/spi_mxs.h new file mode 100644 index 0000000..5164834 --- /dev/null +++ b/include/dm/platform_data/spi_mxs.h @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2018 Akash Gajjar <akash(a)openedev.com> + * + * SPDX-License-Identifier: GPL-2.0+ + * + */ + +#ifndef __SPI_MXS_H +#define __SPI_MXS_H + +struct mxs_spi_platdata { + struct mxs_ssp_regs *regs; + u32 bus; + u32 max_hz; + u32 cs; +}; + +#endif /* __SPI_MXS_H */ -- 2.7.4

3 5

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 11 May '18

11 May '18

The following changes since commit 6417572efa9107674ec106ae7e388178a92155fc: lib/Kconfig: Mark OF_LIBFDT_OVERLAY as depending on OF_LIBFDT (2018-05-08 09:07:41 -0400) are available in the Git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to 792557d1110e13f82ee66dab57c5dca2102744da: spl: socfpga: Generate Arria10 SFP header V1 (2018-05-08 21:08:42 +0200) ---------------------------------------------------------------- Marek Vasut (5): ARM: socfpga: Add boot trampoline for Arria10 image: socfpga: Add SFP image version 1 definition tools: socfpga: Stop using global struct socfpga_image tools: socfpga: Add SFP image V1 support spl: socfpga: Generate Arria10 SFP header V1 arch/arm/mach-socfpga/include/mach/boot0.h | 4 +- common/image.c | 3 +- include/image.h | 3 +- scripts/Makefile.spl | 4 ++ tools/socfpgaimage.c | 295 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------- 5 files changed, 229 insertions(+), 80 deletions(-)

2 1

[U-Boot] [PATCH] SPDX: Convert a few files that were missed before
by Tom Rini 11 May '18

11 May '18

As part of the main conversion a few files were missed. These files had additional whitespace after the '*' and before the SPDX tag and my previous regex was too strict. This time I did a grep for all SPDX tags and then filtered out anything that matched the correct styles. Fixes: 83d290c56fab ("SPDX: Convert all of our single license tags to Linux Kernel style") Reported-by: Heinrich Schuchardt <xypron.debian(a)gmx.de> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- arch/arm/mach-rmobile/include/mach/ehci-rmobile.h | 3 +-- arch/arm/mach-socfpga/qts-filter.sh | 2 +- arch/arm/thumb1/include/asm/proc-armv/system.h | 3 +-- board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c | 3 +-- board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c | 5 +---- board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c | 5 +---- board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c | 5 +---- board/xilinx/zynq/zynq-zed/ps7_init_gpl.c | 5 +---- cmd/bootefi.c | 3 +-- doc/README.uefi | 4 ++-- drivers/net/vsc9953.c | 3 +-- drivers/usb/host/ehci-rmobile.c | 3 +-- drivers/video/bridge/Makefile | 3 +-- include/asm-generic/pe.h | 3 +-- include/charset.h | 3 +-- include/efi_driver.h | 3 +-- include/efi_loader.h | 3 +-- include/efi_selftest.h | 3 +-- include/net.h | 2 +- include/pe.h | 3 +-- lib/charset.c | 3 +-- lib/efi_driver/Makefile | 4 +--- lib/efi_driver/efi_block_device.c | 3 +-- lib/efi_driver/efi_uclass.c | 3 +-- lib/efi_loader/Makefile | 3 +-- lib/efi_loader/efi_bootmgr.c | 3 +-- lib/efi_loader/efi_boottime.c | 3 +-- lib/efi_loader/efi_console.c | 3 +-- lib/efi_loader/efi_device_path_to_text.c | 3 +-- lib/efi_loader/efi_device_path_utilities.c | 3 +-- lib/efi_loader/efi_disk.c | 3 +-- lib/efi_loader/efi_file.c | 3 +-- lib/efi_loader/efi_gop.c | 3 +-- lib/efi_loader/efi_image_loader.c | 3 +-- lib/efi_loader/efi_memory.c | 3 +-- lib/efi_loader/efi_net.c | 3 +-- lib/efi_loader/efi_runtime.c | 3 +-- lib/efi_loader/efi_smbios.c | 3 +-- lib/efi_loader/efi_variable.c | 3 +-- lib/efi_loader/efi_watchdog.c | 3 +-- lib/efi_selftest/Makefile | 6 ++---- lib/efi_selftest/efi_selftest_disk_image.h | 3 +-- lib/lz4.c | 3 +-- net/arp.c | 2 +- net/arp.h | 2 +- net/cdp.c | 2 +- net/cdp.h | 2 +- net/net.c | 2 +- net/ping.c | 2 +- net/ping.h | 2 +- test/fs/fs-test.sh | 4 +--- tools/file2include.c | 3 +-- tools/ifdtool.c | 2 +- 53 files changed, 55 insertions(+), 108 deletions(-) diff --git a/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h b/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h index 463654efd33e..ca8c5f370637 100644 --- a/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h +++ b/arch/arm/mach-rmobile/include/mach/ehci-rmobile.h @@ -1,8 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (C) 2013,2014 Renesas Electronics Corporation * Copyright (C) 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __EHCI_RMOBILE_H__ diff --git a/arch/arm/mach-socfpga/qts-filter.sh b/arch/arm/mach-socfpga/qts-filter.sh index 02c28be2b772..3a442bc5d827 100755 --- a/arch/arm/mach-socfpga/qts-filter.sh +++ b/arch/arm/mach-socfpga/qts-filter.sh @@ -145,10 +145,10 @@ process_sdram_config() { ( cat << EOF +/* SPDX-License-Identifier: BSD-3-Clause */ /* * Altera SoCFPGA SDRAM configuration * - * SPDX-License-Identifier: BSD-3-Clause */ #ifndef __SOCFPGA_SDRAM_CONFIG_H__ diff --git a/arch/arm/thumb1/include/asm/proc-armv/system.h b/arch/arm/thumb1/include/asm/proc-armv/system.h index 7dfbf3d33db0..1324f7efb137 100644 --- a/arch/arm/thumb1/include/asm/proc-armv/system.h +++ b/arch/arm/thumb1/include/asm/proc-armv/system.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Thumb-1 drop-in for the linux/include/asm-arm/proc-armv/system.h * @@ -7,8 +8,6 @@ * The original file does not build in Thumb mode. However, in U-Boot * we don't use interrupt context, so we can redefine these as empty * memory barriers, which makes Thumb-1 compiler happy. - * - * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c index 3bd02f3c83ec..500dcce4da5c 100644 --- a/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c +++ b/board/opalkelly/zynq/zynq-syzygy-hub/ps7_init_gpl.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. * (c) Copyright 2017 Opal Kelly Inc. -* -* SPDX-License-Identifier: GPL-2.0+ *****************************************************************************/ #include <asm/arch/ps7_init_gpl.h> diff --git a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c index 5cf627d2233d..39afd82195c2 100644 --- a/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-microzed/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c index fc325a6b028a..88ff7947f20e 100644 --- a/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc702/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c index ca5490f0b0e3..e9e4e4d077b7 100644 --- a/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zc706/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c index 54c803cfa659..df7d3535ddb7 100644 --- a/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c +++ b/board/xilinx/zynq/zynq-zed/ps7_init_gpl.c @@ -1,9 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ /****************************************************************************** * (c) Copyright 2010-2014 Xilinx, Inc. All rights reserved. -* -* SPDX-License-Identifier: GPL-2.0+ -* -* ******************************************************************************/ /****************************************************************************/ /** diff --git a/cmd/bootefi.c b/cmd/bootefi.c index 5498a5fccf78..11b84c552897 100644 --- a/cmd/bootefi.c +++ b/cmd/bootefi.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application loader * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <charset.h> diff --git a/doc/README.uefi b/doc/README.uefi index bb89b7ac2f70..196e99994a33 100644 --- a/doc/README.uefi +++ b/doc/README.uefi @@ -1,7 +1,7 @@  # UEFI on U-Boot diff --git a/drivers/net/vsc9953.c b/drivers/net/vsc9953.c index 2388438d1016..5d196cfb3f38 100644 --- a/drivers/net/vsc9953.c +++ b/drivers/net/vsc9953.c @@ -1,8 +1,7 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Copyright 2014 - 2015 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ - * * Driver for the Vitesse VSC9953 L2 Switch */ diff --git a/drivers/usb/host/ehci-rmobile.c b/drivers/usb/host/ehci-rmobile.c index 7fe79efc1776..4868581066f4 100644 --- a/drivers/usb/host/ehci-rmobile.c +++ b/drivers/usb/host/ehci-rmobile.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 /* * EHCI HCD (Host Controller Driver) for USB. * * Copyright (C) 2013,2014 Renesas Electronics Corporation * Copyright (C) 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> - * - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/drivers/video/bridge/Makefile b/drivers/video/bridge/Makefile index 2a746c6f8b0f..45e54ac17682 100644 --- a/drivers/video/bridge/Makefile +++ b/drivers/video/bridge/Makefile @@ -1,8 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # Copyright (C) 2015 Google, Inc # Written by Simon Glass <sjg(a)chromium.org> -# -# SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_VIDEO_BRIDGE) += video-bridge-uclass.o obj-$(CONFIG_VIDEO_BRIDGE_PARADE_PS862X) += ps862x.o diff --git a/include/asm-generic/pe.h b/include/asm-generic/pe.h index d1683f238afe..9a8b5e82e389 100644 --- a/include/asm-generic/pe.h +++ b/include/asm-generic/pe.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Portable Executable and Common Object Constants * @@ -5,8 +6,6 @@ * * based on the "Microsoft Portable Executable and Common Object File Format * Specification", revision 11, 2017-01-23 - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_PE_H diff --git a/include/charset.h b/include/charset.h index 2662c2f7c9a6..11832cbd122e 100644 --- a/include/charset.h +++ b/include/charset.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * charset conversion utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CHARSET_H_ diff --git a/include/efi_driver.h b/include/efi_driver.h index 010e55a47397..840483a416a4 100644 --- a/include/efi_driver.h +++ b/include/efi_driver.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * EFI application loader * * Copyright (c) 2017 Heinrich Schuchardt - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EFI_DRIVER_H diff --git a/include/efi_loader.h b/include/efi_loader.h index 8d21ba74b1d2..2868ca25abb4 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * EFI application loader * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EFI_LOADER_H diff --git a/include/efi_selftest.h b/include/efi_selftest.h index c23bc24bed0f..d0a76d70cae4 100644 --- a/include/efi_selftest.h +++ b/include/efi_selftest.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * EFI application loader * * Copyright (c) 2017 Heinrich Schuchardt <xypron.glpk(a)gmx.de> - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EFI_SELFTEST_H diff --git a/include/net.h b/include/net.h index 3469811aa0ea..65f51d77a555 100644 --- a/include/net.h +++ b/include/net.h @@ -1,9 +1,9 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * LiMon Monitor (LiMon) - Network. * * Copyright 1994 - 2000 Neil Russell. * (See License) - * SPDX-License-Identifier: GPL-2.0 * * History * 9/16/00 bor adapted to TQM823L/STK8xxL board, RARP/TFTP boot added diff --git a/include/pe.h b/include/pe.h index e7845bb7d2cf..d73eb142cb3a 100644 --- a/include/pe.h +++ b/include/pe.h @@ -1,11 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Portable Executable binary format structures * * Copyright (c) 2016 Alexander Graf * * Based on wine code - * - * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PE_H diff --git a/lib/charset.c b/lib/charset.c index 8cd17ea1cb78..cd186a5a5ae6 100644 --- a/lib/charset.c +++ b/lib/charset.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * charset conversion utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <charset.h> diff --git a/lib/efi_driver/Makefile b/lib/efi_driver/Makefile index e35529a95228..83baa1c9a498 100644 --- a/lib/efi_driver/Makefile +++ b/lib/efi_driver/Makefile @@ -1,8 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2017 Heinrich Schuchardt -# -# SPDX-License-Identifier: GPL-2.0+ -# # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c index d9d2b14f6124..9c807ff71dff 100644 --- a/lib/efi_driver/efi_block_device.c +++ b/lib/efi_driver/efi_block_device.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI block driver * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * The EFI uclass creates a handle for this driver and installs the * driver binding protocol on it. * diff --git a/lib/efi_driver/efi_uclass.c b/lib/efi_driver/efi_uclass.c index 46b69b479cb6..b484aba072fa 100644 --- a/lib/efi_driver/efi_uclass.c +++ b/lib/efi_driver/efi_uclass.c @@ -1,10 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * Uclass for EFI drivers * * Copyright (c) 2017 Heinrich Schuchardt * - * SPDX-License-Identifier: GPL-2.0+ - * * For each EFI driver the uclass * - creates a handle * - installs the driver binding protocol diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile index 55c97c047666..c6046e36d264 100644 --- a/lib/efi_loader/Makefile +++ b/lib/efi_loader/Makefile @@ -1,8 +1,7 @@ +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2016 Alexander Graf # -# SPDX-License-Identifier: GPL-2.0+ -# # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it diff --git a/lib/efi_loader/efi_bootmgr.c b/lib/efi_loader/efi_bootmgr.c index c96b9d48c592..153e17375737 100644 --- a/lib/efi_loader/efi_bootmgr.c +++ b/lib/efi_loader/efi_bootmgr.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 1cfdabf6ebb1..5715a8b810e7 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application boot time services * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_console.c b/lib/efi_loader/efi_console.c index 5d1a9a8081ee..d777db8a3ed1 100644 --- a/lib/efi_loader/efi_console.c +++ b/lib/efi_loader/efi_console.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application console interface * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_device_path_to_text.c b/lib/efi_loader/efi_device_path_to_text.c index a79e60a4eeae..ca8037def239 100644 --- a/lib/efi_loader/efi_device_path_to_text.c +++ b/lib/efi_loader/efi_device_path_to_text.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI device path interface * * Copyright (c) 2017 Heinrich Schuchardt - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_device_path_utilities.c b/lib/efi_loader/efi_device_path_utilities.c index 0ada2111db98..94015329c8cb 100644 --- a/lib/efi_loader/efi_device_path_utilities.c +++ b/lib/efi_loader/efi_device_path_utilities.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI device path interface * * Copyright (c) 2017 Leif Lindholm - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_disk.c b/lib/efi_loader/efi_disk.c index 825a6d86de8e..5c6ec5258cda 100644 --- a/lib/efi_loader/efi_disk.c +++ b/lib/efi_loader/efi_disk.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application disk support * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c index cec8347f5587..e6a15bcb523e 100644 --- a/lib/efi_loader/efi_file.c +++ b/lib/efi_loader/efi_file.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_gop.c b/lib/efi_loader/efi_gop.c index 363ccbb78904..1afe8418e127 100644 --- a/lib/efi_loader/efi_gop.c +++ b/lib/efi_loader/efi_gop.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application disk support * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index 2ccd476e57a2..e832cde9016d 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -1,11 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI image loader * * based partly on wine code * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 95f9ff0a1401..664c651db562 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application memory management * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_net.c b/lib/efi_loader/efi_net.c index e3132e6c172e..e1139501d1fb 100644 --- a/lib/efi_loader/efi_net.c +++ b/lib/efi_loader/efi_net.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application network access support * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_runtime.c b/lib/efi_loader/efi_runtime.c index 8558124c0a12..52f1301d75b6 100644 --- a/lib/efi_loader/efi_runtime.c +++ b/lib/efi_loader/efi_runtime.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application runtime services * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_smbios.c b/lib/efi_loader/efi_smbios.c index 62e96979021d..482436e2adb7 100644 --- a/lib/efi_loader/efi_smbios.c +++ b/lib/efi_loader/efi_smbios.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI application tables support * * Copyright (c) 2016 Alexander Graf - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c index 6c177da3a605..7e0e7f020ee1 100644 --- a/lib/efi_loader/efi_variable.c +++ b/lib/efi_loader/efi_variable.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI utils * * Copyright (c) 2017 Rob Clark - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <malloc.h> diff --git a/lib/efi_loader/efi_watchdog.c b/lib/efi_loader/efi_watchdog.c index d12e51da0a21..6f69b76e4d94 100644 --- a/lib/efi_loader/efi_watchdog.c +++ b/lib/efi_loader/efi_watchdog.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0+ /* * EFI watchdog * * Copyright (c) 2017 Heinrich Schuchardt - * - * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/lib/efi_selftest/Makefile b/lib/efi_selftest/Makefile index 0e4980c8a0bf..80c43026458e 100644 --- a/lib/efi_selftest/Makefile +++ b/lib/efi_selftest/Makefile @@ -1,8 +1,6 @@ -: -# (C) Copyright 2017, Heinrich Schuchardt <xypron.glpk(a)gmx.de> -# -# SPDX-License-Identifier: GPL-2.0+ +# SPDX-License-Identifier: GPL-2.0+ # +# (C) Copyright 2017, Heinrich Schuchardt <xypron.glpk(a)gmx.de> # This file only gets included with CONFIG_EFI_LOADER set, so all # object inclusion implicitly depends on it diff --git a/lib/efi_selftest/efi_selftest_disk_image.h b/lib/efi_selftest/efi_selftest_disk_image.h index 9c741ce136c4..a0e058660892 100644 --- a/lib/efi_selftest/efi_selftest_disk_image.h +++ b/lib/efi_selftest/efi_selftest_disk_image.h @@ -1,9 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ /* * Non-zero 8 byte strings of a disk image * * Generated with tools/file2include - * - * SPDX-License-Identifier: GPL-2.0+ */ #define EFI_ST_DISK_IMG { 0x00010000, { \ diff --git a/lib/lz4.c b/lib/lz4.c index f518341af5c2..046c34e39063 100644 --- a/lib/lz4.c +++ b/lib/lz4.c @@ -1,9 +1,8 @@ +// SPDX-License-Identifier: BSD-2-Clause /* LZ4 - Fast LZ compression algorithm Copyright (C) 2011-2015, Yann Collet. - SPDX-License-Identifier: BSD-2-Clause - You can contact the author at : - LZ4 source repository : https://github.com/Cyan4973/lz4 - LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c diff --git a/net/arp.c b/net/arp.c index 4c79e09ccbf6..990b771c9211 100644 --- a/net/arp.c +++ b/net/arp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/net/arp.h b/net/arp.h index a288d618b684..afb86958f3ad 100644 --- a/net/arp.h +++ b/net/arp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ARP_H__ diff --git a/net/cdp.c b/net/cdp.c index f9ccf5323183..fac020468194 100644 --- a/net/cdp.c +++ b/net/cdp.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de - * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/net/cdp.h b/net/cdp.h index 83475c992d23..16ccbf4b59ed 100644 --- a/net/cdp.h +++ b/net/cdp.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de - * SPDX-License-Identifier: GPL-2.0 */ #if defined(CONFIG_CMD_CDP) diff --git a/net/net.c b/net/net.c index d222c1f2bd42..7f852114427e 100644 --- a/net/net.c +++ b/net/net.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de - * SPDX-License-Identifier: GPL-2.0 */ /* diff --git a/net/ping.c b/net/ping.c index 9508cf1160ea..5464f2f785fe 100644 --- a/net/ping.c +++ b/net/ping.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0 /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de - * SPDX-License-Identifier: GPL-2.0 */ #include "ping.h" diff --git a/net/ping.h b/net/ping.h index b672b9573934..7b6f4e566dbd 100644 --- a/net/ping.h +++ b/net/ping.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copied from Linux Monitor (LiMon) - Networking. * @@ -6,7 +7,6 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de - * SPDX-License-Identifier: GPL-2.0 */ #ifndef __PING_H__ diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh index 20d5dd8a47d9..b6b9461a1073 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -1,9 +1,7 @@ #!/bin/bash +# SPDX-License-Identifier: GPL-2.0+ # # (C) Copyright 2014 Suriyan Ramasami -# -# SPDX-License-Identifier: GPL-2.0+ -# # Invoke this test script from U-Boot base directory as ./test/fs/fs-test.sh # It currently tests the fs/sb and native commands for ext4 and fat partitions diff --git a/tools/file2include.c b/tools/file2include.c index 7ca45c8339a2..e602f937f156 100644 --- a/tools/file2include.c +++ b/tools/file2include.c @@ -62,12 +62,11 @@ int main(int argc, char *argv[]) count = fread(buf, 1, count, file); /* Generate output */ + printf("/* SPDX-License-Identifier: GPL-2.0+ */\n"); printf("/*\n"); printf(" * Non-zero %u byte strings of a disk image\n", BLOCK_SIZE); printf(" *\n"); printf(" * Generated with tools/file2include\n"); - printf(" *\n"); - printf(" * SPDX-License-Identifier: GPL-2.0+\n"); printf(" */\n\n"); printf("#define EFI_ST_DISK_IMG { 0x%08zx, { \\\n", count); diff --git a/tools/ifdtool.c b/tools/ifdtool.c index a576e2fce19a..3a39b7bc7011 100644 --- a/tools/ifdtool.c +++ b/tools/ifdtool.c @@ -757,7 +757,7 @@ static void print_version(void) { printf("ifdtool v%s -- ", IFDTOOL_VERSION); printf("Copyright (C) 2014 Google Inc.\n\n"); - printf("SPDX-License-Identifier: GPL-2.0+\n"); + printf("SPDX-License-Identifier: GPL-2.0+\n"); } static void print_usage(const char *name) -- 2.7.4

1 1

[U-Boot] [PATCH 1/1] tools/file2include: avoid incorrect comments
by Heinrich Schuchardt 11 May '18

11 May '18

Avoid creating incorrect comments like /* ...*/... */ by printing '.' instead of '*' inside comments. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- tools/file2include.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/file2include.c b/tools/file2include.c index e602f937f15..b98af30a728 100644 --- a/tools/file2include.c +++ b/tools/file2include.c @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) printf("\\x%02x", buf[j]); printf("\"}, /* "); for (j = i; j < i + BLOCK_SIZE && j < count; ++j) { - if (buf[j] >= 0x20 && buf[j] <= 0x7e) + if (buf[j] != '*' && buf[j] >= 0x20 && buf[j] <= 0x7e) printf("%c", buf[j]); else printf("."); -- 2.17.0

2 1

[U-Boot] [PATCH v2 1/1] include: update log2 header from the Linux kernel
by Heinrich Schuchardt 11 May '18

11 May '18

Without the patch gcc 8 produces: warning: ignoring attribute ‘noreturn’ because it conflicts with attribute ‘const’ [-Wattributes] int ____ilog2_NaN(void); So let's update the include from Linux kernel v4.16. This removes static checks of ilog2() arguments. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2 rebased --- include/linux/log2.h | 63 ++++++++++++++++++++++++++------------------ 1 file changed, 37 insertions(+), 26 deletions(-) diff --git a/include/linux/log2.h b/include/linux/log2.h index 4ded5ee68a9..d4e32ecfc64 100644 --- a/include/linux/log2.h +++ b/include/linux/log2.h @@ -3,6 +3,11 @@ * * Copyright (C) 2006 Red Hat, Inc. All Rights Reserved. * Written by David Howells (dhowells(a)redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. */ #ifndef _LINUX_LOG2_H @@ -11,12 +16,6 @@ #include <linux/types.h> #include <linux/bitops.h> -/* - * deal with unrepresentable constant logarithms - */ -extern __attribute__((const, noreturn)) -int ____ilog2_NaN(void); - /* * non-constant log of base 2 calculators * - the arch may override these in asm/bitops.h if they can be implemented @@ -39,19 +38,23 @@ int __ilog2_u64(u64 n) } #endif -/* - * Determine whether some value is a power of two, where zero is +/** + * is_power_of_2() - check if a value is a power of two + * @n: the value to check + * + * Determine whether some value is a power of two, where zero is * *not* considered a power of two. + * Return: true if @n is a power of 2, otherwise false. */ - static inline __attribute__((const)) bool is_power_of_2(unsigned long n) { return (n != 0 && ((n & (n - 1)) == 0)); } -/* - * round up to nearest power of two +/** + * __roundup_pow_of_two() - round up to nearest power of two + * @n: value to round up */ static inline __attribute__((const)) unsigned long __roundup_pow_of_two(unsigned long n) @@ -59,8 +62,9 @@ unsigned long __roundup_pow_of_two(unsigned long n) return 1UL << fls_long(n - 1); } -/* - * round down to nearest power of two +/** + * __rounddown_pow_of_two() - round down to nearest power of two + * @n: value to round down */ static inline __attribute__((const)) unsigned long __rounddown_pow_of_two(unsigned long n) @@ -69,19 +73,19 @@ unsigned long __rounddown_pow_of_two(unsigned long n) } /** - * ilog2 - log of base 2 of 32-bit or a 64-bit unsigned value - * @n - parameter + * ilog2 - log base 2 of 32-bit or a 64-bit unsigned value + * @n: parameter * * constant-capable log of base 2 calculation * - this can be used to initialise global variables from constant data, hence - * the massive ternary operator construction + * the massive ternary operator construction * * selects the appropriately-sized optimised version depending on sizeof(n) */ #define ilog2(n) \ ( \ __builtin_constant_p(n) ? ( \ - (n) < 1 ? ____ilog2_NaN() : \ + (n) < 2 ? 0 : \ (n) & (1ULL << 63) ? 63 : \ (n) & (1ULL << 62) ? 62 : \ (n) & (1ULL << 61) ? 61 : \ @@ -144,10 +148,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) (n) & (1ULL << 4) ? 4 : \ (n) & (1ULL << 3) ? 3 : \ (n) & (1ULL << 2) ? 2 : \ - (n) & (1ULL << 1) ? 1 : \ - (n) & (1ULL << 0) ? 0 : \ - ____ilog2_NaN() \ - ) : \ + 1) : \ (sizeof(n) <= 4) ? \ __ilog2_u32(n) : \ __ilog2_u64(n) \ @@ -155,7 +156,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) /** * roundup_pow_of_two - round the given value up to nearest power of two - * @n - parameter + * @n: parameter * * round the given value up to the nearest power of two * - the result is undefined when n == 0 @@ -172,7 +173,7 @@ unsigned long __rounddown_pow_of_two(unsigned long n) /** * rounddown_pow_of_two - round the given value down to nearest power of two - * @n - parameter + * @n: parameter * * round the given value down to the nearest power of two * - the result is undefined when n == 0 @@ -185,6 +186,12 @@ unsigned long __rounddown_pow_of_two(unsigned long n) __rounddown_pow_of_two(n) \ ) +static inline __attribute_const__ +int __order_base_2(unsigned long n) +{ + return n > 1 ? ilog2(n - 1) + 1 : 0; +} + /** * order_base_2 - calculate the (rounded up) base 2 order of the argument * @n: parameter @@ -198,7 +205,11 @@ unsigned long __rounddown_pow_of_two(unsigned long n) * ob2(5) = 3 * ... and so on. */ - -#define order_base_2(n) ilog2(roundup_pow_of_two(n)) - +#define order_base_2(n) \ +( \ + __builtin_constant_p(n) ? ( \ + ((n) == 0 || (n) == 1) ? 0 : \ + ilog2((n) - 1) + 1) : \ + __order_base_2(n) \ +) #endif /* _LINUX_LOG2_H */ -- 2.17.0

2 1

[U-Boot] [PATCH 1/1] xyz-modem: va_start() must be matched by va_end()
by Heinrich Schuchardt 11 May '18

11 May '18

Every va_start() call must be matched by a va_end() call. scripts/checkpatch.pl required reformatting the complete function zm_dprintf(). Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/xyzModem.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/common/xyzModem.c b/common/xyzModem.c index a126e32ed35..2b18a6e9f50 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -180,15 +180,16 @@ static char *zm_out = zm_debug_buf; static char *zm_out_start = zm_debug_buf; static int -zm_dprintf (char *fmt, ...) +zm_dprintf(char *fmt, ...) { - int len; - va_list args; - - va_start (args, fmt); - len = diag_vsprintf (zm_out, fmt, args); - zm_out += len; - return len; + int len; + va_list args; + + va_start(args, fmt); + len = diag_vsprintf(zm_out, fmt, args); + va_end(args); + zm_out += len; + return len; } static void -- 2.17.0

2 1

[U-Boot] [PATCH 1/1] tools/file2include: create Linux style SPDX header
by Heinrich Schuchardt 11 May '18

11 May '18

file2include is used to convert a binary file to a C include. With the patch the SPDX header is written to the first line as expected by scripts/checkpatch.pl. Cf. https://www.kernel.org/doc/html/v4.16/process/license-rules.html Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- tools/file2include.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/file2include.c b/tools/file2include.c index 7ca45c8339a..e602f937f15 100644 --- a/tools/file2include.c +++ b/tools/file2include.c @@ -62,12 +62,11 @@ int main(int argc, char *argv[]) count = fread(buf, 1, count, file); /* Generate output */ + printf("/* SPDX-License-Identifier: GPL-2.0+ */\n"); printf("/*\n"); printf(" * Non-zero %u byte strings of a disk image\n", BLOCK_SIZE); printf(" *\n"); printf(" * Generated with tools/file2include\n"); - printf(" *\n"); - printf(" * SPDX-License-Identifier: GPL-2.0+\n"); printf(" */\n\n"); printf("#define EFI_ST_DISK_IMG { 0x%08zx, { \\\n", count); -- 2.17.0

3 3

[U-Boot] [PATCH] bootm: fix 'memory-fixup' for vxWorks boot
by Hannes Schmelzer 11 May '18

11 May '18

The check for having a memory node within the fdt blob is made wrong, we fix this here. Signed-off-by: Hannes Schmelzer <hannes.schmelzer(a)br-automation.com> --- arch/arm/lib/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 91a64be..92780fd 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -438,7 +438,7 @@ void boot_prep_vxworks(bootm_headers_t *images) if (images->ft_addr) { off = fdt_path_offset(images->ft_addr, "/memory"); - if (off < 0) { + if (off > 0) { if (arch_fixup_fdt(images->ft_addr)) puts("## WARNING: fixup memory failed!\n"); } -- 2.7.4

2 1

[U-Boot] [PATCH] Fix Ymodem build when DEBUG and CONFIG_USE_TINY_PRINTF are selected
by Alex Kiernan 11 May '18

11 May '18

Attempting to build with both DEBUG and CONFIG_USE_TINY_PRINTF along with CONFIG_SPL_YMODEM_SUPPORT fails at link time: common/built-in.o: In function `zm_dprintf': common/xyzModem.c:190: undefined reference to `vsprintf' Disable Ymodem debug if we don't have full vsprintf support. Signed-off-by: Alex Kiernan <alex.kiernan(a)gmail.com> --- common/xyzModem.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/xyzModem.c b/common/xyzModem.c index a0c5dfe..8f830bb 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -172,7 +172,7 @@ parse_num (char *s, unsigned long *val, char **es, char *delim) } -#ifdef DEBUG +#if defined(DEBUG) && !defined(CONFIG_USE_TINY_PRINTF) /* * Note: this debug setup works by storing the strings in a fixed buffer */ -- 2.7.4

3 2

[U-Boot] [PATCH 1/2] p1022ds: Change Timur's email address
by Fabio Estevam 11 May '18

11 May '18

From: Fabio Estevam <fabio.estevam(a)nxp.com> timur(a)freescale.com is not a valid email for quite some time, so change it to Timur's updated email. Signed-off-by: Fabio Estevam <fabio.estevam(a)nxp.com> --- board/freescale/p1022ds/MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/p1022ds/MAINTAINERS b/board/freescale/p1022ds/MAINTAINERS index 86aac36..62256c3 100644 --- a/board/freescale/p1022ds/MAINTAINERS +++ b/board/freescale/p1022ds/MAINTAINERS @@ -1,5 +1,5 @@ P1022DS BOARD -M: Timur Tabi <timur(a)freescale.com> +M: Timur Tabi <timur(a)tabi.org> S: Maintained F: board/freescale/p1022ds/ F: include/configs/P1022DS.h -- 2.7.4

3 4