diff options
758 files changed, 2782 insertions, 1305 deletions
diff --git a/.gitignore b/.gitignore index 255d89f893..a39bd54d38 100644 --- a/.gitignore +++ b/.gitignore @@ -60,6 +60,8 @@ /reloc_off /include/generated/ +/include/spl-autoconf.mk +/include/tpl-autoconf.mk asm-offsets.s # stgit generated dirs diff --git a/Licenses/README b/Licenses/README index 9f61192557..c6ff2774fc 100644 --- a/Licenses/README +++ b/Licenses/README @@ -37,6 +37,18 @@ replaced by a single line: SPDX-License-Identifier: GPL-2.0+ +Ideally, the license terms of all files in the source tree should be +defined by such License Identifiers; in no case a file can contain +more than one such License Identifier list. + +If a "SPDX-License-Identifier:" line references more than one Unique +License Identifier, then this means that the respective file can be +used under the terms of either of these licenses, i. e. with + + SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause + +you can chose between GPL-2.0+ and BSD-3-Clause licensing. + We use the SPDX Unique License Identifiers here; these are available at [2]. @@ -38,8 +38,8 @@ usage() BUILD_NCPUS number of parallel make jobs (default: auto) CROSS_COMPILE cross-compiler toolchain prefix (default: "") CROSS_COMPILE_<ARCH> cross-compiler toolchain prefix for - architecture "ARCH". Substitute "ARCH" for any - supported architecture (default: "") + architecture "ARCH". Substitute "ARCH" for any + supported architecture (default: "") MAKEALL_LOGDIR output all logs to here (default: ./LOG/) BUILD_DIR output build directory (default: ./) BUILD_NBUILDS number of parallel targets (default: 1) @@ -284,6 +284,7 @@ LIBS-y += drivers/pci/libpci.o LIBS-y += drivers/pcmcia/libpcmcia.o LIBS-y += drivers/power/libpower.o \ drivers/power/fuel_gauge/libfuel_gauge.o \ + drivers/power/mfd/libmfd.o \ drivers/power/pmic/libpmic.o \ drivers/power/battery/libbattery.o LIBS-y += drivers/spi/libspi.o @@ -944,10 +944,10 @@ The following options need to be configured: - Regular expression support: CONFIG_REGEX - If this variable is defined, U-Boot is linked against - the SLRE (Super Light Regular Expression) library, - which adds regex support to some commands, as for - example "env grep" and "setexpr". + If this variable is defined, U-Boot is linked against + the SLRE (Super Light Regular Expression) library, + which adds regex support to some commands, as for + example "env grep" and "setexpr". - Device tree: CONFIG_OF_CONTROL @@ -1096,8 +1096,8 @@ The following options need to be configured: devices. CONFIG_SYS_SCSI_SYM53C8XX_CCF to fix clock timing (80Mhz) - The environment variable 'scsidevs' is set to the number of - SCSI devices found during the last scan. + The environment variable 'scsidevs' is set to the number of + SCSI devices found during the last scan. - NETWORK Support (PCI): CONFIG_E1000 @@ -1987,7 +1987,7 @@ CBFS (Coreboot Filesystem) support offset CONFIG_SYS_FSL_I2C_SPEED for the i2c speed and CONFIG_SYS_FSL_I2C_SLAVE for the slave addr of the first bus. - - If your board supports a second fsl i2c bus, define + - If your board supports a second fsl i2c bus, define CONFIG_SYS_FSL_I2C2_OFFSET for the register offset CONFIG_SYS_FSL_I2C2_SPEED for the speed and CONFIG_SYS_FSL_I2C2_SLAVE for the slave address of the @@ -3191,9 +3191,9 @@ FIT uImage format: CONFIG_TPL_PAD_TO Image offset to which the TPL should be padded before appending the TPL payload. By default, this is defined as - CONFIG_SPL_MAX_SIZE, or 0 if CONFIG_SPL_MAX_SIZE is undefined. - CONFIG_SPL_PAD_TO must be either 0, meaning to append the SPL - payload without any padding, or >= CONFIG_SPL_MAX_SIZE. + CONFIG_SPL_MAX_SIZE, or 0 if CONFIG_SPL_MAX_SIZE is undefined. + CONFIG_SPL_PAD_TO must be either 0, meaning to append the SPL + payload without any padding, or >= CONFIG_SPL_MAX_SIZE. Modem Support: -------------- diff --git a/arch/arm/config.mk b/arch/arm/config.mk index d0cf43ff41..bdabcf407e 100644 --- a/arch/arm/config.mk +++ b/arch/arm/config.mk @@ -17,7 +17,7 @@ endif LDFLAGS_FINAL += --gc-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections \ - -fno-common -ffixed-r9 -msoft-float + -fno-common -ffixed-r9 -msoft-float # Support generic board on ARM __HAVE_ARCH_GENERIC_BOARD := y diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S index bd1e067599..00d1b30ba6 100644 --- a/arch/arm/cpu/arm1136/start.S +++ b/arch/arm/cpu/arm1136/start.S @@ -9,7 +9,7 @@ * Copyright (c) 2003 Richard Woodruff <r-woodruff2@ti.com> * Copyright (c) 2003 Kshitij <kshitij@ti.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/arch/arm/cpu/arm720t/interrupts.c b/arch/arm/cpu/arm720t/interrupts.c index 90170d71ea..e8ba1ae09e 100644 --- a/arch/arm/cpu/arm720t/interrupts.c +++ b/arch/arm/cpu/arm720t/interrupts.c @@ -7,7 +7,7 @@ * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Alex Zuepke <azu@sysgo.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S index b6bfacfcfc..f180eb8aa6 100644 --- a/arch/arm/cpu/arm720t/start.S +++ b/arch/arm/cpu/arm720t/start.S @@ -4,7 +4,7 @@ * Copyright (c) 2001 Marius Gröger <mag@sysgo.de> * Copyright (c) 2002 Alex Züpke <azu@sysgo.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S index 39de2f4904..e83968fb7a 100644 --- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S +++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S @@ -7,7 +7,7 @@ * Copyright (C) 2008 Ronetix Ilko Iliev (www.ronetix.at) * Copyright (C) 2009 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/arm/cpu/arm926ejs/davinci/timer.c b/arch/arm/cpu/arm926ejs/davinci/timer.c index 8928bbc624..c7d0652e83 100644 --- a/arch/arm/cpu/arm926ejs/davinci/timer.c +++ b/arch/arm/cpu/arm926ejs/davinci/timer.c @@ -18,7 +18,7 @@ * * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c index 4275c5d0a6..8ea45be1d2 100644 --- a/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c +++ b/arch/arm/cpu/arm926ejs/mxs/spl_power_init.c @@ -56,7 +56,7 @@ static void mxs_power_clock2pll(void) * This function ungates the RTC block and sets the AUTO_RESTART * bit to work around a design bug on MX28EVK Rev. A . */ - + static void mxs_power_set_auto_restart(void) { struct mxs_rtc_regs *rtc_regs = diff --git a/arch/arm/cpu/arm926ejs/mxs/timer.c b/arch/arm/cpu/arm926ejs/mxs/timer.c index 9b49ef4a91..99d3fb8731 100644 --- a/arch/arm/cpu/arm926ejs/mxs/timer.c +++ b/arch/arm/cpu/arm926ejs/mxs/timer.c @@ -7,7 +7,7 @@ * Based on code from LTIB: * (C) Copyright 2009-2010 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/omap/timer.c b/arch/arm/cpu/arm926ejs/omap/timer.c index 3e660347ee..b9715656c8 100644 --- a/arch/arm/cpu/arm926ejs/omap/timer.c +++ b/arch/arm/cpu/arm926ejs/omap/timer.c @@ -16,7 +16,7 @@ * (C) Copyright 2004 * Philippe Robin, ARM Ltd. <philippe.robin@arm.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/spear/spear600.c b/arch/arm/cpu/arm926ejs/spear/spear600.c index fe52d8904a..6474e9d554 100644 --- a/arch/arm/cpu/arm926ejs/spear/spear600.c +++ b/arch/arm/cpu/arm926ejs/spear/spear600.c @@ -3,7 +3,7 @@ * Viresh Kumar, ST Microelectronics, viresh.kumar@st.com * Vipin Kumar, ST Microelectronics, vipin.kumar@st.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/spear/spl_boot.c b/arch/arm/cpu/arm926ejs/spear/spl_boot.c index 3e7766f655..c846d758c9 100644 --- a/arch/arm/cpu/arm926ejs/spear/spl_boot.c +++ b/arch/arm/cpu/arm926ejs/spear/spl_boot.c @@ -4,7 +4,7 @@ * * Copyright (C) 2012 Stefan Roese <sr@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c index cc45ab7016..3d6ad04abf 100644 --- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c +++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h128m8_3_266_cl5_async.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2009 * Vipin Kumar, ST Microelectronics, vipin.kumar@st.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c index 4097f03c2d..105b3058fb 100644 --- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c +++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_333_cl5_psync.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2009 * Vipin Kumar, ST Microelectronics, vipin.kumar@st.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c index c17442ed67..00b6b29276 100644 --- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c +++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h32m16_37e_166_cl4_sync.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2009 * Vipin Kumar, ST Microelectronics, vipin.kumar@st.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c index 935ac941a2..a406c3e8c6 100644 --- a/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c +++ b/arch/arm/cpu/arm926ejs/spear/spr600_mt47h64m16_3_333_cl5_psync.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2009 * Vipin Kumar, ST Microelectronics, vipin.kumar@st.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm926ejs/versatile/timer.c b/arch/arm/cpu/arm926ejs/versatile/timer.c index 54361622b4..870f927e5d 100644 --- a/arch/arm/cpu/arm926ejs/versatile/timer.c +++ b/arch/arm/cpu/arm926ejs/versatile/timer.c @@ -16,7 +16,7 @@ * (C) Copyright 2004 * Philippe Robin, ARM Ltd. <philippe.robin@arm.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/arm946es/cpu.c b/arch/arm/cpu/arm946es/cpu.c index aa499cc677..0c8d92d737 100644 --- a/arch/arm/cpu/arm946es/cpu.c +++ b/arch/arm/cpu/arm946es/cpu.c @@ -6,7 +6,7 @@ * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/arm/cpu/armv7/mx5/lowlevel_init.S b/arch/arm/cpu/armv7/mx5/lowlevel_init.S index fc7c76759a..25fadf6487 100644 --- a/arch/arm/cpu/armv7/mx5/lowlevel_init.S +++ b/arch/arm/cpu/armv7/mx5/lowlevel_init.S @@ -31,10 +31,10 @@ /* reconfigure L2 cache aux control reg */ ldr r0, =0xC0 | /* tag RAM */ \ - 0x4 | /* data RAM */ \ - 1 << 24 | /* disable write allocate delay */ \ - 1 << 23 | /* disable write allocate combine */ \ - 1 << 22 /* disable write allocate */ + 0x4 | /* data RAM */ \ + 1 << 24 | /* disable write allocate delay */ \ + 1 << 23 | /* disable write allocate combine */ \ + 1 << 22 /* disable write allocate */ #if defined(CONFIG_MX51) ldr r3, [r4, #ROM_SI_REV] @@ -290,20 +290,20 @@ setup_pll_func: setup_pll PLL1_BASE_ADDR, 800 - setup_pll PLL3_BASE_ADDR, 400 + setup_pll PLL3_BASE_ADDR, 400 - /* Switch peripheral to PLL3 */ - ldr r0, =CCM_BASE_ADDR - ldr r1, =0x00015154 - str r1, [r0, #CLKCTL_CBCMR] - ldr r1, =0x02898945 - str r1, [r0, #CLKCTL_CBCDR] - /* make sure change is effective */ + /* Switch peripheral to PLL3 */ + ldr r0, =CCM_BASE_ADDR + ldr r1, =0x00015154 + str r1, [r0, #CLKCTL_CBCMR] + ldr r1, =0x02898945 + str r1, [r0, #CLKCTL_CBCDR] + /* make sure change is effective */ 1: ldr r1, [r0, #CLKCTL_CDHIPR] - cmp r1, #0x0 - bne 1b + cmp r1, #0x0 + bne 1b - setup_pll PLL2_BASE_ADDR, 400 + setup_pll PLL2_BASE_ADDR, 400 /* Switch peripheral to PLL2 */ ldr r0, =CCM_BASE_ADDR @@ -324,7 +324,7 @@ setup_pll_func: cmp r1, #0x0 bne 1b - setup_pll PLL3_BASE_ADDR, 216 + setup_pll PLL3_BASE_ADDR, 216 setup_pll PLL4_BASE_ADDR, 455 @@ -358,13 +358,13 @@ setup_pll_func: str r1, [r0, #CLKCTL_CCGR6] str r1, [r0, #CLKCTL_CCGR7] - mov r1, #0x00000 - str r1, [r0, #CLKCTL_CCDR] + mov r1, #0x00000 + str r1, [r0, #CLKCTL_CCDR] - /* for cko - for ARM div by 8 */ - mov r1, #0x000A0000 - add r1, r1, #0x00000F0 - str r1, [r0, #CLKCTL_CCOSR] + /* for cko - for ARM div by 8 */ + mov r1, #0x000A0000 + add r1, r1, #0x00000F0 + str r1, [r0, #CLKCTL_CCOSR] #endif /* CONFIG_MX53 */ .endm diff --git a/arch/arm/cpu/armv7/omap3/am35x_musb.c b/arch/arm/cpu/armv7/omap3/am35x_musb.c index 9a31f8a1d1..74dd105eb6 100644 --- a/arch/arm/cpu/armv7/omap3/am35x_musb.c +++ b/arch/arm/cpu/armv7/omap3/am35x_musb.c @@ -59,4 +59,3 @@ void am35x_musb_clear_irq(void) 0, USBOTGSS_INT_CLR); readl(&am35x_scm_general_regs->lvl_intr_clr); } - diff --git a/arch/arm/cpu/armv7/omap4/sdram_elpida.c b/arch/arm/cpu/armv7/omap4/sdram_elpida.c index 67a79261f7..e4c8316370 100644 --- a/arch/arm/cpu/armv7/omap4/sdram_elpida.c +++ b/arch/arm/cpu/armv7/omap4/sdram_elpida.c @@ -121,6 +121,8 @@ static void emif_get_reg_dump_sdp(u32 emif_nr, const struct emif_regs **regs) *regs = &emif_regs_elpida_380_mhz_1cs; else if (omap4_rev == OMAP4430_ES2_0) *regs = &emif_regs_elpida_200_mhz_2cs; + else if (omap4_rev == OMAP4430_ES2_3) + *regs = &emif_regs_elpida_400_mhz_1cs; else if (omap4_rev < OMAP4470_ES1_0) *regs = &emif_regs_elpida_400_mhz_2cs; else @@ -136,6 +138,8 @@ static void emif_get_dmm_regs_sdp(const struct dmm_lisa_map_regs if (omap_rev == OMAP4430_ES1_0) *dmm_lisa_regs = &lisa_map_2G_x_1_x_2; + else if (omap_rev == OMAP4430_ES2_3) + *dmm_lisa_regs = &lisa_map_2G_x_2_x_2; else if (omap_rev < OMAP4460_ES1_0) *dmm_lisa_regs = &lisa_map_2G_x_2_x_2; else diff --git a/arch/arm/cpu/armv7/omap5/prcm-regs.c b/arch/arm/cpu/armv7/omap5/prcm-regs.c index 7a7caded03..764620d62a 100644 --- a/arch/arm/cpu/armv7/omap5/prcm-regs.c +++ b/arch/arm/cpu/armv7/omap5/prcm-regs.c @@ -526,8 +526,6 @@ struct prcm_regs const omap5_es2_prcm = { .cm1_abe_timer8_clkctrl = 0x4a004580, .cm1_abe_wdt3_clkctrl = 0x4a004588, - - /* cm2.ckgen */ .cm_clksel_mpu_m3_iss_root = 0x4a008100, .cm_clksel_usb_60mhz = 0x4a008104, diff --git a/arch/arm/cpu/armv7/rmobile/Makefile b/arch/arm/cpu/armv7/rmobile/Makefile index 3168e979f2..41bceb1cf5 100644 --- a/arch/arm/cpu/armv7/rmobile/Makefile +++ b/arch/arm/cpu/armv7/rmobile/Makefile @@ -46,4 +46,3 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend ######################################################################### - diff --git a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S b/arch/arm/cpu/armv7/rmobile/lowlevel_init.S index ff18d9694c..0d654403ee 100644 --- a/arch/arm/cpu/armv7/rmobile/lowlevel_init.S +++ b/arch/arm/cpu/armv7/rmobile/lowlevel_init.S @@ -2,7 +2,7 @@ * Copyright (C) 2012 Nobuhiro Iwamatsu <nobuhiro.Iwamatsu.yj@renesas.com> * Copyright (C) 2012 Renesas Solutions Corp. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c index 47aa9cccbf..b8805c8d43 100644 --- a/arch/arm/cpu/armv7/s5p-common/pwm.c +++ b/arch/arm/cpu/armv7/s5p-common/pwm.c @@ -3,7 +3,7 @@ * * Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/armv7/s5p-common/timer.c b/arch/arm/cpu/armv7/s5p-common/timer.c index 5b87a081c8..949abb1c8f 100644 --- a/arch/arm/cpu/armv7/s5p-common/timer.c +++ b/arch/arm/cpu/armv7/s5p-common/timer.c @@ -4,7 +4,7 @@ * Inki Dae <inki.dae@samsung.com> * Minkyu Kang <mk7.kang@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index ef62fc8327..6c9b11a452 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -10,7 +10,7 @@ * Copyright (c) 2003 Kshitij <kshitij@ti.com> * Copyright (c) 2006-2008 Syed Mohammed Khasim <x0khasim@ti.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/arch/arm/cpu/armv7/zynq/cpu.c b/arch/arm/cpu/armv7/zynq/cpu.c index 4367d1afac..49149861f8 100644 --- a/arch/arm/cpu/armv7/zynq/cpu.c +++ b/arch/arm/cpu/armv7/zynq/cpu.c @@ -2,7 +2,7 @@ * Copyright (C) 2012 Michal Simek <monstr@monstr.eu> * Copyright (C) 2012 Xilinx, Inc. All rights reserved. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <asm/io.h> diff --git a/arch/arm/cpu/armv7/zynq/timer.c b/arch/arm/cpu/armv7/zynq/timer.c index 3b8d9497a0..636322a8e5 100644 --- a/arch/arm/cpu/armv7/zynq/timer.c +++ b/arch/arm/cpu/armv7/zynq/timer.c @@ -22,7 +22,7 @@ * Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Alex Zuepke <azu@sysgo.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/cpu/ixp/start.S b/arch/arm/cpu/ixp/start.S index 1362234b2a..82c868a174 100644 --- a/arch/arm/cpu/ixp/start.S +++ b/arch/arm/cpu/ixp/start.S @@ -8,7 +8,7 @@ * Intel IXP4xx Programmer's Guide and past u-boot Start.S * samples. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S index 303ca84d46..d8fb812dbf 100644 --- a/arch/arm/cpu/pxa/start.S +++ b/arch/arm/cpu/pxa/start.S @@ -16,7 +16,7 @@ * Copyright (C) 2004 Texas Instruments <r-woodruff2@ti.com> * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/arch/arm/dts/exynos5250.dtsi b/arch/arm/dts/exynos5250.dtsi index 1c5474f40b..44cbb5a2e5 100644 --- a/arch/arm/dts/exynos5250.dtsi +++ b/arch/arm/dts/exynos5250.dtsi @@ -140,7 +140,7 @@ reg = <0x12d40000 0x30>; clock-frequency = <50000000>; interrupts = <0 70 0>; - }; + }; spi@131a0000 { #address-cells = <1>; diff --git a/arch/arm/include/asm/arch-exynos/dp.h b/arch/arm/include/asm/arch-exynos/dp.h index 19f313c8c9..0ec58e94ce 100644 --- a/arch/arm/include/asm/arch-exynos/dp.h +++ b/arch/arm/include/asm/arch-exynos/dp.h @@ -3,7 +3,7 @@ * * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARM_ARCH_DP_H_ diff --git a/arch/arm/include/asm/arch-exynos/dp_info.h b/arch/arm/include/asm/arch-exynos/dp_info.h index 8c523099c9..3f6750a6b2 100644 --- a/arch/arm/include/asm/arch-exynos/dp_info.h +++ b/arch/arm/include/asm/arch-exynos/dp_info.h @@ -3,7 +3,7 @@ * * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _DP_INFO_H diff --git a/arch/arm/include/asm/arch-exynos/dsim.h b/arch/arm/include/asm/arch-exynos/dsim.h index 889e7d009a..86ff4da4d8 100644 --- a/arch/arm/include/asm/arch-exynos/dsim.h +++ b/arch/arm/include/asm/arch-exynos/dsim.h @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_ARM_ARCH_DSIM_H_ diff --git a/arch/arm/include/asm/arch-exynos/mipi_dsim.h b/arch/arm/include/asm/arch-exynos/mipi_dsim.h index 498a9ffc04..40aca71678 100644 --- a/arch/arm/include/asm/arch-exynos/mipi_dsim.h +++ b/arch/arm/include/asm/arch-exynos/mipi_dsim.h @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _DSIM_H diff --git a/arch/arm/include/asm/arch-exynos/pwm_backlight.h b/arch/arm/include/asm/arch-exynos/pwm_backlight.h index 2dd7be8d3b..4f54fa737d 100644 --- a/arch/arm/include/asm/arch-exynos/pwm_backlight.h +++ b/arch/arm/include/asm/arch-exynos/pwm_backlight.h @@ -3,7 +3,7 @@ * * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PWM_BACKLIGHT_H_ diff --git a/arch/arm/include/asm/arch-ixp/ixp425pci.h b/arch/arm/include/asm/arch-ixp/ixp425pci.h index 8e16a11293..f499883936 100644 --- a/arch/arm/include/asm/arch-ixp/ixp425pci.h +++ b/arch/arm/include/asm/arch-ixp/ixp425pci.h @@ -3,7 +3,7 @@ * (C) Copyright 2004 eslab.whut.edu.cn * Yue Hu(huyue_whut@yahoo.com.cn), Ligong Xue(lgxue@hotmail.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _IXP425PCI_H diff --git a/arch/arm/include/asm/arch-omap4/omap.h b/arch/arm/include/asm/arch-omap4/omap.h index 9129c0dd7c..e35f51c7bf 100644 --- a/arch/arm/include/asm/arch-omap4/omap.h +++ b/arch/arm/include/asm/arch-omap4/omap.h @@ -33,6 +33,10 @@ /* CONTROL_ID_CODE */ #define CONTROL_ID_CODE 0x4A002204 +#define STD_FUSE_DIE_ID_0 0x4A002200 +#define STD_FUSE_DIE_ID_1 0x4A002208 +#define STD_FUSE_DIE_ID_2 0x4A00220c +#define STD_FUSE_DIE_ID_3 0x4A002210 #define OMAP4_CONTROL_ID_CODE_ES1_0 0x0B85202F #define OMAP4_CONTROL_ID_CODE_ES2_0 0x1B85202F diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index 04b70f6cc8..603bf14627 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -16,7 +16,7 @@ * (C) Copyright 2004 * Philippe Robin, ARM Ltd. <philippe.robin@arm.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/arm/lib/relocate.S b/arch/arm/lib/relocate.S index a62a556561..8035251563 100644 --- a/arch/arm/lib/relocate.S +++ b/arch/arm/lib/relocate.S @@ -66,9 +66,9 @@ relocate_done: /* ARMv4- don't know bx lr but the assembler fails to see that */ #ifdef __ARM_ARCH_4__ - mov pc, lr + mov pc, lr #else - bx lr + bx lr #endif ENDPROC(relocate_code) diff --git a/arch/blackfin/cpu/traps.c b/arch/blackfin/cpu/traps.c index 20aeab81a2..10f72f8246 100644 --- a/arch/blackfin/cpu/traps.c +++ b/arch/blackfin/cpu/traps.c @@ -261,7 +261,7 @@ static void decode_address(char *buf, unsigned long address) if (!address) sprintf(buf, "<0x%p> /* Maybe null pointer? */", paddr); else if (address >= CONFIG_SYS_MONITOR_BASE && - address < CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) + address < CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN) sprintf(buf, "<0x%p> /* somewhere in u-boot */", paddr); else sprintf(buf, "<0x%p> /* unknown address */", paddr); diff --git a/arch/blackfin/include/asm/mach-common/bits/lockbox.h b/arch/blackfin/include/asm/mach-common/bits/lockbox.h index 77f849e8f2..17d22ab57f 100644 --- a/arch/blackfin/include/asm/mach-common/bits/lockbox.h +++ b/arch/blackfin/include/asm/mach-common/bits/lockbox.h @@ -16,7 +16,7 @@ typedef struct SESR_args { unsigned long ulMessageSize; /* message length in bytes */ unsigned long ulSFEntryPoint; /* entry point of secure function */ unsigned long ulMessagePtr; /* pointer to the buffer containing - the digital signature and message */ + the digital signature and message */ unsigned long ulReserved1; /* reserved */ unsigned long ulReserved2; /* reserved */ } tSESR_args; diff --git a/arch/m68k/cpu/mcf5227x/start.S b/arch/m68k/cpu/mcf5227x/start.S index c84edd3632..23024f94c8 100644 --- a/arch/m68k/cpu/mcf5227x/start.S +++ b/arch/m68k/cpu/mcf5227x/start.S @@ -2,7 +2,7 @@ * Copyright (C) 2003 Josef Baumgartner <josef.baumgartner@telex.de> * Based on code from Bernhard Kuhn <bkuhn@metrowerks.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index 0882c3b8e5..edcb092fec 100644 --- a/arch/m68k/cpu/mcf52x2/cpu_init.c +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c @@ -15,7 +15,7 @@ * MCF5275 additions * Copyright (C) 2008 Arthur Shipkowski (art@videon-central.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/m68k/cpu/mcf532x/start.S b/arch/m68k/cpu/mcf532x/start.S index 322b699465..3b9ede0d3d 100644 --- a/arch/m68k/cpu/mcf532x/start.S +++ b/arch/m68k/cpu/mcf532x/start.S @@ -5,7 +5,7 @@ * (C) Copyright 2004-2008 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/arch/m68k/cpu/mcf5445x/pci.c b/arch/m68k/cpu/mcf5445x/pci.c index 235e2cc8f4..e41f36cdd2 100644 --- a/arch/m68k/cpu/mcf5445x/pci.c +++ b/arch/m68k/cpu/mcf5445x/pci.c @@ -2,7 +2,7 @@ * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/m68k/cpu/mcf5445x/start.S b/arch/m68k/cpu/mcf5445x/start.S index 18f8da550c..979eb5a765 100644 --- a/arch/m68k/cpu/mcf5445x/start.S +++ b/arch/m68k/cpu/mcf5445x/start.S @@ -5,7 +5,7 @@ * Copyright 2010-2012 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/m68k/cpu/mcf547x_8x/pci.c b/arch/m68k/cpu/mcf547x_8x/pci.c index 1a40108377..cde7e5aa69 100644 --- a/arch/m68k/cpu/mcf547x_8x/pci.c +++ b/arch/m68k/cpu/mcf547x_8x/pci.c @@ -2,7 +2,7 @@ * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/m68k/cpu/mcf547x_8x/slicetimer.c b/arch/m68k/cpu/mcf547x_8x/slicetimer.c index 7be713e62b..2e7ed36e11 100644 --- a/arch/m68k/cpu/mcf547x_8x/slicetimer.c +++ b/arch/m68k/cpu/mcf547x_8x/slicetimer.c @@ -2,7 +2,7 @@ * (C) Copyright 2007, 2012 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/m68k/cpu/mcf547x_8x/start.S b/arch/m68k/cpu/mcf547x_8x/start.S index c41c79a958..75de22d37c 100644 --- a/arch/m68k/cpu/mcf547x_8x/start.S +++ b/arch/m68k/cpu/mcf547x_8x/start.S @@ -2,7 +2,7 @@ * Copyright (C) 2003 Josef Baumgartner <josef.baumgartner@telex.de> * Based on code from Bernhard Kuhn <bkuhn@metrowerks.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/arch/m68k/include/asm/immap_5282.h b/arch/m68k/include/asm/immap_5282.h index 5f3ef5287a..a36e065c75 100644 --- a/arch/m68k/include/asm/immap_5282.h +++ b/arch/m68k/include/asm/immap_5282.h @@ -3,7 +3,7 @@ * * Copyright (c) 2003 Josef Baumgartner <josef.baumgartner@telex.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IMMAP_5282__ diff --git a/arch/m68k/lib/time.c b/arch/m68k/lib/time.c index a85c22bcb3..31633543e0 100644 --- a/arch/m68k/lib/time.c +++ b/arch/m68k/lib/time.c @@ -4,7 +4,7 @@ * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c index 55bf0c290f..cbd410ceb7 100644 --- a/arch/m68k/lib/traps.c +++ b/arch/m68k/lib/traps.c @@ -20,7 +20,7 @@ extern void _int_handler(void); static void show_frame(struct pt_regs *fp) { printf ("Vector Number: %d Format: %02x Fault Status: %01x\n\n", (fp->vector & 0x3fc) >> 2, - fp->format, (fp->vector & 0x3) | ((fp->vector & 0xc00) >> 8)); + fp->format, (fp->vector & 0x3) | ((fp->vector & 0xc00) >> 8)); printf ("PC: %08lx SR: %08lx SP: %08lx\n", fp->pc, (long) fp->sr, (long) fp); printf ("D0: %08lx D1: %08lx D2: %08lx D3: %08lx\n", fp->d0, fp->d1, fp->d2, fp->d3); diff --git a/arch/microblaze/include/asm/asm.h b/arch/microblaze/include/asm/asm.h index ce9bb8a8d6..c1c3b03985 100644 --- a/arch/microblaze/include/asm/asm.h +++ b/arch/microblaze/include/asm/asm.h @@ -3,7 +3,7 @@ * * Michal SIMEK <monstr@monstr.eu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* FSL macros */ diff --git a/arch/microblaze/include/asm/gpio.h b/arch/microblaze/include/asm/gpio.h index f5cad56686..4762de0243 100644 --- a/arch/microblaze/include/asm/gpio.h +++ b/arch/microblaze/include/asm/gpio.h @@ -12,4 +12,3 @@ extern int gpio_alloc(u32 baseaddr, const char *name, u32 gpio_no); extern void gpio_info(void); #endif - diff --git a/arch/microblaze/include/asm/microblaze_intc.h b/arch/microblaze/include/asm/microblaze_intc.h index bfbd724004..0fb9207882 100644 --- a/arch/microblaze/include/asm/microblaze_intc.h +++ b/arch/microblaze/include/asm/microblaze_intc.h @@ -3,7 +3,7 @@ * * Michal SIMEK <monstr@monstr.cz> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ typedef volatile struct microblaze_intc_t { @@ -36,4 +36,3 @@ int install_interrupt_handler(int irq, interrupt_handler_t *hdlr, void *arg); int interrupts_init(void); - diff --git a/arch/microblaze/include/asm/microblaze_timer.h b/arch/microblaze/include/asm/microblaze_timer.h index cfd3792ae9..0d8140201d 100644 --- a/arch/microblaze/include/asm/microblaze_timer.h +++ b/arch/microblaze/include/asm/microblaze_timer.h @@ -25,4 +25,3 @@ typedef volatile struct microblaze_timer_t { } microblaze_timer_t; int timer_init(void); - diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index f5a7f1d48a..d60b307f6f 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -5,7 +5,7 @@ * Michal SIMEK <monstr@monstr.eu> * Yasushi SHOJI <yashi@atmark-techno.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/mips/cpu/mips32/au1x00/au1x00_eth.c b/arch/mips/cpu/mips32/au1x00/au1x00_eth.c index 65671cd188..4770f563aa 100644 --- a/arch/mips/cpu/mips32/au1x00/au1x00_eth.c +++ b/arch/mips/cpu/mips32/au1x00/au1x00_eth.c @@ -3,7 +3,7 @@ * (C) Copyright 2003 * Thomas.Lange@corelatus.se * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/nios2/cpu/epcs.c b/arch/nios2/cpu/epcs.c index c83f5eec4e..9758552447 100644 --- a/arch/nios2/cpu/epcs.c +++ b/arch/nios2/cpu/epcs.c @@ -475,7 +475,7 @@ void do_epcs_info (struct epcs_devinfo_t *dev, int argc, char * const argv[]) printf ("status: 0x%02x (WIP:%d, WEL:%d, PROT:%s)\n", stat, (stat & EPCS_STATUS_WIP) ? 1 : 0, - (stat & EPCS_STATUS_WEL) ? 1 : 0, + (stat & EPCS_STATUS_WEL) ? 1 : 0, (stat & dev->prot_mask) ? "on" : "off" ); /* Configuration */ diff --git a/arch/nios2/cpu/exceptions.S b/arch/nios2/cpu/exceptions.S index 50200d283c..f5fa8d7453 100644 --- a/arch/nios2/cpu/exceptions.S +++ b/arch/nios2/cpu/exceptions.S @@ -2,7 +2,7 @@ * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt@psyent.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/nios2/cpu/u-boot.lds b/arch/nios2/cpu/u-boot.lds index d7d5c6085d..be92e8edfc 100644 --- a/arch/nios2/cpu/u-boot.lds +++ b/arch/nios2/cpu/u-boot.lds @@ -2,7 +2,7 @@ * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt@psyent.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/nios2/lib/libgcc.c b/arch/nios2/lib/libgcc.c index 3caee19340..cf1b836925 100644 --- a/arch/nios2/lib/libgcc.c +++ b/arch/nios2/lib/libgcc.c @@ -548,7 +548,7 @@ __mulsi3 (SItype a, SItype b) while (cnt) { if (cnt & 1) - { + { res += b; } b <<= 1; diff --git a/arch/openrisc/cpu/cpu.c b/arch/openrisc/cpu/cpu.c index f238fe4c60..272656a361 100644 --- a/arch/openrisc/cpu/cpu.c +++ b/arch/openrisc/cpu/cpu.c @@ -138,8 +138,8 @@ int do_reset(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Code the jump to __reset here as the compiler is prone to emitting a bad jump instruction if the function is in flash */ __asm__("l.movhi r1,hi(__reset); \ - l.ori r1,r1,lo(__reset); \ - l.jr r1"); + l.ori r1,r1,lo(__reset); \ + l.jr r1"); /* not reached, __reset does not return */ return 0; } diff --git a/arch/openrisc/lib/bootm.c b/arch/openrisc/lib/bootm.c index 3df4d9ec1d..a18748f61f 100644 --- a/arch/openrisc/lib/bootm.c +++ b/arch/openrisc/lib/bootm.c @@ -8,7 +8,7 @@ * Michal SIMEK <monstr@monstr.eu> * Yasushi SHOJI <yashi@atmark-techno.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/powerpc/cpu/74xx_7xx/speed.c b/arch/powerpc/cpu/74xx_7xx/speed.c index eec9ed56b4..5ffa41cfc1 100644 --- a/arch/powerpc/cpu/74xx_7xx/speed.c +++ b/arch/powerpc/cpu/74xx_7xx/speed.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/powerpc/cpu/mpc824x/cpu_init.c b/arch/powerpc/cpu/mpc824x/cpu_init.c index b6ac69321e..37d796e635 100644 --- a/arch/powerpc/cpu/mpc824x/cpu_init.c +++ b/arch/powerpc/cpu/mpc824x/cpu_init.c @@ -2,7 +2,7 @@ * (C) Copyright 2000 * Rob Taylor. Flying Pig Systems. robt@flyingpig.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/powerpc/cpu/mpc8260/pci.c b/arch/powerpc/cpu/mpc8260/pci.c index 49985c4f86..2c013bbe5d 100644 --- a/arch/powerpc/cpu/mpc8260/pci.c +++ b/arch/powerpc/cpu/mpc8260/pci.c @@ -6,7 +6,7 @@ * Vitaly Bordug <vbordug@ru.mvista.com> * Added support for PCI bridge on MPC8272ADS * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/powerpc/cpu/mpc83xx/cpu_init.c b/arch/powerpc/cpu/mpc83xx/cpu_init.c index d568f889d2..0e9ddb8e26 100644 --- a/arch/powerpc/cpu/mpc83xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc83xx/cpu_init.c @@ -425,15 +425,15 @@ static int print_83xx_arb_event(int force) }; int etype = (gd->arch.arbiter_event_attributes & AEATR_EVENT) - >> AEATR_EVENT_SHIFT; + >> AEATR_EVENT_SHIFT; int mstr_id = (gd->arch.arbiter_event_attributes & AEATR_MSTR_ID) - >> AEATR_MSTR_ID_SHIFT; + >> AEATR_MSTR_ID_SHIFT; int tbst = (gd->arch.arbiter_event_attributes & AEATR_TBST) - >> AEATR_TBST_SHIFT; + >> AEATR_TBST_SHIFT; int tsize = (gd->arch.arbiter_event_attributes & AEATR_TSIZE) - >> AEATR_TSIZE_SHIFT; + >> AEATR_TSIZE_SHIFT; int ttype = (gd->arch.arbiter_event_attributes & AEATR_TTYPE) - >> AEATR_TTYPE_SHIFT; + >> AEATR_TTYPE_SHIFT; if (!force && !gd->arch.arbiter_event_address) return 0; diff --git a/arch/powerpc/cpu/mpc83xx/pci.c b/arch/powerpc/cpu/mpc83xx/pci.c index e073c904ef..30606fbe58 100644 --- a/arch/powerpc/cpu/mpc83xx/pci.c +++ b/arch/powerpc/cpu/mpc83xx/pci.c @@ -67,7 +67,7 @@ static void pci_init_bus(int bus, struct pci_region *reg) pci_ctrl->pibar1 = 0; pci_ctrl->piebar1 = 0; pci_ctrl->piwar1 = PIWAR_EN | PIWAR_PF | PIWAR_RTT_SNOOP | - PIWAR_WTT_SNOOP | (__ilog2(gd->ram_size - 1)); + PIWAR_WTT_SNOOP | (__ilog2(gd->ram_size - 1)); i = hose->region_count++; hose->regions[i].bus_start = 0; @@ -79,7 +79,7 @@ static void pci_init_bus(int bus, struct pci_region *reg) hose->last_busno = 0xff; pci_setup_indirect(hose, CONFIG_SYS_IMMR + 0x8300 + bus * 0x80, - CONFIG_SYS_IMMR + 0x8304 + bus * 0x80); + CONFIG_SYS_IMMR + 0x8304 + bus * 0x80); pci_register_hose(hose); diff --git a/arch/powerpc/cpu/mpc83xx/spd_sdram.c b/arch/powerpc/cpu/mpc83xx/spd_sdram.c index 3580706105..f62e1b79d3 100644 --- a/arch/powerpc/cpu/mpc83xx/spd_sdram.c +++ b/arch/powerpc/cpu/mpc83xx/spd_sdram.c @@ -8,7 +8,7 @@ * (C) Copyright 2003 Motorola Inc. * Xianghua Xiao (X.Xiao@motorola.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index be4f4ae870..d329aa84ab 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -2,7 +2,7 @@ * Copyright 2004, 2007-2012 Freescale Semiconductor, Inc. * Copyright (C) 2003 Motorola,Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* U-Boot Startup Code for Motorola 85xx PowerPC based Embedded Boards diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c index c9adc71af8..3ef6e4ae16 100644 --- a/arch/powerpc/cpu/mpc85xx/traps.c +++ b/arch/powerpc/cpu/mpc85xx/traps.c @@ -13,7 +13,7 @@ * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/arch/powerpc/cpu/mpc86xx/speed.c b/arch/powerpc/cpu/mpc86xx/speed.c index 854d02b5c4..5abe6f0bf2 100644 --- a/arch/powerpc/cpu/mpc86xx/speed.c +++ b/arch/powerpc/cpu/mpc86xx/speed.c @@ -6,7 +6,7 @@ * (C) Copyright 2000-2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/powerpc/cpu/mpc8xx/plprcr_write.S b/arch/powerpc/cpu/mpc8xx/plprcr_write.S index 923b8dc916..e28292f5e2 100644 --- a/arch/powerpc/cpu/mpc8xx/plprcr_write.S +++ b/arch/powerpc/cpu/mpc8xx/plprcr_write.S @@ -2,7 +2,7 @@ * (C) Copyright 2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <mpc8xx.h> diff --git a/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c b/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c index 4417646f83..717e7badbe 100644 --- a/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c +++ b/arch/powerpc/cpu/ppc4xx/40x_spd_sdram.c @@ -23,7 +23,7 @@ * (C) Copyright 2005 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c index 52340f209d..36e7b01e8c 100644 --- a/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c +++ b/arch/powerpc/cpu/ppc4xx/44x_spd_ddr.c @@ -23,7 +23,7 @@ * (C) Copyright 2005-2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* define DEBUG for debugging output (obviously ;-)) */ diff --git a/arch/powerpc/cpu/ppc4xx/4xx_pci.c b/arch/powerpc/cpu/ppc4xx/4xx_pci.c index 08781a1fb9..33dc72585c 100644 --- a/arch/powerpc/cpu/ppc4xx/4xx_pci.c +++ b/arch/powerpc/cpu/ppc4xx/4xx_pci.c @@ -143,14 +143,14 @@ void pci_405gp_init(struct pci_controller *hose) ptmla_str = getenv("ptm1la"); ptmms_str = getenv("ptm1ms"); if(NULL != ptmla_str && NULL != ptmms_str ) { - ptmla[0] = simple_strtoul (ptmla_str, NULL, 16); + ptmla[0] = simple_strtoul (ptmla_str, NULL, 16); ptmms[0] = simple_strtoul (ptmms_str, NULL, 16); } ptmla_str = getenv("ptm2la"); ptmms_str = getenv("ptm2ms"); if(NULL != ptmla_str && NULL != ptmms_str ) { - ptmla[1] = simple_strtoul (ptmla_str, NULL, 16); + ptmla[1] = simple_strtoul (ptmla_str, NULL, 16); ptmms[1] = simple_strtoul (ptmms_str, NULL, 16); } #endif diff --git a/arch/powerpc/cpu/ppc4xx/dcr.S b/arch/powerpc/cpu/ppc4xx/dcr.S index c80bc45b14..0d99391dfb 100644 --- a/arch/powerpc/cpu/ppc4xx/dcr.S +++ b/arch/powerpc/cpu/ppc4xx/dcr.S @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/arch/powerpc/cpu/ppc4xx/sdram.c b/arch/powerpc/cpu/ppc4xx/sdram.c index 2d95bc53c2..d4ef36d39f 100644 --- a/arch/powerpc/cpu/ppc4xx/sdram.c +++ b/arch/powerpc/cpu/ppc4xx/sdram.c @@ -8,7 +8,7 @@ * (C) Copyright 2002-2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/powerpc/cpu/ppc4xx/tlb.c b/arch/powerpc/cpu/ppc4xx/tlb.c index 86521676f1..3cb09bda43 100644 --- a/arch/powerpc/cpu/ppc4xx/tlb.c +++ b/arch/powerpc/cpu/ppc4xx/tlb.c @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/powerpc/include/asm/apm821xx.h b/arch/powerpc/include/asm/apm821xx.h index 11c06a2239..d027866d3d 100644 --- a/arch/powerpc/include/asm/apm821xx.h +++ b/arch/powerpc/include/asm/apm821xx.h @@ -2,7 +2,7 @@ * Copyright (c) 2010, Applied Micro Circuits Corporation * Author: Tirumala R Marri <tmarri@apm.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _APM821XX_H_ diff --git a/arch/powerpc/include/asm/ppc405ep.h b/arch/powerpc/include/asm/ppc405ep.h index ae3c99c5be..9f04215661 100644 --- a/arch/powerpc/include/asm/ppc405ep.h +++ b/arch/powerpc/include/asm/ppc405ep.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC405EP_H_ diff --git a/arch/powerpc/include/asm/ppc405ex.h b/arch/powerpc/include/asm/ppc405ex.h index 179ef149d7..083405ccb6 100644 --- a/arch/powerpc/include/asm/ppc405ex.h +++ b/arch/powerpc/include/asm/ppc405ex.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC405EX_H_ diff --git a/arch/powerpc/include/asm/ppc405ez.h b/arch/powerpc/include/asm/ppc405ez.h index 0a53458af1..40cf8ed51b 100644 --- a/arch/powerpc/include/asm/ppc405ez.h +++ b/arch/powerpc/include/asm/ppc405ez.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC405EZ_H_ diff --git a/arch/powerpc/include/asm/ppc405gp.h b/arch/powerpc/include/asm/ppc405gp.h index 60d2d3d6af..0044a3a42c 100644 --- a/arch/powerpc/include/asm/ppc405gp.h +++ b/arch/powerpc/include/asm/ppc405gp.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC405GP_H_ diff --git a/arch/powerpc/include/asm/ppc440ep_gr.h b/arch/powerpc/include/asm/ppc440ep_gr.h index 9ebbfcc2b2..c2c3abb0b0 100644 --- a/arch/powerpc/include/asm/ppc440ep_gr.h +++ b/arch/powerpc/include/asm/ppc440ep_gr.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC440EP_GR_H_ diff --git a/arch/powerpc/include/asm/ppc440epx_grx.h b/arch/powerpc/include/asm/ppc440epx_grx.h index 2520050773..93c3e2ef1a 100644 --- a/arch/powerpc/include/asm/ppc440epx_grx.h +++ b/arch/powerpc/include/asm/ppc440epx_grx.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC440EPX_GRX_H_ diff --git a/arch/powerpc/include/asm/ppc440gp.h b/arch/powerpc/include/asm/ppc440gp.h index 7eb16216c7..01b66c0508 100644 --- a/arch/powerpc/include/asm/ppc440gp.h +++ b/arch/powerpc/include/asm/ppc440gp.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC440GP_H_ diff --git a/arch/powerpc/include/asm/ppc440gx.h b/arch/powerpc/include/asm/ppc440gx.h index 4e3cbfb896..7bd36e860b 100644 --- a/arch/powerpc/include/asm/ppc440gx.h +++ b/arch/powerpc/include/asm/ppc440gx.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC440GX_H_ diff --git a/arch/powerpc/include/asm/ppc440sp.h b/arch/powerpc/include/asm/ppc440sp.h index ca69179a9b..5c2192ee43 100644 --- a/arch/powerpc/include/asm/ppc440sp.h +++ b/arch/powerpc/include/asm/ppc440sp.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC440SP_H_ diff --git a/arch/powerpc/include/asm/ppc440spe.h b/arch/powerpc/include/asm/ppc440spe.h index 2ae2193de8..105dc01196 100644 --- a/arch/powerpc/include/asm/ppc440spe.h +++ b/arch/powerpc/include/asm/ppc440spe.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC440SPE_H_ diff --git a/arch/powerpc/include/asm/ppc460ex_gt.h b/arch/powerpc/include/asm/ppc460ex_gt.h index 31750a4555..f41df0da6a 100644 --- a/arch/powerpc/include/asm/ppc460ex_gt.h +++ b/arch/powerpc/include/asm/ppc460ex_gt.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC460EX_GT_H_ diff --git a/arch/powerpc/include/asm/ppc460sx.h b/arch/powerpc/include/asm/ppc460sx.h index d6dcda52e2..b692d07f33 100644 --- a/arch/powerpc/include/asm/ppc460sx.h +++ b/arch/powerpc/include/asm/ppc460sx.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC460SX_H_ diff --git a/arch/powerpc/include/asm/ppc4xx-ebc.h b/arch/powerpc/include/asm/ppc4xx-ebc.h index 32062fd419..07a3fe033f 100644 --- a/arch/powerpc/include/asm/ppc4xx-ebc.h +++ b/arch/powerpc/include/asm/ppc4xx-ebc.h @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC4xx_EBC_H_ diff --git a/arch/powerpc/include/asm/ppc4xx-sdram.h b/arch/powerpc/include/asm/ppc4xx-sdram.h index 84968f81f6..12d6d038c7 100644 --- a/arch/powerpc/include/asm/ppc4xx-sdram.h +++ b/arch/powerpc/include/asm/ppc4xx-sdram.h @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC4xx_SDRAM_H_ diff --git a/arch/powerpc/include/asm/ppc4xx-uic.h b/arch/powerpc/include/asm/ppc4xx-uic.h index 13211e3a9c..05b4690a5c 100644 --- a/arch/powerpc/include/asm/ppc4xx-uic.h +++ b/arch/powerpc/include/asm/ppc4xx-uic.h @@ -4,7 +4,7 @@ * (C) Copyright 2008-2009 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PPC4xx_UIC_H_ diff --git a/arch/sandbox/cpu/u-boot.lds b/arch/sandbox/cpu/u-boot.lds index 615c5567c3..7e92b4ac66 100644 --- a/arch/sandbox/cpu/u-boot.lds +++ b/arch/sandbox/cpu/u-boot.lds @@ -3,7 +3,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ SECTIONS diff --git a/arch/sandbox/include/asm/byteorder.h b/arch/sandbox/include/asm/byteorder.h index ca1cb816ca..ba3c1643d9 100644 --- a/arch/sandbox/include/asm/byteorder.h +++ b/arch/sandbox/include/asm/byteorder.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2011 The Chromium OS Authors. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_SANDBOX_BYTEORDER_H diff --git a/arch/sandbox/include/asm/io.h b/arch/sandbox/include/asm/io.h index 0f41864682..9ac6a5f00d 100644 --- a/arch/sandbox/include/asm/io.h +++ b/arch/sandbox/include/asm/io.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2011 The Chromium OS Authors. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __SANDBOX_ASM_IO_H diff --git a/arch/sandbox/include/asm/ptrace.h b/arch/sandbox/include/asm/ptrace.h index 4d651cfb65..e9f552f4ae 100644 --- a/arch/sandbox/include/asm/ptrace.h +++ b/arch/sandbox/include/asm/ptrace.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2011 The Chromium OS Authors. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_SANDBOX_PTRACE_H diff --git a/arch/sandbox/include/asm/string.h b/arch/sandbox/include/asm/string.h index ef820fa736..f247ff3ba7 100644 --- a/arch/sandbox/include/asm/string.h +++ b/arch/sandbox/include/asm/string.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2011 The Chromium OS Authors. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <linux/string.h> diff --git a/arch/sandbox/include/asm/system.h b/arch/sandbox/include/asm/system.h index 95ec7d1068..066acc53fd 100644 --- a/arch/sandbox/include/asm/system.h +++ b/arch/sandbox/include/asm/system.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2011 The Chromium OS Authors. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_SANDBOX_SYSTEM_H diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h index 4f1ab13d10..88c84bae7c 100644 --- a/arch/sandbox/include/asm/types.h +++ b/arch/sandbox/include/asm/types.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2011 The Chromium OS Authors. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASM_SANDBOX_TYPES_H diff --git a/arch/sandbox/include/asm/unaligned.h b/arch/sandbox/include/asm/unaligned.h index 2df1cd0449..e52980499f 100644 --- a/arch/sandbox/include/asm/unaligned.h +++ b/arch/sandbox/include/asm/unaligned.h @@ -1,7 +1,7 @@ /* * Copyright (c) 2011 The Chromium OS Authors. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-generic/unaligned.h> diff --git a/arch/sandbox/lib/interrupts.c b/arch/sandbox/lib/interrupts.c index 52ba7c2104..c6d8ae913a 100644 --- a/arch/sandbox/lib/interrupts.c +++ b/arch/sandbox/lib/interrupts.c @@ -3,7 +3,7 @@ * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index 1ce3b5ef6c..e24f13afaf 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -3,7 +3,7 @@ * (C) Copyright 2008 * Graeme Russ, graeme.russ@gmail.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/arch/x86/cpu/coreboot/pci.c b/arch/x86/cpu/coreboot/pci.c index 7484c5c02a..33f16a3079 100644 --- a/arch/x86/cpu/coreboot/pci.c +++ b/arch/x86/cpu/coreboot/pci.c @@ -6,7 +6,7 @@ * (C) Copyright 2002 * Daniel Engström, Omicron Ceti AB, <daniel@omicron.se> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/Barix/ipam390/README.ipam390 b/board/Barix/ipam390/README.ipam390 index 2d155a33fe..5c45fca59f 100644 --- a/board/Barix/ipam390/README.ipam390 +++ b/board/Barix/ipam390/README.ipam390 @@ -50,7 +50,7 @@ TFTP from server 192.168.1.1; our IP address is 192.168.20.71 Filename '/tftpboot/ipam390/u-boot.ais'. Load address: 0xc0000000 Loading: ################################## - 1.5 MiB/s + 1.5 MiB/s done Bytes transferred = 493716 (78894 hex) diff --git a/board/LEOX/elpt860/README.LEOX b/board/LEOX/elpt860/README.LEOX index fe3c0f1528..aa41ff8fd2 100644 --- a/board/LEOX/elpt860/README.LEOX +++ b/board/LEOX/elpt860/README.LEOX @@ -46,7 +46,6 @@ U-Boot, at the address of 0x03000000. ============================================================================= - ################################################## # Operation on the serial console (SMC1) ############################## diff --git a/board/Marvell/db64360/mv_eth.h b/board/Marvell/db64360/mv_eth.h index 790b0df4da..d960eb4c5d 100644 --- a/board/Marvell/db64360/mv_eth.h +++ b/board/Marvell/db64360/mv_eth.h @@ -5,7 +5,7 @@ * based on - Driver for MV64360X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/Marvell/db64360/mv_regs.h b/board/Marvell/db64360/mv_regs.h index 45274f08d9..9a54a976d9 100644 --- a/board/Marvell/db64360/mv_regs.h +++ b/board/Marvell/db64360/mv_regs.h @@ -5,7 +5,7 @@ * based on - Driver for MV64360X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /******************************************************************************** diff --git a/board/Marvell/db64360/sdram_init.c b/board/Marvell/db64360/sdram_init.c index dafbe59f52..5954b4cea2 100644 --- a/board/Marvell/db64360/sdram_init.c +++ b/board/Marvell/db64360/sdram_init.c @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************* diff --git a/board/Marvell/db64460/mv_eth.h b/board/Marvell/db64460/mv_eth.h index 97a3a6661f..4c95e3ec4c 100644 --- a/board/Marvell/db64460/mv_eth.h +++ b/board/Marvell/db64460/mv_eth.h @@ -5,7 +5,7 @@ * based on - Driver for MV64460X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/Marvell/db64460/mv_regs.h b/board/Marvell/db64460/mv_regs.h index 4aefb3f683..70b6d2eeac 100644 --- a/board/Marvell/db64460/mv_regs.h +++ b/board/Marvell/db64460/mv_regs.h @@ -5,7 +5,7 @@ * based on - Driver for MV64460X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /******************************************************************************** diff --git a/board/RPXClassic/RPXClassic.c b/board/RPXClassic/RPXClassic.c index f47e8fa44d..15b7232fd7 100644 --- a/board/RPXClassic/RPXClassic.c +++ b/board/RPXClassic/RPXClassic.c @@ -7,7 +7,7 @@ * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/adder/adder.c b/board/adder/adder.c index fa1a54b1a7..2ee7096b83 100644 --- a/board/adder/adder.c +++ b/board/adder/adder.c @@ -5,7 +5,7 @@ * Support for Analogue&Micro Adder boards family. * Tested on AdderII and Adder87x. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/altera/common/epled.c b/board/altera/common/epled.c index 639170f7fd..580d590f2a 100644 --- a/board/altera/common/epled.c +++ b/board/altera/common/epled.c @@ -2,7 +2,7 @@ * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt@psyent.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/altera/common/sevenseg.c b/board/altera/common/sevenseg.c index 7ae7ca2116..1f22c8524a 100644 --- a/board/altera/common/sevenseg.c +++ b/board/altera/common/sevenseg.c @@ -87,10 +87,10 @@ static inline void __sevenseg_set (unsigned int value) #if (SEVENSEG_ACTIVE == 0) sevenseg_portval = (sevenseg_portval & SEVENDEG_MASK_DP) - | ((~value) & (~SEVENDEG_MASK_DP)); + | ((~value) & (~SEVENDEG_MASK_DP)); #else sevenseg_portval = (sevenseg_portval & SEVENDEG_MASK_DP) - | (value); + | (value); #endif piop->data = sevenseg_portval; diff --git a/board/altera/nios2-generic/u-boot.lds b/board/altera/nios2-generic/u-boot.lds index 9720d58584..e35fae54d2 100644 --- a/board/altera/nios2-generic/u-boot.lds +++ b/board/altera/nios2-generic/u-boot.lds @@ -2,7 +2,7 @@ * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt@psyent.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/amcc/bamboo/bamboo.h b/board/amcc/bamboo/bamboo.h index e85841a014..49f200aa0b 100644 --- a/board/amcc/bamboo/bamboo.h +++ b/board/amcc/bamboo/bamboo.h @@ -2,7 +2,7 @@ * (C) Copyright 2005 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /*----------------------------------------------------------------------------+ diff --git a/board/amcc/bamboo/init.S b/board/amcc/bamboo/init.S index 408450c080..48dbcbe2a1 100644 --- a/board/amcc/bamboo/init.S +++ b/board/amcc/bamboo/init.S @@ -4,7 +4,7 @@ * * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/amcc/bluestone/init.S b/board/amcc/bluestone/init.S index a1bf16804c..cf22ca6340 100644 --- a/board/amcc/bluestone/init.S +++ b/board/amcc/bluestone/init.S @@ -2,7 +2,7 @@ * Copyright (c) 2010, Applied Micro Circuits Corporation * Author: Tirumala R Marri <tmarri@apm.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/amcc/canyonlands/init.S b/board/amcc/canyonlands/init.S index e3134ddd6a..d83cd6e754 100644 --- a/board/amcc/canyonlands/init.S +++ b/board/amcc/canyonlands/init.S @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/amcc/ebony/ebony.c b/board/amcc/ebony/ebony.c index df35589aa6..eb424489ef 100644 --- a/board/amcc/ebony/ebony.c +++ b/board/amcc/ebony/ebony.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/amcc/katmai/init.S b/board/amcc/katmai/init.S index 83ccd53020..32f26672e2 100644 --- a/board/amcc/katmai/init.S +++ b/board/amcc/katmai/init.S @@ -4,7 +4,7 @@ * * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <ppc_asm.tmpl> diff --git a/board/amcc/luan/init.S b/board/amcc/luan/init.S index 9514fb8b8a..0f4a78e1e7 100644 --- a/board/amcc/luan/init.S +++ b/board/amcc/luan/init.S @@ -4,7 +4,7 @@ * * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <ppc_asm.tmpl> diff --git a/board/amcc/luan/luan.c b/board/amcc/luan/luan.c index 509595b5ad..774671db43 100644 --- a/board/amcc/luan/luan.c +++ b/board/amcc/luan/luan.c @@ -2,7 +2,7 @@ * (C) Copyright 2005 * John Otken, jotken@softadvances.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/amcc/makalu/init.S b/board/amcc/makalu/init.S index 032640f67f..e15c62249e 100644 --- a/board/amcc/makalu/init.S +++ b/board/amcc/makalu/init.S @@ -7,7 +7,7 @@ * * Originally based on code provided from Senao and AMCC * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ .globl ext_bus_cntlr_init diff --git a/board/amcc/ocotea/init.S b/board/amcc/ocotea/init.S index e23cc7e134..35085f0a06 100644 --- a/board/amcc/ocotea/init.S +++ b/board/amcc/ocotea/init.S @@ -1,7 +1,7 @@ /* * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <ppc_asm.tmpl> diff --git a/board/amcc/ocotea/ocotea.c b/board/amcc/ocotea/ocotea.c index e0039485e6..5f11f195e8 100644 --- a/board/amcc/ocotea/ocotea.c +++ b/board/amcc/ocotea/ocotea.c @@ -4,7 +4,7 @@ * (C) Copyright 2005 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/amcc/redwood/init.S b/board/amcc/redwood/init.S index 748422dedd..fd05130870 100644 --- a/board/amcc/redwood/init.S +++ b/board/amcc/redwood/init.S @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Feng Kan, Applied Micro Circuits Corp., fkan@amcc.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <ppc_asm.tmpl> diff --git a/board/amcc/sequoia/init.S b/board/amcc/sequoia/init.S index 9497865575..b31e9db3f9 100644 --- a/board/amcc/sequoia/init.S +++ b/board/amcc/sequoia/init.S @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/amcc/taishan/init.S b/board/amcc/taishan/init.S index 0ff4a9134a..ab1bb34fb8 100644 --- a/board/amcc/taishan/init.S +++ b/board/amcc/taishan/init.S @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <ppc_asm.tmpl> diff --git a/board/amcc/taishan/lcd.c b/board/amcc/taishan/lcd.c index c0a668a95e..124b81ee0b 100644 --- a/board/amcc/taishan/lcd.c +++ b/board/amcc/taishan/lcd.c @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/amcc/taishan/showinfo.c b/board/amcc/taishan/showinfo.c index bc74e8a9af..53bfdf790b 100644 --- a/board/amcc/taishan/showinfo.c +++ b/board/amcc/taishan/showinfo.c @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/amcc/taishan/taishan.c b/board/amcc/taishan/taishan.c index 52af23c6e9..5c8d9ec8f1 100644 --- a/board/amcc/taishan/taishan.c +++ b/board/amcc/taishan/taishan.c @@ -4,7 +4,7 @@ * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/amcc/taishan/update.c b/board/amcc/taishan/update.c index 3440d50a2d..273898929a 100644 --- a/board/amcc/taishan/update.c +++ b/board/amcc/taishan/update.c @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c index 8523ac33ee..56b5191d66 100644 --- a/board/amcc/yosemite/yosemite.c +++ b/board/amcc/yosemite/yosemite.c @@ -2,7 +2,7 @@ * (C) Copyright 2006-2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/amcc/yucca/init.S b/board/amcc/yucca/init.S index b2fc43e52f..7da5c0d44f 100644 --- a/board/amcc/yucca/init.S +++ b/board/amcc/yucca/init.S @@ -4,7 +4,7 @@ * * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <ppc_asm.tmpl> diff --git a/board/armltd/integrator/arm-ebi.h b/board/armltd/integrator/arm-ebi.h index fb6ed56851..6381fcc464 100644 --- a/board/armltd/integrator/arm-ebi.h +++ b/board/armltd/integrator/arm-ebi.h @@ -5,7 +5,7 @@ * Register definitions for the External Bus Interface (EBI) * found in the ARM Integrator AP and CP reference designs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ARM_EBI_H diff --git a/board/armltd/integrator/integrator-sc.h b/board/armltd/integrator/integrator-sc.h index e9897c823b..7a94d67304 100644 --- a/board/armltd/integrator/integrator-sc.h +++ b/board/armltd/integrator/integrator-sc.h @@ -6,7 +6,7 @@ * the similar "CP Controller" found in the ARM Integrator/AP and * Integrator/CP reference designs * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ARM_SC_H diff --git a/board/armltd/integrator/integrator.c b/board/armltd/integrator/integrator.c index 62870c6f43..f0fe0fd3aa 100644 --- a/board/armltd/integrator/integrator.c +++ b/board/armltd/integrator/integrator.c @@ -14,7 +14,7 @@ * ARM Ltd. * Philippe Robin, <philippe.robin@arm.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/armltd/integrator/lowlevel_init.S b/board/armltd/integrator/lowlevel_init.S index 4e2da4006f..389d5e9083 100644 --- a/board/armltd/integrator/lowlevel_init.S +++ b/board/armltd/integrator/lowlevel_init.S @@ -4,7 +4,7 @@ * (C) Copyright 2004, ARM Ltd. * Philippe Robin, <philippe.robin@arm.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/armltd/integrator/pci.c b/board/armltd/integrator/pci.c index c3f84236e5..157138b03a 100644 --- a/board/armltd/integrator/pci.c +++ b/board/armltd/integrator/pci.c @@ -18,7 +18,7 @@ * Linaro * Linus Walleij <linus.walleij@linaro.org> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> #include <pci.h> diff --git a/board/armltd/integrator/timer.c b/board/armltd/integrator/timer.c index f77edad4ff..14a52c4608 100644 --- a/board/armltd/integrator/timer.c +++ b/board/armltd/integrator/timer.c @@ -14,7 +14,7 @@ * ARM Ltd. * Philippe Robin, <philippe.robin@arm.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/atmark-techno/armadillo-800eva/Makefile b/board/atmark-techno/armadillo-800eva/Makefile index 9f9618b518..a81e40b58b 100644 --- a/board/atmark-techno/armadillo-800eva/Makefile +++ b/board/atmark-techno/armadillo-800eva/Makefile @@ -43,4 +43,3 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend ######################################################################### - diff --git a/board/bc3450/bc3450.c b/board/bc3450/bc3450.c index bfb11bf78e..a5c6d750cb 100644 --- a/board/bc3450/bc3450.c +++ b/board/bc3450/bc3450.c @@ -11,7 +11,7 @@ * (C) Copyright 2006 * Stefan Strobl, GERSYS GmbH, stefan.strobl@gersys.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/boundary/nitrogen6x/6x_upgrade.txt b/board/boundary/nitrogen6x/6x_upgrade.txt index 0d8e8e542b..1f9a889554 100644 --- a/board/boundary/nitrogen6x/6x_upgrade.txt +++ b/board/boundary/nitrogen6x/6x_upgrade.txt @@ -6,39 +6,39 @@ if ${fs}load ${dtype} ${disk}:1 12000000 u-boot.imx || ${fs}load ${dtype} ${disk if sf probe || sf probe || \ sf probe 1 27000000 || sf probe 1 27000000 ; then echo "probed SPI ROM" ; - if sf read 0x12400000 $offset $filesize ; then - if cmp.b 0x12000000 0x12400000 $filesize ; then - echo "------- U-Boot versions match" ; - else - echo "Need U-Boot upgrade" ; - echo "Program in 5 seconds" ; - for n in 5 4 3 2 1 ; do - echo $n ; - sleep 1 ; - done + if sf read 0x12400000 $offset $filesize ; then + if cmp.b 0x12000000 0x12400000 $filesize ; then + echo "------- U-Boot versions match" ; + else + echo "Need U-Boot upgrade" ; + echo "Program in 5 seconds" ; + for n in 5 4 3 2 1 ; do + echo $n ; + sleep 1 ; + done echo "erasing" ; - sf erase 0 0x50000 ; + sf erase 0 0x50000 ; # two steps to prevent bricking echo "programming" ; - sf write 0x12000000 $offset $filesize ; + sf write 0x12000000 $offset $filesize ; echo "verifying" ; - if sf read 0x12400000 $offset $filesize ; then - if cmp.b 0x12000000 0x12400000 $filesize ; then - while echo "---- U-Boot upgraded. reset" ; do + if sf read 0x12400000 $offset $filesize ; then + if cmp.b 0x12000000 0x12400000 $filesize ; then + while echo "---- U-Boot upgraded. reset" ; do sleep 120 done - else - echo "Read verification error" ; - fi - else - echo "Error re-reading EEPROM" ; - fi - fi - else - echo "Error reading boot loader from EEPROM" ; - fi + else + echo "Read verification error" ; + fi + else + echo "Error re-reading EEPROM" ; + fi + fi + else + echo "Error reading boot loader from EEPROM" ; + fi else - echo "Error initializing EEPROM" ; + echo "Error initializing EEPROM" ; fi ; else echo "No U-Boot image found on SD card" ; diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 2b61e5d2a9..17129081b7 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -2,7 +2,7 @@ * Copyright (C) 2010-2013 Freescale Semiconductor, Inc. * Copyright (C) 2013, Boundary Devices <info@boundarydevices.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/chromebook-x86/coreboot/coreboot_start.S b/board/chromebook-x86/coreboot/coreboot_start.S index c6279bb30b..932fe6c24b 100644 --- a/board/chromebook-x86/coreboot/coreboot_start.S +++ b/board/chromebook-x86/coreboot/coreboot_start.S @@ -3,7 +3,7 @@ * (C) Copyright 2008 * Graeme Russ, graeme.russ@gmail.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* board early intialization */ diff --git a/board/chromebook-x86/dts/alex.dts b/board/chromebook-x86/dts/alex.dts index cb6a9e41ee..2f13544612 100644 --- a/board/chromebook-x86/dts/alex.dts +++ b/board/chromebook-x86/dts/alex.dts @@ -3,8 +3,8 @@ /include/ "coreboot.dtsi" / { - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; model = "Google Alex"; compatible = "google,alex", "intel,atom-pineview"; @@ -12,13 +12,13 @@ silent_console = <0>; }; - gpio: gpio {}; + gpio: gpio {}; serial { reg = <0x3f8 8>; clock-frequency = <115200>; }; - chosen { }; - memory { device_type = "memory"; reg = <0 0>; }; + chosen { }; + memory { device_type = "memory"; reg = <0 0>; }; }; diff --git a/board/chromebook-x86/dts/link.dts b/board/chromebook-x86/dts/link.dts index c95ee8a108..4a37dac4ea 100644 --- a/board/chromebook-x86/dts/link.dts +++ b/board/chromebook-x86/dts/link.dts @@ -3,8 +3,8 @@ /include/ "coreboot.dtsi" / { - #address-cells = <1>; - #size-cells = <1>; + #address-cells = <1>; + #size-cells = <1>; model = "Google Link"; compatible = "google,link", "intel,celeron-ivybridge"; @@ -12,15 +12,15 @@ silent_console = <0>; }; - gpio: gpio {}; + gpio: gpio {}; serial { reg = <0x3f8 8>; clock-frequency = <115200>; }; - chosen { }; - memory { device_type = "memory"; reg = <0 0>; }; + chosen { }; + memory { device_type = "memory"; reg = <0 0>; }; spi { #address-cells = <1>; diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index e391dfc9e1..048aa6c2e9 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -16,7 +16,7 @@ * - run-time SDRAM controller configuration * - LIBFDT support * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/cm5200/cm5200.h b/board/cm5200/cm5200.h index 9abc3568b6..c2573f3bf6 100644 --- a/board/cm5200/cm5200.h +++ b/board/cm5200/cm5200.h @@ -4,7 +4,7 @@ * Author: Bartlomiej Sieka <tur@semihalf.com> * Author: Grzegorz Bernacki <gjb@semihalf.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _CM5200_H diff --git a/board/cm5200/fwupdate.c b/board/cm5200/fwupdate.c index e963eb553f..06d50234e9 100644 --- a/board/cm5200/fwupdate.c +++ b/board/cm5200/fwupdate.c @@ -7,7 +7,7 @@ * - code clean-up * - bugfix for overwriting bootargs by user * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/cm5200/fwupdate.h b/board/cm5200/fwupdate.h index ca77f89ab0..6ddf0bac35 100644 --- a/board/cm5200/fwupdate.h +++ b/board/cm5200/fwupdate.h @@ -3,7 +3,7 @@ * * Author: Michel Marti <mma@objectxp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __FW_UPDATE_H diff --git a/board/cogent/flash.c b/board/cogent/flash.c index 207380f099..d4ae4d0a3c 100644 --- a/board/cogent/flash.c +++ b/board/cogent/flash.c @@ -487,7 +487,7 @@ flash_erase(flash_info_t *info, int s_first, int s_last) if (haderr > 0) { printf (" failed\n"); - rcode = 1; + rcode = 1; } else printf (" done\n"); diff --git a/board/congatec/cgtqmx6eval/cgtqmx6eval.c b/board/congatec/cgtqmx6eval/cgtqmx6eval.c index d42152734d..1ea68f4668 100644 --- a/board/congatec/cgtqmx6eval/cgtqmx6eval.c +++ b/board/congatec/cgtqmx6eval/cgtqmx6eval.c @@ -4,7 +4,7 @@ * Copyright (C) 2013, Adeneo Embedded <www.adeneo-embedded.com> * Leo Sartre, <lsartre@adeneo-embedded.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/cpc45/ide.c b/board/cpc45/ide.c index 448d887b3a..1944e36005 100644 --- a/board/cpc45/ide.c +++ b/board/cpc45/ide.c @@ -126,4 +126,3 @@ void ide_led(uchar led, uchar status) writeb(val, BCSR_BASE + 0x04); } - diff --git a/board/cpu86/flash.c b/board/cpu86/flash.c index fd97c36d21..b99a9a089b 100644 --- a/board/cpu86/flash.c +++ b/board/cpu86/flash.c @@ -5,7 +5,7 @@ * Flash Routines for Intel devices * *-------------------------------------------------------------------- - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/cpu87/flash.c b/board/cpu87/flash.c index 79ec7e8ee5..96ba7d9b33 100644 --- a/board/cpu87/flash.c +++ b/board/cpu87/flash.c @@ -5,7 +5,7 @@ * Flash Routines for Intel devices * *-------------------------------------------------------------------- - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/csb272/csb272.c b/board/csb272/csb272.c index 43a1aa0521..dc2c9503e6 100644 --- a/board/csb272/csb272.c +++ b/board/csb272/csb272.c @@ -2,7 +2,7 @@ * (C) Copyright 2004 * Tolunay Orkun, Nextio Inc., torkun@nextio.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/csb472/csb472.c b/board/csb472/csb472.c index 2fd32444ea..b1de18ce51 100644 --- a/board/csb472/csb472.c +++ b/board/csb472/csb472.c @@ -2,7 +2,7 @@ * (C) Copyright 2004 * Tolunay Orkun, Nextio Inc., torkun@nextio.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/emk/top860/top860.c b/board/emk/top860/top860.c index c88ae75e9b..32c77f84e7 100644 --- a/board/emk/top860/top860.c +++ b/board/emk/top860/top860.c @@ -12,7 +12,7 @@ * - ethernet io initialisation * * ----------------------------------------------------------------- - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/ep88x/ep88x.c b/board/ep88x/ep88x.c index 8a60b5850f..cad0bfc6ca 100644 --- a/board/ep88x/ep88x.c +++ b/board/ep88x/ep88x.c @@ -5,7 +5,7 @@ * Support for Embedded Planet EP88x boards. * Tested on EP88xC with MPC885 CPU, 64MB SDRAM and 16MB flash. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/esd/common/lcd.h b/board/esd/common/lcd.h index 96e4b9972d..5b14bf9260 100644 --- a/board/esd/common/lcd.h +++ b/board/esd/common/lcd.h @@ -9,7 +9,7 @@ * Neutralize little endians. */ #define SWAP_LONG(data) ((unsigned long) \ - (((unsigned long)(data) >> 24) | \ + (((unsigned long)(data) >> 24) | \ ((unsigned long)(data) << 24) | \ (((unsigned long)(data) >> 8) & 0x0000ff00 ) | \ (((unsigned long)(data) << 8) & 0x00ff0000 ))) diff --git a/board/esd/cpci2dp/cpci2dp.c b/board/esd/cpci2dp/cpci2dp.c index aade55ac67..336c551263 100644 --- a/board/esd/cpci2dp/cpci2dp.c +++ b/board/esd/cpci2dp/cpci2dp.c @@ -2,7 +2,7 @@ * (C) Copyright 2005 * Matthias Fuchs, esd gmbh germany, matthias.fuchs@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/esd/cpci5200/strataflash.c b/board/esd/cpci5200/strataflash.c index 4983112a87..7dc2e58c12 100644 --- a/board/esd/cpci5200/strataflash.c +++ b/board/esd/cpci5200/strataflash.c @@ -2,7 +2,7 @@ * (C) Copyright 2002 * Brad Kemp, Seranoa Networks, Brad.Kemp@seranoa.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/esd/cpci750/ide.c b/board/esd/cpci750/ide.c index 5f306855ac..f555c08427 100644 --- a/board/esd/cpci750/ide.c +++ b/board/esd/cpci750/ide.c @@ -43,7 +43,7 @@ int ide_preinit (void) if (devbusfn != -1) { cpci_hd_type = 1; } else { - devbusfn = pci_find_device (0x1095, 0x3114, 0); + devbusfn = pci_find_device (0x1095, 0x3114, 0); if (devbusfn != -1) { cpci_hd_type = 2; } diff --git a/board/esd/cpci750/mv_eth.h b/board/esd/cpci750/mv_eth.h index b93cb27825..c04fb58afd 100644 --- a/board/esd/cpci750/mv_eth.h +++ b/board/esd/cpci750/mv_eth.h @@ -5,7 +5,7 @@ * based on - Driver for MV64360X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/esd/cpci750/mv_regs.h b/board/esd/cpci750/mv_regs.h index 45274f08d9..9a54a976d9 100644 --- a/board/esd/cpci750/mv_regs.h +++ b/board/esd/cpci750/mv_regs.h @@ -5,7 +5,7 @@ * based on - Driver for MV64360X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /******************************************************************************** diff --git a/board/esd/cpci750/pci.c b/board/esd/cpci750/pci.c index c9b3ac2a4f..59f170a0df 100644 --- a/board/esd/cpci750/pci.c +++ b/board/esd/cpci750/pci.c @@ -746,7 +746,7 @@ static int gt_read_config_dword (struct pci_controller *hose, int bus = PCI_BUS (dev); if ((bus == local_buses[0]) || (bus == local_buses[1])) { - *value = pciReadConfigReg ((PCI_HOST) hose->cfg_addr, + *value = pciReadConfigReg ((PCI_HOST) hose->cfg_addr, offset | (PCI_FUNC(dev) << 8), PCI_DEV (dev)); } else { diff --git a/board/esd/du440/init.S b/board/esd/du440/init.S index f3d76b8538..ab4b6ceda7 100644 --- a/board/esd/du440/init.S +++ b/board/esd/du440/init.S @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Matthias Fuchs, esd gmbh, matthias.fuchs@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/etin/debris/flash.c b/board/etin/debris/flash.c index 9d22aa2bd7..26579588dd 100644 --- a/board/etin/debris/flash.c +++ b/board/etin/debris/flash.c @@ -323,7 +323,7 @@ int flash_erase (flash_info_t *flash, int s_first, int s_last) if (prot) printf ("- Warning: %d protected sectors will not be erased!\n", - prot); + prot); else printf ("\n"); @@ -365,7 +365,7 @@ static const struct jedec_flash_info jedec_table[] = { DevSize: SIZE_1MiB, NumEraseRegions: 4, regions: {ERASEINFO(0x10000,15), - ERASEINFO(0x08000,1), + ERASEINFO(0x08000,1), ERASEINFO(0x02000,2), ERASEINFO(0x04000,1) } @@ -376,7 +376,7 @@ static const struct jedec_flash_info jedec_table[] = { DevSize: SIZE_2MiB, NumEraseRegions: 4, regions: {ERASEINFO(0x10000,31), - ERASEINFO(0x08000,1), + ERASEINFO(0x08000,1), ERASEINFO(0x02000,2), ERASEINFO(0x04000,1) } @@ -387,7 +387,7 @@ static const struct jedec_flash_info jedec_table[] = { DevSize: SIZE_2MiB, NumEraseRegions: 4, regions: {ERASEINFO(0x04000,1), - ERASEINFO(0x02000,2), + ERASEINFO(0x02000,2), ERASEINFO(0x08000,1), ERASEINFO(0x10000,31) } @@ -398,7 +398,7 @@ static const struct jedec_flash_info jedec_table[] = { DevSize: SIZE_4MiB, NumEraseRegions: 2, regions: {ERASEINFO(0x10000,63), - ERASEINFO(0x02000,8) + ERASEINFO(0x02000,8) } }, { @@ -408,7 +408,7 @@ static const struct jedec_flash_info jedec_table[] = { DevSize: SIZE_4MiB, NumEraseRegions: 2, regions: {ERASEINFO(0x02000,8), - ERASEINFO(0x10000,63) + ERASEINFO(0x10000,63) } } }; diff --git a/board/evb64260/flash.c b/board/evb64260/flash.c index 88c43ff688..f3b0074c5d 100644 --- a/board/evb64260/flash.c +++ b/board/evb64260/flash.c @@ -60,7 +60,7 @@ flash_init (void) #define CONFIG_SYS_BOOT_FLASH_WIDTH 1 #endif size_b0 = flash_get_size(CONFIG_SYS_BOOT_FLASH_WIDTH, (vu_long *)base, - &flash_info[0]); + &flash_info[0]); #ifndef CONFIG_P3G4 printf("["); @@ -97,17 +97,17 @@ flash_init (void) #if CONFIG_SYS_MONITOR_BASE >= CONFIG_SYS_FLASH_BASE /* monitor protection ON by default */ flash_protect(FLAG_PROTECT_SET, - CONFIG_SYS_MONITOR_BASE, - CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, - flash_get_info(CONFIG_SYS_MONITOR_BASE)); + CONFIG_SYS_MONITOR_BASE, + CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1, + flash_get_info(CONFIG_SYS_MONITOR_BASE)); #endif #ifdef CONFIG_ENV_IS_IN_FLASH /* ENV protection ON by default */ flash_protect(FLAG_PROTECT_SET, - CONFIG_ENV_ADDR, - CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, - flash_get_info(CONFIG_ENV_ADDR)); + CONFIG_ENV_ADDR, + CONFIG_ENV_ADDR + CONFIG_ENV_SIZE - 1, + flash_get_info(CONFIG_ENV_ADDR)); #endif flash_size = size_b0 + size_b1; diff --git a/board/evb64260/mpsc.c b/board/evb64260/mpsc.c index 1a2ad20598..c9da57c20d 100644 --- a/board/evb64260/mpsc.c +++ b/board/evb64260/mpsc.c @@ -785,7 +785,7 @@ galmpsc_shutdown(int mpsc) GT_REG_WRITE(GALSDMA_0_COM_REG + CHANNEL * GALSDMA_REG_DIFF, 0); GT_REG_WRITE(GALSDMA_0_COM_REG + CHANNEL * GALSDMA_REG_DIFF, - SDMA_TX_ABORT | SDMA_RX_ABORT); + SDMA_TX_ABORT | SDMA_RX_ABORT); /* shut down the MPSC */ GT_REG_WRITE(GALMPSC_MCONF_LOW, 0); @@ -797,7 +797,7 @@ galmpsc_shutdown(int mpsc) /* shut down the sdma engines. */ /* reset config to default */ GT_REG_WRITE(GALSDMA_0_CONF_REG + CHANNEL * GALSDMA_REG_DIFF, - 0x000000fc); + 0x000000fc); udelay(100); diff --git a/board/exmeritus/hww1u1a/gpios.h b/board/exmeritus/hww1u1a/gpios.h index 704dc630d3..499880f1a0 100644 --- a/board/exmeritus/hww1u1a/gpios.h +++ b/board/exmeritus/hww1u1a/gpios.h @@ -1,7 +1,7 @@ /* * Copyright 2010 eXMeritus, A Boeing Company * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/mpc85xx_gpio.h> diff --git a/board/exmeritus/hww1u1a/hww1u1a.c b/board/exmeritus/hww1u1a/hww1u1a.c index 9611f6d64e..7c11e38d1c 100644 --- a/board/exmeritus/hww1u1a/hww1u1a.c +++ b/board/exmeritus/hww1u1a/hww1u1a.c @@ -2,7 +2,7 @@ * Copyright 2009-2011 eXMeritus, A Boeing Company * Copyright 2007-2009 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/fads/fads.c b/board/fads/fads.c index 3fe318f765..89dd9efe78 100644 --- a/board/fads/fads.c +++ b/board/fads/fads.c @@ -434,7 +434,7 @@ static int _initsdram(uint base, uint noMbytes) */ memctl->memc_mcr = 0x80808111; /* run umpb cs4 1 count 1, addr 0x11 ??? (50MHz) */ - /* run umpb cs4 1 count 1, addr 0x11 precharge+MRS (100MHz) */ + /* run umpb cs4 1 count 1, addr 0x11 precharge+MRS (100MHz) */ udelay(200); /* Run 8 refresh cycles */ @@ -567,7 +567,7 @@ static int initsdram(uint base, uint *noMbytes) if(!_initsdram(base, m)) { - *noMbytes += m; + *noMbytes += m; return 0; } else diff --git a/board/freescale/b4860qds/tlb.c b/board/freescale/b4860qds/tlb.c index f71aca4092..00798a1c19 100644 --- a/board/freescale/b4860qds/tlb.c +++ b/board/freescale/b4860qds/tlb.c @@ -68,7 +68,7 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 3, BOOKE_PAGESZ_256M, 1), SET_TLB_ENTRY(1, CONFIG_SYS_PCIE1_MEM_VIRT + 0x10000000, - CONFIG_SYS_PCIE1_MEM_PHYS + 0x10000000, + CONFIG_SYS_PCIE1_MEM_PHYS + 0x10000000, MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 4, BOOKE_PAGESZ_256M, 1), diff --git a/board/freescale/bsc9132qds/README b/board/freescale/bsc9132qds/README index 4a3dbfe5d4..f8377c9aa4 100644 --- a/board/freescale/bsc9132qds/README +++ b/board/freescale/bsc9132qds/README @@ -23,14 +23,14 @@ Overview ECC), up to 1333 MHz data rate - Dedicated security engine featuring trusted boot - Two DMA controllers - - OCNDMA with four bidirectional channels - - SysDMA with sixteen bidirectional channels + - OCNDMA with four bidirectional channels + - SysDMA with sixteen bidirectional channels - Interfaces - - Four-lane SerDes PHY + - Four-lane SerDes PHY - PCI Express controller complies with the PEX Specification-Rev 2.0 - - Two Common Public Radio Interface (CPRI) controller lanes + - Two Common Public Radio Interface (CPRI) controller lanes - High-speed USB 2.0 host and device controller with ULPI interface - - Enhanced secure digital (SD/MMC) host controller (eSDHC) + - Enhanced secure digital (SD/MMC) host controller (eSDHC) - Antenna interface controller (AIC), supporting four industry standard JESD207/four custom ADI RF interfaces - ADI lanes support both full duplex FDD support & half duplex TDD diff --git a/board/freescale/common/cadmus.c b/board/freescale/common/cadmus.c index 7772f9f99c..dad684773b 100644 --- a/board/freescale/common/cadmus.c +++ b/board/freescale/common/cadmus.c @@ -1,7 +1,7 @@ /* * Copyright 2004, 2011 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/freescale/common/cadmus.h b/board/freescale/common/cadmus.h index 959ea21714..7867192825 100644 --- a/board/freescale/common/cadmus.h +++ b/board/freescale/common/cadmus.h @@ -1,7 +1,7 @@ /* * Copyright 2004 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CADMUS_H_ diff --git a/board/freescale/common/cds_pci_ft.c b/board/freescale/common/cds_pci_ft.c index 4cd804577b..2e5dcdf0e2 100644 --- a/board/freescale/common/cds_pci_ft.c +++ b/board/freescale/common/cds_pci_ft.c @@ -1,7 +1,7 @@ /* * Copyright 2004 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/common/cds_via.c b/board/freescale/common/cds_via.c index 76631fa452..028b093ec4 100644 --- a/board/freescale/common/cds_via.c +++ b/board/freescale/common/cds_via.c @@ -1,7 +1,7 @@ /* * Copyright 2006 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/common/eeprom.h b/board/freescale/common/eeprom.h index 222405bb3b..efdba4e503 100644 --- a/board/freescale/common/eeprom.h +++ b/board/freescale/common/eeprom.h @@ -1,7 +1,7 @@ /* * Copyright 2004 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __EEPROM_H_ diff --git a/board/freescale/mpc8313erdb/mpc8313erdb.c b/board/freescale/mpc8313erdb/mpc8313erdb.c index 591a4c61d0..69e98a5007 100644 --- a/board/freescale/mpc8313erdb/mpc8313erdb.c +++ b/board/freescale/mpc8313erdb/mpc8313erdb.c @@ -129,12 +129,12 @@ void board_init_f(ulong bootflag) { board_early_init_f(); NS16550_init((NS16550_t)(CONFIG_SYS_IMMR + 0x4500), - CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); + CONFIG_SYS_NS16550_CLK / 16 / CONFIG_BAUDRATE); puts("NAND boot... "); init_timebase(); initdram(0); relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC_SP, (gd_t *)gd, - CONFIG_SYS_NAND_U_BOOT_RELOC); + CONFIG_SYS_NAND_U_BOOT_RELOC); } void board_init_r(gd_t *gd, ulong dest_addr) diff --git a/board/freescale/mpc8360emds/mpc8360emds.c b/board/freescale/mpc8360emds/mpc8360emds.c index 39a86dffe1..ac96163aa4 100644 --- a/board/freescale/mpc8360emds/mpc8360emds.c +++ b/board/freescale/mpc8360emds/mpc8360emds.c @@ -427,7 +427,7 @@ void ft_board_setup(void *blob, bd_t *bd) if (prop) { path = fdt_path_offset(blob, prop); prop = fdt_getprop(blob, path, - "phy-connection-type", 0); + "phy-connection-type", 0); if (prop && (strcmp(prop, "rgmii-id") == 0)) fdt_fixup_phy_connection(blob, path, PHY_INTERFACE_MODE_RGMII_RXID); @@ -439,7 +439,7 @@ void ft_board_setup(void *blob, bd_t *bd) if (prop) { path = fdt_path_offset(blob, prop); prop = fdt_getprop(blob, path, - "phy-connection-type", 0); + "phy-connection-type", 0); if (prop && (strcmp(prop, "rgmii-id") == 0)) fdt_fixup_phy_connection(blob, path, PHY_INTERFACE_MODE_RGMII_RXID); diff --git a/board/freescale/mpc8536ds/mpc8536ds.c b/board/freescale/mpc8536ds/mpc8536ds.c index a8bb2b29ac..5daab692c6 100644 --- a/board/freescale/mpc8536ds/mpc8536ds.c +++ b/board/freescale/mpc8536ds/mpc8536ds.c @@ -1,7 +1,7 @@ /* * Copyright 2008-2012 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mpc8540ads/mpc8540ads.c b/board/freescale/mpc8540ads/mpc8540ads.c index 2fb4037428..175eefcc6b 100644 --- a/board/freescale/mpc8540ads/mpc8540ads.c +++ b/board/freescale/mpc8540ads/mpc8540ads.c @@ -5,7 +5,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/freescale/mpc8541cds/mpc8541cds.c b/board/freescale/mpc8541cds/mpc8541cds.c index 1e21a664c1..8115e5c69b 100644 --- a/board/freescale/mpc8541cds/mpc8541cds.c +++ b/board/freescale/mpc8541cds/mpc8541cds.c @@ -3,7 +3,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mpc8548cds/mpc8548cds.c b/board/freescale/mpc8548cds/mpc8548cds.c index 2f0b71bea1..51e4bb5dcb 100644 --- a/board/freescale/mpc8548cds/mpc8548cds.c +++ b/board/freescale/mpc8548cds/mpc8548cds.c @@ -3,7 +3,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mpc8555cds/mpc8555cds.c b/board/freescale/mpc8555cds/mpc8555cds.c index ee9269504c..e2093d1bbc 100644 --- a/board/freescale/mpc8555cds/mpc8555cds.c +++ b/board/freescale/mpc8555cds/mpc8555cds.c @@ -1,7 +1,7 @@ /* * Copyright 2004, 2011 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mpc8560ads/mpc8560ads.c b/board/freescale/mpc8560ads/mpc8560ads.c index 162636ef8c..90a2522cb9 100644 --- a/board/freescale/mpc8560ads/mpc8560ads.c +++ b/board/freescale/mpc8560ads/mpc8560ads.c @@ -5,7 +5,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/freescale/mpc8568mds/bcsr.c b/board/freescale/mpc8568mds/bcsr.c index 509bfc6894..4a6105cb1f 100644 --- a/board/freescale/mpc8568mds/bcsr.c +++ b/board/freescale/mpc8568mds/bcsr.c @@ -1,7 +1,7 @@ /* * Copyright 2007 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mpc8568mds/bcsr.h b/board/freescale/mpc8568mds/bcsr.h index 3bfca479cb..215534e6c9 100644 --- a/board/freescale/mpc8568mds/bcsr.h +++ b/board/freescale/mpc8568mds/bcsr.h @@ -1,7 +1,7 @@ /* * Copyright 2007 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __BCSR_H_ diff --git a/board/freescale/mpc8568mds/mpc8568mds.c b/board/freescale/mpc8568mds/mpc8568mds.c index 2f9417fc77..ae80697b38 100644 --- a/board/freescale/mpc8568mds/mpc8568mds.c +++ b/board/freescale/mpc8568mds/mpc8568mds.c @@ -3,7 +3,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mpc8569mds/bcsr.c b/board/freescale/mpc8569mds/bcsr.c index b9c32eca94..178d9f873d 100644 --- a/board/freescale/mpc8569mds/bcsr.c +++ b/board/freescale/mpc8569mds/bcsr.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2009 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mpc8569mds/bcsr.h b/board/freescale/mpc8569mds/bcsr.h index a32bc3bea7..6f4d13961b 100644 --- a/board/freescale/mpc8569mds/bcsr.h +++ b/board/freescale/mpc8569mds/bcsr.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __BCSR_H_ diff --git a/board/freescale/mpc8569mds/mpc8569mds.c b/board/freescale/mpc8569mds/mpc8569mds.c index 99b89d3a1f..c928a964f9 100644 --- a/board/freescale/mpc8569mds/mpc8569mds.c +++ b/board/freescale/mpc8569mds/mpc8569mds.c @@ -3,7 +3,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mpc8572ds/mpc8572ds.c b/board/freescale/mpc8572ds/mpc8572ds.c index 1201d6bc3d..657df6a718 100644 --- a/board/freescale/mpc8572ds/mpc8572ds.c +++ b/board/freescale/mpc8572ds/mpc8572ds.c @@ -1,7 +1,7 @@ /* * Copyright 2007-2011 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mpc8610hpcd/mpc8610hpcd.c b/board/freescale/mpc8610hpcd/mpc8610hpcd.c index 1f09429a04..ffdcf2444c 100644 --- a/board/freescale/mpc8610hpcd/mpc8610hpcd.c +++ b/board/freescale/mpc8610hpcd/mpc8610hpcd.c @@ -1,7 +1,7 @@ /* * Copyright 2007,2009-2011 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/mx31ads/u-boot.lds b/board/freescale/mx31ads/u-boot.lds index a6ef66eeab..3acc4ca548 100644 --- a/board/freescale/mx31ads/u-boot.lds +++ b/board/freescale/mx31ads/u-boot.lds @@ -5,7 +5,7 @@ * (C) Copyright 2002 * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") diff --git a/board/freescale/p1023rdb/ddr.c b/board/freescale/p1023rdb/ddr.c index ce406b2b82..f027885100 100644 --- a/board/freescale/p1023rdb/ddr.c +++ b/board/freescale/p1023rdb/ddr.c @@ -86,4 +86,3 @@ void fsl_ddr_board_options(memctl_options_t *popts, popts->cs_local_opts[i].odt_wr_cfg = FSL_DDR_ODT_CS; } } - diff --git a/board/freescale/p1_p2_rdb/pci.c b/board/freescale/p1_p2_rdb/pci.c index 76ef28b8c8..745ebb15e0 100644 --- a/board/freescale/p1_p2_rdb/pci.c +++ b/board/freescale/p1_p2_rdb/pci.c @@ -1,7 +1,7 @@ /* * Copyright 2009-2010 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/freescale/p2020ds/p2020ds.c b/board/freescale/p2020ds/p2020ds.c index 1334f250eb..58a42231a9 100644 --- a/board/freescale/p2020ds/p2020ds.c +++ b/board/freescale/p2020ds/p2020ds.c @@ -1,7 +1,7 @@ /* * Copyright 2007-2012 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/funkwerk/vovpn-gw/vovpn-gw.c b/board/funkwerk/vovpn-gw/vovpn-gw.c index d33563b8d8..c2aad6eb05 100644 --- a/board/funkwerk/vovpn-gw/vovpn-gw.c +++ b/board/funkwerk/vovpn-gw/vovpn-gw.c @@ -270,9 +270,9 @@ int misc_init_r (void) for (i = 0; i < 64; i++) { c = *dummy; printf( "UPMA[%02d]: 0x%08lx,0x%08lx: 0x%08lx\n",i, - memctl->memc_mamr, - memctl->memc_mar, - memctl->memc_mdr ); + memctl->memc_mamr, + memctl->memc_mar, + memctl->memc_mdr ); } memctl->memc_mamr = 0x00044440; #endif diff --git a/board/g2000/strataflash.c b/board/g2000/strataflash.c index 93e2432ebf..1d29eb4325 100644 --- a/board/g2000/strataflash.c +++ b/board/g2000/strataflash.c @@ -2,7 +2,7 @@ * (C) Copyright 2002 * Brad Kemp, Seranoa Networks, Brad.Kemp@seranoa.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/gdsys/gdppc440etx/gdppc440etx.c b/board/gdsys/gdppc440etx/gdppc440etx.c index 6ee7764448..04191dff1e 100644 --- a/board/gdsys/gdppc440etx/gdppc440etx.c +++ b/board/gdsys/gdppc440etx/gdppc440etx.c @@ -6,7 +6,7 @@ * (C) Copyright 2006-2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/gdsys/intip/init.S b/board/gdsys/intip/init.S index 5963180941..1fc2a2f3e8 100644 --- a/board/gdsys/intip/init.S +++ b/board/gdsys/intip/init.S @@ -6,7 +6,7 @@ * (C) Copyright 2008 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/gen860t/flash.c b/board/gen860t/flash.c index 8433d5d2cf..ca1ed3d62d 100644 --- a/board/gen860t/flash.c +++ b/board/gen860t/flash.c @@ -182,7 +182,7 @@ flash_get_offsets (ulong base, flash_info_t *info) default: printf ("Don't know sector offsets for FLASH" - " type 0x%lx\n", info->flash_id); + " type 0x%lx\n", info->flash_id); return; } } diff --git a/board/gw8260/gw8260.c b/board/gw8260/gw8260.c index f0ed16cd93..bbae0a8922 100644 --- a/board/gw8260/gw8260.c +++ b/board/gw8260/gw8260.c @@ -11,7 +11,7 @@ * Advent Networks, Inc. <http://www.adventnetworks.com> * Oliver Brown <oliverb@alumni.utexas.net> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /*********************************************************************/ diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c index de6b8fbd9b..1b2d0e09a9 100644 --- a/board/ids8247/ids8247.c +++ b/board/ids8247/ids8247.c @@ -2,7 +2,7 @@ * (C) Copyright 2005 * Heiko Schocher, DENX Software Engineering, <hs@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/incaip/incaip.c b/board/incaip/incaip.c index 911fb63fcd..217b8afa34 100644 --- a/board/incaip/incaip.c +++ b/board/incaip/incaip.c @@ -58,9 +58,9 @@ phys_size_t initdram(int board_type) for (rows = 0xB; rows <= 0xD; rows++) { *INCA_IP_SDRAM_MC_CFGPB0 = (0x14 << 8) | - (rows << 4) | cols; + (rows << 4) | cols; size = get_ram_size((long *)CONFIG_SYS_SDRAM_BASE, - max_sdram_size()); + max_sdram_size()); if (size > max_size) { diff --git a/board/incaip/lowlevel_init.S b/board/incaip/lowlevel_init.S index 702f9e0aa0..b6cf6a9960 100644 --- a/board/incaip/lowlevel_init.S +++ b/board/incaip/lowlevel_init.S @@ -3,7 +3,7 @@ * * Copyright (c) 2003 Wolfgang Denk <wd@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/inka4x0/inka4x0.c b/board/inka4x0/inka4x0.c index fc3333efe4..0a32f0e1b9 100644 --- a/board/inka4x0/inka4x0.c +++ b/board/inka4x0/inka4x0.c @@ -14,7 +14,7 @@ * (C) Copyright 2003-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/io.h> diff --git a/board/iomega/iconnect/iconnect.c b/board/iomega/iconnect/iconnect.c index 45ff2940ef..c3443bdc88 100644 --- a/board/iomega/iconnect/iconnect.c +++ b/board/iomega/iconnect/iconnect.c @@ -36,7 +36,7 @@ int board_early_init_f(void) MPP5_NF_IO7, MPP6_SYSRST_OUTn, /* Reset signal */ MPP7_GPO, - MPP8_TW_SDA, /* I2C */ + MPP8_TW_SDA, /* I2C */ MPP9_TW_SCK, /* I2C */ MPP10_UART0_TXD, MPP11_UART0_RXD, diff --git a/board/iphase4539/flash.c b/board/iphase4539/flash.c index d3122edf21..3c2dad67b5 100644 --- a/board/iphase4539/flash.c +++ b/board/iphase4539/flash.c @@ -7,7 +7,7 @@ * * Adapted for Interphase 4539 by Wolfgang Grandegger <wg@denx.de>. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/isee/igep0033/board.c b/board/isee/igep0033/board.c index 347c128cb9..0b8356dc47 100644 --- a/board/isee/igep0033/board.c +++ b/board/isee/igep0033/board.c @@ -168,4 +168,3 @@ int board_eth_init(bd_t *bis) return ret; } #endif - diff --git a/board/isee/igep0033/mux.c b/board/isee/igep0033/mux.c index 16f4addf3d..e86277663d 100644 --- a/board/isee/igep0033/mux.c +++ b/board/isee/igep0033/mux.c @@ -86,4 +86,3 @@ void enable_board_pin_mux(void) /* Ethernet pinmux. */ configure_module_pin_mux(rmii1_pin_mux); } - diff --git a/board/jornada/setup.S b/board/jornada/setup.S index 1fafa2ab28..da9f00646d 100644 --- a/board/jornada/setup.S +++ b/board/jornada/setup.S @@ -5,7 +5,7 @@ * Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl) * 2004 (c) MontaVista Software, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c index 481876b2ed..5620737bf0 100644 --- a/board/keymile/km_arm/km_arm.c +++ b/board/keymile/km_arm/km_arm.c @@ -343,7 +343,7 @@ void reset_phy(void) #if defined(CONFIG_KM_NUSA) struct mv88e_sw_reg extsw_conf[] = { /* - * port 0, PIGGY4, autoneg + * port 0, PIGGY4, autoneg * first the fix for the 1000Mbits Autoneg, this is from * a Marvell errata, the regs are undocumented */ diff --git a/board/korat/init.S b/board/korat/init.S index 23557fe34d..20c5bddf6b 100644 --- a/board/korat/init.S +++ b/board/korat/init.S @@ -1,6 +1,6 @@ /* * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index 1cabc80b8a..b6c68da7a8 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -143,4 +143,3 @@ int board_eth_init(bd_t *bis) return n; } #endif - diff --git a/board/lwmon5/init.S b/board/lwmon5/init.S index 94274a7248..e5207c2b40 100644 --- a/board/lwmon5/init.S +++ b/board/lwmon5/init.S @@ -4,7 +4,7 @@ * * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/manroland/hmi1001/hmi1001.c b/board/manroland/hmi1001/hmi1001.c index 781f10b861..64bdd8f58f 100644 --- a/board/manroland/hmi1001/hmi1001.c +++ b/board/manroland/hmi1001/hmi1001.c @@ -8,7 +8,7 @@ * (C) Copyright 2004 * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/manroland/mucmc52/mucmc52.c b/board/manroland/mucmc52/mucmc52.c index 63dc2ad5fa..c3ce66d8d0 100644 --- a/board/manroland/mucmc52/mucmc52.c +++ b/board/manroland/mucmc52/mucmc52.c @@ -11,7 +11,7 @@ * (C) Copyright 2008 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/manroland/uc101/uc101.c b/board/manroland/uc101/uc101.c index 6e1246ecac..5c5afa21ef 100644 --- a/board/manroland/uc101/uc101.c +++ b/board/manroland/uc101/uc101.c @@ -11,7 +11,7 @@ * (C) Copyright 2004 * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/matrix_vision/mvbc_p/Makefile b/board/matrix_vision/mvbc_p/Makefile index 84add28d40..61474aaf8b 100644 --- a/board/matrix_vision/mvbc_p/Makefile +++ b/board/matrix_vision/mvbc_p/Makefile @@ -19,7 +19,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) + $(call cmd_link_o_target, $(OBJS)) ######################################################################### diff --git a/board/matrix_vision/mvsmr/Makefile b/board/matrix_vision/mvsmr/Makefile index 0e53e8df21..ef768feb72 100644 --- a/board/matrix_vision/mvsmr/Makefile +++ b/board/matrix_vision/mvsmr/Makefile @@ -19,7 +19,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) + $(call cmd_link_o_target, $(OBJS)) @mkimage -T script -C none -n mvSMR_Script -d bootscript $(obj)bootscript.img ######################################################################### diff --git a/board/mbx8xx/mbx8xx.c b/board/mbx8xx/mbx8xx.c index 75b0bb8fe6..98c723f047 100644 --- a/board/mbx8xx/mbx8xx.c +++ b/board/mbx8xx/mbx8xx.c @@ -12,7 +12,7 @@ * - ethernet io initialisation * * ----------------------------------------------------------------- - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/mosaixtech/icon/init.S b/board/mosaixtech/icon/init.S index ad12d7c9d3..c28a3a38a1 100644 --- a/board/mosaixtech/icon/init.S +++ b/board/mosaixtech/icon/init.S @@ -2,7 +2,7 @@ * (C) Copyright 2009-2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <ppc_asm.tmpl> diff --git a/board/mousse/mousse.h b/board/mousse/mousse.h index 7802ab9d7c..ce8a054175 100644 --- a/board/mousse/mousse.h +++ b/board/mousse/mousse.h @@ -8,7 +8,7 @@ * (C) Copyright 2001 * James Dougherty (jfd@cs.stanford.edu) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MOUSSE_H diff --git a/board/netphone/netphone.c b/board/netphone/netphone.c index 053bdf1416..8ff4489ade 100644 --- a/board/netphone/netphone.c +++ b/board/netphone/netphone.c @@ -3,7 +3,7 @@ * Pantelis Antoniou, Intracom S.A., panto@intracom.gr * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/netphone/phone_console.c b/board/netphone/phone_console.c index 2c25ffe8d1..d195a398eb 100644 --- a/board/netphone/phone_console.c +++ b/board/netphone/phone_console.c @@ -2,7 +2,7 @@ * (C) Copyright 2004 Intracom S.A. * Pantelis Antoniou <panto@intracom.gr> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/netta/netta.c b/board/netta/netta.c index bfd51e7c3b..2c9c6bf6bc 100644 --- a/board/netta/netta.c +++ b/board/netta/netta.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/netta2/netta2.c b/board/netta2/netta2.c index 362a3c782c..008ae67aec 100644 --- a/board/netta2/netta2.c +++ b/board/netta2/netta2.c @@ -3,7 +3,7 @@ * Pantelis Antoniou, Intracom S.A., panto@intracom.gr * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/netvia/netvia.c b/board/netvia/netvia.c index 2857a4f4c4..b3bbf47e01 100644 --- a/board/netvia/netvia.c +++ b/board/netvia/netvia.c @@ -2,7 +2,7 @@ * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/openrisc/openrisc-generic/or1ksim.cfg b/board/openrisc/openrisc-generic/or1ksim.cfg index 9926093a40..2bd8642932 100644 --- a/board/openrisc/openrisc-generic/or1ksim.cfg +++ b/board/openrisc/openrisc-generic/or1ksim.cfg @@ -20,8 +20,8 @@ the simulator. not found too, it reverts to the built-in default configuration. NOTE: Users should not rely on the built-in configuration, since the - default configuration may differ between version. - Rather create a configuration file that sets all critical values. + default configuration may differ between version. + Rather create a configuration file that sets all critical values. This file may contain (standard C) comments only - no // support. @@ -306,7 +306,7 @@ end debug = 0-9 0 : no debug messages 1-9: debug message level. - higher numbers produce more messages + higher numbers produce more messages profile = 0/1 '0': don't generate profiling file 'sim.profile' @@ -375,11 +375,11 @@ end Core Verification. enabled = 0/1 - '0': disbable VAPI server - '1': enable/start VAPI server + '0': disbable VAPI server + '1': enable/start VAPI server server_port = <value> - TCP/IP port to start VAPI server on + TCP/IP port to start VAPI server on log_enabled = 0/1 '0': disable VAPI requests logging @@ -565,56 +565,56 @@ end This section configures the UARTs enabled = <0|1> - Enable/disable the peripheral. By default if it is enabled. + Enable/disable the peripheral. By default if it is enabled. baseaddr = <hex_value> - address of first UART register for this device + address of first UART register for this device channel = <channeltype>:<args> - The channel parameter indicates the source of received UART characters - and the sink for transmitted UART characters. + The channel parameter indicates the source of received UART characters + and the sink for transmitted UART characters. - The <channeltype> can be either "file", "xterm", "tcp", "fd", or "tty" - (without quotes). + The <channeltype> can be either "file", "xterm", "tcp", "fd", or "tty" + (without quotes). - A) To send/receive characters from a pair of files, use a file - channel: + A) To send/receive characters from a pair of files, use a file + channel: - channel=file:<rxfile>,<txfile> + channel=file:<rxfile>,<txfile> B) To create an interactive terminal window, use an xterm channel: - channel=xterm:[<xterm_arg>]* + channel=xterm:[<xterm_arg>]* C) To create a bidirectional tcp socket which one could, for example, - access via telnet, use a tcp channel: + access via telnet, use a tcp channel: - channel=tcp:<port number> + channel=tcp:<port number> D) To cause the UART to read/write from existing numeric file - descriptors, use an fd channel: + descriptors, use an fd channel: - channel=fd:<rx file descriptor num>,<tx file descriptor num> + channel=fd:<rx file descriptor num>,<tx file descriptor num> - E) To connect the UART to a physical serial port, create a tty - channel: + E) To connect the UART to a physical serial port, create a tty + channel: channel=tty:device=/dev/ttyS0,baud=9600 irq = <value> - irq number for this device + irq number for this device 16550 = 0/1 - '0': this device is a UART16450 - '1': this device is a UART16550 + '0': this device is a UART16450 + '1': this device is a UART16550 jitter = <value> - in msecs... time to block, -1 to disable it + in msecs... time to block, -1 to disable it vapi_id = <hex_value> - VAPI id of this instance + VAPI id of this instance */ section uart @@ -634,16 +634,16 @@ end This section configures the DMAs enabled = <0|1> - Enable/disable the peripheral. By default if it is enabled. + Enable/disable the peripheral. By default if it is enabled. baseaddr = <hex_value> - address of first DMA register for this device + address of first DMA register for this device irq = <value> - irq number for this device + irq number for this device vapi_id = <hex_value> - VAPI id of this instance + VAPI id of this instance */ section dma @@ -658,37 +658,37 @@ end This section configures the ETHERNETs enabled = <0|1> - Enable/disable the peripheral. By default if it is enabled. + Enable/disable the peripheral. By default if it is enabled. baseaddr = <hex_value> - address of first ethernet register for this device + address of first ethernet register for this device dma = <value> - which controller is this ethernet "connected" to + which controller is this ethernet "connected" to irq = <value> - ethernet mac IRQ level + ethernet mac IRQ level rtx_type = <value> - use 0 - file interface, 1 - socket interface + use 0 - file interface, 1 - socket interface rx_channel = <value> - DMA channel used for RX + DMA channel used for RX tx_channel = <value> - DMA channel used for TX + DMA channel used for TX rxfile = "<filename>" - filename, where to read data from + filename, where to read data from txfile = "<filename>" - filename, where to write data to + filename, where to write data to sockif = "<ifacename>" - interface name of ethernet socket + interface name of ethernet socket vapi_id = <hex_value> - VAPI id of this instance + VAPI id of this instance */ section ethernet @@ -711,16 +711,16 @@ end This section configures the GPIOs enabled = <0|1> - Enable/disable the peripheral. By default if it is enabled. + Enable/disable the peripheral. By default if it is enabled. baseaddr = <hex_value> - address of first GPIO register for this device + address of first GPIO register for this device irq = <value> - irq number for this device + irq number for this device base_vapi_id = <hex_value> - first VAPI id of this instance + first VAPI id of this instance GPIO uses 8 consecutive VAPI IDs */ @@ -736,19 +736,19 @@ end This section configures the VGA/LCD controller enabled = <0|1> - Enable/disable the peripheral. By default if it is enabled. + Enable/disable the peripheral. By default if it is enabled. baseaddr = <hex_value> - address of first VGA register + address of first VGA register irq = <value> - irq number for this device + irq number for this device refresh_rate = <value> - number of cycles between screen dumps + number of cycles between screen dumps filename = "<filename>" - template name for generated names (e.g. "primary" produces "primary0023.bmp") + template name for generated names (e.g. "primary" produces "primary0023.bmp") */ section vga @@ -825,39 +825,39 @@ end This section configures the ATA/ATAPI host controller baseaddr = <hex_value> - address of first ATA register + address of first ATA register enabled = <0|1> - Enable/disable the peripheral. By default if it is enabled. + Enable/disable the peripheral. By default if it is enabled. irq = <value> - irq number for this device + irq number for this device debug = <value> - debug level for ata models. + debug level for ata models. 0: no debug messages 1: verbose messages 3: normal messages (more messages than verbose) - 5: debug messages (normal debug messages) + 5: debug messages (normal debug messages) 7: flow control messages (debug statemachine flows) 9: low priority message (display everything the code does) dev_type0/1 = <value> - ata device 0 type - 0: NO_CONNeCT: none (not connected) + ata device 0 type + 0: NO_CONNeCT: none (not connected) 1: FILE : simulated harddisk 2: LOCAL : local system harddisk dev_file0/1 = "<filename>" - filename for simulated ATA device + filename for simulated ATA device valid only if dev_type0 == 1 dev_size0/1 = <value> - size of simulated hard-disk (in MBytes) + size of simulated hard-disk (in MBytes) valid only if dev_type0 == 1 dev_packet0/1 = <value> - 0: simulated ATA device does NOT implement PACKET command feature set + 0: simulated ATA device does NOT implement PACKET command feature set 1: simulated ATA device does implement PACKET command feature set FIXME: irq number diff --git a/board/palmtreo680/README b/board/palmtreo680/README index 159f1f69dc..c8799c6ab1 100644 --- a/board/palmtreo680/README +++ b/board/palmtreo680/README @@ -30,7 +30,6 @@ go wrong, but please tell me what happened exactly. For that matter, I'd love to hear from you if you succeed. - Details on the SPL ================== @@ -51,7 +50,6 @@ IPL has already loaded to its correct SDRAM address, and then loads the remainder of u-boot and jumps to it. - The docg4's "reliable mode" =========================== @@ -79,7 +77,6 @@ module parameter), but not reading. However, the u-boot docg4_spl driver does read in reliable mode, in the same fashion as the IPL. - Details on the IPL and its data format ====================================== @@ -105,7 +102,6 @@ For the sake of simplicity and uniformity, the u-boot SPL mimics the operation of the IPL, and expects the image to be stored in the same format. - Instructions on Programming u-boot to flash =========================================== @@ -117,7 +113,6 @@ remainder of this document describes in detail how to program u-boot to the flash using Linux running on the Treo. - Hardware Prerequisites ====================== @@ -136,7 +131,6 @@ A Linux desktop PC. to flash, you'll really want to use a Linux PC. - Treo-side Software Prerequisites ================================ @@ -152,7 +146,6 @@ Linux bootloader for PalmOS: parameters passed to the kernel. - Linux kernel: The kernel on the Treo 680 is still a little rough around the edges, and the @@ -200,7 +193,6 @@ Linux kernel: and /dev/mtd2 for these partitions, respectively. Ensure that your root file system at least has /dev/mtd1 if you are not running udev or mdev. - Userspace Utilities: In addition to everything necessary to provide a useful userspace environment @@ -221,19 +213,16 @@ Userspace Utilities: from the mtd-utils package. - Desktop PC-side Software Prerequisites ====================================== Terminal emulator application: minicom, kermit, etc. - Linux kernel: Compiled with CONFIG_USB_SERIAL enabled. Build this as a module. - Recommended (Not directly related to u-boot) ============================================ @@ -275,7 +264,6 @@ configure the usb0 interface on the desktop.) Use the nfs 'nolock' option when mounting to avoid the need to run a portmapper like rpcbind. - Preliminaries ============= @@ -397,7 +385,6 @@ forget to copy the file to permanent storage, such as an mmc card. If all of the above went well, you can now program u-boot. - Programming u-boot ================== @@ -438,7 +425,6 @@ four blocks in /dev/mtd1; i.e., at offsets 0x00000, 0x40000, 0x80000, 0xc0000. Shutdown linux, remove and re-insert the battery, hold your breath... - Enjoying u-boot =============== @@ -478,7 +464,6 @@ support for reliable mode in u-boot's docg4 flash driver. This should be corrected soon. - Customizing =========== @@ -511,7 +496,6 @@ in flash did not seem worth the cost of a 256k flash block. But adding this should be straightforward. - Restoring PalmOS ================ @@ -568,7 +552,6 @@ modprobe docg4 ignore_badblocks=1 || exit 1 dd if=$1 bs=1 skip=$file_ofs count=540672 | nandwrite -o -n -s 0x80000 $2 - || exit 1 modprobe -r docg4 - TODO ==== @@ -578,4 +561,3 @@ TODO - U-boot command that will write a new image to the bootloader partition in flash. - Linux FTD support. - diff --git a/board/pcs440ep/init.S b/board/pcs440ep/init.S index 33a0f4e15e..c0e83de257 100644 --- a/board/pcs440ep/init.S +++ b/board/pcs440ep/init.S @@ -2,7 +2,7 @@ * (C) Copyright 2006 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/pcs440ep/pcs440ep.c b/board/pcs440ep/pcs440ep.c index 0a934fb2cf..f90e809d15 100644 --- a/board/pcs440ep/pcs440ep.c +++ b/board/pcs440ep/pcs440ep.c @@ -2,7 +2,7 @@ * (C) Copyright 2006 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/pm826/flash.c b/board/pm826/flash.c index e8d4176e37..786a29b49f 100644 --- a/board/pm826/flash.c +++ b/board/pm826/flash.c @@ -5,7 +5,7 @@ * Flash Routines for Intel devices * *-------------------------------------------------------------------- - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/pm828/flash.c b/board/pm828/flash.c index 9a00a66858..8888560b62 100644 --- a/board/pm828/flash.c +++ b/board/pm828/flash.c @@ -5,7 +5,7 @@ * Flash Routines for Intel devices * *-------------------------------------------------------------------- - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/ppmc8260/strataflash.c b/board/ppmc8260/strataflash.c index 3f4fcb93eb..ea3c42eed4 100644 --- a/board/ppmc8260/strataflash.c +++ b/board/ppmc8260/strataflash.c @@ -2,7 +2,7 @@ * (C) Copyright 2002 * Brad Kemp, Seranoa Networks, Brad.Kemp@seranoa.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> @@ -407,7 +407,7 @@ static int flash_full_status_check(flash_info_t * info, ulong sector, ulong tout printf("Command Sequence Error.\n"); } else if(flash_isset(info, sector, 0, FLASH_STATUS_ECLBS)){ printf("Block Erase Error.\n"); - retcode = ERR_NOT_ERASED; + retcode = ERR_NOT_ERASED; } else if (flash_isset(info, sector, 0, FLASH_STATUS_PSLBS)) { printf("Locking Error\n"); } diff --git a/board/prodrive/alpr/alpr.c b/board/prodrive/alpr/alpr.c index 56533dfadb..31c1ab5d0f 100644 --- a/board/prodrive/alpr/alpr.c +++ b/board/prodrive/alpr/alpr.c @@ -2,7 +2,7 @@ * (C) Copyright 2006 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/prodrive/alpr/init.S b/board/prodrive/alpr/init.S index 0f24a19b7f..7ff7a59170 100644 --- a/board/prodrive/alpr/init.S +++ b/board/prodrive/alpr/init.S @@ -2,7 +2,7 @@ * (C) Copyright 2006 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/prodrive/p3mx/mv_eth.h b/board/prodrive/p3mx/mv_eth.h index fbda0daa12..7bbd7f045c 100644 --- a/board/prodrive/p3mx/mv_eth.h +++ b/board/prodrive/p3mx/mv_eth.h @@ -5,7 +5,7 @@ * based on - Driver for MV64460X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/board/prodrive/p3mx/mv_regs.h b/board/prodrive/p3mx/mv_regs.h index becd42116c..279a7e9610 100644 --- a/board/prodrive/p3mx/mv_regs.h +++ b/board/prodrive/p3mx/mv_regs.h @@ -5,7 +5,7 @@ * based on - Driver for MV64460X ethernet ports * Copyright (C) 2002 rabeeh@galileo.co.il * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /******************************************************************************** diff --git a/board/prodrive/p3mx/sdram_init.c b/board/prodrive/p3mx/sdram_init.c index 4a42fa3546..4220930bc5 100644 --- a/board/prodrive/p3mx/sdram_init.c +++ b/board/prodrive/p3mx/sdram_init.c @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************* diff --git a/board/prodrive/p3p440/init.S b/board/prodrive/p3p440/init.S index 8f4c1cc01e..35b1afab85 100644 --- a/board/prodrive/p3p440/init.S +++ b/board/prodrive/p3p440/init.S @@ -4,7 +4,7 @@ * * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <ppc_asm.tmpl> diff --git a/board/prodrive/p3p440/p3p440.c b/board/prodrive/p3p440/p3p440.c index bcbc179460..929e8eb1a5 100644 --- a/board/prodrive/p3p440/p3p440.c +++ b/board/prodrive/p3p440/p3p440.c @@ -4,7 +4,7 @@ * * Copyright (C) 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/prodrive/p3p440/p3p440.h b/board/prodrive/p3p440/p3p440.h index 9375688286..a164f95feb 100644 --- a/board/prodrive/p3p440/p3p440.h +++ b/board/prodrive/p3p440/p3p440.h @@ -2,7 +2,7 @@ * (C) Copyright 2005 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __P3P440_H__ diff --git a/board/psyent/pk1c20/led.c b/board/psyent/pk1c20/led.c index 639170f7fd..580d590f2a 100644 --- a/board/psyent/pk1c20/led.c +++ b/board/psyent/pk1c20/led.c @@ -2,7 +2,7 @@ * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt@psyent.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/rbc823/rbc823.c b/board/rbc823/rbc823.c index f276e5e5f5..5881111c70 100644 --- a/board/rbc823/rbc823.c +++ b/board/rbc823/rbc823.c @@ -78,7 +78,7 @@ const uint static_table[] = 0x0FFFFC04, 0x0FF3FC04, 0x0FF3CC04, 0x0FF3CC04, 0x0FF3EC04, 0x0FF3CC00, 0x0FF7FC04, 0x3FFFFC04, 0xFFFFFC04, 0xFFFFFC05, /* last */ - _NOT_USED_, _NOT_USED_, + _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, _NOT_USED_, diff --git a/board/samsung/common/multi_i2c.c b/board/samsung/common/multi_i2c.c index 084858defa..71c32c0b6e 100644 --- a/board/samsung/common/multi_i2c.c +++ b/board/samsung/common/multi_i2c.c @@ -8,6 +8,14 @@ #include <common.h> #include <i2c.h> +#ifndef CONFIG_SOFT_I2C_I2C10_SCL +#define CONFIG_SOFT_I2C_I2C10_SCL 0 +#endif + +#ifndef CONFIG_SOFT_I2C_I2C10_SDA +#define CONFIG_SOFT_I2C_I2C10_SDA 0 +#endif + /* Handle multiple I2C buses instances */ int get_multi_scl_pin(void) { @@ -18,6 +26,8 @@ int get_multi_scl_pin(void) return CONFIG_SOFT_I2C_I2C5_SCL; case I2C_1: return CONFIG_SOFT_I2C_I2C9_SCL; + case I2C_2: + return CONFIG_SOFT_I2C_I2C10_SCL; default: printf("I2C_%d not supported!\n", bus); }; @@ -34,6 +44,8 @@ int get_multi_sda_pin(void) return CONFIG_SOFT_I2C_I2C5_SDA; case I2C_1: return CONFIG_SOFT_I2C_I2C9_SDA; + case I2C_2: + return CONFIG_SOFT_I2C_I2C10_SDA; default: printf("I2C_%d not supported!\n", bus); }; diff --git a/board/samsung/dts/exynos5250-snow.dts b/board/samsung/dts/exynos5250-snow.dts index 9b7e57e43d..12cd67e49c 100644 --- a/board/samsung/dts/exynos5250-snow.dts +++ b/board/samsung/dts/exynos5250-snow.dts @@ -71,9 +71,9 @@ codec-enable-gpio = <&gpio 0xb7 0>; }; - sound@12d60000 { - status = "disabled"; - }; + sound@12d60000 { + status = "disabled"; + }; i2c@12cd0000 { soundcodec@22 { diff --git a/board/samsung/trats2/Makefile b/board/samsung/trats2/Makefile new file mode 100644 index 0000000000..805fb8191a --- /dev/null +++ b/board/samsung/trats2/Makefile @@ -0,0 +1,34 @@ +# +# Copyright (c) 2000 - 2013 Samsung Electronics Co., Ltd. All rights reserved. +# Sanghee Kim <sh0130.kim@samsung.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS-y := trats2.o + +SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS-y)) + + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c new file mode 100644 index 0000000000..d44d825e80 --- /dev/null +++ b/board/samsung/trats2/trats2.c @@ -0,0 +1,513 @@ +/* + * Copyright (c) 2013 Samsung Electronics Co., Ltd. All rights reserved. + * Sanghee Kim <sh0130.kim@samsung.com> + * Piotr Wilczek <p.wilczek@samsung.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <lcd.h> +#include <asm/io.h> +#include <asm/arch/gpio.h> +#include <asm/arch/mmc.h> +#include <asm/arch/power.h> +#include <asm/arch/clk.h> +#include <asm/arch/clock.h> +#include <asm/arch/mipi_dsim.h> +#include <asm/arch/pinmux.h> +#include <asm/arch/power.h> +#include <power/pmic.h> +#include <power/max77686_pmic.h> +#include <power/battery.h> +#include <power/max77693_pmic.h> +#include <power/max77693_muic.h> +#include <power/max77693_fg.h> +#include <libtizen.h> +#include <errno.h> + +DECLARE_GLOBAL_DATA_PTR; + +static struct exynos4x12_gpio_part1 *gpio1; +static struct exynos4x12_gpio_part2 *gpio2; + +static unsigned int board_rev = -1; + +static inline u32 get_model_rev(void); + +static void check_hw_revision(void) +{ + int modelrev = 0; + int i; + + gpio2 = (struct exynos4x12_gpio_part2 *)EXYNOS4X12_GPIO_PART2_BASE; + + /* + * GPM1[1:0]: MODEL_REV[1:0] + * Don't set as pull-none for these N/C pin. + * TRM say that it may cause unexcepted state and leakage current. + * and pull-none is only for output function. + */ + for (i = 0; i < 2; i++) + s5p_gpio_cfg_pin(&gpio2->m1, i, GPIO_INPUT); + + /* GPM1[5:2]: HW_REV[3:0] */ + for (i = 2; i < 6; i++) { + s5p_gpio_cfg_pin(&gpio2->m1, i, GPIO_INPUT); + s5p_gpio_set_pull(&gpio2->m1, i, GPIO_PULL_NONE); + } + + /* GPM1[1:0]: MODEL_REV[1:0] */ + for (i = 0; i < 2; i++) + modelrev |= (s5p_gpio_get_value(&gpio2->m1, i) << i); + + /* board_rev[15:8] = model */ + board_rev = modelrev << 8; +} + +#ifdef CONFIG_DISPLAY_BOARDINFO +int checkboard(void) +{ + puts("Board:\tTRATS2\n"); + return 0; +} +#endif + +static void show_hw_revision(void) +{ + printf("HW Revision:\t0x%04x\n", board_rev); +} + +u32 get_board_rev(void) +{ + return board_rev; +} + +static inline u32 get_model_rev(void) +{ + return (board_rev >> 8) & 0xff; +} + +static void board_external_gpio_init(void) +{ + gpio2 = (struct exynos4x12_gpio_part2 *)EXYNOS4X12_GPIO_PART2_BASE; + + /* + * some pins which in alive block are connected with external pull-up + * but it's default setting is pull-down. + * if that pin set as input then that floated + */ + + s5p_gpio_set_pull(&gpio2->x0, 2, GPIO_PULL_NONE); /* PS_ALS_INT */ + s5p_gpio_set_pull(&gpio2->x0, 4, GPIO_PULL_NONE); /* TSP_nINT */ + s5p_gpio_set_pull(&gpio2->x0, 7, GPIO_PULL_NONE); /* AP_PMIC_IRQ*/ + s5p_gpio_set_pull(&gpio2->x1, 5, GPIO_PULL_NONE); /* IF_PMIC_IRQ*/ + s5p_gpio_set_pull(&gpio2->x2, 0, GPIO_PULL_NONE); /* VOL_UP */ + s5p_gpio_set_pull(&gpio2->x2, 1, GPIO_PULL_NONE); /* VOL_DOWN */ + s5p_gpio_set_pull(&gpio2->x2, 3, GPIO_PULL_NONE); /* FUEL_ALERT */ + s5p_gpio_set_pull(&gpio2->x2, 4, GPIO_PULL_NONE); /* ADC_INT */ + s5p_gpio_set_pull(&gpio2->x2, 7, GPIO_PULL_NONE); /* nPOWER */ + s5p_gpio_set_pull(&gpio2->x3, 0, GPIO_PULL_NONE); /* WPC_INT */ + s5p_gpio_set_pull(&gpio2->x3, 5, GPIO_PULL_NONE); /* OK_KEY */ + s5p_gpio_set_pull(&gpio2->x3, 7, GPIO_PULL_NONE); /* HDMI_HPD */ +} + +#ifdef CONFIG_SYS_I2C_INIT_BOARD +static void board_init_i2c(void) +{ + gpio1 = (struct exynos4x12_gpio_part1 *)EXYNOS4X12_GPIO_PART1_BASE; + gpio2 = (struct exynos4x12_gpio_part2 *)EXYNOS4X12_GPIO_PART2_BASE; + + /* I2C_7 */ + s5p_gpio_direction_output(&gpio1->d0, 2, 1); + s5p_gpio_direction_output(&gpio1->d0, 3, 1); + + /* I2C_8 */ + s5p_gpio_direction_output(&gpio1->f1, 4, 1); + s5p_gpio_direction_output(&gpio1->f1, 5, 1); + + /* I2C_9 */ + s5p_gpio_direction_output(&gpio2->m2, 1, 1); + s5p_gpio_direction_output(&gpio2->m2, 0, 1); +} +#endif + +int board_early_init_f(void) +{ + check_hw_revision(); + board_external_gpio_init(); + + gd->flags |= GD_FLG_DISABLE_CONSOLE; + + return 0; +} + +static int pmic_init_max77686(void); + +int board_init(void) +{ + struct exynos4_power *pwr = + (struct exynos4_power *)EXYNOS4X12_POWER_BASE; + + gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; + + /* workaround: clear INFORM4..5 */ + writel(0, (unsigned int)&pwr->inform4); + writel(0, (unsigned int)&pwr->inform5); + + return 0; +} + +int power_init_board(void) +{ + int chrg; + struct power_battery *pb; + struct pmic *p_chrg, *p_muic, *p_fg, *p_bat; + +#ifdef CONFIG_SYS_I2C_INIT_BOARD + board_init_i2c(); +#endif + pmic_init(I2C_0); /* I2C adapter 0 - bus name I2C_5 */ + pmic_init_max77686(); + pmic_init_max77693(I2C_2); /* I2C adapter 2 - bus name I2C_10 */ + power_muic_init(I2C_2); /* I2C adapter 2 - bus name I2C_10 */ + power_fg_init(I2C_1); /* I2C adapter 1 - bus name I2C_9 */ + power_bat_init(0); + + p_chrg = pmic_get("MAX77693_PMIC"); + if (!p_chrg) { + puts("MAX77693_PMIC: Not found\n"); + return -ENODEV; + } + + p_muic = pmic_get("MAX77693_MUIC"); + if (!p_muic) { + puts("MAX77693_MUIC: Not found\n"); + return -ENODEV; + } + + p_fg = pmic_get("MAX77693_FG"); + if (!p_fg) { + puts("MAX17042_FG: Not found\n"); + return -ENODEV; + } + + if (p_chrg->chrg->chrg_bat_present(p_chrg) == 0) + puts("No battery detected\n"); + + p_bat = pmic_get("BAT_TRATS2"); + if (!p_bat) { + puts("BAT_TRATS2: Not found\n"); + return -ENODEV; + } + + p_fg->parent = p_bat; + p_chrg->parent = p_bat; + p_muic->parent = p_bat; + + p_bat->pbat->battery_init(p_bat, p_fg, p_chrg, p_muic); + + pb = p_bat->pbat; + chrg = p_muic->chrg->chrg_type(p_muic); + debug("CHARGER TYPE: %d\n", chrg); + + if (!p_chrg->chrg->chrg_bat_present(p_chrg)) { + puts("No battery detected\n"); + return -1; + } + + p_fg->fg->fg_battery_check(p_fg, p_bat); + + if (pb->bat->state == CHARGE && chrg == CHARGER_USB) + puts("CHARGE Battery !\n"); + + return 0; +} + +int dram_init(void) +{ + u32 size_mb; + + size_mb = (get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE) + + get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE) + + get_ram_size((long *)PHYS_SDRAM_3, PHYS_SDRAM_3_SIZE) + + get_ram_size((long *)PHYS_SDRAM_4, PHYS_SDRAM_4_SIZE)) >> 20; + + gd->ram_size = size_mb << 20; + + return 0; +} + +void dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; + gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; + gd->bd->bi_dram[1].start = PHYS_SDRAM_2; + gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; + gd->bd->bi_dram[2].start = PHYS_SDRAM_3; + gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE; + gd->bd->bi_dram[3].start = PHYS_SDRAM_4; + gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE; +} + +int board_mmc_init(bd_t *bis) +{ + int err0, err2 = 0; + + gpio2 = (struct exynos4x12_gpio_part2 *)EXYNOS4X12_GPIO_PART2_BASE; + + /* eMMC_EN: SD_0_CDn: GPK0[2] Output High */ + s5p_gpio_direction_output(&gpio2->k0, 2, 1); + s5p_gpio_set_pull(&gpio2->k0, 2, GPIO_PULL_NONE); + + /* + * eMMC GPIO: + * SDR 8-bit@48MHz at MMC0 + * GPK0[0] SD_0_CLK(2) + * GPK0[1] SD_0_CMD(2) + * GPK0[2] SD_0_CDn -> Not used + * GPK0[3:6] SD_0_DATA[0:3](2) + * GPK1[3:6] SD_0_DATA[0:3](3) + * + * DDR 4-bit@26MHz at MMC4 + * GPK0[0] SD_4_CLK(3) + * GPK0[1] SD_4_CMD(3) + * GPK0[2] SD_4_CDn -> Not used + * GPK0[3:6] SD_4_DATA[0:3](3) + * GPK1[3:6] SD_4_DATA[4:7](4) + */ + + err0 = exynos_pinmux_config(PERIPH_ID_SDMMC0, PINMUX_FLAG_8BIT_MODE); + + /* + * MMC device init + * mmc0 : eMMC (8-bit buswidth) + * mmc2 : SD card (4-bit buswidth) + */ + if (err0) + debug("SDMMC0 not configured\n"); + else + err0 = s5p_mmc_init(0, 8); + + /* T-flash detect */ + s5p_gpio_cfg_pin(&gpio2->x3, 4, 0xf); + s5p_gpio_set_pull(&gpio2->x3, 4, GPIO_PULL_UP); + + /* + * Check the T-flash detect pin + * GPX3[4] T-flash detect pin + */ + if (!s5p_gpio_get_value(&gpio2->x3, 4)) { + err2 = exynos_pinmux_config(PERIPH_ID_SDMMC2, PINMUX_FLAG_NONE); + if (err2) + debug("SDMMC2 not configured\n"); + else + err2 = s5p_mmc_init(2, 4); + } + + return err0 & err2; +} + +static int pmic_init_max77686(void) +{ + struct pmic *p = pmic_get("MAX77686_PMIC"); + + if (pmic_probe(p)) + return -1; + + /* BUCK/LDO Output Voltage */ + max77686_set_ldo_voltage(p, 21, 2800000); /* LDO21 VTF_2.8V */ + max77686_set_ldo_voltage(p, 23, 3300000); /* LDO23 TSP_AVDD_3.3V*/ + max77686_set_ldo_voltage(p, 24, 1800000); /* LDO24 TSP_VDD_1.8V */ + + /* BUCK/LDO Output Mode */ + max77686_set_buck_mode(p, 1, OPMODE_STANDBY); /* BUCK1 VMIF_1.1V_AP */ + max77686_set_buck_mode(p, 2, OPMODE_ON); /* BUCK2 VARM_1.0V_AP */ + max77686_set_buck_mode(p, 3, OPMODE_ON); /* BUCK3 VINT_1.0V_AP */ + max77686_set_buck_mode(p, 4, OPMODE_ON); /* BUCK4 VG3D_1.0V_AP */ + max77686_set_buck_mode(p, 5, OPMODE_ON); /* BUCK5 VMEM_1.2V_AP */ + max77686_set_buck_mode(p, 6, OPMODE_ON); /* BUCK6 VCC_SUB_1.35V*/ + max77686_set_buck_mode(p, 7, OPMODE_ON); /* BUCK7 VCC_SUB_2.0V */ + max77686_set_buck_mode(p, 8, OPMODE_OFF); /* VMEM_VDDF_2.85V */ + max77686_set_buck_mode(p, 9, OPMODE_OFF); /* CAM_ISP_CORE_1.2V*/ + + max77686_set_ldo_mode(p, 1, OPMODE_LPM); /* LDO1 VALIVE_1.0V_AP*/ + max77686_set_ldo_mode(p, 2, OPMODE_STANDBY); /* LDO2 VM1M2_1.2V_AP */ + max77686_set_ldo_mode(p, 3, OPMODE_LPM); /* LDO3 VCC_1.8V_AP */ + max77686_set_ldo_mode(p, 4, OPMODE_LPM); /* LDO4 VCC_2.8V_AP */ + max77686_set_ldo_mode(p, 5, OPMODE_OFF); /* LDO5_VCC_1.8V_IO */ + max77686_set_ldo_mode(p, 6, OPMODE_STANDBY); /* LDO6 VMPLL_1.0V_AP */ + max77686_set_ldo_mode(p, 7, OPMODE_STANDBY); /* LDO7 VPLL_1.0V_AP */ + max77686_set_ldo_mode(p, 8, OPMODE_LPM); /* LDO8 VMIPI_1.0V_AP */ + max77686_set_ldo_mode(p, 9, OPMODE_OFF); /* CAM_ISP_MIPI_1.2*/ + max77686_set_ldo_mode(p, 10, OPMODE_LPM); /* LDO10 VMIPI_1.8V_AP*/ + max77686_set_ldo_mode(p, 11, OPMODE_STANDBY); /* LDO11 VABB1_1.8V_AP*/ + max77686_set_ldo_mode(p, 12, OPMODE_LPM); /* LDO12 VUOTG_3.0V_AP*/ + max77686_set_ldo_mode(p, 13, OPMODE_OFF); /* LDO13 VC2C_1.8V_AP */ + max77686_set_ldo_mode(p, 14, OPMODE_STANDBY); /* VABB02_1.8V_AP */ + max77686_set_ldo_mode(p, 15, OPMODE_STANDBY); /* LDO15 VHSIC_1.0V_AP*/ + max77686_set_ldo_mode(p, 16, OPMODE_STANDBY); /* LDO16 VHSIC_1.8V_AP*/ + max77686_set_ldo_mode(p, 17, OPMODE_OFF); /* CAM_SENSOR_CORE_1.2*/ + max77686_set_ldo_mode(p, 18, OPMODE_OFF); /* CAM_ISP_SEN_IO_1.8V*/ + max77686_set_ldo_mode(p, 19, OPMODE_OFF); /* LDO19 VT_CAM_1.8V */ + max77686_set_ldo_mode(p, 20, OPMODE_ON); /* LDO20 VDDQ_PRE_1.8V*/ + max77686_set_ldo_mode(p, 21, OPMODE_OFF); /* LDO21 VTF_2.8V */ + max77686_set_ldo_mode(p, 22, OPMODE_OFF); /* LDO22 VMEM_VDD_2.8V*/ + max77686_set_ldo_mode(p, 23, OPMODE_OFF); /* LDO23 TSP_AVDD_3.3V*/ + max77686_set_ldo_mode(p, 24, OPMODE_OFF); /* LDO24 TSP_VDD_1.8V */ + max77686_set_ldo_mode(p, 25, OPMODE_OFF); /* LDO25 VCC_3.3V_LCD */ + max77686_set_ldo_mode(p, 26, OPMODE_OFF); /*LDO26 VCC_3.0V_MOTOR*/ + + return 0; +} + +/* + * LCD + */ + +#ifdef CONFIG_LCD +static struct mipi_dsim_config dsim_config = { + .e_interface = DSIM_VIDEO, + .e_virtual_ch = DSIM_VIRTUAL_CH_0, + .e_pixel_format = DSIM_24BPP_888, + .e_burst_mode = DSIM_BURST_SYNC_EVENT, + .e_no_data_lane = DSIM_DATA_LANE_4, + .e_byte_clk = DSIM_PLL_OUT_DIV8, + .hfp = 1, + + .p = 3, + .m = 120, + .s = 1, + + /* D-PHY PLL stable time spec :min = 200usec ~ max 400usec */ + .pll_stable_time = 500, + + /* escape clk : 10MHz */ + .esc_clk = 20 * 1000000, + + /* stop state holding counter after bta change count 0 ~ 0xfff */ + .stop_holding_cnt = 0x7ff, + /* bta timeout 0 ~ 0xff */ + .bta_timeout = 0xff, + /* lp rx timeout 0 ~ 0xffff */ + .rx_timeout = 0xffff, +}; + +static struct exynos_platform_mipi_dsim dsim_platform_data = { + .lcd_panel_info = NULL, + .dsim_config = &dsim_config, +}; + +static struct mipi_dsim_lcd_device mipi_lcd_device = { + .name = "s6e8ax0", + .id = -1, + .bus_id = 0, + .platform_data = (void *)&dsim_platform_data, +}; + +static int mipi_power(void) +{ + struct pmic *p = pmic_get("MAX77686_PMIC"); + + /* LDO8 VMIPI_1.0V_AP */ + max77686_set_ldo_mode(p, 8, OPMODE_ON); + /* LDO10 VMIPI_1.8V_AP */ + max77686_set_ldo_mode(p, 10, OPMODE_ON); + + return 0; +} + +void exynos_lcd_power_on(void) +{ + struct pmic *p = pmic_get("MAX77686_PMIC"); + + gpio1 = (struct exynos4x12_gpio_part1 *)EXYNOS4X12_GPIO_PART1_BASE; + + /* LCD_2.2V_EN: GPC0[1] */ + s5p_gpio_set_pull(&gpio1->c0, 1, GPIO_PULL_UP); + s5p_gpio_direction_output(&gpio1->c0, 1, 1); + + /* LDO25 VCC_3.1V_LCD */ + pmic_probe(p); + max77686_set_ldo_voltage(p, 25, 3100000); + max77686_set_ldo_mode(p, 25, OPMODE_LPM); +} + +void exynos_reset_lcd(void) +{ + gpio1 = (struct exynos4x12_gpio_part1 *)EXYNOS4X12_GPIO_PART1_BASE; + + /* reset lcd */ + s5p_gpio_direction_output(&gpio1->f2, 1, 0); + udelay(10); + s5p_gpio_set_value(&gpio1->f2, 1, 1); +} + +vidinfo_t panel_info = { + .vl_freq = 60, + .vl_col = 720, + .vl_row = 1280, + .vl_width = 720, + .vl_height = 1280, + .vl_clkp = CONFIG_SYS_HIGH, + .vl_hsp = CONFIG_SYS_LOW, + .vl_vsp = CONFIG_SYS_LOW, + .vl_dp = CONFIG_SYS_LOW, + .vl_bpix = 5, /* Bits per pixel, 2^5 = 32 */ + + /* s6e8ax0 Panel infomation */ + .vl_hspw = 5, + .vl_hbpd = 10, + .vl_hfpd = 10, + + .vl_vspw = 2, + .vl_vbpd = 1, + .vl_vfpd = 13, + .vl_cmd_allow_len = 0xf, + .mipi_enabled = 1, + + .dual_lcd_enabled = 0, + + .init_delay = 0, + .power_on_delay = 25, + .reset_delay = 0, + .interface_mode = FIMD_RGB_INTERFACE, +}; + +void init_panel_info(vidinfo_t *vid) +{ + vid->logo_on = 1; + vid->resolution = HD_RESOLUTION; + vid->rgb_mode = MODE_RGB_P; + + vid->power_on_delay = 30; + + mipi_lcd_device.reverse_panel = 1; + +#ifdef CONFIG_TIZEN + get_tizen_logo_info(vid); +#endif + + strcpy(dsim_platform_data.lcd_panel_name, mipi_lcd_device.name); + dsim_platform_data.mipi_power = mipi_power; + dsim_platform_data.phy_enable = set_mipi_phy_ctrl; + dsim_platform_data.lcd_panel_info = (void *)vid; + exynos_mipi_dsi_register_lcd_device(&mipi_lcd_device); + + s6e8ax0_init(); + + exynos_set_dsim_platform_data(&dsim_platform_data); +} +#endif /* LCD */ + +#ifdef CONFIG_MISC_INIT_R +int misc_init_r(void) +{ + setenv("model", "GT-I8800"); + setenv("board", "TRATS2"); + + show_hw_revision(); + + return 0; +} +#endif diff --git a/board/sandbox/sandbox/README.sandbox b/board/sandbox/sandbox/README.sandbox index bcb2f330fa..30b05416a7 100644 --- a/board/sandbox/sandbox/README.sandbox +++ b/board/sandbox/sandbox/README.sandbox @@ -1,7 +1,7 @@ /* * Copyright (c) 2011 The Chromium OS Authors. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ Native Execution of U-Boot diff --git a/board/sandburst/common/flash.c b/board/sandburst/common/flash.c index 81d65dd5bc..ad046bed69 100644 --- a/board/sandburst/common/flash.c +++ b/board/sandburst/common/flash.c @@ -5,7 +5,7 @@ * (C) Copyright 2002 Jun Gu <jung@artesyncp.com> * Add support for Am29F016D and dynamic switch setting. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* * Ported from Ebony flash support diff --git a/board/sandburst/common/sb_common.c b/board/sandburst/common/sb_common.c index b579812ccf..c23ef50547 100644 --- a/board/sandburst/common/sb_common.c +++ b/board/sandburst/common/sb_common.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2005 Sandburst Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <common.h> diff --git a/board/sandburst/common/sb_common.h b/board/sandburst/common/sb_common.h index 8716eacd84..57406335bf 100644 --- a/board/sandburst/common/sb_common.h +++ b/board/sandburst/common/sb_common.h @@ -3,7 +3,7 @@ /* * Copyright (C) 2005 Sandburst Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <common.h> diff --git a/board/sandburst/karef/karef.c b/board/sandburst/karef/karef.c index 683d68b933..96d7dcd8fd 100644 --- a/board/sandburst/karef/karef.c +++ b/board/sandburst/karef/karef.c @@ -2,7 +2,7 @@ * Copyright (C) 2005 Sandburst Corporation * Travis B. Sawyer * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/board/sandburst/karef/karef_version.h b/board/sandburst/karef/karef_version.h index 5226e7a4ec..6c6baee015 100644 --- a/board/sandburst/karef/karef_version.h +++ b/board/sandburst/karef/karef_version.h @@ -4,7 +4,7 @@ * Copyright (C) 2005 Sandburst Corporation * Travis B. Sawyer * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #define KAREF_U_BOOT_REL_STR "Release 0.0.7" #endif diff --git a/board/sandburst/metrobox/metrobox.c b/board/sandburst/metrobox/metrobox.c index 5bc7f2f433..290fa020f8 100644 --- a/board/sandburst/metrobox/metrobox.c +++ b/board/sandburst/metrobox/metrobox.c @@ -2,7 +2,7 @@ * Copyright (c) 2005 * Travis B. Sawyer, Sandburst Corporation, tsawyer@sandburst.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <common.h> diff --git a/board/sandpoint/README b/board/sandpoint/README index a2e0831f33..c9996a8c06 100644 --- a/board/sandpoint/README +++ b/board/sandpoint/README @@ -15,8 +15,6 @@ tkoeller@gmx.net. Thomas Koeller - - The port was tested on a Sandpoint 8240 X3 board, with U-Boot installed in the flash memory of the CPU card. Please use the following DIP switch settings: diff --git a/board/sbc405/strataflash.c b/board/sbc405/strataflash.c index c6d8e99c09..7ddc97c5ea 100644 --- a/board/sbc405/strataflash.c +++ b/board/sbc405/strataflash.c @@ -2,7 +2,7 @@ * (C) Copyright 2002 * Brad Kemp, Seranoa Networks, Brad.Kemp@seranoa.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/sbc8548/sbc8548.c b/board/sbc8548/sbc8548.c index 837851838d..3cd945f2c2 100644 --- a/board/sbc8548/sbc8548.c +++ b/board/sbc8548/sbc8548.c @@ -7,7 +7,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/sbc8641d/sbc8641d.c b/board/sbc8641d/sbc8641d.c index 3a4815499f..0b5e8dc17e 100644 --- a/board/sbc8641d/sbc8641d.c +++ b/board/sbc8641d/sbc8641d.c @@ -9,7 +9,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/siemens/rut/board.c b/board/siemens/rut/board.c index f2b0476817..5de8fc6cbf 100644 --- a/board/siemens/rut/board.c +++ b/board/siemens/rut/board.c @@ -328,8 +328,6 @@ static int get_clk(struct dpll_regs *dpll_regs) return f; }; - - int clk_get(int clk) { return get_clk(&dpll_lcd_regs); @@ -426,7 +424,5 @@ static int board_video_init(void) return 0; } - - #endif /* ifdef CONFIG_VIDEO */ #include "../common/board.c" diff --git a/board/stx/stxgp3/stxgp3.c b/board/stx/stxgp3/stxgp3.c index e5e8311099..bd683f6af8 100644 --- a/board/stx/stxgp3/stxgp3.c +++ b/board/stx/stxgp3/stxgp3.c @@ -9,7 +9,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/stx/stxssa/stxssa.c b/board/stx/stxssa/stxssa.c index e69e2662c8..c08a18bffe 100644 --- a/board/stx/stxssa/stxssa.c +++ b/board/stx/stxssa/stxssa.c @@ -9,7 +9,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/svm_sc8xx/svm_sc8xx.c b/board/svm_sc8xx/svm_sc8xx.c index a508595abf..5db48506c6 100644 --- a/board/svm_sc8xx/svm_sc8xx.c +++ b/board/svm_sc8xx/svm_sc8xx.c @@ -139,6 +139,6 @@ phys_size_t initdram (int board_type) #if defined(CONFIG_CMD_DOC) void doc_init (void) { - doc_probe (CONFIG_SYS_DOC_BASE); + doc_probe (CONFIG_SYS_DOC_BASE); } #endif diff --git a/board/t3corp/init.S b/board/t3corp/init.S index 70c455ab3d..7ae9c43924 100644 --- a/board/t3corp/init.S +++ b/board/t3corp/init.S @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm-offsets.h> diff --git a/board/ti/omap5912osk/omap5912osk.c b/board/ti/omap5912osk/omap5912osk.c index e402649132..88a7310cec 100644 --- a/board/ti/omap5912osk/omap5912osk.c +++ b/board/ti/omap5912osk/omap5912osk.c @@ -14,7 +14,7 @@ * Texas Instruments, <www.ti.com> * Rishi Bhattacharya <rishi@ti.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/ti/omap730p2/omap730p2.c b/board/ti/omap730p2/omap730p2.c index 48dc82699e..554019c207 100644 --- a/board/ti/omap730p2/omap730p2.c +++ b/board/ti/omap730p2/omap730p2.c @@ -10,7 +10,7 @@ * Texas Instruments, <www.ti.com> * Kshitij Gupta <Kshitij@ti.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index e838ffd954..bc3c29220e 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -133,6 +133,7 @@ int misc_init_r(void) { int phy_type; u32 auxclk, altclksrc; + uint8_t device_mac[6]; /* EHCI is not supported on ES1.0 */ if (omap_revision() == OMAP4430_ES1_0) @@ -186,6 +187,21 @@ int misc_init_r(void) writel(altclksrc, &scrm->altclksrc); + if (!getenv("usbethaddr")) { + /* + * create a fake MAC address from the processor ID code. + * first byte is 0x02 to signify locally administered. + */ + device_mac[0] = 0x02; + device_mac[1] = readl(STD_FUSE_DIE_ID_3) & 0xff; + device_mac[2] = readl(STD_FUSE_DIE_ID_2) & 0xff; + device_mac[3] = readl(STD_FUSE_DIE_ID_1) & 0xff; + device_mac[4] = readl(STD_FUSE_DIE_ID_0) & 0xff; + device_mac[5] = (readl(STD_FUSE_DIE_ID_0) >> 8) & 0xff; + + eth_setenv_enetaddr("usbethaddr", device_mac); + } + return 0; } diff --git a/board/tqc/tqm5200/tqm5200.c b/board/tqc/tqm5200/tqm5200.c index d5a8a979d5..a1f56cde29 100644 --- a/board/tqc/tqm5200/tqm5200.c +++ b/board/tqc/tqm5200/tqm5200.c @@ -8,7 +8,7 @@ * (C) Copyright 2004-2006 * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/tqc/tqm8272/nand.c b/board/tqc/tqm8272/nand.c index fa257b7f3a..4925b8dda3 100644 --- a/board/tqc/tqm8272/nand.c +++ b/board/tqc/tqm8272/nand.c @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/tqc/tqm8272/tqm8272.c b/board/tqc/tqm8272/tqm8272.c index 334fd6d74b..d6508681e9 100644 --- a/board/tqc/tqm8272/tqm8272.c +++ b/board/tqc/tqm8272/tqm8272.c @@ -2,7 +2,7 @@ * (C) Copyright 2006 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/tqc/tqm8272/tqm8272.h b/board/tqc/tqm8272/tqm8272.h index 2205d51b06..1eeaf0e993 100644 --- a/board/tqc/tqm8272/tqm8272.h +++ b/board/tqc/tqm8272/tqm8272.h @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _TQM8272_HEADER_H diff --git a/board/trizepsiv/eeprom.c b/board/trizepsiv/eeprom.c index d8195b6d75..1318edc5d6 100644 --- a/board/trizepsiv/eeprom.c +++ b/board/trizepsiv/eeprom.c @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/w7o/cmd_vpd.c b/board/w7o/cmd_vpd.c index bbb85f39ef..879cb6133c 100644 --- a/board/w7o/cmd_vpd.c +++ b/board/w7o/cmd_vpd.c @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/w7o/errors.h b/board/w7o/errors.h index dfb4558bd1..05540fb2d2 100644 --- a/board/w7o/errors.h +++ b/board/w7o/errors.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Bill Hunter, Wave 7 Optics, william.hunter@mediaone.net * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ERRORS_H_ #define _ERRORS_H_ diff --git a/board/w7o/fpga.c b/board/w7o/fpga.c index 77e0a18022..a27e8ab88f 100644 --- a/board/w7o/fpga.c +++ b/board/w7o/fpga.c @@ -4,7 +4,7 @@ * and * Bill Hunter, Wave 7 Optics, william.hunter@mediaone.net * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> #include <common.h> diff --git a/board/w7o/post1.S b/board/w7o/post1.S index 8a1b9e6909..7a411a4920 100644 --- a/board/w7o/post1.S +++ b/board/w7o/post1.S @@ -4,7 +4,7 @@ * and * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* * Description: diff --git a/board/w7o/post2.c b/board/w7o/post2.c index f16f9a191c..76b65975ce 100644 --- a/board/w7o/post2.c +++ b/board/w7o/post2.c @@ -4,7 +4,7 @@ * and * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/xes/common/fsl_8xxx_clk.c b/board/xes/common/fsl_8xxx_clk.c index 57ff0005b5..2a604d448b 100644 --- a/board/xes/common/fsl_8xxx_clk.c +++ b/board/xes/common/fsl_8xxx_clk.c @@ -1,7 +1,7 @@ /* * Copyright 2008 Extreme Engineering Solutions, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/xes/common/fsl_8xxx_misc.c b/board/xes/common/fsl_8xxx_misc.c index dfd6946b5f..2899e1117d 100644 --- a/board/xes/common/fsl_8xxx_misc.c +++ b/board/xes/common/fsl_8xxx_misc.c @@ -1,7 +1,7 @@ /* * Copyright 2008 Extreme Engineering Solutions, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/xes/common/fsl_8xxx_misc.h b/board/xes/common/fsl_8xxx_misc.h index 90e0f45ff7..106bb233a4 100644 --- a/board/xes/common/fsl_8xxx_misc.h +++ b/board/xes/common/fsl_8xxx_misc.h @@ -1,7 +1,7 @@ /* * Copyright 2008 Extreme Engineering Solutions, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __FSL_8XXX_MISC_H___ diff --git a/board/xes/common/fsl_8xxx_pci.c b/board/xes/common/fsl_8xxx_pci.c index 625594d1b1..510f638ffe 100644 --- a/board/xes/common/fsl_8xxx_pci.c +++ b/board/xes/common/fsl_8xxx_pci.c @@ -2,7 +2,7 @@ * Copyright 2008 Extreme Engineering Solutions, Inc. * Copyright 2007-2008 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/xes/xpedite517x/ddr.c b/board/xes/xpedite517x/ddr.c index 53cb156fd5..f48c02fdae 100644 --- a/board/xes/xpedite517x/ddr.c +++ b/board/xes/xpedite517x/ddr.c @@ -2,7 +2,7 @@ * Copyright 2009 Extreme Engineering Solutions, Inc. * Copyright 2007-2008 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/xes/xpedite537x/ddr.c b/board/xes/xpedite537x/ddr.c index c128fcb53d..f41ae73755 100644 --- a/board/xes/xpedite537x/ddr.c +++ b/board/xes/xpedite537x/ddr.c @@ -2,7 +2,7 @@ * Copyright 2008 Extreme Engineering Solutions, Inc. * Copyright 2008 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/xes/xpedite537x/xpedite537x.c b/board/xes/xpedite537x/xpedite537x.c index aaa87b268d..efd563b266 100644 --- a/board/xes/xpedite537x/xpedite537x.c +++ b/board/xes/xpedite537x/xpedite537x.c @@ -1,7 +1,7 @@ /* * Copyright 2008 Extreme Engineering Solutions, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/xes/xpedite550x/ddr.c b/board/xes/xpedite550x/ddr.c index 993ae800f3..a03a96b182 100644 --- a/board/xes/xpedite550x/ddr.c +++ b/board/xes/xpedite550x/ddr.c @@ -2,7 +2,7 @@ * Copyright 2010 Extreme Engineering Solutions, Inc. * Copyright 2007-2008 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/xes/xpedite550x/xpedite550x.c b/board/xes/xpedite550x/xpedite550x.c index 161dc2d90a..e64d682afe 100644 --- a/board/xes/xpedite550x/xpedite550x.c +++ b/board/xes/xpedite550x/xpedite550x.c @@ -1,7 +1,7 @@ /* * Copyright 2010 Extreme Engineering Solutions, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index be7154ea14..42a8d0c400 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -3,7 +3,7 @@ * * Michal SIMEK <monstr@monstr.eu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* This is a board specific file. It's OK to include board specific diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index f7f1c59ac5..5119c09037 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2012 Michal Simek <monstr@monstr.eu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/boards.cfg b/boards.cfg index 85143c64a9..aa2ee642d4 100644 --- a/boards.cfg +++ b/boards.cfg @@ -274,6 +274,7 @@ Active arm armv7 exynos samsung smdk5250 Active arm armv7 exynos samsung smdk5250 snow - Rajeshwari Shinde <rajeshwari.s@samsung.com> Active arm armv7 exynos samsung smdkv310 smdkv310 - Chander Kashyap <k.chander@samsung.com> Active arm armv7 exynos samsung trats trats - Lukasz Majewski <l.majewski@samsung.com> +Active arm armv7 exynos samsung trats2 trats2 - Piotr Wilczek <p.wilczek@samsung.com> Active arm armv7 exynos samsung universal_c210 s5pc210_universal - Minkyu Kang <mk7.kang@samsung.com> Active arm armv7 highbank - highbank highbank - Rob Herring <rob.herring@calxeda.com> Active arm armv7 mx5 denx m53evk m53evk m53evk:IMX_CONFIG=board/denx/m53evk/imximage.cfg Marek Vasut <marek.vasut@gmail.com> diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index c093fefd4c..cc904c2535 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -121,9 +121,9 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar break; case 4: addr = simple_strtoul(argv[1], NULL, 16); - x = simple_strtoul(argv[2], NULL, 10); - y = simple_strtoul(argv[3], NULL, 10); - break; + x = simple_strtoul(argv[2], NULL, 10); + y = simple_strtoul(argv[3], NULL, 10); + break; default: return CMD_RET_USAGE; } diff --git a/common/cmd_dtt.c b/common/cmd_dtt.c index 7257f10fb1..f2e750f2f1 100644 --- a/common/cmd_dtt.c +++ b/common/cmd_dtt.c @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/cmd_irq.c b/common/cmd_irq.c index a91d0bf1fc..02da450f67 100644 --- a/common/cmd_irq.c +++ b/common/cmd_irq.c @@ -1,7 +1,7 @@ /* * Copyright 2008 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/cmd_itest.c b/common/cmd_itest.c index 10d53a063b..29f8076f82 100644 --- a/common/cmd_itest.c +++ b/common/cmd_itest.c @@ -2,7 +2,7 @@ * (C) Copyright 2003 * Tait Electronics Limited, Christchurch, New Zealand * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/common/cmd_led.c b/common/cmd_led.c index c48603cada..172bc30bd6 100644 --- a/common/cmd_led.c +++ b/common/cmd_led.c @@ -7,7 +7,7 @@ * (C) Copyright 2008 * Ulf Samuelsson <ulf.samuelsson@atmel.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index f791372de1..40b6333ebf 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -93,13 +93,13 @@ DECLARE_GLOBAL_DATA_PTR; /* special size referring to all the remaining space in a partition */ -#define SIZE_REMAINING 0xFFFFFFFF +#define SIZE_REMAINING (~0llu) /* special offset value, it is used when not provided by user * * this value is used temporarily during parsing, later such offests * are recalculated */ -#define OFFSET_NOT_SPECIFIED 0xFFFFFFFF +#define OFFSET_NOT_SPECIFIED (~0llu) /* minimum partition size */ #define MIN_PART_SIZE 4096 @@ -160,9 +160,9 @@ static int device_del(struct mtd_device *dev); * @param retptr output pointer to next char after parse completes (output) * @return resulting unsigned int */ -static unsigned long memsize_parse (const char *const ptr, const char **retptr) +static u64 memsize_parse (const char *const ptr, const char **retptr) { - unsigned long ret = simple_strtoul(ptr, (char **)retptr, 0); + u64 ret = simple_strtoull(ptr, (char **)retptr, 0); switch (**retptr) { case 'G': @@ -193,20 +193,20 @@ static unsigned long memsize_parse (const char *const ptr, const char **retptr) * @param buf output buffer * @param size size to be converted to string */ -static void memsize_format(char *buf, u32 size) +static void memsize_format(char *buf, u64 size) { #define SIZE_GB ((u32)1024*1024*1024) #define SIZE_MB ((u32)1024*1024) #define SIZE_KB ((u32)1024) if ((size % SIZE_GB) == 0) - sprintf(buf, "%ug", size/SIZE_GB); + sprintf(buf, "%llug", size/SIZE_GB); else if ((size % SIZE_MB) == 0) - sprintf(buf, "%um", size/SIZE_MB); + sprintf(buf, "%llum", size/SIZE_MB); else if (size % SIZE_KB == 0) - sprintf(buf, "%uk", size/SIZE_KB); + sprintf(buf, "%lluk", size/SIZE_KB); else - sprintf(buf, "%u", size); + sprintf(buf, "%llu", size); } /** @@ -310,6 +310,7 @@ static int part_validate_eraseblock(struct mtdids *id, struct part_info *part) struct mtd_info *mtd = NULL; int i, j; ulong start; + u64 offset, size; if (get_mtd_info(id->type, id->num, &mtd)) return 1; @@ -321,14 +322,16 @@ static int part_validate_eraseblock(struct mtdids *id, struct part_info *part) * Only one eraseregion (NAND, OneNAND or uniform NOR), * checking for alignment is easy here */ - if ((unsigned long)part->offset % mtd->erasesize) { + offset = part->offset; + if (do_div(offset, mtd->erasesize)) { printf("%s%d: partition (%s) start offset" "alignment incorrect\n", MTD_DEV_TYPE(id->type), id->num, part->name); return 1; } - if (part->size % mtd->erasesize) { + size = part->size; + if (do_div(size, mtd->erasesize)) { printf("%s%d: partition (%s) size alignment incorrect\n", MTD_DEV_TYPE(id->type), id->num, part->name); return 1; @@ -395,7 +398,7 @@ static int part_validate(struct mtdids *id, struct part_info *part) part->size = id->size - part->offset; if (part->offset > id->size) { - printf("%s: offset %08x beyond flash size %08x\n", + printf("%s: offset %08llx beyond flash size %08llx\n", id->mtd_id, part->offset, id->size); return 1; } @@ -578,8 +581,8 @@ static int part_add(struct mtd_device *dev, struct part_info *part) static int part_parse(const char *const partdef, const char **ret, struct part_info **retpart) { struct part_info *part; - unsigned long size; - unsigned long offset; + u64 size; + u64 offset; const char *name; int name_len; unsigned int mask_flags; @@ -598,7 +601,7 @@ static int part_parse(const char *const partdef, const char **ret, struct part_i } else { size = memsize_parse(p, &p); if (size < MIN_PART_SIZE) { - printf("partition size too small (%lx)\n", size); + printf("partition size too small (%llx)\n", size); return 1; } } @@ -670,14 +673,14 @@ static int part_parse(const char *const partdef, const char **ret, struct part_i part->auto_name = 0; } else { /* auto generated name in form of size@offset */ - sprintf(part->name, "0x%08lx@0x%08lx", size, offset); + sprintf(part->name, "0x%08llx@0x%08llx", size, offset); part->auto_name = 1; } part->name[name_len - 1] = '\0'; INIT_LIST_HEAD(&part->link); - debug("+ partition: name %-22s size 0x%08x offset 0x%08x mask flags %d\n", + debug("+ partition: name %-22s size 0x%08llx offset 0x%08llx mask flags %d\n", part->name, part->size, part->offset, part->mask_flags); @@ -693,7 +696,7 @@ static int part_parse(const char *const partdef, const char **ret, struct part_i * @param size a pointer to the size of the mtd device (output) * @return 0 if device is valid, 1 otherwise */ -static int mtd_device_validate(u8 type, u8 num, u32 *size) +static int mtd_device_validate(u8 type, u8 num, u64 *size) { struct mtd_info *mtd = NULL; @@ -826,7 +829,7 @@ static int device_parse(const char *const mtd_dev, const char **ret, struct mtd_ LIST_HEAD(tmp_list); struct list_head *entry, *n; u16 num_parts; - u32 offset; + u64 offset; int err = 1; debug("===device_parse===\n"); @@ -1071,7 +1074,8 @@ static int generate_mtdparts(char *buf, u32 buflen) struct part_info *part, *prev_part; char *p = buf; char tmpbuf[32]; - u32 size, offset, len, part_cnt; + u64 size, offset; + u32 len, part_cnt; u32 maxlen = buflen - 1; debug("--- generate_mtdparts ---\n"); @@ -1270,7 +1274,7 @@ static void print_partition_table(void) list_for_each(pentry, &dev->parts) { part = list_entry(pentry, struct part_info, link); - printf("%2d: %-20s0x%08x\t0x%08x\t%d\n", + printf("%2d: %-20s0x%08llx\t0x%08llx\t%d\n", part_num, part->name, part->size, part->offset, part->mask_flags); #endif /* defined(CONFIG_CMD_MTDPARTS_SHOW_NET_SIZES) */ @@ -1297,7 +1301,7 @@ static void list_partitions(void) if (current_mtd_dev) { part = mtd_part_info(current_mtd_dev, current_mtd_partnum); if (part) { - printf("\nactive partition: %s%d,%d - (%s) 0x%08x @ 0x%08x\n", + printf("\nactive partition: %s%d,%d - (%s) 0x%08llx @ 0x%08llx\n", MTD_DEV_TYPE(current_mtd_dev->id->type), current_mtd_dev->id->num, current_mtd_partnum, part->name, part->size, part->offset); @@ -1397,7 +1401,7 @@ static int delete_partition(const char *id) if (find_dev_and_part(id, &dev, &pnum, &part) == 0) { - debug("delete_partition: device = %s%d, partition %d = (%s) 0x%08x@0x%08x\n", + debug("delete_partition: device = %s%d, partition %d = (%s) 0x%08llx@0x%08llx\n", MTD_DEV_TYPE(dev->id->type), dev->id->num, pnum, part->name, part->size, part->offset); @@ -1589,7 +1593,7 @@ static int parse_mtdids(const char *const ids) struct list_head *entry, *n; struct mtdids *id_tmp; u8 type, num; - u32 size; + u64 size; int ret = 1; debug("\n---parse_mtdids---\nmtdids = %s\n\n", ids); @@ -1663,7 +1667,7 @@ static int parse_mtdids(const char *const ids) id->mtd_id[mtd_id_len - 1] = '\0'; INIT_LIST_HEAD(&id->link); - debug("+ id %s%d\t%16d bytes\t%s\n", + debug("+ id %s%d\t%16lld bytes\t%s\n", MTD_DEV_TYPE(id->type), id->num, id->size, id->mtd_id); diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 778dca5af9..ba9ba16972 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -7,7 +7,7 @@ * * Copyright 2011 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index c5f4a221b8..79d3a061f5 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -114,16 +114,16 @@ static int get_bootfile_path(const char *file_path, char *bootfile_path, return 1; } -static int (*do_getfile)(const char *file_path, char *file_addr); +static int (*do_getfile)(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr); -static int do_get_tftp(const char *file_path, char *file_addr) +static int do_get_tftp(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr) { char *tftp_argv[] = {"tftp", NULL, NULL, NULL}; tftp_argv[1] = file_addr; tftp_argv[2] = (void *)file_path; - if (do_tftpb(NULL, 0, 3, tftp_argv)) + if (do_tftpb(cmdtp, 0, 3, tftp_argv)) return -ENOENT; return 1; @@ -131,27 +131,27 @@ static int do_get_tftp(const char *file_path, char *file_addr) static char *fs_argv[5]; -static int do_get_ext2(const char *file_path, char *file_addr) +static int do_get_ext2(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr) { #ifdef CONFIG_CMD_EXT2 fs_argv[0] = "ext2load"; fs_argv[3] = file_addr; fs_argv[4] = (void *)file_path; - if (!do_ext2load(NULL, 0, 5, fs_argv)) + if (!do_ext2load(cmdtp, 0, 5, fs_argv)) return 1; #endif return -ENOENT; } -static int do_get_fat(const char *file_path, char *file_addr) +static int do_get_fat(cmd_tbl_t *cmdtp, const char *file_path, char *file_addr) { #ifdef CONFIG_CMD_FAT fs_argv[0] = "fatload"; fs_argv[3] = file_addr; fs_argv[4] = (void *)file_path; - if (!do_fat_fsload(NULL, 0, 5, fs_argv)) + if (!do_fat_fsload(cmdtp, 0, 5, fs_argv)) return 1; #endif return -ENOENT; @@ -165,7 +165,7 @@ static int do_get_fat(const char *file_path, char *file_addr) * * Returns 1 for success, or < 0 on error. */ -static int get_relfile(const char *file_path, void *file_addr) +static int get_relfile(cmd_tbl_t *cmdtp, const char *file_path, void *file_addr) { size_t path_len; char relfile[MAX_TFTP_PATH_LEN+1]; @@ -194,7 +194,7 @@ static int get_relfile(const char *file_path, void *file_addr) sprintf(addr_buf, "%p", file_addr); - return do_getfile(relfile, addr_buf); + return do_getfile(cmdtp, relfile, addr_buf); } /* @@ -204,13 +204,13 @@ static int get_relfile(const char *file_path, void *file_addr) * * Returns 1 on success, or < 0 for error. */ -static int get_pxe_file(const char *file_path, void *file_addr) +static int get_pxe_file(cmd_tbl_t *cmdtp, const char *file_path, void *file_addr) { unsigned long config_file_size; char *tftp_filesize; int err; - err = get_relfile(file_path, file_addr); + err = get_relfile(cmdtp, file_path, file_addr); if (err < 0) return err; @@ -241,7 +241,7 @@ static int get_pxe_file(const char *file_path, void *file_addr) * * Returns 1 on success or < 0 on error. */ -static int get_pxelinux_path(const char *file, void *pxefile_addr_r) +static int get_pxelinux_path(cmd_tbl_t *cmdtp, const char *file, void *pxefile_addr_r) { size_t base_len = strlen(PXELINUX_DIR); char path[MAX_TFTP_PATH_LEN+1]; @@ -254,7 +254,7 @@ static int get_pxelinux_path(const char *file, void *pxefile_addr_r) sprintf(path, PXELINUX_DIR "%s", file); - return get_pxe_file(path, pxefile_addr_r); + return get_pxe_file(cmdtp, path, pxefile_addr_r); } /* @@ -262,7 +262,7 @@ static int get_pxelinux_path(const char *file, void *pxefile_addr_r) * * Returns 1 on success or < 0 on error. */ -static int pxe_uuid_path(void *pxefile_addr_r) +static int pxe_uuid_path(cmd_tbl_t *cmdtp, void *pxefile_addr_r) { char *uuid_str; @@ -271,7 +271,7 @@ static int pxe_uuid_path(void *pxefile_addr_r) if (!uuid_str) return -ENOENT; - return get_pxelinux_path(uuid_str, pxefile_addr_r); + return get_pxelinux_path(cmdtp, uuid_str, pxefile_addr_r); } /* @@ -280,7 +280,7 @@ static int pxe_uuid_path(void *pxefile_addr_r) * * Returns 1 on success or < 0 on error. */ -static int pxe_mac_path(void *pxefile_addr_r) +static int pxe_mac_path(cmd_tbl_t *cmdtp, void *pxefile_addr_r) { char mac_str[21]; int err; @@ -290,7 +290,7 @@ static int pxe_mac_path(void *pxefile_addr_r) if (err < 0) return err; - return get_pxelinux_path(mac_str, pxefile_addr_r); + return get_pxelinux_path(cmdtp, mac_str, pxefile_addr_r); } /* @@ -300,7 +300,7 @@ static int pxe_mac_path(void *pxefile_addr_r) * * Returns 1 on success or < 0 on error. */ -static int pxe_ipaddr_paths(void *pxefile_addr_r) +static int pxe_ipaddr_paths(cmd_tbl_t *cmdtp, void *pxefile_addr_r) { char ip_addr[9]; int mask_pos, err; @@ -308,7 +308,7 @@ static int pxe_ipaddr_paths(void *pxefile_addr_r) sprintf(ip_addr, "%08X", ntohl(NetOurIP)); for (mask_pos = 7; mask_pos >= 0; mask_pos--) { - err = get_pxelinux_path(ip_addr, pxefile_addr_r); + err = get_pxelinux_path(cmdtp, ip_addr, pxefile_addr_r); if (err > 0) return err; @@ -359,16 +359,16 @@ do_pxe_get(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * Keep trying paths until we successfully get a file we're looking * for. */ - if (pxe_uuid_path((void *)pxefile_addr_r) > 0 || - pxe_mac_path((void *)pxefile_addr_r) > 0 || - pxe_ipaddr_paths((void *)pxefile_addr_r) > 0) { + if (pxe_uuid_path(cmdtp, (void *)pxefile_addr_r) > 0 || + pxe_mac_path(cmdtp, (void *)pxefile_addr_r) > 0 || + pxe_ipaddr_paths(cmdtp, (void *)pxefile_addr_r) > 0) { printf("Config file found\n"); return 0; } while (pxe_default_paths[i]) { - if (get_pxelinux_path(pxe_default_paths[i], + if (get_pxelinux_path(cmdtp, pxe_default_paths[i], (void *)pxefile_addr_r) > 0) { printf("Config file found\n"); return 0; @@ -388,7 +388,7 @@ do_pxe_get(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) * * Returns 1 on success or < 0 on error. */ -static int get_relfile_envaddr(const char *file_path, const char *envaddr_name) +static int get_relfile_envaddr(cmd_tbl_t *cmdtp, const char *file_path, const char *envaddr_name) { unsigned long file_addr; char *envaddr; @@ -401,7 +401,7 @@ static int get_relfile_envaddr(const char *file_path, const char *envaddr_name) if (strict_strtoul(envaddr, 16, &file_addr) < 0) return -EINVAL; - return get_relfile(file_path, (void *)file_addr); + return get_relfile(cmdtp, file_path, (void *)file_addr); } /* @@ -599,7 +599,7 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) } if (label->initrd) { - if (get_relfile_envaddr(label->initrd, "ramdisk_addr_r") < 0) { + if (get_relfile_envaddr(cmdtp, label->initrd, "ramdisk_addr_r") < 0) { printf("Skipping %s for failure retrieving initrd\n", label->name); return 1; @@ -613,7 +613,7 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) bootm_argv[2] = "-"; } - if (get_relfile_envaddr(label->kernel, "kernel_addr_r") < 0) { + if (get_relfile_envaddr(cmdtp, label->kernel, "kernel_addr_r") < 0) { printf("Skipping %s for failure retrieving kernel\n", label->name); return 1; @@ -673,7 +673,7 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) /* if fdt label is defined then get fdt from server */ if (bootm_argv[3] && label->fdt) { - if (get_relfile_envaddr(label->fdt, "fdt_addr_r") < 0) { + if (get_relfile_envaddr(cmdtp, label->fdt, "fdt_addr_r") < 0) { printf("Skipping %s for failure retrieving fdt\n", label->name); return 1; @@ -950,7 +950,7 @@ static int parse_integer(char **c, int *dst) return 1; } -static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level); +static int parse_pxefile_top(cmd_tbl_t *cmdtp, char *p, struct pxe_menu *cfg, int nest_level); /* * Parse an include statement, and retrieve and parse the file it mentions. @@ -960,7 +960,7 @@ static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level); * include, nest_level has already been incremented and doesn't need to be * incremented here. */ -static int handle_include(char **c, char *base, +static int handle_include(cmd_tbl_t *cmdtp, char **c, char *base, struct pxe_menu *cfg, int nest_level) { char *include_path; @@ -975,14 +975,14 @@ static int handle_include(char **c, char *base, return err; } - err = get_pxe_file(include_path, base); + err = get_pxe_file(cmdtp, include_path, base); if (err < 0) { printf("Couldn't retrieve %s\n", include_path); return err; } - return parse_pxefile_top(base, cfg, nest_level); + return parse_pxefile_top(cmdtp, base, cfg, nest_level); } /* @@ -995,7 +995,7 @@ static int handle_include(char **c, char *base, * nest_level should be 1 when parsing the top level pxe file, 2 when parsing * a file it includes, 3 when parsing a file included by that file, and so on. */ -static int parse_menu(char **c, struct pxe_menu *cfg, char *b, int nest_level) +static int parse_menu(cmd_tbl_t *cmdtp, char **c, struct pxe_menu *cfg, char *b, int nest_level) { struct token t; char *s = *c; @@ -1010,7 +1010,7 @@ static int parse_menu(char **c, struct pxe_menu *cfg, char *b, int nest_level) break; case T_INCLUDE: - err = handle_include(c, b + strlen(b) + 1, cfg, + err = handle_include(cmdtp, c, b + strlen(b) + 1, cfg, nest_level + 1); break; @@ -1172,7 +1172,7 @@ static int parse_label(char **c, struct pxe_menu *cfg) * * Returns 1 on success, < 0 on error. */ -static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level) +static int parse_pxefile_top(cmd_tbl_t *cmdtp, char *p, struct pxe_menu *cfg, int nest_level) { struct token t; char *s, *b, *label_name; @@ -1194,7 +1194,7 @@ static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level) switch (t.type) { case T_MENU: cfg->prompt = 1; - err = parse_menu(&p, cfg, b, nest_level); + err = parse_menu(cmdtp, &p, cfg, b, nest_level); break; case T_TIMEOUT: @@ -1219,7 +1219,7 @@ static int parse_pxefile_top(char *p, struct pxe_menu *cfg, int nest_level) break; case T_INCLUDE: - err = handle_include(&p, b + ALIGN(strlen(b), 4), cfg, + err = handle_include(cmdtp, &p, b + ALIGN(strlen(b), 4), cfg, nest_level + 1); break; @@ -1276,7 +1276,7 @@ static void destroy_pxe_menu(struct pxe_menu *cfg) * files it includes). The resulting pxe_menu struct can be free()'d by using * the destroy_pxe_menu() function. */ -static struct pxe_menu *parse_pxefile(char *menucfg) +static struct pxe_menu *parse_pxefile(cmd_tbl_t *cmdtp, char *menucfg) { struct pxe_menu *cfg; @@ -1289,7 +1289,7 @@ static struct pxe_menu *parse_pxefile(char *menucfg) INIT_LIST_HEAD(&cfg->labels); - if (parse_pxefile_top(menucfg, cfg, 1) < 0) { + if (parse_pxefile_top(cmdtp, menucfg, cfg, 1) < 0) { destroy_pxe_menu(cfg); return NULL; } @@ -1446,7 +1446,7 @@ do_pxe_boot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } - cfg = parse_pxefile((char *)(pxefile_addr_r)); + cfg = parse_pxefile(cmdtp, (char *)(pxefile_addr_r)); if (cfg == NULL) { printf("Error parsing config file\n"); @@ -1544,12 +1544,12 @@ int do_sysboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } - if (get_pxe_file(filename, (void *)pxefile_addr_r) < 0) { + if (get_pxe_file(cmdtp, filename, (void *)pxefile_addr_r) < 0) { printf("Error reading config file\n"); return 1; } - cfg = parse_pxefile((char *)(pxefile_addr_r)); + cfg = parse_pxefile(cmdtp, (char *)(pxefile_addr_r)); if (cfg == NULL) { printf("Error parsing config file\n"); diff --git a/common/cmd_sandbox.c b/common/cmd_sandbox.c index 75eb23adf2..8d59364b63 100644 --- a/common/cmd_sandbox.c +++ b/common/cmd_sandbox.c @@ -10,7 +10,7 @@ static int do_sandbox_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - return do_load(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX, 16); + return do_load(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX); } static int do_sandbox_ls(cmd_tbl_t *cmdtp, int flag, int argc, @@ -22,7 +22,7 @@ static int do_sandbox_ls(cmd_tbl_t *cmdtp, int flag, int argc, static int do_sandbox_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - return do_save(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX, 16); + return do_save(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX); } static cmd_tbl_t cmd_sandbox_sub[] = { diff --git a/common/cmd_setexpr.c b/common/cmd_setexpr.c index 1fc080b9b5..926339b9f1 100644 --- a/common/cmd_setexpr.c +++ b/common/cmd_setexpr.c @@ -2,7 +2,7 @@ * Copyright 2008 Freescale Semiconductor, Inc. * Copyright 2013 Wolfgang Denk <wd@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/common/cmd_tsi148.c b/common/cmd_tsi148.c index 317ba50fd1..dc488b2b3e 100644 --- a/common/cmd_tsi148.c +++ b/common/cmd_tsi148.c @@ -5,7 +5,7 @@ * * (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index 5ba4feb485..122ba7e171 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -167,7 +167,7 @@ bad: return err; } -static int ubi_create_vol(char *volume, int size, int dynamic) +static int ubi_create_vol(char *volume, int64_t size, int dynamic) { struct ubi_mkvol_req req; int err; @@ -191,7 +191,7 @@ static int ubi_create_vol(char *volume, int size, int dynamic) printf("verify_mkvol_req failed %d\n", err); return err; } - printf("Creating %s volume %s of size %d\n", + printf("Creating %s volume %s of size %lld\n", dynamic ? "dynamic" : "static", volume, size); /* Call real ubi create volume */ return ubi_create_volume(ubi, &req); @@ -266,28 +266,15 @@ out_err: return err; } -int ubi_volume_write(char *volume, void *buf, size_t size) +int ubi_volume_continue_write(char *volume, void *buf, size_t size) { int err = 1; - int rsvd_bytes = 0; struct ubi_volume *vol; vol = ubi_find_volume(volume); if (vol == NULL) return ENODEV; - rsvd_bytes = vol->reserved_pebs * (ubi->leb_size - vol->data_pad); - if (size < 0 || size > rsvd_bytes) { - printf("size > volume size! Aborting!\n"); - return EINVAL; - } - - err = ubi_start_update(ubi, vol, size); - if (err < 0) { - printf("Cannot start volume update\n"); - return -err; - } - err = ubi_more_update_data(ubi, vol, buf, size); if (err < 0) { printf("Couldnt or partially wrote data\n"); @@ -314,6 +301,37 @@ int ubi_volume_write(char *volume, void *buf, size_t size) return 0; } +int ubi_volume_begin_write(char *volume, void *buf, size_t size, + size_t full_size) +{ + int err = 1; + int rsvd_bytes = 0; + struct ubi_volume *vol; + + vol = ubi_find_volume(volume); + if (vol == NULL) + return ENODEV; + + rsvd_bytes = vol->reserved_pebs * (ubi->leb_size - vol->data_pad); + if (size < 0 || size > rsvd_bytes) { + printf("size > volume size! Aborting!\n"); + return EINVAL; + } + + err = ubi_start_update(ubi, vol, full_size); + if (err < 0) { + printf("Cannot start volume update\n"); + return -err; + } + + return ubi_volume_continue_write(volume, buf, size); +} + +int ubi_volume_write(char *volume, void *buf, size_t size) +{ + return ubi_volume_begin_write(volume, buf, size, size); +} + int ubi_volume_read(char *volume, char *buf, size_t size) { int err, lnum, off, len, tbuf_size; @@ -498,7 +516,7 @@ int ubi_part(char *part_name, const char *vid_header_offset) static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - size_t size = 0; + int64_t size = 0; ulong addr = 0; if (argc < 2) @@ -558,13 +576,13 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } /* E.g., create volume size */ if (argc == 4) { - size = simple_strtoul(argv[3], NULL, 16); + size = simple_strtoull(argv[3], NULL, 16); argc--; } /* Use maximum available size */ if (!size) { - size = ubi->avail_pebs * ubi->leb_size; - printf("No size specified -> Using max size (%u)\n", size); + size = (int64_t)ubi->avail_pebs * ubi->leb_size; + printf("No size specified -> Using max size (%lld)\n", size); } /* E.g., create volume */ if (argc == 3) @@ -588,9 +606,22 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) addr = simple_strtoul(argv[2], NULL, 16); size = simple_strtoul(argv[4], NULL, 16); - ret = ubi_volume_write(argv[3], (void *)addr, size); + if (strlen(argv[1]) == 10 && + strncmp(argv[1] + 5, ".part", 5) == 0) { + if (argc < 6) { + ret = ubi_volume_continue_write(argv[3], + (void *)addr, size); + } else { + size_t full_size; + full_size = simple_strtoul(argv[5], NULL, 16); + ret = ubi_volume_begin_write(argv[3], + (void *)addr, size, full_size); + } + } else { + ret = ubi_volume_write(argv[3], (void *)addr, size); + } if (!ret) { - printf("%d bytes written to volume %s\n", size, + printf("%lld bytes written to volume %s\n", size, argv[3]); } @@ -613,7 +644,7 @@ static int do_ubi(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } if (argc == 3) { - printf("Read %d bytes from volume %s to %lx\n", size, + printf("Read %lld bytes from volume %s to %lx\n", size, argv[3], addr); return ubi_volume_read(argv[3], (char *)addr, size); @@ -636,6 +667,8 @@ U_BOOT_CMD( " - create volume name with size\n" "ubi write[vol] address volume size" " - Write volume from address with size\n" + "ubi write.part address volume size [fullsize]\n" + " - Write part of a volume from address\n" "ubi read[vol] address volume [size]" " - Read volume to address with size\n" "ubi remove[vol] volume" diff --git a/common/cmd_universe.c b/common/cmd_universe.c index ad15613845..c9310363f1 100644 --- a/common/cmd_universe.c +++ b/common/cmd_universe.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/env_common.c b/common/env_common.c index 1ac337730c..c0bfc2f5db 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -5,7 +5,7 @@ * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel@sysgo.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/env_dataflash.c b/common/env_dataflash.c index 5f21d5c38e..b53b87e958 100644 --- a/common/env_dataflash.c +++ b/common/env_dataflash.c @@ -29,11 +29,25 @@ uchar env_get_char_spec(int index) void env_relocate_spec(void) { + ulong crc, new = 0; + unsigned off; char buf[CONFIG_ENV_SIZE]; + /* Read old CRC */ + read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc), + sizeof(ulong), (char *)&crc); + + /* Read whole environment */ read_dataflash(CONFIG_ENV_ADDR, CONFIG_ENV_SIZE, buf); - env_import(buf, 1); + /* Calculate the CRC */ + off = offsetof(env_t, data); + new = crc32(new, (unsigned char *)(buf + off), ENV_SIZE); + + if (crc == new) + env_import(buf, 1); + else + set_default_env("!bad CRC"); } #ifdef CONFIG_ENV_OFFSET_REDUND @@ -67,37 +81,9 @@ int saveenv(void) */ int env_init(void) { - ulong crc, len = ENV_SIZE, new = 0; - unsigned off; - uchar buf[64]; - - if (gd->env_valid) - return 0; - - AT91F_DataflashInit(); /* prepare for DATAFLASH read/write */ - - /* read old CRC */ - read_dataflash(CONFIG_ENV_ADDR + offsetof(env_t, crc), - sizeof(ulong), (char *)&crc); - - off = offsetof(env_t, data); - while (len > 0) { - int n = (len > sizeof(buf)) ? sizeof(buf) : len; - - read_dataflash(CONFIG_ENV_ADDR + off, n, (char *)buf); - - new = crc32(new, buf, n); - len -= n; - off += n; - } - - if (crc == new) { - gd->env_addr = offsetof(env_t, data); - gd->env_valid = 1; - } else { - gd->env_addr = (ulong)&default_environment[0]; - gd->env_valid = 0; - } + /* use default */ + gd->env_addr = (ulong)&default_environment[0]; + gd->env_valid = 1; return 0; } diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 149370f834..0dcdd1fc80 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -5,7 +5,7 @@ * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel@sysgo.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/env_embedded.c b/common/env_embedded.c index 91d8ba308d..1c4f915b79 100644 --- a/common/env_embedded.c +++ b/common/env_embedded.c @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ASSEMBLY__ diff --git a/common/env_fat.c b/common/env_fat.c index e114921c4a..708fd13dc7 100644 --- a/common/env_fat.c +++ b/common/env_fat.c @@ -4,7 +4,7 @@ * Author: * Maximilian Schwerin <mvs@tigris.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/env_flash.c b/common/env_flash.c index d4a0e18c3d..7d5a4cfc8a 100644 --- a/common/env_flash.c +++ b/common/env_flash.c @@ -5,7 +5,7 @@ * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel@sysgo.de> - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* #define DEBUG */ diff --git a/common/env_mmc.c b/common/env_mmc.c index 65aafa9cac..045428c6ec 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2008-2011 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* #define DEBUG */ @@ -192,11 +192,12 @@ void env_relocate_spec(void) u32 offset1, offset2; int read1_fail = 0, read2_fail = 0; int crc1_ok = 0, crc2_ok = 0; - env_t *ep, *tmp_env1, *tmp_env2; + env_t *ep; int ret; - tmp_env1 = (env_t *)malloc(CONFIG_ENV_SIZE); - tmp_env2 = (env_t *)malloc(CONFIG_ENV_SIZE); + ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env1, 1); + ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env2, 1); + if (tmp_env1 == NULL || tmp_env2 == NULL) { puts("Can't allocate buffers for environment\n"); ret = 1; @@ -266,8 +267,6 @@ err: if (ret) set_default_env(NULL); - free(tmp_env1); - free(tmp_env2); #endif } #else /* ! CONFIG_ENV_OFFSET_REDUND */ diff --git a/common/env_nand.c b/common/env_nand.c index 75309621b0..695a9eebb0 100644 --- a/common/env_nand.c +++ b/common/env_nand.c @@ -11,7 +11,7 @@ * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel@sysgo.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/env_nowhere.c b/common/env_nowhere.c index c411e8cfe7..bdc1ed5e67 100644 --- a/common/env_nowhere.c +++ b/common/env_nowhere.c @@ -5,7 +5,7 @@ * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel@sysgo.de> - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/env_nvram.c b/common/env_nvram.c index 49144220b1..0866cde924 100644 --- a/common/env_nvram.c +++ b/common/env_nvram.c @@ -5,7 +5,7 @@ * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel@sysgo.de> - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/common/env_remote.c b/common/env_remote.c index 1b6609b909..eb977ee1fe 100644 --- a/common/env_remote.c +++ b/common/env_remote.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2011-2012 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* #define DEBUG */ diff --git a/common/env_ubi.c b/common/env_ubi.c index f24a96c3e9..c0828a47d3 100644 --- a/common/env_ubi.c +++ b/common/env_ubi.c @@ -2,7 +2,7 @@ * (c) Copyright 2012 by National Instruments, * Joe Hershberger <joe.hershberger@ni.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/iomux.c b/common/iomux.c index cf4da45707..62bdec61aa 100644 --- a/common/iomux.c +++ b/common/iomux.c @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/common/lcd.c b/common/lcd.c index 990650c7ef..5dd7948121 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -4,7 +4,7 @@ * (C) Copyright 2001-2002 * Wolfgang Denk, DENX Software Engineering -- wd@denx.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************/ diff --git a/common/main.c b/common/main.c index ae37fee46d..6f475f0cca 100644 --- a/common/main.c +++ b/common/main.c @@ -365,7 +365,7 @@ static void process_boot_delay(void) #ifdef CONFIG_BOOTCOUNT_LIMIT if (bootlimit && (bootcount > bootlimit)) { printf ("Warning: Bootlimit (%u) exceeded. Using altbootcmd.\n", - (unsigned)bootlimit); + (unsigned)bootlimit); s = getenv ("altbootcmd"); } else @@ -320,7 +320,7 @@ endif # Linus' kernel sanity checking tool CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \ - -Wbitwise -Wno-return-void -D__CHECK_ENDIAN__ $(CF) + -Wbitwise -Wno-return-void -D__CHECK_ENDIAN__ $(CF) # Location of a usable BFD library, where we define "usable" as # "built for ${HOST}, supports ${TARGET}". Sensible values are diff --git a/disk/part_amiga.h b/disk/part_amiga.h index 524da10fd0..0f04e97e2c 100644 --- a/disk/part_amiga.h +++ b/disk/part_amiga.h @@ -3,7 +3,7 @@ * Hans-Joerg Frieden, Hyperion Entertainment * Hans-JoergF@hyperion-entertainment.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _DISK_PART_AMIGA_H diff --git a/disk/part_dos.h b/disk/part_dos.h index e0608e0925..0321d922b7 100644 --- a/disk/part_dos.h +++ b/disk/part_dos.h @@ -2,7 +2,7 @@ * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _DISK_PART_DOS_H diff --git a/disk/part_iso.c b/disk/part_iso.c index 80c1d95d59..2547c703db 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland, d.peter@mpl.ch. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/disk/part_iso.h b/disk/part_iso.h index e5a3e0220f..dace0f87dc 100644 --- a/disk/part_iso.h +++ b/disk/part_iso.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Denis Peter, MPL AG Switzerland, d.peter@mpl.ch. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PART_CD_H #define _PART_CD_H diff --git a/doc/DocBook/Makefile b/doc/DocBook/Makefile index 521e8bc0e9..29b79d7cd1 100644 --- a/doc/DocBook/Makefile +++ b/doc/DocBook/Makefile @@ -134,7 +134,7 @@ build_main_index = rm -rf $(main_idx); \ quiet_cmd_db2html = HTML $@ cmd_db2html = xmlto html $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \ echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \ - $(patsubst %.html,%,$(notdir $@))</a><p>' > $@ + $(patsubst %.html,%,$(notdir $@))</a><p>' > $@ %.html: %.xml @(which xmlto > /dev/null 2>&1) || \ @@ -143,7 +143,7 @@ quiet_cmd_db2html = HTML $@ @rm -rf $@ $(patsubst %.html,%,$@) $(call cmd_db2html) @if [ ! -z "$(PNG-$(basename $(notdir $@)))" ]; then \ - cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi + cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi quiet_cmd_db2man = MAN $@ cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi diff --git a/doc/README.atmel_pmecc b/doc/README.atmel_pmecc index 41f3bd7860..cf8373b54e 100644 --- a/doc/README.atmel_pmecc +++ b/doc/README.atmel_pmecc @@ -27,4 +27,3 @@ Take AT91SAM9X5EK as an example, the board definition file likes: #define CONFIG_ATMEL_NAND_HW_PMECC 1 #define CONFIG_PMECC_CAP 2 #define CONFIG_PMECC_SECTOR_SIZE 512 - diff --git a/doc/README.autoboot b/doc/README.autoboot index e4fabc90ce..ff58a79e49 100644 --- a/doc/README.autoboot +++ b/doc/README.autoboot @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Dave Ellis, SIXNET, dge@sixnetio.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ Using autoboot configuration options diff --git a/doc/README.b4860qds b/doc/README.b4860qds index bd10a6df04..48ece4b835 100644 --- a/doc/README.b4860qds +++ b/doc/README.b4860qds @@ -5,7 +5,7 @@ The B4860QDS is a Freescale reference board that hosts the B4860 SoC (and varian B4860 Overview ------------- The B4860 QorIQ Qonverge device is a Freescale high-end, multicore SoC based on -StarCore and Power Architecture® cores. It targets the broadband wireless +StarCore and Power Architecture® cores. It targets the broadband wireless infrastructure and builds upon the proven success of the existing multicore DSPs and Power CPUs. It is designed to bolster the rapidly changing and expanding wireless markets, such as 3GLTE (FDD and TDD), LTE-Advanced, and UMTS. @@ -99,11 +99,11 @@ B4420 Personality B4420 Personality -------------------- B4420 is a reduced personality of B4860 with less core/clusters(both SC3900 and e6500), less DDR -controllers, less serdes lanes, less SGMII interfaces and reduced target frequencies. +controllers, less serdes lanes, less SGMII interfaces and reduced target frequencies. Key differences between B4860 and B4420 ---------------------------------------- - + B4420 has: 1. Less e6500 cores: 1 cluster with 2 e6500 cores 2. Less SC3900 cores/clusters: 1 cluster with 2 SC3900 cores per cluster. @@ -130,7 +130,7 @@ Note: Boot location: NOR flash. SysClk/Core(e6500)/CCB/DDR/FMan/DDRCLK/StarCore/CPRI-Maple/eTVPE-Maple/ULB-Maple 66MHz/1.6GHz/667MHz/1.6GHz data rate/667MHz/133MHz/1200MHz/500MHz/800MHz/667MHz -a) NAND boot +a) NAND boot SW1 [1.1] = 0 SW2 [1.1] = 1 SW3 [1:4] = 0001 @@ -155,7 +155,7 @@ Note: Boot location: NOR flash. SysClk/Core(e6500)/CCB/DDR/FMan/DDRCLK/StarCore/CPRI-Maple/eTVPE-Maple/ULB-Maple 66MHz/1.6GHz/667MHz/1.6GHz data rate/667MHz/133MHz/1200MHz/500MHz/800MHz/667MHz -a) NAND boot +a) NAND boot SW1 [1.1] = 0 SW2 [1.1] = 1 SW3 [1:4] = 0001 @@ -246,7 +246,7 @@ Various Software configurations/environment variables/commands -------------------------------------------------------------- The below commands apply to both B4860QDS and B4420QDS. -1. U-boot environment variable hwconfig +1. U-boot environment variable hwconfig The default hwconfig is: hwconfig=fsl_ddr:ctlr_intlv=null,bank_intlv=cs0_cs1;usb1: dr_mode=host,phy_type=ulpi @@ -258,7 +258,7 @@ The below commands apply to both B4860QDS and B4420QDS. 3. Switching to alternate bank Commands for switching to alternate bank. - 1. To change from vbank0 to vbank2 + 1. To change from vbank0 to vbank2 => qixis_reset altbank (it will boot using vbank2) 2.To change from vbank2 to vbank0 @@ -269,7 +269,7 @@ The below commands apply to both B4860QDS and B4420QDS. 1)Boot from vbank0 2)Flash vbank2 with b4420 rcw and u-boot 3)Give following commands to uboot prompt - => mw.b ffdf0040 0x30; + => mw.b ffdf0040 0x30; => mw.b ffdf0010 0x00; => mw.b ffdf0062 0x02; => mw.b ffdf0050 0x02; @@ -283,32 +283,32 @@ The below commands apply to both B4860QDS and B4420QDS. To change from NOR to NAND boot give following command on uboot prompt => mw.b ffdf0040 0x30 - => mw.b ffdf0010 0x00 + => mw.b ffdf0010 0x00 => mw.b 0xffdf0050 0x08 => mw.b 0xffdf0060 0x82 => mw.b ffdf0061 0x00 - => mw.b ffdf0010 0x30 + => mw.b ffdf0010 0x30 => reset To change from NAND to NOR boot give following command on uboot prompt: => mw.b ffdf0040 0x30 - => mw.b ffdf0010 0x00 + => mw.b ffdf0010 0x00 => mw.b 0xffdf0050 0x00(for vbank0) or (mw.b 0xffdf0050 0x02 for vbank2) => mw.b 0xffdf0060 0x12 => mw.b ffdf0061 0x01 - => mw.b ffdf0010 0x30 + => mw.b ffdf0010 0x30 => reset Note: Power off cycle will lead to default switch settings. Note: 0xffdf0000 is the address of the QIXIS FPGA. -6. Ethernet interfaces for B4860QDS +6. Ethernet interfaces for B4860QDS Serdes protocosl tested: 0x2a, 0x8d (serdes1, serdes2) [DEFAULT] 0x2a, 0xb2 (serdes1, serdes2) When using [DEFAULT] RCW, which including 2 * 1G SGMII on board and 2 * 1G - SGMII on SGMII riser card. + SGMII on SGMII riser card. Under U-boot these network interfaces are recognized as: FM1@DTSEC3, FM1@DTSEC4, FM1@DTSEC5 and FM1@DTSEC6. @@ -318,7 +318,7 @@ The below commands apply to both B4860QDS and B4420QDS. . eth4 -> fm1-gb4 . eth5 -> fm1-gb5 -7. RCW and Ethernet interfaces for B4420QDS +7. RCW and Ethernet interfaces for B4420QDS Serdes protocosl tested: 0x18, 0x9e (serdes1, serdes2) diff --git a/doc/README.ext4 b/doc/README.ext4 index b7d0ad3930..9a2de5088b 100644 --- a/doc/README.ext4 +++ b/doc/README.ext4 @@ -28,30 +28,30 @@ Steps to test: 1. After applying the patch, ext4 specific commands can be seen in the boot loader prompt using - UBOOT #help + UBOOT #help - ext4load- load binary file from a Ext4 file system - ext4ls - list files in a directory (default /) - ext4write- create a file in ext4 formatted partition + ext4load- load binary file from a Ext4 file system + ext4ls - list files in a directory (default /) + ext4write- create a file in ext4 formatted partition 2. To list the files in ext4 formatted partition, execute - ext4ls <interface> <dev[:part]> [directory] - For example: - UBOOT #ext4ls mmc 0:5 /usr/lib + ext4ls <interface> <dev[:part]> [directory] + For example: + UBOOT #ext4ls mmc 0:5 /usr/lib 3. To read and load a file from an ext4 formatted partition to RAM, execute - ext4load <interface> <dev[:part]> [addr] [filename] [bytes] - For example: - UBOOT #ext4load mmc 2:2 0x30007fc0 uImage + ext4load <interface> <dev[:part]> [addr] [filename] [bytes] + For example: + UBOOT #ext4load mmc 2:2 0x30007fc0 uImage 4. To write a file to a ext4 formatted partition. - a) First load a file to RAM at a particular address for example 0x30007fc0. - Now execute ext4write command - ext4write <interface> <dev[:part]> [filename] [Address] [sizebytes] - For example: - UBOOT #ext4write mmc 2:2 /boot/uImage 0x30007fc0 6183120 - (here 6183120 is the size of the file to be written) - Note: Absolute path is required for the file to be written + a) First load a file to RAM at a particular address for example 0x30007fc0. + Now execute ext4write command + ext4write <interface> <dev[:part]> [filename] [Address] [sizebytes] + For example: + UBOOT #ext4write mmc 2:2 /boot/uImage 0x30007fc0 6183120 + (here 6183120 is the size of the file to be written) + Note: Absolute path is required for the file to be written References : -- ext4 implementation in Linux Kernel diff --git a/doc/README.gpt b/doc/README.gpt index 81dfe584c5..5c133f3321 100644 --- a/doc/README.gpt +++ b/doc/README.gpt @@ -6,7 +6,6 @@ # # SPDX-License-Identifier: GPL-2.0+ - Glossary: ======== - UUID -(Universally Unique Identifier) @@ -22,7 +21,6 @@ Introduction: This document describes the GPT partition table format and usage of the gpt command in u-boot. - UUID introduction: ==================== @@ -78,7 +76,6 @@ GPT brief explanation: LBA -1 |Secondary GPT Header | ---------------------------------------------------------- - For a legacy reasons, GPT's LBA 0 sector has a MBR structure. It is called "protective MBR". Its first partition entry ID has 0xEE value, and disk software, which is not @@ -114,7 +111,6 @@ Offset Size Description TOTAL: 512 B - IMPORTANT: GPT headers and partition entries are protected by CRC32 (the POSIX CRC32). @@ -132,7 +128,6 @@ sizeof(partition_entry_size (usually 128))) Observe, how Secondary GPT is placed in the memory. It is NOT a mirror reflect of the Primary. - Partition Entry Format: ---------------------- Offset Size Description @@ -150,7 +145,6 @@ of the Primary. Bit 62 - Hidden Bit 63 - Not mount - Creating GPT partitions in U-Boot: ============== @@ -171,7 +165,6 @@ To restore GUID partition table one needs to: 2. From u-boot prompt type: gpt write mmc 0 $partitions - Useful info: ============ diff --git a/doc/README.kwbimage b/doc/README.kwbimage index e91c387b51..8ed708c356 100644 --- a/doc/README.kwbimage +++ b/doc/README.kwbimage @@ -40,9 +40,9 @@ Board specific configuration file specifications: ------------------------------------------------ 1. This file must present in the $(BOARDDIR). The default name is kwbimage.cfg. The name can be set as part of the full path - to the file using CONFIG_SYS_KWD_CONFIG (probably in - include/configs/<yourboard>.h). The path should look like: - $(SRCTREE)/$(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg + to the file using CONFIG_SYS_KWD_CONFIG (probably in + include/configs/<yourboard>.h). The path should look like: + $(SRCTREE)/$(CONFIG_BOARDDIR)/<yourkwbimagename>.cfg 2. This file can have empty lines and lines starting with "#" as first character to put comments 3. This file can have configuration command lines as mentioned below, diff --git a/doc/README.mxc_hab b/doc/README.mxc_hab index 97f8b7d743..43e64a2797 100644 --- a/doc/README.mxc_hab +++ b/doc/README.mxc_hab @@ -20,7 +20,7 @@ Data Size: 327680 Bytes = 320.00 kB = 0.31 MB Load Address: 177ff420 Entry Point: 17800000 HAB Blocks: 177ff400 00000000 0004dc00 - ^^^^^^^^ ^^^^^^^^ ^^^^^^^^ + ^^^^^^^^ ^^^^^^^^ ^^^^^^^^ | | | | | -------- (1) | | diff --git a/doc/README.mxsimage b/doc/README.mxsimage index 88a2caf3e6..0d31cba1fb 100644 --- a/doc/README.mxsimage +++ b/doc/README.mxsimage @@ -10,7 +10,7 @@ The mxsimage tool is targeted to be a simple replacement for the elftosb2 . To generate an image, write an image configuration file and run: mkimage -A arm -O u-boot -T mxsimage -n <path to configuration file> \ - <output bootstream file> + <output bootstream file> The output bootstream file is usually using the .sb file extension. Note that the example configuration files for producing bootable BootStream with @@ -54,33 +54,33 @@ These semantics and rules will be outlined now. LOAD u32_address string_filename - Instructs the BootROM to load file pointed by "string_filename" onto - address "u32_address". + address "u32_address". LOAD IVT u32_address u32_IVT_entry_point - Crafts and loads IVT onto address "u32_address" with the entry point - of u32_IVT_entry_point. + of u32_IVT_entry_point. - i.MX28-specific instruction! LOAD DCD u32_address u32_DCD_block_ID - Loads the DCD block with ID "u32_DCD_block_ID" onto address - "u32_address" and executes the contents of this DCD block + "u32_address" and executes the contents of this DCD block - i.MX28-specific instruction! FILL u32_address u32_pattern u32_length - Starts to write memory from addres "u32_address" with a pattern - specified by "u32_pattern". Writes exactly "u32_length" bytes of the + specified by "u32_pattern". Writes exactly "u32_length" bytes of the pattern. JUMP [HAB] u32_address [u32_r0_arg] - Jumps onto memory address specified by "u32_address" by setting this - address in PT. The BootROM will pass the "u32_r0_arg" value in ARM + address in PT. The BootROM will pass the "u32_r0_arg" value in ARM register "r0" to the executed code if this option is specified. Otherwise, ARM register "r0" will default to value 0x00000000. The optional "HAB" flag is i.MX28-specific flag turning on the HAB boot. CALL [HAB] u32_address [u32_r0_arg] - See JUMP instruction above, as the operation is exactly the same with - one difference. The CALL instruction does allow returning into the + one difference. The CALL instruction does allow returning into the BootROM from the executed code. U-Boot makes use of this in it's SPL code. @@ -88,10 +88,10 @@ These semantics and rules will be outlined now. - Restart the CPU and start booting from device specified by the "string_mode" argument. The "string_mode" differs for each CPU and can be: - i.MX23, string_mode = USB/I2C/SPI1_FLASH/SPI2_FLASH/NAND_BCH - JTAG/SPI3_EEPROM/SD_SSP0/SD_SSP1 - i.MX28, string_mode = USB/I2C/SPI2_FLASH/SPI3_FLASH/NAND_BCH - JTAG/SPI2_EEPROM/SD_SSP0/SD_SSP1 + i.MX23, string_mode = USB/I2C/SPI1_FLASH/SPI2_FLASH/NAND_BCH + JTAG/SPI3_EEPROM/SD_SSP0/SD_SSP1 + i.MX28, string_mode = USB/I2C/SPI2_FLASH/SPI3_FLASH/NAND_BCH + JTAG/SPI2_EEPROM/SD_SSP0/SD_SSP1 - An optional "DCD" blocks can be added at the begining of the configuration file. Note that the DCD is only supported on i.MX28. @@ -99,7 +99,7 @@ These semantics and rules will be outlined now. configuration file. - The DCD block has the following semantics: - DCD u32_DCD_block_ID + DCD u32_DCD_block_ID - u32_DCD_block_ID :: The ID number of the DCD block, must match the ID number used by "LOAD DCD" instruction. diff --git a/doc/README.nokia_rx51 b/doc/README.nokia_rx51 index a8fdfcd372..586ed7c1cc 100644 --- a/doc/README.nokia_rx51 +++ b/doc/README.nokia_rx51 @@ -62,7 +62,7 @@ Available additional commands/variables: * run trymmcscriptboot - Try to load and boot script ${mmcscriptfile} * run trymmckernboot - Try to load and boot kernel image ${mmckernfile} * run trymmckerninitrdboot - Try to load and boot kernel image ${mmckernfile} - with initrd image ${mmcinitrdfile} + with initrd image ${mmcinitrdfile} Additional variables for loading files from mmc: diff --git a/doc/README.p1010rdb b/doc/README.p1010rdb index dee63d713a..6b2b5ff3fb 100644 --- a/doc/README.p1010rdb +++ b/doc/README.p1010rdb @@ -185,7 +185,6 @@ Switch from NAND to NOR boot with Core/CCB/DDR (800/400/667 MHz): => reset - Boot Linux from network using TFTP on P1010RDB ============================================== Place uImage, p1010rdb.dtb and rootfs files in the TFTP disk area. diff --git a/doc/README.qemu-mips b/doc/README.qemu-mips index 1fdfbab677..a192752f4d 100644 --- a/doc/README.qemu-mips +++ b/doc/README.qemu-mips @@ -15,7 +15,6 @@ recent qemu versions. When using emulated flash, launch with -pflash <filename> and erase mips_bios.bin. - Notes for the Qemu MIPS port ---------------------------- diff --git a/doc/README.ramboot-ppc85xx b/doc/README.ramboot-ppc85xx index 8ed45fb46d..5cc546a36f 100644 --- a/doc/README.ramboot-ppc85xx +++ b/doc/README.ramboot-ppc85xx @@ -23,11 +23,11 @@ methods could be handy. the board.And then execute the bootloader from DDR. Some usecases where this may be used: - While developing some new feature of u-boot, for example USB driver or - SPI driver. - Suppose the board already has a working bootloader on it. And you would - prefer to keep it intact, at the same time want to test your bootloader. - In this case you can get your test bootloader binary into DDR via tftp - for example. Then execute the test bootloader. + SPI driver. + Suppose the board already has a working bootloader on it. And you would + prefer to keep it intact, at the same time want to test your bootloader. + In this case you can get your test bootloader binary into DDR via tftp + for example. Then execute the test bootloader. - Suppose a platform already has a propreitery bootloader which does not support for example AMP boot. In this case also RAM boot loader can be utilized. diff --git a/doc/README.trace b/doc/README.trace index 8106290ed9..f0c9699773 100644 --- a/doc/README.trace +++ b/doc/README.trace @@ -63,20 +63,20 @@ In: serial Out: serial Err: serial =>trace stats - 671,406 function sites - 69,712 function calls - 0 untracked function calls - 73,373 traced function calls - 16 maximum observed call depth - 15 call depth limit - 66,491 calls not traced due to depth + 671,406 function sites + 69,712 function calls + 0 untracked function calls + 73,373 traced function calls + 16 maximum observed call depth + 15 call depth limit + 66,491 calls not traced due to depth =>trace stats - 671,406 function sites + 671,406 function sites 1,279,450 function calls - 0 untracked function calls - 950,490 traced function calls (333217 dropped due to overflow) - 16 maximum observed call depth - 15 call depth limit + 0 untracked function calls + 950,490 traced function calls (333217 dropped due to overflow) + 16 maximum observed call depth + 15 call depth limit 1,275,767 calls not traced due to depth =>trace calls 0 e00000 Call list dumped to 00000000, size 0xae0a40 diff --git a/doc/README.ubi b/doc/README.ubi index 3cf4ef232d..9efab6cdc9 100644 --- a/doc/README.ubi +++ b/doc/README.ubi @@ -14,6 +14,8 @@ ubi part [part] [offset] ubi info [l[ayout]] - Display volume and ubi layout information ubi create[vol] volume [size] [type] - create volume name with size ubi write[vol] address volume size - Write volume from address with size +ubi write.part address volume size [fullsize] + - Write part of a volume from address ubi read[vol] address volume [size] - Read volume to address with size ubi remove[vol] volume - Remove volume [Legends] @@ -77,6 +79,7 @@ ubi createvol Create UBI volume on UBI device ubi removevol Remove UBI volume from UBI device ubi read Read data from UBI volume to memory ubi write Write data from memory to UBI volume +ubi write.part Write data from memory to UBI volume, in parts Here a few examples on the usage: @@ -185,8 +188,8 @@ ubifsls [directory] For example: => ubifsls - 17442 Thu Jan 01 02:57:38 1970 imx28-evk.dtb - 2998146 Thu Jan 01 02:57:43 1970 zImage + 17442 Thu Jan 01 02:57:38 1970 imx28-evk.dtb + 2998146 Thu Jan 01 02:57:43 1970 zImage And the ubifsload command allows you to load a file from a UBI diff --git a/doc/README.zfs b/doc/README.zfs index f5998f2f88..7f237c4076 100644 --- a/doc/README.zfs +++ b/doc/README.zfs @@ -7,20 +7,20 @@ Steps to test: 1. After applying the patch, zfs specific commands can be seen in the boot loader prompt using - UBOOT #help + UBOOT #help - zfsload- load binary file from a ZFS file system - zfsls - list files in a directory (default /) + zfsload- load binary file from a ZFS file system + zfsls - list files in a directory (default /) 2. To list the files in zfs pool, device or partition, execute - zfsls <interface> <dev[:part]> [POOL/@/dir/file] - For example: - UBOOT #zfsls mmc 0:5 /rpool/@/usr/bin/ + zfsls <interface> <dev[:part]> [POOL/@/dir/file] + For example: + UBOOT #zfsls mmc 0:5 /rpool/@/usr/bin/ 3. To read and load a file from an ZFS formatted partition to RAM, execute - zfsload <interface> <dev[:part]> [addr] [filename] [bytes] - For example: - UBOOT #zfsload mmc 2:2 0x30007fc0 /rpool/@/boot/uImage + zfsload <interface> <dev[:part]> [addr] [filename] [bytes] + For example: + UBOOT #zfsload mmc 2:2 0x30007fc0 /rpool/@/boot/uImage References : -- ZFS GRUB sources from Solaris GRUB-0.97 diff --git a/doc/driver-model/UDM-block.txt b/doc/driver-model/UDM-block.txt index b42ec69c94..ffbbdf3a7a 100644 --- a/doc/driver-model/UDM-block.txt +++ b/doc/driver-model/UDM-block.txt @@ -218,7 +218,6 @@ II) Approach in near future. - III) Analysis of in-tree drivers -------------------------------- diff --git a/doc/driver-model/UDM-cores.txt b/doc/driver-model/UDM-cores.txt index 4e1318871a..60323335b8 100644 --- a/doc/driver-model/UDM-cores.txt +++ b/doc/driver-model/UDM-cores.txt @@ -94,12 +94,12 @@ Pavel Herrmann <morpheus.ibis@gmail.com> driver_activate(instance *inst); This call will recursively activate all devices necessary for using the specified device. the code could be simplified as: - { - if (is_activated(inst)) - return; - driver_activate(inst->bus); - get_driver(inst)->probe(inst); - } + { + if (is_activated(inst)) + return; + driver_activate(inst->bus); + get_driver(inst)->probe(inst); + } The case with multiple parents will need to be handled here as well. get_driver is an accessor to available drivers, which will get struct @@ -107,12 +107,12 @@ Pavel Herrmann <morpheus.ibis@gmail.com> i2c_write(instance *inst, ...); An actual call to some method of the driver. This code will look like: - { - driver_activate(inst); - struct instance *core = get_core_instance(CORE_I2C); - device_ops = get_ops(inst); - device_ops->write(...); - } + { + driver_activate(inst); + struct instance *core = get_core_instance(CORE_I2C); + device_ops = get_ops(inst); + device_ops->write(...); + } get_ops will not be an exported function, it will be internal and specific to the core, as it needs to know how are the ops stored, and what type diff --git a/doc/driver-model/UDM-design.txt b/doc/driver-model/UDM-design.txt index 185f477b06..9f03bbaad3 100644 --- a/doc/driver-model/UDM-design.txt +++ b/doc/driver-model/UDM-design.txt @@ -87,7 +87,7 @@ III) The drivers of the cores. FIXME: Should *cores[] be really struct driver, pointing to drivers that - represent the cores? Shouldn't it be core instance pointer? + represent the cores? Shouldn't it be core instance pointer? 2) Instantiation of a driver ---------------------------- @@ -101,7 +101,7 @@ III) The drivers functions. FIXME: We need some functions that will return list of busses of certain type - registered with the system so the user can find proper instance even if + registered with the system so the user can find proper instance even if he has no bus pointer (this will come handy if the user isn't registering the driver from board init function, but somewhere else). @@ -183,12 +183,12 @@ III) The drivers int driver_bind(struct instance *in) { ... - core_bind(&core_i2c_static_instance, in, i2c_bus_funcs); - ... + core_bind(&core_i2c_static_instance, in, i2c_bus_funcs); + ... } FIXME: What if we need to run-time determine, depending on some hardware - register, what kind of i2c_bus_funcs to pass? + register, what kind of i2c_bus_funcs to pass? This makes the i2c core aware of a new bus. The i2c_bus_funcs is a constant structure of functions any i2c bus driver must provide to work. This will @@ -196,7 +196,7 @@ III) The drivers the pointer to the instance of a core this driver provides function to. FIXME: Maybe replace "core-i2c" with CORE_I2C global pointer to an instance of - the core? + the core? 4) The instantiation of a core driver ------------------------------------- diff --git a/doc/driver-model/UDM-gpio.txt b/doc/driver-model/UDM-gpio.txt index 8ff0a965c7..87554dde68 100644 --- a/doc/driver-model/UDM-gpio.txt +++ b/doc/driver-model/UDM-gpio.txt @@ -56,11 +56,11 @@ II) Approach struct gpio_driver_ops { int (*gpio_request)(struct instance *i, unsigned gpio, - const char *label); + const char *label); int (*gpio_free)(struct instance *i, unsigned gpio); int (*gpio_direction_input)(struct instance *i, unsigned gpio); int (*gpio_direction_output)(struct instance *i, unsigned gpio, - int value); + int value); int (*gpio_get_value)(struct instance *i, unsigned gpio); void (*gpio_set_value)(struct instance *i, unsigned gpio, int value); } diff --git a/doc/driver-model/UDM-hwmon.txt b/doc/driver-model/UDM-hwmon.txt index cc5d529c3b..9048cc0f00 100644 --- a/doc/driver-model/UDM-hwmon.txt +++ b/doc/driver-model/UDM-hwmon.txt @@ -36,15 +36,15 @@ II) Approach In the UDM each hwmon driver would register itself by a function int hwmon_device_register(struct instance *i, - struct hwmon_device_ops *o); + struct hwmon_device_ops *o); The structure being defined as follows: struct hwmon_device_ops { - int (*read)(struct instance *i, int sensor, int reg); - int (*write)(struct instance *i, int sensor, int reg, - int val); - int (*get_temp)(struct instance *i, int sensor); + int (*read)(struct instance *i, int sensor, int reg); + int (*write)(struct instance *i, int sensor, int reg, + int val); + int (*get_temp)(struct instance *i, int sensor); }; diff --git a/doc/driver-model/UDM-mmc.txt b/doc/driver-model/UDM-mmc.txt index bed430643b..1f07d874ea 100644 --- a/doc/driver-model/UDM-mmc.txt +++ b/doc/driver-model/UDM-mmc.txt @@ -107,7 +107,7 @@ struct mmc { /* DRIVER: Function used to submit command to the card */ int (*send_cmd)(struct mmc *mmc, - struct mmc_cmd *cmd, struct mmc_data *data); + struct mmc_cmd *cmd, struct mmc_data *data); /* DRIVER: Function used to configure the host */ void (*set_ios)(struct mmc *mmc); @@ -139,7 +139,7 @@ provided by the MMC driver: struct mmc_driver_ops { /* Function used to submit command to the card */ int (*send_cmd)(struct mmc *mmc, - struct mmc_cmd *cmd, struct mmc_data *data); + struct mmc_cmd *cmd, struct mmc_data *data); /* DRIVER: Function used to configure the host */ void (*set_ios)(struct mmc *mmc); /* Function used to initialize the host */ @@ -206,7 +206,7 @@ struct mmc_card_props { The probe() function will then register the MMC driver by calling: mmc_device_register(struct instance *i, struct mmc_driver_ops *o, - struct mmc_driver_params *p); + struct mmc_driver_params *p); The struct mmc_driver_params will have to be dynamic in some cases, but the driver shouldn't modify it's contents elsewhere than in probe() call. diff --git a/doc/driver-model/UDM-power.txt b/doc/driver-model/UDM-power.txt index 9ac1a5fbb5..015c7737f6 100644 --- a/doc/driver-model/UDM-power.txt +++ b/doc/driver-model/UDM-power.txt @@ -57,20 +57,20 @@ III) Analysis of in-tree drivers All methods of this file are moved to another location. void ftpmu010_32768osc_enable(void): Move to boards hacks void ftpmu010_mfpsr_select_dev(unsigned int dev): Move to board file - arch/nds32/lib/board.c + arch/nds32/lib/board.c void ftpmu010_mfpsr_diselect_dev(unsigned int dev): Dead code void ftpmu010_dlldis_disable(void): Dead code void ftpmu010_sdram_clk_disable(unsigned int cr0): Move to board file - arch/nds32/lib/board.c + arch/nds32/lib/board.c void ftpmu010_sdramhtc_set(unsigned int val): Move to board file - arch/nds32/lib/board.c + arch/nds32/lib/board.c 2) twl4030.c ------------ All methods of this file are moved to another location. void twl4030_power_reset_init(void): Move to board hacks void twl4030_pmrecv_vsel_cfg(u8 vsel_reg, u8 vsel_val, u8 dev_grp, - u8 dev_grp_sel): Move to board hacks + u8 dev_grp_sel): Move to board hacks void twl4030_power_init(void): Move to board hacks void twl4030_power_mmc_init(void): Move to board hacks @@ -83,6 +83,6 @@ III) Analysis of in-tree drivers int twl6030_get_battery_voltage(void): Convert to new API void twl6030_init_battery_charging(void): Convert to new API void twl6030_power_mmc_init(): Move to board file - drivers/mmc/omap_hsmmc.c + drivers/mmc/omap_hsmmc.c void twl6030_usb_device_settings(): Move to board file - drivers/usb/musb/omap3.c + drivers/usb/musb/omap3.c diff --git a/doc/driver-model/UDM-rtc.txt b/doc/driver-model/UDM-rtc.txt index 6aaeb86f27..8391f38723 100644 --- a/doc/driver-model/UDM-rtc.txt +++ b/doc/driver-model/UDM-rtc.txt @@ -12,15 +12,15 @@ U-Boot currently implements one common API for RTC devices. The interface is defined in include/rtc.h and comprises of functions and structures: struct rtc_time { - int tm_sec; - int tm_min; - int tm_hour; - int tm_mday; - int tm_mon; - int tm_year; - int tm_wday; - int tm_yday; - int tm_isdst; + int tm_sec; + int tm_min; + int tm_hour; + int tm_mday; + int tm_mon; + int tm_year; + int tm_wday; + int tm_yday; + int tm_isdst; }; int rtc_get (struct rtc_time *); @@ -42,14 +42,14 @@ II) Approach In the UDM each rtc driver would register itself by a function int rtc_device_register(struct instance *i, - struct rtc_device_ops *o); + struct rtc_device_ops *o); The structure being defined as follows: struct rtc_device_ops { - int (*get_time)(struct instance *i, struct rtc_time *t); - int (*set_time)(struct instance *i, struct rtc_time *t); - int (*reset)(struct instance *i); + int (*get_time)(struct instance *i, struct rtc_time *t); + int (*set_time)(struct instance *i, struct rtc_time *t); + int (*reset)(struct instance *i); }; diff --git a/doc/driver-model/UDM-spi.txt b/doc/driver-model/UDM-spi.txt index 7442a32bd0..6e6acc8787 100644 --- a/doc/driver-model/UDM-spi.txt +++ b/doc/driver-model/UDM-spi.txt @@ -15,12 +15,12 @@ I) Overview void spi_init(void); struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, - unsigned int max_hz, unsigned int mode); + unsigned int max_hz, unsigned int mode); void spi_free_slave(struct spi_slave *slave); int spi_claim_bus(struct spi_slave *slave); void spi_release_bus(struct spi_slave *slave); int spi_xfer(struct spi_slave *slave, unsigned int bitlen, - const void *dout, void *din, unsigned long flags); + const void *dout, void *din, unsigned long flags); int spi_cs_is_valid(unsigned int bus, unsigned int cs); void spi_cs_activate(struct spi_slave *slave); void spi_cs_deactivate(struct spi_slave *slave); @@ -69,13 +69,13 @@ II) Approach struct ops { int (*spi_request_bus)(struct instance *i, unsigned int bus, - unsigned int cs, unsigned int max_hz, - unsigned int mode); + unsigned int cs, unsigned int max_hz, + unsigned int mode); void (*spi_release_bus)(struct instance *i); int (*spi_xfer) (struct instance *i, unsigned int bitlen, - const void *dout, void *din, unsigned long flags); + const void *dout, void *din, unsigned long flags); int (*spi_cs_is_valid)(struct instance *i, unsigned int bus, - unsigned int cs); + unsigned int cs); void (*spi_cs_activate)(struct instance *i); void (*spi_cs_deactivate)(struct instance *i); void (*spi_set_speed)(struct instance *i, uint hz); diff --git a/doc/driver-model/UDM-stdio.txt b/doc/driver-model/UDM-stdio.txt index a6c484f37c..c0b1c90b29 100644 --- a/doc/driver-model/UDM-stdio.txt +++ b/doc/driver-model/UDM-stdio.txt @@ -17,29 +17,29 @@ Each device that wants to register with STDIO subsystem has to define struct stdio_dev, defined in include/stdio_dev.h and containing the following fields: struct stdio_dev { - int flags; /* Device flags: input/output/system */ - int ext; /* Supported extensions */ - char name[16]; /* Device name */ + int flags; /* Device flags: input/output/system */ + int ext; /* Supported extensions */ + char name[16]; /* Device name */ /* GENERAL functions */ - int (*start) (void); /* To start the device */ - int (*stop) (void); /* To stop the device */ + int (*start) (void); /* To start the device */ + int (*stop) (void); /* To stop the device */ /* OUTPUT functions */ - void (*putc) (const char c); /* To put a char */ - void (*puts) (const char *s); /* To put a string (accelerator) */ + void (*putc) (const char c); /* To put a char */ + void (*puts) (const char *s); /* To put a string (accelerator) */ /* INPUT functions */ - int (*tstc) (void); /* To test if a char is ready... */ - int (*getc) (void); /* To get that char */ + int (*tstc) (void); /* To test if a char is ready... */ + int (*getc) (void); /* To get that char */ /* Other functions */ - void *priv; /* Private extensions */ - struct list_head list; + void *priv; /* Private extensions */ + struct list_head list; }; Currently used flags are DEV_FLAGS_INPUT, DEV_FLAGS_OUTPUT and DEV_FLAGS_SYSTEM, @@ -139,13 +139,13 @@ II) Approach purpose. The following flags will be defined: STDIO_FLG_STDIN ..... This device will be used as an input device. All input - from all devices with this flag set will be received + from all devices with this flag set will be received and passed to the upper layers. STDIO_FLG_STDOUT .... This device will be used as an output device. All - output sent to stdout will be routed to all devices + output sent to stdout will be routed to all devices with this flag set. STDIO_FLG_STDERR .... This device will be used as an standard error output - device. All output sent to stderr will be routed to + device. All output sent to stderr will be routed to all devices with this flag set. The "list" member of this structure allows to have a linked list of all diff --git a/doc/driver-model/UDM-tpm.txt b/doc/driver-model/UDM-tpm.txt index 91a953a72e..0beff4a857 100644 --- a/doc/driver-model/UDM-tpm.txt +++ b/doc/driver-model/UDM-tpm.txt @@ -14,7 +14,7 @@ controlling it is very much based on this. The API is very simple: int tis_open(void); int tis_close(void); int tis_sendrecv(const u8 *sendbuf, size_t send_size, - u8 *recvbuf, size_t *recv_len); + u8 *recvbuf, size_t *recv_len); The command operating the TPM chip only provides operations to send and receive bytes from the chip. diff --git a/doc/driver-model/UDM-watchdog.txt b/doc/driver-model/UDM-watchdog.txt index 7db328639f..7948e59260 100644 --- a/doc/driver-model/UDM-watchdog.txt +++ b/doc/driver-model/UDM-watchdog.txt @@ -41,13 +41,13 @@ II) Approach In the UDM each watchdog driver would register itself by a function int watchdog_device_register(struct instance *i, - const struct watchdog_device_ops *o); + const struct watchdog_device_ops *o); The structure being defined as follows: struct watchdog_device_ops { - int (*disable)(struct instance *i); - void (*reset)(struct instance *i); + int (*disable)(struct instance *i); + void (*reset)(struct instance *i); }; The watchdog_init() function will be dissolved into probe() function. diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index 8cc9379b82..0daad364d7 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -113,7 +113,7 @@ int __weak ahci_link_up(struct ahci_probe_ent *probe_ent, u8 port) int j = 0; u8 *port_mmio = (u8 *)probe_ent->port[port].port_mmio; - /* + /* * Bring up SATA link. * SATA link bringup time is usually less than 1 ms; only very * rarely has it taken between 1-2 ms. Never seen it above 2 ms. diff --git a/drivers/fpga/zynqpl.c b/drivers/fpga/zynqpl.c index 14363c9a5b..717c0394ca 100644 --- a/drivers/fpga/zynqpl.c +++ b/drivers/fpga/zynqpl.c @@ -4,7 +4,7 @@ * (C) Copyright 2012 * Joe Hershberger <joe.hershberger@ni.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/input/i8042.c b/drivers/input/i8042.c index 8a1e22e8df..35fa0bb504 100644 --- a/drivers/input/i8042.c +++ b/drivers/input/i8042.c @@ -2,7 +2,7 @@ * (C) Copyright 2002 ELTEC Elektronik AG * Frank Gottschling <fgottschling@eltec.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* i8042.c - Intel 8042 keyboard driver routines */ diff --git a/drivers/misc/status_led.c b/drivers/misc/status_led.c index 6b71ad4f25..ed9adb21d6 100644 --- a/drivers/misc/status_led.c +++ b/drivers/misc/status_led.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2003 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 49c08145a7..0a38fbef14 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -217,11 +217,23 @@ int mtd_erase(struct mtd_info *mtd, struct erase_info *instr) int mtd_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { + int ret_code; if (from < 0 || from > mtd->size || len > mtd->size - from) return -EINVAL; if (!len) return 0; - return mtd->_read(mtd, from, len, retlen, buf); + + /* + * In the absence of an error, drivers return a non-negative integer + * representing the maximum number of bitflips that were corrected on + * any one ecc region (if applicable; zero otherwise). + */ + ret_code = mtd->_read(mtd, from, len, retlen, buf); + if (unlikely(ret_code < 0)) + return ret_code; + if (mtd->ecc_strength == 0) + return 0; /* device lacks ecc */ + return ret_code >= mtd->bitflip_threshold ? -EUCLEAN : 0; } int mtd_write(struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, @@ -376,4 +388,3 @@ int mtd_block_markbad(struct mtd_info *mtd, loff_t ofs) return -EROFS; return mtd->_block_markbad(mtd, ofs); } - diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c index 9dfe7bbc9a..146ce11eb1 100644 --- a/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c @@ -53,12 +53,12 @@ static int part_read(struct mtd_info *mtd, loff_t from, size_t len, stats = part->master->ecc_stats; res = mtd_read(part->master, from + part->offset, len, retlen, buf); - if (unlikely(res)) { - if (mtd_is_bitflip(res)) - mtd->ecc_stats.corrected += part->master->ecc_stats.corrected - stats.corrected; - if (mtd_is_eccerr(res)) - mtd->ecc_stats.failed += part->master->ecc_stats.failed - stats.failed; - } + if (unlikely(mtd_is_eccerr(res))) + mtd->ecc_stats.failed += + part->master->ecc_stats.failed - stats.failed; + else + mtd->ecc_stats.corrected += + part->master->ecc_stats.corrected - stats.corrected; return res; } diff --git a/drivers/mtd/nand/fsl_elbc_spl.c b/drivers/mtd/nand/fsl_elbc_spl.c index a7476b49bb..29521359a5 100644 --- a/drivers/mtd/nand/fsl_elbc_spl.c +++ b/drivers/mtd/nand/fsl_elbc_spl.c @@ -59,20 +59,20 @@ static int nand_load_image(uint32_t offs, unsigned int uboot_size, void *vdst) if (large) { fmr |= FMR_ECCM; out_be32(®s->fcr, (NAND_CMD_READ0 << FCR_CMD0_SHIFT) | - (NAND_CMD_READSTART << FCR_CMD1_SHIFT)); + (NAND_CMD_READSTART << FCR_CMD1_SHIFT)); out_be32(®s->fir, - (FIR_OP_CW0 << FIR_OP0_SHIFT) | - (FIR_OP_CA << FIR_OP1_SHIFT) | - (FIR_OP_PA << FIR_OP2_SHIFT) | - (FIR_OP_CW1 << FIR_OP3_SHIFT) | - (FIR_OP_RBW << FIR_OP4_SHIFT)); + (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_CA << FIR_OP1_SHIFT) | + (FIR_OP_PA << FIR_OP2_SHIFT) | + (FIR_OP_CW1 << FIR_OP3_SHIFT) | + (FIR_OP_RBW << FIR_OP4_SHIFT)); } else { out_be32(®s->fcr, NAND_CMD_READ0 << FCR_CMD0_SHIFT); out_be32(®s->fir, - (FIR_OP_CW0 << FIR_OP0_SHIFT) | - (FIR_OP_CA << FIR_OP1_SHIFT) | - (FIR_OP_PA << FIR_OP2_SHIFT) | - (FIR_OP_RBW << FIR_OP3_SHIFT)); + (FIR_OP_CW0 << FIR_OP0_SHIFT) | + (FIR_OP_CA << FIR_OP1_SHIFT) | + (FIR_OP_PA << FIR_OP2_SHIFT) | + (FIR_OP_RBW << FIR_OP3_SHIFT)); } out_be32(®s->fbcr, 0); diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index a0fe1e09ec..3ae0044f26 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c @@ -112,10 +112,10 @@ static void fun_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) fsl_upm_run_pattern(&fun->upm, fun->width, io_addr, mar); /* - * Some boards/chips needs this. At least the MPC8360E-RDK - * needs it. Probably weird chip, because I don't see any - * need for this on MPC8555E + Samsung K9F1G08U0A. Usually - * here are 0-2 unexpected busy states per block read. + * Some boards/chips needs this. At least the MPC8360E-RDK + * needs it. Probably weird chip, because I don't see any + * need for this on MPC8555E + Samsung K9F1G08U0A. Usually + * here are 0-2 unexpected busy states per block read. */ if (fun->wait_flags & FSL_UPM_WAIT_RUN_PATTERN) fun_wait(fun); diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 9e05cef417..1ce55fde8b 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -1238,6 +1238,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, mtd->oobavail : mtd->oobsize; uint8_t *bufpoi, *oob, *buf; + unsigned int max_bitflips = 0; stats = mtd->ecc_stats; @@ -1265,7 +1266,10 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, chip->cmdfunc(mtd, NAND_CMD_READ0, 0x00, page); - /* Now read the page into the buffer */ + /* + * Now read the page into the buffer. Absent an error, + * the read methods return max bitflips per ecc step. + */ if (unlikely(ops->mode == MTD_OPS_RAW)) ret = chip->ecc.read_page_raw(mtd, chip, bufpoi, oob_required, @@ -1284,15 +1288,19 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, break; } + max_bitflips = max_t(unsigned int, max_bitflips, ret); + /* Transfer not aligned data */ if (!aligned) { if (!NAND_HAS_SUBPAGE_READ(chip) && !oob && !(mtd->ecc_stats.failed - stats.failed) && - (ops->mode != MTD_OPS_RAW)) + (ops->mode != MTD_OPS_RAW)) { chip->pagebuf = realpage; - else + chip->pagebuf_bitflips = ret; + } else { /* Invalidate page cache */ chip->pagebuf = -1; + } memcpy(buf, chip->buffers->databuf + col, bytes); } @@ -1310,6 +1318,8 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, } else { memcpy(buf, chip->buffers->databuf + col, bytes); buf += bytes; + max_bitflips = max_t(unsigned int, max_bitflips, + chip->pagebuf_bitflips); } readlen -= bytes; @@ -1341,7 +1351,7 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, if (mtd->ecc_stats.failed - stats.failed) return -EBADMSG; - return mtd->ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0; + return max_bitflips; } /** @@ -3272,7 +3282,7 @@ int nand_scan_tail(struct mtd_info *mtd) case NAND_ECC_NONE: pr_warn("NAND_ECC_NONE selected by board driver. " - "This is not recommended !!\n"); + "This is not recommended !!\n"); chip->ecc.read_page = nand_read_page_raw; chip->ecc.write_page = nand_write_page_raw; chip->ecc.read_oob = nand_read_oob_std; diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c index f856778b5e..f3f0cb676d 100644 --- a/drivers/mtd/nand/nand_ids.c +++ b/drivers/mtd/nand/nand_ids.c @@ -180,4 +180,3 @@ const struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_EON, "Eon"}, {0x0, "Unknown"} }; - diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index d149a6dae6..5246bbf1ac 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -142,8 +142,8 @@ int nand_erase_opts(nand_info_t *meminfo, const nand_erase_options_t *opts) ops.mode = MTD_OPS_AUTO_OOB; result = mtd_write_oob(meminfo, - erase.addr, - &ops); + erase.addr, + &ops); if (result != 0) { printf("\n%s: MTD writeoob failure: %d\n", mtd_device, result); diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index ddfe7e7c75..067f8ef184 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -969,7 +969,8 @@ static int onenand_read_ops_nolock(struct mtd_info *mtd, loff_t from, if (mtd->ecc_stats.failed - stats.failed) return -EBADMSG; - return mtd->ecc_stats.corrected - stats.corrected ? -EUCLEAN : 0; + /* return max bitflips per ecc step; ONENANDs correct 1 bit only */ + return mtd->ecc_stats.corrected != stats.corrected ? 1 : 0; } /** diff --git a/drivers/mtd/ubi/crc32.c b/drivers/mtd/ubi/crc32.c index ab439b3e20..f1bebf58c1 100644 --- a/drivers/mtd/ubi/crc32.c +++ b/drivers/mtd/ubi/crc32.c @@ -102,7 +102,7 @@ u32 crc32_le(u32 crc, unsigned char const *p, size_t len) if((len >= 4)){ /* load data 32 bits wide, xor data 32 bits wide. */ size_t save_len = len & 3; - len = len >> 2; + len = len >> 2; --b; /* use pre increment below(*++b) for speed */ do { crc ^= *++b; @@ -200,7 +200,7 @@ u32 __attribute_pure__ crc32_be(u32 crc, unsigned char const *p, size_t len) if(likely(len >= 4)){ /* load data 32 bits wide, xor data 32 bits wide. */ size_t save_len = len & 3; - len = len >> 2; + len = len >> 2; --b; /* use pre increment below(*++b) for speed */ do { crc ^= *++b; diff --git a/drivers/net/dc2114x.c b/drivers/net/dc2114x.c index 994ebf2fc9..799839c4f1 100644 --- a/drivers/net/dc2114x.c +++ b/drivers/net/dc2114x.c @@ -1,5 +1,5 @@ /* - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index ffb8ea01dc..f7170e0554 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -17,7 +17,7 @@ V0.11 06/20/2001 REG_0A bit3=1, default enable BP with DA match R17 = (R17 & 0xfff0) | NF v1.00 modify by simon 2001.9.5 - change for kernel 2.4.x + change for kernel 2.4.x v1.1 11/09/2001 fix force mode bug diff --git a/drivers/net/plb2800_eth.c b/drivers/net/plb2800_eth.c index 8aefc14144..f869514f29 100644 --- a/drivers/net/plb2800_eth.c +++ b/drivers/net/plb2800_eth.c @@ -4,7 +4,7 @@ * (C) Copyright 2003 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> @@ -260,7 +260,7 @@ static int plb2800_eth_recv(struct eth_device *dev) printf("Received %d bytes\n", length); #endif NetReceive((void*)(NetRxPackets[rx_new]), - length - 4); + length - 4); } else { diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 987af39bc9..0a5209d2f8 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -4,7 +4,7 @@ * * Michal SIMEK <monstr@monstr.eu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index b3ed6eaaf6..236a75311f 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -6,7 +6,7 @@ * Based on Xilinx gmac driver: * (C) Copyright 2011 Xilinx * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/power/battery/Makefile b/drivers/power/battery/Makefile index 637d1ffb3e..4bf315da9b 100644 --- a/drivers/power/battery/Makefile +++ b/drivers/power/battery/Makefile @@ -10,6 +10,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libbattery.o COBJS-$(CONFIG_POWER_BATTERY_TRATS) += bat_trats.o +COBJS-$(CONFIG_POWER_BATTERY_TRATS2) += bat_trats2.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/power/battery/bat_trats2.c b/drivers/power/battery/bat_trats2.c new file mode 100644 index 0000000000..f2648329d4 --- /dev/null +++ b/drivers/power/battery/bat_trats2.c @@ -0,0 +1,65 @@ +/* + * Copyright (C) 2013 Samsung Electronics + * Piotr Wilczek <p.wilczek@samsung.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <power/pmic.h> +#include <power/battery.h> +#include <power/max8997_pmic.h> +#include <errno.h> + +static struct battery battery_trats; + +static int power_battery_charge(struct pmic *bat) +{ + struct power_battery *p_bat = bat->pbat; + + if (bat->chrg->chrg_state(p_bat->chrg, CHARGER_ENABLE, 450)) + return -1; + + return 0; +} + +static int power_battery_init_trats2(struct pmic *bat_, + struct pmic *fg_, + struct pmic *chrg_, + struct pmic *muic_) +{ + bat_->pbat->fg = fg_; + bat_->pbat->chrg = chrg_; + bat_->pbat->muic = muic_; + + bat_->fg = fg_->fg; + bat_->chrg = chrg_->chrg; + bat_->chrg->chrg_type = muic_->chrg->chrg_type; + return 0; +} + +static struct power_battery power_bat_trats2 = { + .bat = &battery_trats, + .battery_init = power_battery_init_trats2, + .battery_charge = power_battery_charge, +}; + +int power_bat_init(unsigned char bus) +{ + static const char name[] = "BAT_TRATS2"; + struct pmic *p = pmic_alloc(); + + if (!p) { + printf("%s: POWER allocation error!\n", __func__); + return -ENOMEM; + } + + debug("Board BAT init\n"); + + p->interface = PMIC_NONE; + p->name = name; + p->bus = bus; + + p->pbat = &power_bat_trats2; + return 0; +} diff --git a/drivers/power/mfd/Makefile b/drivers/power/mfd/Makefile new file mode 100644 index 0000000000..76a05daa67 --- /dev/null +++ b/drivers/power/mfd/Makefile @@ -0,0 +1,33 @@ +# +# Copyright (C) 2013 Samsung Electronics +# Piotr Wilczek <p.wilczek@samsung.com> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +include $(TOPDIR)/config.mk + +LIB := $(obj)libmfd.o + +COBJS-$(CONFIG_POWER_PMIC_MAX77693) += pmic_max77693.o +COBJS-$(CONFIG_POWER_MUIC_MAX77693) += muic_max77693.o +COBJS-$(CONFIG_POWER_FG_MAX77693) += fg_max77693.o + +COBJS := $(COBJS-y) +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +all: $(LIB) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################## diff --git a/drivers/power/mfd/fg_max77693.c b/drivers/power/mfd/fg_max77693.c new file mode 100644 index 0000000000..4519fed497 --- /dev/null +++ b/drivers/power/mfd/fg_max77693.c @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2013 Samsung Electronics + * Piotr Wilczek <p.wilczek@samsung.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <power/pmic.h> +#include <power/max77693_fg.h> +#include <i2c.h> +#include <power/power_chrg.h> +#include <power/battery.h> +#include <power/fg_battery_cell_params.h> +#include <errno.h> + +static int max77693_get_vcell(u32 *vcell) +{ + u16 value; + u8 ret; + + ret = i2c_read(MAX77693_FUEL_I2C_ADDR, MAX77693_VCELL, 1, + (u8 *)&value, 2); + if (ret) + return ret; + + *vcell = (u32)(value >> 3); + *vcell = *vcell * 625; + + return 0; +} + +static int max77693_get_soc(u32 *soc) +{ + u16 value; + u8 ret; + + ret = i2c_read(MAX77693_FUEL_I2C_ADDR, MAX77693_VFSOC, 1, + (u8 *)&value, 2); + if (ret) + return ret; + + *soc = (u32)(value >> 8); + + return 0; +} + +static int power_update_battery(struct pmic *p, struct pmic *bat) +{ + struct power_battery *pb = bat->pbat; + int ret; + + if (pmic_probe(p)) { + puts("Can't find max77693 fuel gauge\n"); + return -1; + } + + ret = max77693_get_soc(&pb->bat->state_of_chrg); + if (ret) + return ret; + + max77693_get_vcell(&pb->bat->voltage_uV); + if (ret) + return ret; + + return 0; +} + +static int power_check_battery(struct pmic *p, struct pmic *bat) +{ + struct power_battery *pb = bat->pbat; + unsigned int val; + int ret = 0; + + if (pmic_probe(p)) { + puts("Can't find max77693 fuel gauge\n"); + return -1; + } + + ret = pmic_reg_read(p, MAX77693_STATUS, &val); + if (ret) + return ret; + debug("fg status: 0x%x\n", val); + + ret = pmic_reg_read(p, MAX77693_VERSION, &pb->bat->version); + if (ret) + return ret; + + ret = power_update_battery(p, bat); + if (ret) + return ret; + debug("fg ver: 0x%x\n", pb->bat->version); + printf("BAT: state_of_charge(SOC):%d%%\n", + pb->bat->state_of_chrg); + + printf(" voltage: %d.%6.6d [V] (expected to be %d [mAh])\n", + pb->bat->voltage_uV / 1000000, + pb->bat->voltage_uV % 1000000, + pb->bat->capacity); + + if (pb->bat->voltage_uV > 3850000) + pb->bat->state = EXT_SOURCE; + else if (pb->bat->voltage_uV < 3600000 || pb->bat->state_of_chrg < 5) + pb->bat->state = CHARGE; + else + pb->bat->state = NORMAL; + + return 0; +} + +static struct power_fg power_fg_ops = { + .fg_battery_check = power_check_battery, + .fg_battery_update = power_update_battery, +}; + +int power_fg_init(unsigned char bus) +{ + static const char name[] = "MAX77693_FG"; + struct pmic *p = pmic_alloc(); + + if (!p) { + printf("%s: POWER allocation error!\n", __func__); + return -ENOMEM; + } + + debug("Board Fuel Gauge init\n"); + + p->name = name; + p->interface = PMIC_I2C; + p->number_of_regs = FG_NUM_OF_REGS; + p->hw.i2c.addr = MAX77693_FUEL_I2C_ADDR; + p->hw.i2c.tx_num = 2; + p->sensor_byte_order = PMIC_SENSOR_BYTE_ORDER_BIG; + p->bus = bus; + + p->fg = &power_fg_ops; + + return 0; +} diff --git a/drivers/power/mfd/muic_max77693.c b/drivers/power/mfd/muic_max77693.c new file mode 100644 index 0000000000..e71012de1f --- /dev/null +++ b/drivers/power/mfd/muic_max77693.c @@ -0,0 +1,77 @@ +/* + * Copyright (C) 2013 Samsung Electronics + * Piotr Wilczek <p.wilczek@samsung.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <power/pmic.h> +#include <power/power_chrg.h> +#include <power/max77693_muic.h> +#include <i2c.h> +#include <errno.h> + +static int power_chrg_get_type(struct pmic *p) +{ + unsigned int val; + unsigned int charge_type, charger; + + /* if probe failed, return cable none */ + if (pmic_probe(p)) + return CHARGER_NO; + + pmic_reg_read(p, MAX77693_MUIC_STATUS2, &val); + + charge_type = val & MAX77693_MUIC_CHG_MASK; + + switch (charge_type) { + case MAX77693_MUIC_CHG_NO: + charger = CHARGER_NO; + break; + case MAX77693_MUIC_CHG_USB: + case MAX77693_MUIC_CHG_USB_D: + charger = CHARGER_USB; + break; + case MAX77693_MUIC_CHG_TA: + case MAX77693_MUIC_CHG_TA_1A: + charger = CHARGER_TA; + break; + case MAX77693_MUIC_CHG_TA_500: + charger = CHARGER_TA_500; + break; + default: + charger = CHARGER_UNKNOWN; + break; + } + + return charger; +} + +static struct power_chrg power_chrg_muic_ops = { + .chrg_type = power_chrg_get_type, +}; + +int power_muic_init(unsigned int bus) +{ + static const char name[] = "MAX77693_MUIC"; + struct pmic *p = pmic_alloc(); + + if (!p) { + printf("%s: POWER allocation error!\n", __func__); + return -ENOMEM; + } + + debug("Board Micro USB Interface Controller init\n"); + + p->name = name; + p->interface = PMIC_I2C; + p->number_of_regs = MUIC_NUM_OF_REGS; + p->hw.i2c.addr = MAX77693_MUIC_I2C_ADDR; + p->hw.i2c.tx_num = 1; + p->bus = bus; + + p->chrg = &power_chrg_muic_ops; + + return 0; +} diff --git a/drivers/power/mfd/pmic_max77693.c b/drivers/power/mfd/pmic_max77693.c new file mode 100644 index 0000000000..1a4416b54f --- /dev/null +++ b/drivers/power/mfd/pmic_max77693.c @@ -0,0 +1,96 @@ +/* + * Copyright (C) 2013 Samsung Electronics + * Piotr Wilczek <p.wilczek@samsung.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> +#include <power/pmic.h> +#include <power/max77693_pmic.h> +#include <i2c.h> +#include <errno.h> + +static int max77693_charger_state(struct pmic *p, int state, int current) +{ + unsigned int val; + + if (pmic_probe(p)) + return -1; + + /* unlock write capability */ + val = MAX77693_CHG_UNLOCK; + pmic_reg_write(p, MAX77693_CHG_CNFG_06, val); + + if (state == CHARGER_DISABLE) { + puts("Disable the charger.\n"); + pmic_reg_read(p, MAX77693_CHG_CNFG_00, &val); + val &= ~0x01; + pmic_reg_write(p, MAX77693_CHG_CNFG_00, val); + return -1; + } + + if (current < CHARGER_MIN_CURRENT || current > CHARGER_MAX_CURRENT) { + printf("%s: Wrong charge current: %d [mA]\n", + __func__, current); + return -1; + } + + /* set charging current */ + pmic_reg_read(p, MAX77693_CHG_CNFG_02, &val); + val &= ~MAX77693_CHG_CC; + val |= current * 10 / 333; /* 0.1A/3 steps */ + pmic_reg_write(p, MAX77693_CHG_CNFG_02, val); + + /* enable charging */ + val = MAX77693_CHG_MODE_ON; + pmic_reg_write(p, MAX77693_CHG_CNFG_00, val); + + /* check charging current */ + pmic_reg_read(p, MAX77693_CHG_CNFG_02, &val); + val &= 0x3f; + printf("Enable the charger @ %d [mA]\n", val * 333 / 10); + + return 0; +} + +static int max77693_charger_bat_present(struct pmic *p) +{ + unsigned int val; + + if (pmic_probe(p)) + return -1; + + pmic_reg_read(p, MAX77693_CHG_INT_OK, &val); + + return !(val & MAX77693_CHG_DETBAT); +} + +static struct power_chrg power_chrg_pmic_ops = { + .chrg_bat_present = max77693_charger_bat_present, + .chrg_state = max77693_charger_state, +}; + +int pmic_init_max77693(unsigned char bus) +{ + static const char name[] = "MAX77693_PMIC"; + struct pmic *p = pmic_alloc(); + + if (!p) { + printf("%s: POWER allocation error!\n", __func__); + return -ENOMEM; + } + + debug("Board PMIC init\n"); + + p->name = name; + p->interface = PMIC_I2C; + p->number_of_regs = PMIC_NUM_OF_REGS; + p->hw.i2c.addr = MAX77693_PMIC_I2C_ADDR; + p->hw.i2c.tx_num = 1; + p->bus = bus; + + p->chrg = &power_chrg_pmic_ops; + + return 0; +} diff --git a/drivers/rtc/bfin_rtc.c b/drivers/rtc/bfin_rtc.c index 5de695384f..21a2189e27 100644 --- a/drivers/rtc/bfin_rtc.c +++ b/drivers/rtc/bfin_rtc.c @@ -68,7 +68,7 @@ int rtc_set(struct rtc_time *tmp) /* Calculate number of seconds this incoming time represents */ remain = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday, - tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); /* Figure out how many days since epoch */ days = remain / NUM_SECS_IN_DAY; diff --git a/drivers/rtc/pl031.c b/drivers/rtc/pl031.c index 11cc719828..c4d1259a89 100644 --- a/drivers/rtc/pl031.c +++ b/drivers/rtc/pl031.c @@ -73,7 +73,7 @@ int rtc_set(struct rtc_time *tmp) /* Calculate number of seconds this incoming time represents */ tim = mktime(tmp->tm_year, tmp->tm_mon, tmp->tm_mday, - tmp->tm_hour, tmp->tm_min, tmp->tm_sec); + tmp->tm_hour, tmp->tm_min, tmp->tm_sec); RTC_WRITE_REG(RTC_LR, tim); diff --git a/drivers/rtc/rs5c372.c b/drivers/rtc/rs5c372.c index 1a179beadd..65f45ea5e3 100644 --- a/drivers/rtc/rs5c372.c +++ b/drivers/rtc/rs5c372.c @@ -16,7 +16,7 @@ * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * published by the Free Software Foundation. */ #include <common.h> diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 348361a7fd..0d59c36151 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -110,10 +110,10 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, if (bitlen <= 16) { if (bitlen <= 4) spi->mode = (spi->mode & 0xff0fffff) | - (3 << 20); + (3 << 20); else spi->mode = (spi->mode & 0xff0fffff) | - ((bitlen - 1) << 20); + ((bitlen - 1) << 20); } else { spi->mode = (spi->mode & 0xff0fffff); /* Set up the next iteration if sending > 32 bits */ diff --git a/drivers/spi/omap3_spi.c b/drivers/spi/omap3_spi.c index 6bac245721..e80be8eaac 100644 --- a/drivers/spi/omap3_spi.c +++ b/drivers/spi/omap3_spi.c @@ -50,7 +50,7 @@ static void omap3_spi_write_chconf(struct omap3_spi_slave *ds, int val) static void omap3_spi_set_enable(struct omap3_spi_slave *ds, int enable) { writel(enable, &ds->regs->channel[ds->slave.cs].chctrl); - /* Flash post writes to make immediate effect */ + /* Flash post writes to make immediate effect */ readl(&ds->regs->channel[ds->slave.cs].chctrl); } @@ -83,7 +83,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, regs = (struct mcspi *)OMAP3_MCSPI2_BASE; break; #endif -#ifdef OMAP3_MCSPI3_BASE +#ifdef OMAP3_MCSPI3_BASE case 2: regs = (struct mcspi *)OMAP3_MCSPI3_BASE; break; @@ -253,9 +253,9 @@ int omap3_spi_write(struct spi_slave *slave, unsigned int len, const u8 *txp, writel(txp[i], &ds->regs->channel[ds->slave.cs].tx); } - /* wait to finish of transfer */ - while (!(readl(&ds->regs->channel[ds->slave.cs].chstat) & - OMAP3_MCSPI_CHSTAT_EOT)); + /* wait to finish of transfer */ + while (!(readl(&ds->regs->channel[ds->slave.cs].chstat) & + OMAP3_MCSPI_CHSTAT_EOT)); /* Disable the channel otherwise the next immediate RX will get affected */ omap3_spi_set_enable(ds,OMAP3_MCSPI_CHCTRL_DIS); @@ -359,7 +359,7 @@ int omap3_spi_txrx(struct spi_slave *slave, rxp[i] = readl(&ds->regs->channel[ds->slave.cs].rx); } /* Disable the channel */ - omap3_spi_set_enable(ds,OMAP3_MCSPI_CHCTRL_DIS); + omap3_spi_set_enable(ds,OMAP3_MCSPI_CHCTRL_DIS); /*if transfer must be terminated disable the channel*/ if (flags & SPI_XFER_END) { diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c index b34068a0bb..6ecdea3e14 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -9,7 +9,6 @@ * SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause */ - /* * The Mass Storage Function acts as a USB Mass Storage device, * appearing to the host as a disk drive or as a CD-ROM drive. In @@ -153,7 +152,6 @@ * <http://www.usb.org/developers/devclass_docs/usbmass-ufi10.pdf>. */ - /* * Driver Design * @@ -264,7 +262,6 @@ static const char fsg_string_interface[] = "Mass Storage"; - #define FSG_NO_INTR_EP 1 #define FSG_NO_DEVICE_STRINGS 1 #define FSG_NO_OTG 1 @@ -2629,8 +2626,6 @@ usb_copy_descriptors(struct usb_descriptor_header **src) return ret; } - - static void fsg_unbind(struct usb_configuration *c, struct usb_function *f) { struct fsg_dev *fsg = fsg_from_func(f); diff --git a/drivers/usb/gadget/mv_udc.c b/drivers/usb/gadget/mv_udc.c index 7574e31a8f..e6700a80fd 100644 --- a/drivers/usb/gadget/mv_udc.c +++ b/drivers/usb/gadget/mv_udc.c @@ -364,7 +364,7 @@ static void handle_ep_complete(struct mv_ep *ep) ep->desc = &ep0_out_desc; item = mv_get_qtd(num, in); mv_invalidate_qtd(num); - + if (item->info & 0xff) printf("EP%d/%s FAIL nfo=%x pg0=%x\n", num, in ? "in" : "out", item->info, item->page0); diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c index cead25dc5e..7ff4ffd880 100644 --- a/drivers/usb/host/sl811-hcd.c +++ b/drivers/usb/host/sl811-hcd.c @@ -16,7 +16,7 @@ * 2.Original SL811 driver (hc_sl811.o) by Pei Liu <pbl@cypress.com> * 3.Rewrited as sl811.o by Yin Aihua <yinah:couragetech.com.cn> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/usb/musb-new/Makefile b/drivers/usb/musb-new/Makefile index c23bef1cc2..626af3e8cd 100644 --- a/drivers/usb/musb-new/Makefile +++ b/drivers/usb/musb-new/Makefile @@ -36,4 +36,3 @@ include $(SRCTREE)/rules.mk sinclude $(obj).depend ######################################################################### - diff --git a/drivers/usb/phy/twl4030.c b/drivers/usb/phy/twl4030.c index 8f5d700aa6..6dcb336bbf 100644 --- a/drivers/usb/phy/twl4030.c +++ b/drivers/usb/phy/twl4030.c @@ -21,7 +21,7 @@ * * ------------------------------------------------------------------------ * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <twl4030.h> diff --git a/drivers/video/ati_radeon_fb.h b/drivers/video/ati_radeon_fb.h index 065904555f..9dd638bb9e 100644 --- a/drivers/video/ati_radeon_fb.h +++ b/drivers/video/ati_radeon_fb.h @@ -92,7 +92,7 @@ static inline void radeon_engine_flush (struct radeonfb_info *rinfo) /* initiate flush */ OUTREGP(RB2D_DSTCACHE_CTLSTAT, RB2D_DC_FLUSH_ALL, - ~RB2D_DC_FLUSH_ALL); + ~RB2D_DC_FLUSH_ALL); for (i=0; i < 2000000; i++) { if (!(INREG(RB2D_DSTCACHE_CTLSTAT) & RB2D_DC_BUSY)) diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index a3f7265df1..853303b5e5 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -3,7 +3,7 @@ * * Copyright (C) 2012 Atmel Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 4bc0f195fe..3cf008ce6b 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c @@ -3,7 +3,7 @@ * * Copyright (C) 2007 Atmel Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c index fd2885573c..a2946c71f6 100644 --- a/drivers/video/cfb_console.c +++ b/drivers/video/cfb_console.c @@ -2,7 +2,7 @@ * (C) Copyright 2002 ELTEC Elektronik AG * Frank Gottschling <fgottschling@eltec.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/drivers/video/exynos_dp.c b/drivers/video/exynos_dp.c index f5c34a980d..682483fc32 100644 --- a/drivers/video/exynos_dp.c +++ b/drivers/video/exynos_dp.c @@ -3,7 +3,7 @@ * * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/video/exynos_dp_lowlevel.c b/drivers/video/exynos_dp_lowlevel.c index ef11b466f6..bf0ea108e8 100644 --- a/drivers/video/exynos_dp_lowlevel.c +++ b/drivers/video/exynos_dp_lowlevel.c @@ -3,7 +3,7 @@ * * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/video/exynos_dp_lowlevel.h b/drivers/video/exynos_dp_lowlevel.h index ae2bcd646e..8651681520 100644 --- a/drivers/video/exynos_dp_lowlevel.h +++ b/drivers/video/exynos_dp_lowlevel.h @@ -3,7 +3,7 @@ * * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EXYNOS_EDP_LOWLEVEL_H diff --git a/drivers/video/exynos_fb.c b/drivers/video/exynos_fb.c index 5c7ec9199b..7d4c6e092d 100644 --- a/drivers/video/exynos_fb.c +++ b/drivers/video/exynos_fb.c @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/video/exynos_fb.h b/drivers/video/exynos_fb.h index 00cf60c45f..2c2f94bd03 100644 --- a/drivers/video/exynos_fb.h +++ b/drivers/video/exynos_fb.h @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EXYNOS_FB_H_ diff --git a/drivers/video/exynos_fimd.c b/drivers/video/exynos_fimd.c index 8c2de4ed29..f962c4f0a6 100644 --- a/drivers/video/exynos_fimd.c +++ b/drivers/video/exynos_fimd.c @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <config.h> diff --git a/drivers/video/exynos_mipi_dsi.c b/drivers/video/exynos_mipi_dsi.c index 3e7158d30e..8bb8feaa9c 100644 --- a/drivers/video/exynos_mipi_dsi.c +++ b/drivers/video/exynos_mipi_dsi.c @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/video/exynos_mipi_dsi_common.c b/drivers/video/exynos_mipi_dsi_common.c index 97e12484fd..925d51500a 100644 --- a/drivers/video/exynos_mipi_dsi_common.c +++ b/drivers/video/exynos_mipi_dsi_common.c @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/video/exynos_mipi_dsi_common.h b/drivers/video/exynos_mipi_dsi_common.h index ef6510abdd..98eb78e5f0 100644 --- a/drivers/video/exynos_mipi_dsi_common.h +++ b/drivers/video/exynos_mipi_dsi_common.h @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <linux/fb.h> diff --git a/drivers/video/exynos_mipi_dsi_lowlevel.c b/drivers/video/exynos_mipi_dsi_lowlevel.c index 1313bcea4c..fcfdc8d120 100644 --- a/drivers/video/exynos_mipi_dsi_lowlevel.c +++ b/drivers/video/exynos_mipi_dsi_lowlevel.c @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/video/exynos_mipi_dsi_lowlevel.h b/drivers/video/exynos_mipi_dsi_lowlevel.h index 59f6ce09e4..0bede25e4d 100644 --- a/drivers/video/exynos_mipi_dsi_lowlevel.h +++ b/drivers/video/exynos_mipi_dsi_lowlevel.h @@ -4,7 +4,7 @@ * Author: InKi Dae <inki.dae@samsung.com> * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _EXYNOS_MIPI_DSI_LOWLEVEL_H diff --git a/drivers/video/mpc8xx_lcd.c b/drivers/video/mpc8xx_lcd.c index f54b4834ff..fceed871a7 100644 --- a/drivers/video/mpc8xx_lcd.c +++ b/drivers/video/mpc8xx_lcd.c @@ -2,7 +2,7 @@ * (C) Copyright 2001-2002 * Wolfgang Denk, DENX Software Engineering -- wd@denx.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************/ diff --git a/drivers/video/pxa_lcd.c b/drivers/video/pxa_lcd.c index 8ed52c0202..e19f6ac7d8 100644 --- a/drivers/video/pxa_lcd.c +++ b/drivers/video/pxa_lcd.c @@ -4,7 +4,7 @@ * (C) Copyright 2001-2002 * Wolfgang Denk, DENX Software Engineering -- wd@denx.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************/ diff --git a/drivers/video/s6e8ax0.c b/drivers/video/s6e8ax0.c index 0e97f511fd..84948177e2 100644 --- a/drivers/video/s6e8ax0.c +++ b/drivers/video/s6e8ax0.c @@ -3,7 +3,7 @@ * * Author: Donghwa Lee <dh09.lee@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/video/sed156x.c b/drivers/video/sed156x.c index f324354c39..2c906ecf1e 100644 --- a/drivers/video/sed156x.c +++ b/drivers/video/sed156x.c @@ -4,7 +4,7 @@ * Pantelis Antoniou <panto@intracom.gr> * Intracom S.A. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/video/videomodes.c b/drivers/video/videomodes.c index d459ef07e9..18c1f3d8ac 100644 --- a/drivers/video/videomodes.c +++ b/drivers/video/videomodes.c @@ -3,7 +3,7 @@ * Pierre Aubert, Staubli Faverges , <p.aubert@staubli.com> * Copyright 2011 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/drivers/video/videomodes.h b/drivers/video/videomodes.h index 9fbe50b0f8..d83993a563 100644 --- a/drivers/video/videomodes.h +++ b/drivers/video/videomodes.h @@ -2,7 +2,7 @@ * (C) Copyright 2004 * Pierre Aubert, Staubli Faverges , <p.aubert@staubli.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/watchdog/s5p_wdt.c b/drivers/watchdog/s5p_wdt.c index b3b5834bb6..a6e54d9f77 100644 --- a/drivers/watchdog/s5p_wdt.c +++ b/drivers/watchdog/s5p_wdt.c @@ -2,7 +2,7 @@ * Copyright (C) 2012 Samsung Electronics * Minkyu Kang <mk7.kang@samsung.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 9acf243eef..67f115f2e8 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -771,7 +771,7 @@ static int mount_ubifs(struct ubifs_info *c) dbg_msg("node sizes: ref %zu, cmt. start %zu, orph %zu", UBIFS_REF_NODE_SZ, UBIFS_CS_NODE_SZ, UBIFS_ORPH_NODE_SZ); dbg_msg("max. node sizes: data %zu, inode %zu dentry %zu", - UBIFS_MAX_DATA_NODE_SZ, UBIFS_MAX_INO_NODE_SZ, + UBIFS_MAX_DATA_NODE_SZ, UBIFS_MAX_INO_NODE_SZ, UBIFS_MAX_DENT_NODE_SZ); dbg_msg("dead watermark: %d", c->dead_wm); dbg_msg("dark watermark: %d", c->dark_wm); diff --git a/include/armcoremodule.h b/include/armcoremodule.h index b8ba36be50..cc6f2b4d3b 100644 --- a/include/armcoremodule.h +++ b/include/armcoremodule.h @@ -6,7 +6,7 @@ * No standalonw port yet available * - this file is included by both integratorap.h & integratorcp.h * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ARMCOREMODULE_H diff --git a/include/common.h b/include/common.h index bed43168fe..409515f498 100644 --- a/include/common.h +++ b/include/common.h @@ -2,7 +2,7 @@ * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __COMMON_H_ diff --git a/include/configs/APC405.h b/include/configs/APC405.h index 37bcac32c7..7373c61082 100644 --- a/include/configs/APC405.h +++ b/include/configs/APC405.h @@ -5,7 +5,7 @@ * (C) Copyright 2001-2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/AR405.h b/include/configs/AR405.h index 11051798b6..b0206f5d79 100644 --- a/include/configs/AR405.h +++ b/include/configs/AR405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/ASH405.h b/include/configs/ASH405.h index 54de966741..a93d0c1037 100644 --- a/include/configs/ASH405.h +++ b/include/configs/ASH405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2003 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/Adder.h b/include/configs/Adder.h index 1a159ad4ab..302d93fbe2 100644 --- a/include/configs/Adder.h +++ b/include/configs/Adder.h @@ -5,7 +5,7 @@ * Support for Analogue&Micro Adder boards family. * Tested on AdderII and Adder87x. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H #define __CONFIG_H diff --git a/include/configs/AdderUSB.h b/include/configs/AdderUSB.h index b2435810b4..ef76ce4cfc 100644 --- a/include/configs/AdderUSB.h +++ b/include/configs/AdderUSB.h @@ -4,7 +4,7 @@ * * Provides support for USB console on the Analogue & Micro Adder87x * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __ADDERUSB__ diff --git a/include/configs/BC3450.h b/include/configs/BC3450.h index 0c5091957f..fd9728ebdc 100644 --- a/include/configs/BC3450.h +++ b/include/configs/BC3450.h @@ -13,7 +13,7 @@ * History: * 1.1 - add define CONFIG_ZERO_BOOTDELAY_CHECK * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/CATcenter.h b/include/configs/CATcenter.h index 3906863f05..47aec5f06c 100644 --- a/include/configs/CATcenter.h +++ b/include/configs/CATcenter.h @@ -12,7 +12,7 @@ * * Credits: Stefan Roese, Wolfgang Denk * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CMS700.h b/include/configs/CMS700.h index 323eac3fb4..bd5d4e904b 100644 --- a/include/configs/CMS700.h +++ b/include/configs/CMS700.h @@ -2,7 +2,7 @@ * (C) Copyright 2005 * Matthias Fuchs, esd gmbh germany, matthias.fuchs@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CPC45.h b/include/configs/CPC45.h index 9a083b7204..a01592168d 100644 --- a/include/configs/CPC45.h +++ b/include/configs/CPC45.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CPCI2DP.h b/include/configs/CPCI2DP.h index bd9fd6ee7b..f522d45090 100644 --- a/include/configs/CPCI2DP.h +++ b/include/configs/CPCI2DP.h @@ -2,7 +2,7 @@ * (C) Copyright 2005 * Matthias Fuchs, esd gmbh germany, matthias.fuchs@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CPCI405.h b/include/configs/CPCI405.h index 94ef16e06c..ca716a2a7d 100644 --- a/include/configs/CPCI405.h +++ b/include/configs/CPCI405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index 8383c19359..e11e85fc1b 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CPCI405AB.h b/include/configs/CPCI405AB.h index ec9f5aec4a..44e691eaf2 100644 --- a/include/configs/CPCI405AB.h +++ b/include/configs/CPCI405AB.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2003 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CPCI405DT.h b/include/configs/CPCI405DT.h index ba926abdc0..746b076912 100644 --- a/include/configs/CPCI405DT.h +++ b/include/configs/CPCI405DT.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CPCI750.h b/include/configs/CPCI750.h index cd2fa9514f..0d561c7e85 100644 --- a/include/configs/CPCI750.h +++ b/include/configs/CPCI750.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CPU87.h b/include/configs/CPU87.h index 7bbcb77af7..d975f0daad 100644 --- a/include/configs/CPU87.h +++ b/include/configs/CPU87.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/CRAYL1.h b/include/configs/CRAYL1.h index fa3efabea4..781a3b4d1d 100644 --- a/include/configs/CRAYL1.h +++ b/include/configs/CRAYL1.h @@ -3,7 +3,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * David Updegraff, Cray, Inc. dave@cray.com: our 405 is walnut-lite.. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* * board/config.h - configuration options, board specific diff --git a/include/configs/DB64360.h b/include/configs/DB64360.h index 2000a88805..bd230eceb0 100644 --- a/include/configs/DB64360.h +++ b/include/configs/DB64360.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/DB64460.h b/include/configs/DB64460.h index e0f7e46728..9f24eafd95 100644 --- a/include/configs/DB64460.h +++ b/include/configs/DB64460.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/DP405.h b/include/configs/DP405.h index 872a2b4408..8155caa5ed 100644 --- a/include/configs/DP405.h +++ b/include/configs/DP405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2003 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/DU405.h b/include/configs/DU405.h index 5b9e0d2f41..b7764d4bc2 100644 --- a/include/configs/DU405.h +++ b/include/configs/DU405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/DU440.h b/include/configs/DU440.h index 08271132dc..5ffa6e4b44 100644 --- a/include/configs/DU440.h +++ b/include/configs/DU440.h @@ -223,7 +223,7 @@ "flash_self=run ramargs addip addtty optargs;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${img};run nfsargs addip addtty optargs;" \ - "bootm\0" \ + "bootm\0" \ "rootpath=/tftpboot/du440/target_root_du440\0" \ "img=/tftpboot/du440/uImage\0" \ "kernel_addr=FFC00000\0" \ diff --git a/include/configs/EP88x.h b/include/configs/EP88x.h index 1d9d0df5a9..6678fc21c7 100644 --- a/include/configs/EP88x.h +++ b/include/configs/EP88x.h @@ -5,7 +5,7 @@ * Support for Embedded Planet EP88x boards. * Tested on EP88xC with MPC885 CPU, 64MB SDRAM and 16MB flash. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H #define __CONFIG_H diff --git a/include/configs/EXBITGEN.h b/include/configs/EXBITGEN.h index d1b9f97b2e..c9cc0d075e 100644 --- a/include/configs/EXBITGEN.h +++ b/include/configs/EXBITGEN.h @@ -2,7 +2,7 @@ * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/FLAGADM.h b/include/configs/FLAGADM.h index a5d1a9c9d3..1c385f1097 100644 --- a/include/configs/FLAGADM.h +++ b/include/configs/FLAGADM.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/G2000.h b/include/configs/G2000.h index 5a74abcd41..818e82d4f4 100644 --- a/include/configs/G2000.h +++ b/include/configs/G2000.h @@ -2,7 +2,7 @@ * (C) Copyright 2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/HH405.h b/include/configs/HH405.h index d20ca77870..a55c874cab 100644 --- a/include/configs/HH405.h +++ b/include/configs/HH405.h @@ -8,7 +8,7 @@ * (C) Copyright 2006 * Matthias Fuchs, esd GmbH, matthias.fuchs@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/HIDDEN_DRAGON.h b/include/configs/HIDDEN_DRAGON.h index ddeccb0868..79ab64c182 100644 --- a/include/configs/HIDDEN_DRAGON.h +++ b/include/configs/HIDDEN_DRAGON.h @@ -5,7 +5,7 @@ * (C) Copyright 2001, 2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* ------------------------------------------------------------------------- */ diff --git a/include/configs/HUB405.h b/include/configs/HUB405.h index cf796bf2d9..1906457f9f 100644 --- a/include/configs/HUB405.h +++ b/include/configs/HUB405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2003 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/IPHASE4539.h b/include/configs/IPHASE4539.h index cbc8b5bbc1..1f5dfa84f5 100644 --- a/include/configs/IPHASE4539.h +++ b/include/configs/IPHASE4539.h @@ -4,7 +4,7 @@ * This file is based on similar values for other boards found in * other U-Boot config files, mainly tqm8260.h and mpc8260ads.h. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h index b0287e2117..ca126ef346 100644 --- a/include/configs/ISPAN.h +++ b/include/configs/ISPAN.h @@ -8,7 +8,7 @@ * Derived from iSPAN 4539 port (iphase4539) by * Wolfgang Grandegger <wg@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H #define __CONFIG_H diff --git a/include/configs/IceCube.h b/include/configs/IceCube.h index df29c7d3f4..2d2394320c 100644 --- a/include/configs/IceCube.h +++ b/include/configs/IceCube.h @@ -2,7 +2,7 @@ * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/JSE.h b/include/configs/JSE.h index 6439d99bf8..0bea46c03c 100644 --- a/include/configs/JSE.h +++ b/include/configs/JSE.h @@ -2,7 +2,7 @@ * (C) Copyright 2003 Picture Elements, Inc. * Stephen Williams <steve@icarus.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/KAREF.h b/include/configs/KAREF.h index 2cbb6eeb9c..da447f5765 100644 --- a/include/configs/KAREF.h +++ b/include/configs/KAREF.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2004 Sandburst Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h index ef51e35df6..3b8e781c9f 100644 --- a/include/configs/KUP4K.h +++ b/include/configs/KUP4K.h @@ -3,7 +3,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Klaus Heydeck, Kieback & Peter GmbH & Co KG, heydeck@kieback-peter.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/KUP4X.h b/include/configs/KUP4X.h index 6da07e7d06..748c8341ac 100644 --- a/include/configs/KUP4X.h +++ b/include/configs/KUP4X.h @@ -3,7 +3,7 @@ * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * Klaus Heydeck, Kieback & Peter GmbH & Co KG, heydeck@kieback-peter.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5208EVBE.h b/include/configs/M5208EVBE.h index fe901ce6c2..51919dbb3f 100644 --- a/include/configs/M5208EVBE.h +++ b/include/configs/M5208EVBE.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _M5208EVBE_H diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 1d10f7f2a0..9aac784392 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h index aaaaa41a15..774db310e0 100644 --- a/include/configs/M5235EVB.h +++ b/include/configs/M5235EVB.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5249EVB.h b/include/configs/M5249EVB.h index 2a1a904bb5..c6ebdc9f35 100644 --- a/include/configs/M5249EVB.h +++ b/include/configs/M5249EVB.h @@ -4,7 +4,7 @@ * (C) Copyright 2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 83122cf59f..240bc7ed80 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -1,7 +1,7 @@ TABILITY or FITNESS FO04-2007 Freescale Semiconductor, Inc. * Hayden Fraser (Hayden.Fraser@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _M5253DEMO_H diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index 109b1c0284..629372a5f5 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -2,7 +2,7 @@ * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * Hayden Fraser (Hayden.Fraser@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _M5253EVBE_H diff --git a/include/configs/M5271EVB.h b/include/configs/M5271EVB.h index a77cb24975..b7b2e18e3e 100644 --- a/include/configs/M5271EVB.h +++ b/include/configs/M5271EVB.h @@ -5,7 +5,7 @@ * (C) Copyright 2006 Lab X Technologies <zachary.landau@labxtechnologies.com> * (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5272C3.h b/include/configs/M5272C3.h index 434c839c73..01d42ad6dc 100644 --- a/include/configs/M5272C3.h +++ b/include/configs/M5272C3.h @@ -3,7 +3,7 @@ * * (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5275EVB.h b/include/configs/M5275EVB.h index bacee0a8fa..f99a545fe6 100644 --- a/include/configs/M5275EVB.h +++ b/include/configs/M5275EVB.h @@ -7,7 +7,7 @@ * Based off of M5272C3 board code by Josef Baumgartner * <josef.baumgartner@telex.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M53017EVB.h b/include/configs/M53017EVB.h index 0ced196489..3bf5989f2b 100644 --- a/include/configs/M53017EVB.h +++ b/include/configs/M53017EVB.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h index 86b06f4f16..85b4435d8b 100644 --- a/include/configs/M5329EVB.h +++ b/include/configs/M5329EVB.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h index cca76097dc..ccb5d05f4e 100644 --- a/include/configs/M5373EVB.h +++ b/include/configs/M5373EVB.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2007, 2012 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M54418TWR.h b/include/configs/M54418TWR.h index bc264276d4..6271bdeebd 100644 --- a/include/configs/M54418TWR.h +++ b/include/configs/M54418TWR.h @@ -4,7 +4,7 @@ * Copyright 2010-2012 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M54451EVB.h b/include/configs/M54451EVB.h index 72ad8366fb..7fc5153c0f 100644 --- a/include/configs/M54451EVB.h +++ b/include/configs/M54451EVB.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index 3dc87d6f61..d3e6457b12 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2007 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index dc38219c1d..75c2b0748b 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 0307f19ad2..a15ee7dc13 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -4,7 +4,7 @@ * Copyright (C) 2004-2008 Freescale Semiconductor, Inc. * TsiChung Liew (Tsi-Chung.Liew@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/METROBOX.h b/include/configs/METROBOX.h index 1e50032414..abb6baa401 100644 --- a/include/configs/METROBOX.h +++ b/include/configs/METROBOX.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2004 Sandburst Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/MHPC.h b/include/configs/MHPC.h index 75eef20e58..0c7a466ba3 100644 --- a/include/configs/MHPC.h +++ b/include/configs/MHPC.h @@ -8,7 +8,7 @@ * Configuation settings for the miniHiPerCam. * * ----------------------------------------------------------------- - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index c535dbeaae..5ced2df71d 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001, 2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h index f9fc8ff7e1..3cdc0bb145 100644 --- a/include/configs/MOUSSE.h +++ b/include/configs/MOUSSE.h @@ -5,7 +5,7 @@ * (C) Copyright 2001 * James F. Dougherty (jfd@cs.stanford.edu) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h index 0f6ca94262..d461d004a2 100644 --- a/include/configs/MPC8260ADS.h +++ b/include/configs/MPC8260ADS.h @@ -19,7 +19,7 @@ * * Copyright (C) Freescale Semiconductor, Inc. 2006-2009. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h index 5a101cf612..f71105157f 100644 --- a/include/configs/MPC8266ADS.h +++ b/include/configs/MPC8266ADS.h @@ -7,7 +7,7 @@ * Note: my board is a PILOT rev. * Note: the mpc8260ads doesn't come with a proper Ethernet MAC address. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8313ERDB.h b/include/configs/MPC8313ERDB.h index ddcbfa6a26..34b960e1f4 100644 --- a/include/configs/MPC8313ERDB.h +++ b/include/configs/MPC8313ERDB.h @@ -1,7 +1,7 @@ /* * Copyright (C) Freescale Semiconductor, Inc. 2006, 2010. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* * mpc8313epb board configuration file diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index 432db72daa..8a7fad36f4 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -2,7 +2,7 @@ * (C) Copyright 2006-2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index c3a577f40a..c492d52fb5 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -1,7 +1,7 @@ /* * Copyright (C) Freescale Semiconductor, Inc. 2006. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h index acd37a01aa..e7ded0127d 100644 --- a/include/configs/MPC8540ADS.h +++ b/include/configs/MPC8540ADS.h @@ -3,7 +3,7 @@ * (C) Copyright 2002,2003 Motorola,Inc. * Xianghua Xiao <X.Xiao@motorola.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8541CDS.h b/include/configs/MPC8541CDS.h index 61775d2c28..150e56ea38 100644 --- a/include/configs/MPC8541CDS.h +++ b/include/configs/MPC8541CDS.h @@ -1,7 +1,7 @@ /* * Copyright 2004, 2011 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8555CDS.h b/include/configs/MPC8555CDS.h index 1ec3797e7c..285872ef3a 100644 --- a/include/configs/MPC8555CDS.h +++ b/include/configs/MPC8555CDS.h @@ -1,7 +1,7 @@ /* * Copyright 2004, 2011 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h index 49f6a35332..24102ee8ab 100644 --- a/include/configs/MPC8560ADS.h +++ b/include/configs/MPC8560ADS.h @@ -3,7 +3,7 @@ * (C) Copyright 2002,2003 Motorola,Inc. * Xianghua Xiao <X.Xiao@motorola.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8568MDS.h b/include/configs/MPC8568MDS.h index 2d5e8c0b7b..90b99b3b5e 100644 --- a/include/configs/MPC8568MDS.h +++ b/include/configs/MPC8568MDS.h @@ -1,7 +1,7 @@ /* * Copyright 2004-2007, 2010-2011 Freescale Semiconductor. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index c35fd2bdbc..3bf01b2c12 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -1,7 +1,7 @@ /* * Copyright 2009-2011 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index 0945ae155d..e438b8ef38 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -3,7 +3,7 @@ * * Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MUSENKI.h b/include/configs/MUSENKI.h index 96efc63d7a..caf6164a30 100644 --- a/include/configs/MUSENKI.h +++ b/include/configs/MUSENKI.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/MVBC_P.h b/include/configs/MVBC_P.h index b7bc920f00..c03ac6b9d0 100644 --- a/include/configs/MVBC_P.h +++ b/include/configs/MVBC_P.h @@ -5,7 +5,7 @@ * (C) Copyright 2004-2008 * Matrix-Vision GmbH, andre.schwarz@matrix-vision.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/MVBLM7.h b/include/configs/MVBLM7.h index 044a1bc2c8..d24f6a4b4e 100644 --- a/include/configs/MVBLM7.h +++ b/include/configs/MVBLM7.h @@ -4,7 +4,7 @@ * Matrix Vision mvBlueLYNX-M7 configuration file * based on Freescale's MPC8349ITX. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/include/configs/MVBLUE.h b/include/configs/MVBLUE.h index 0968b86778..db9502ade3 100644 --- a/include/configs/MVBLUE.h +++ b/include/configs/MVBLUE.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h index 47f5c32d64..43a0f6e60c 100644 --- a/include/configs/MVSMR.h +++ b/include/configs/MVSMR.h @@ -5,7 +5,7 @@ * (C) Copyright 2004-2010 * Matrix-Vision GmbH, andre.schwarz@matrix-vision.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/NX823.h b/include/configs/NX823.h index 635f9ce1ed..9cfa087345 100644 --- a/include/configs/NX823.h +++ b/include/configs/NX823.h @@ -5,7 +5,7 @@ * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/OCRTC.h b/include/configs/OCRTC.h index c919613519..11e7b5baf8 100644 --- a/include/configs/OCRTC.h +++ b/include/configs/OCRTC.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/ORSG.h b/include/configs/ORSG.h index 56d251cea5..b269a33cb0 100644 --- a/include/configs/ORSG.h +++ b/include/configs/ORSG.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/P3G4.h b/include/configs/P3G4.h index 6328ba9bf4..354e9d211b 100644 --- a/include/configs/P3G4.h +++ b/include/configs/P3G4.h @@ -85,7 +85,7 @@ "flash_self=run ramargs addip addtty;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ + "bootm\0" \ "rootpath=/opt/eldk/ppc_74xx\0" \ "bootfile=/tftpboot/p3g4/uImage\0" \ "kernel_addr=ff000000\0" \ diff --git a/include/configs/PCI405.h b/include/configs/PCI405.h index a71a5219cf..53e0d9fd8f 100644 --- a/include/configs/PCI405.h +++ b/include/configs/PCI405.h @@ -5,7 +5,7 @@ * (C) Copyright 2001-2004 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 2251ca6116..c67e61f79a 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/PK1C20.h b/include/configs/PK1C20.h index 115c89a36b..afa273d89f 100644 --- a/include/configs/PK1C20.h +++ b/include/configs/PK1C20.h @@ -2,7 +2,7 @@ * (C) Copyright 2004, Psyent Corporation <www.psyent.com> * Scott McNutt <smcnutt@psyent.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 3c31cfb01a..912bcf59f8 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2003 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/PM520.h b/include/configs/PM520.h index 7ab1d84773..218dca0266 100644 --- a/include/configs/PM520.h +++ b/include/configs/PM520.h @@ -2,7 +2,7 @@ * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/PM828.h b/include/configs/PM828.h index cb68c41bab..8ca2400a08 100644 --- a/include/configs/PM828.h +++ b/include/configs/PM828.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/PMC405DE.h b/include/configs/PMC405DE.h index 531e95612a..3d6dc91a0b 100644 --- a/include/configs/PMC405DE.h +++ b/include/configs/PMC405DE.h @@ -2,7 +2,7 @@ * (C) Copyright 2009 * Matthias Fuchs, esd gmbh germany, matthias.fuchs@esd.eu * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h index cd9eb4b10b..bdfe3c1b27 100644 --- a/include/configs/PPChameleonEVB.h +++ b/include/configs/PPChameleonEVB.h @@ -11,7 +11,7 @@ * * Credits: Stefan Roese, Wolfgang Denk * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h index 3970dc36f1..7b10d289b9 100644 --- a/include/configs/RBC823.h +++ b/include/configs/RBC823.h @@ -262,8 +262,8 @@ */ #define SCCR_MASK SCCR_EBDF11 #define CONFIG_SYS_SCCR (SCCR_RTDIV | SCCR_RTSEL | SCCR_CRQEN | \ - SCCR_PRQEN | SCCR_EBDF00 | \ - SCCR_COM01 | SCCR_DFSYNC00 | SCCR_DFBRG00 | \ + SCCR_PRQEN | SCCR_EBDF00 | \ + SCCR_COM01 | SCCR_DFSYNC00 | SCCR_DFBRG00 | \ SCCR_DFNL000 | SCCR_DFNH000 | SCCR_DFLCD001 | \ SCCR_DFALCD00) @@ -344,7 +344,7 @@ #define CONFIG_SYS_OR1_PRELIM (CONFIG_SYS_PRELIM_OR_AM | CONFIG_SYS_OR_TIMING_MSYS) #define CONFIG_SYS_BR1_PRELIM ((FLASH_BASE1_PRELIM & BR_BA_MSK) | BR_MS_UPMB | \ - BR_PS_8 | BR_V) + BR_PS_8 | BR_V) /* * BR4 and OR4 (SDRAM) diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h index 1404634991..7d4e5e72a6 100644 --- a/include/configs/Rattler.h +++ b/include/configs/Rattler.h @@ -4,7 +4,7 @@ * * U-Boot configuration for Analogue&Micro Rattler boards. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/SIMPC8313.h b/include/configs/SIMPC8313.h index 3448ef35a8..1045afb0c2 100644 --- a/include/configs/SIMPC8313.h +++ b/include/configs/SIMPC8313.h @@ -1,7 +1,7 @@ /* * Copyright (C) Sheldon Instruments, Inc. 2008 * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* * simpc8313 board configuration file diff --git a/include/configs/SPD823TS.h b/include/configs/SPD823TS.h index 64596b35c1..147cf5bec1 100644 --- a/include/configs/SPD823TS.h +++ b/include/configs/SPD823TS.h @@ -2,7 +2,7 @@ * (C) Copyright 2000 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/T4240EMU.h b/include/configs/T4240EMU.h index 9fa6b77ab1..5e228f3556 100644 --- a/include/configs/T4240EMU.h +++ b/include/configs/T4240EMU.h @@ -30,7 +30,6 @@ #define CONFIG_DDR_CLK_FREQ 133333333 #define CONFIG_FSL_TBCLK_EXTRA_DIV 100 - /* * DDR Setup */ @@ -76,7 +75,6 @@ #define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NOR_FTIM2 #define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NOR_FTIM3 - /* I2C */ #define CONFIG_SYS_FSL_I2C_SPEED 4000000 /* faster speed for emulator */ #define CONFIG_SYS_FSL_I2C2_SPEED 4000000 @@ -104,8 +102,6 @@ #define CONFIG_SYS_QE_FMAN_FW_LENGTH 0x10000 #define CONFIG_SYS_FDT_PAD (0x3000 + CONFIG_SYS_QE_FMAN_FW_LENGTH) - - #define CONFIG_BOOTDELAY 0 /* diff --git a/include/configs/TASREG.h b/include/configs/TASREG.h index bce4176f9d..e1a2c12c61 100644 --- a/include/configs/TASREG.h +++ b/include/configs/TASREG.h @@ -4,7 +4,7 @@ * (C) Copyright 2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/TB5200.h b/include/configs/TB5200.h index 1fa4714884..47e74e7999 100644 --- a/include/configs/TB5200.h +++ b/include/configs/TB5200.h @@ -5,7 +5,7 @@ * (C) Copyright 2004-2006 * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/TK885D.h b/include/configs/TK885D.h index 7f2b842993..4ad857e98d 100644 --- a/include/configs/TK885D.h +++ b/include/configs/TK885D.h @@ -5,7 +5,7 @@ * (C) Copyright 2006 * Martin Krause, TQ-Systems GmBH, martin.krause@tqs.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h index 00056a33d4..b5f330fb6f 100644 --- a/include/configs/TOP5200.h +++ b/include/configs/TOP5200.h @@ -14,7 +14,7 @@ * Internal regs are at 0xf0000000 * Reset jumps to 0x00000100 * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 8a4dd358d8..6a9f64e17b 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -5,7 +5,7 @@ * (C) Copyright 2004-2006 * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/TQM834x.h b/include/configs/TQM834x.h index 07b5acb977..194dc8b62a 100644 --- a/include/configs/TQM834x.h +++ b/include/configs/TQM834x.h @@ -2,7 +2,7 @@ * (C) Copyright 2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 9cf263cff6..30e94013b0 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -2,7 +2,7 @@ * (C) Copyright 2000-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index 1f52efcf5b..8263752573 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -5,7 +5,7 @@ * (C) Copyright 2006 * Martin Krause, TQ-Systems GmBH, martin.krause@tqs.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/Total5200.h b/include/configs/Total5200.h index 9d8819977e..dbd281415b 100644 --- a/include/configs/Total5200.h +++ b/include/configs/Total5200.h @@ -5,7 +5,7 @@ * (C) Copyright 2004 * Mark Jonas, Freescale Semiconductor, mark.jonas@freescale.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/VOH405.h b/include/configs/VOH405.h index a1dad2b5bb..91fd93b331 100644 --- a/include/configs/VOH405.h +++ b/include/configs/VOH405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2003 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/VOM405.h b/include/configs/VOM405.h index 5daf175863..4a2ee91dda 100644 --- a/include/configs/VOM405.h +++ b/include/configs/VOM405.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/W7OLMC.h b/include/configs/W7OLMC.h index 51cfcf6e21..54ca4997b5 100644 --- a/include/configs/W7OLMC.h +++ b/include/configs/W7OLMC.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/W7OLMG.h b/include/configs/W7OLMG.h index 6769c0d806..ac194a4efa 100644 --- a/include/configs/W7OLMG.h +++ b/include/configs/W7OLMG.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/WUH405.h b/include/configs/WUH405.h index f38d90ee3f..6999384653 100644 --- a/include/configs/WUH405.h +++ b/include/configs/WUH405.h @@ -2,7 +2,7 @@ * (C) Copyright 2004 * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h index 2160694df2..c28f21d1fb 100644 --- a/include/configs/ZPC1900.h +++ b/include/configs/ZPC1900.h @@ -5,7 +5,7 @@ * U-Boot configuration for Zephyr Engineering ZPC.1900 board. * This port was developed and tested on Revision C board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/ZUMA.h b/include/configs/ZUMA.h index ec86023974..80a381595c 100644 --- a/include/configs/ZUMA.h +++ b/include/configs/ZUMA.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Josh Huber <huber@mclx.com>, Mission Critical Linux, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index d243bc12c0..75b6526127 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -5,7 +5,7 @@ * (C) Copyright 2010 * Sergei Poselenov, Emcraft Systems, sposelenov@emcraft.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/acadia.h b/include/configs/acadia.h index f79706e1d2..f23d549497 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/aev.h b/include/configs/aev.h index 6c0b034dcc..33d7815e98 100644 --- a/include/configs/aev.h +++ b/include/configs/aev.h @@ -5,7 +5,7 @@ * (C) Copyright 2004-2005 * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/alpr.h b/include/configs/alpr.h index 5431b098c5..f0a89623c3 100644 --- a/include/configs/alpr.h +++ b/include/configs/alpr.h @@ -2,7 +2,7 @@ * (C) Copyright 2006-2008 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H @@ -148,7 +148,7 @@ "flash_self=run ramargs addip addtty;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ + "bootm\0" \ "net_nfs_fdt=tftp 200000 ${bootfile};" \ "tftp ${fdt_addr} ${fdt_file};" \ "run nfsargs addip addtty;" \ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index f746e48548..c2ba7e35d8 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -359,6 +359,9 @@ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 #define CONFIG_SYS_MMC_ENV_PART 2 +#define CONFIG_ENV_OFFSET 0x0 +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT #endif /* SPI flash. */ diff --git a/include/configs/aria.h b/include/configs/aria.h index 68f25ea388..b5e212e9d8 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -2,7 +2,7 @@ * (C) Copyright 2009 Wolfgang Denk <wd@denx.de> * (C) Copyright 2009, DAVE Srl <www.dave.eu> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index ed9400e4c0..f0dd6ccb74 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -3,7 +3,7 @@ * * (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 5336f69103..326e3d6692 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -2,7 +2,7 @@ * (C) Copyright 2005-2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/bubinga.h b/include/configs/bubinga.h index 9301fccbdc..2b9c1c96e4 100644 --- a/include/configs/bubinga.h +++ b/include/configs/bubinga.h @@ -2,7 +2,7 @@ * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/cam_enc_4xx.h b/include/configs/cam_enc_4xx.h index db9eb0f159..2e024f54a9 100644 --- a/include/configs/cam_enc_4xx.h +++ b/include/configs/cam_enc_4xx.h @@ -4,7 +4,7 @@ * Copyright (C) 2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/canmb.h b/include/configs/canmb.h index 7b90dcb5ac..485bf1658e 100644 --- a/include/configs/canmb.h +++ b/include/configs/canmb.h @@ -2,7 +2,7 @@ * (C) Copyright 2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/charon.h b/include/configs/charon.h index 88ac4ad327..2f537e0d4b 100644 --- a/include/configs/charon.h +++ b/include/configs/charon.h @@ -8,7 +8,7 @@ * (C) Copyright 2010 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_CHARON_H diff --git a/include/configs/cm4008.h b/include/configs/cm4008.h index b40199566e..9447c0b935 100644 --- a/include/configs/cm4008.h +++ b/include/configs/cm4008.h @@ -3,7 +3,7 @@ * Greg Ungerer <greg.ungerer@opengear.com>. * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H #define __CONFIG_H diff --git a/include/configs/cm41xx.h b/include/configs/cm41xx.h index d792240e95..306684ac0d 100644 --- a/include/configs/cm41xx.h +++ b/include/configs/cm41xx.h @@ -3,7 +3,7 @@ * Greg Ungerer <greg.ungerer@opengear.com>. * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H #define __CONFIG_H diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index cfd63ad831..17824ec9a9 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -2,7 +2,7 @@ * (C) Copyright 2003-2007 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/cobra5272.h b/include/configs/cobra5272.h index 885dfd4761..b13898815a 100644 --- a/include/configs/cobra5272.h +++ b/include/configs/cobra5272.h @@ -3,7 +3,7 @@ * * (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* --- diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 290a08d044..ee0342b44b 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -3,7 +3,7 @@ * * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/coreboot.h b/include/configs/coreboot.h index 47215e59aa..d1be5e3c0c 100644 --- a/include/configs/coreboot.h +++ b/include/configs/coreboot.h @@ -3,7 +3,7 @@ * (C) Copyright 2008 * Graeme Russ, graeme.russ@gmail.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <asm/ibmpc.h> diff --git a/include/configs/cpci5200.h b/include/configs/cpci5200.h index 05529c8fce..eb56f96988 100644 --- a/include/configs/cpci5200.h +++ b/include/configs/cpci5200.h @@ -2,7 +2,7 @@ * (C) Copyright 2003-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/include/configs/cpuat91.h b/include/configs/cpuat91.h index c56fdd7517..6742dbcd92 100644 --- a/include/configs/cpuat91.h +++ b/include/configs/cpuat91.h @@ -4,7 +4,7 @@ * * Configuration settings for the CPUAT91 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _CONFIG_CPUAT91_H diff --git a/include/configs/csb272.h b/include/configs/csb272.h index 49a144fd33..6ae19e4b87 100644 --- a/include/configs/csb272.h +++ b/include/configs/csb272.h @@ -2,7 +2,7 @@ * (C) Copyright 2004 * Tolunay Orkun, Nextio Inc., torkun@nextio.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/csb472.h b/include/configs/csb472.h index 7705a5dda8..0c467c51f8 100644 --- a/include/configs/csb472.h +++ b/include/configs/csb472.h @@ -2,7 +2,7 @@ * (C) Copyright 2004 * Tolunay Orkun, Nextio Inc., torkun@nextio.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/davinci_dm355evm.h b/include/configs/davinci_dm355evm.h index 96d35c5718..07b1bdd082 100644 --- a/include/configs/davinci_dm355evm.h +++ b/include/configs/davinci_dm355evm.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009 David Brownell * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/davinci_dm365evm.h b/include/configs/davinci_dm365evm.h index 82dc1a2579..1f49e514ac 100644 --- a/include/configs/davinci_dm365evm.h +++ b/include/configs/davinci_dm365evm.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009 Texas Instruments Incorporated * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/davinci_dvevm.h b/include/configs/davinci_dvevm.h index a49a9891d4..ca2cb2db72 100644 --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/davinci_schmoogie.h b/include/configs/davinci_schmoogie.h index 1595bc7f63..299a2e8bb2 100644 --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/davinci_sonata.h b/include/configs/davinci_sonata.h index 3eaa7c0840..a81364ce55 100644 --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007 Sergey Kubushyn <ksi@koi8.net> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index cb79b4ef43..c1e996e448 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -9,7 +9,7 @@ * * Configuration settings for the DevKit8000 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H @@ -278,8 +278,8 @@ #define CONFIG_SYS_INIT_RAM_ADDR 0x4020f800 #define CONFIG_SYS_INIT_RAM_SIZE 0x800 #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ - CONFIG_SYS_INIT_RAM_SIZE - \ - GENERATED_GBL_DATA_SIZE) + CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) /* SRAM config */ #define CONFIG_SYS_SRAM_START 0x40200000 diff --git a/include/configs/dig297.h b/include/configs/dig297.h index 30e39087c7..08d49fb00d 100644 --- a/include/configs/dig297.h +++ b/include/configs/dig297.h @@ -10,7 +10,7 @@ * * Configuration settings for the Comelit DIG297 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/dlvision-10g.h b/include/configs/dlvision-10g.h index 68e5246b6d..c527be4909 100644 --- a/include/configs/dlvision-10g.h +++ b/include/configs/dlvision-10g.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/dlvision.h b/include/configs/dlvision.h index 2f8d6b4c90..c97963a3f8 100644 --- a/include/configs/dlvision.h +++ b/include/configs/dlvision.h @@ -2,7 +2,7 @@ * (C) Copyright 2009 * Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index 51e0e801a2..3a4c06bc8f 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -6,7 +6,7 @@ * Configuration settings for the TI DRA7XX board. * See omap5_common.h for omap5 common settings. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_DRA7XX_EVM_H diff --git a/include/configs/eXalion.h b/include/configs/eXalion.h index 7321b60c2f..0767df1993 100644 --- a/include/configs/eXalion.h +++ b/include/configs/eXalion.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* ------------------------------------------------------------------------- */ diff --git a/include/configs/ebony.h b/include/configs/ebony.h index 47014f9e30..8dc654ea50 100644 --- a/include/configs/ebony.h +++ b/include/configs/ebony.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/ep8248.h b/include/configs/ep8248.h index 32d5cd65b9..e95d312f9e 100644 --- a/include/configs/ep8248.h +++ b/include/configs/ep8248.h @@ -4,7 +4,7 @@ * * U-Boot configuration for Embedded Planet EP8248 boards. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/ep82xxm.h b/include/configs/ep82xxm.h index bcf01b6169..a3b3349598 100644 --- a/include/configs/ep82xxm.h +++ b/include/configs/ep82xxm.h @@ -3,7 +3,7 @@ * * U-Boot configuration for Embedded Planet EP82xxM boards. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/flea3.h b/include/configs/flea3.h index cfcaf1b232..655df67961 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -7,7 +7,7 @@ * * Configuration for the flea3 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h index 47e65d8b72..011a3b315c 100644 --- a/include/configs/galaxy5200.h +++ b/include/configs/galaxy5200.h @@ -11,7 +11,7 @@ * (C) Copyright 2009 * Eric Millbrandt, DEKA Research and Development Corporation * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/gdppc440etx.h b/include/configs/gdppc440etx.h index cfb2a72716..a6f1afff97 100644 --- a/include/configs/gdppc440etx.h +++ b/include/configs/gdppc440etx.h @@ -6,7 +6,7 @@ * (C) Copyright 2005-2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index 4f286bd941..86de48e496 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -8,7 +8,7 @@ * (C) Copyright 2008 * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H__ diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index fac7f1c5f1..cb651b0b0c 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -9,7 +9,7 @@ * (C) Copyright 2008 * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H__ diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index 7f0c5be0c9..50cf3f6f52 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -7,7 +7,7 @@ * (C) Copyright 2007 * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H__ diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 612451904f..69ac0c10bf 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -7,7 +7,7 @@ * (C) Copyright 2007 * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H__ diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 2226f5bbb8..531c4bc4be 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -6,7 +6,7 @@ * (C) Copyright 2007 * Daniel Hellstrom, Gaisler Research, daniel@gaisler.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H__ diff --git a/include/configs/hmi1001.h b/include/configs/hmi1001.h index 747c43c070..9073d7e6c7 100644 --- a/include/configs/hmi1001.h +++ b/include/configs/hmi1001.h @@ -2,7 +2,7 @@ * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/idmr.h b/include/configs/idmr.h index 55ea567bee..3cae30a0b4 100644 --- a/include/configs/idmr.h +++ b/include/configs/idmr.h @@ -6,7 +6,7 @@ * (C) Copyright 2006 Lab X Technologies <zachary.landau@labxtechnologies.com> * (C) Copyright 2003 Josef Baumgartner <josef.baumgartner@telex.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _IDMR_H diff --git a/include/configs/igep00x0.h b/include/configs/igep00x0.h index 9982cf6e90..e92bb68484 100644 --- a/include/configs/igep00x0.h +++ b/include/configs/igep00x0.h @@ -4,7 +4,7 @@ * (C) Copyright 2012 * ISEE 2007 SL, <www.iseebcn.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IGEP00X0_H diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index cda7e0d92b..c6b852969b 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -4,7 +4,7 @@ * based on: * Copyright (C) 2009 Ilya Yanok <yanok@emcraft.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __IMX27LITE_COMMON_CONFIG_H diff --git a/include/configs/imx27lite.h b/include/configs/imx27lite.h index 805c05d77e..c18c35ef53 100644 --- a/include/configs/imx27lite.h +++ b/include/configs/imx27lite.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009 Ilya Yanok <yanok@emcraft.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 30c65da539..0d0715869d 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -6,7 +6,7 @@ * * Configuration settings for the LogicPD i.MX31 Litekit board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h index 720e1bf407..1e2b12cb25 100644 --- a/include/configs/imx31_phycore.h +++ b/include/configs/imx31_phycore.h @@ -6,7 +6,7 @@ * * Configuration settings for the phyCORE-i.MX31 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 5cc686f2ff..6242a94172 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -5,7 +5,7 @@ * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index 910c243175..94cdfd29da 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -4,7 +4,7 @@ * Linus Walleij <linus.walleij@linaro.org> * Common ARM Integrator configuration settings * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #define CONFIG_INTEGRATOR diff --git a/include/configs/integratorap.h b/include/configs/integratorap.h index fb71e3c26a..edea769a92 100644 --- a/include/configs/integratorap.h +++ b/include/configs/integratorap.h @@ -9,7 +9,7 @@ * Philippe Robin, <philippe.robin@arm.com> * Configuration for Integrator AP board. *. - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/integratorcp.h b/include/configs/integratorcp.h index dcbdd227fe..608719a7ea 100644 --- a/include/configs/integratorcp.h +++ b/include/configs/integratorcp.h @@ -9,7 +9,7 @@ * Philippe Robin, <philippe.robin@arm.com> * Configuration for Compact Integrator board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/io.h b/include/configs/io.h index 79ada68ac7..2d67cfc66a 100644 --- a/include/configs/io.h +++ b/include/configs/io.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/io64.h b/include/configs/io64.h index f110b70602..39ed2850d2 100644 --- a/include/configs/io64.h +++ b/include/configs/io64.h @@ -6,7 +6,7 @@ * by Stefan Roese, DENX Software Engineering, sr@denx.de. * and Grant Erickson <gerickson@nuovations.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/iocon.h b/include/configs/iocon.h index ec9016a6d1..788c715a2f 100644 --- a/include/configs/iocon.h +++ b/include/configs/iocon.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 50fd995657..d2351cc53a 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -5,7 +5,7 @@ * (C) Copyright 2009 * Wolfgang Grandegger, DENX Software Engineering, wg@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index bd3bbb79a5..d2acc281cd 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -5,7 +5,7 @@ * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h index 733023049f..91ca480f48 100644 --- a/include/configs/km/keymile-common.h +++ b/include/configs/km/keymile-common.h @@ -2,7 +2,7 @@ * (C) Copyright 2008-2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_KEYMILE_H diff --git a/include/configs/km/km-powerpc.h b/include/configs/km/km-powerpc.h index 7ceb5e7eda..8ee0ac6dbf 100644 --- a/include/configs/km/km-powerpc.h +++ b/include/configs/km/km-powerpc.h @@ -2,7 +2,7 @@ * (C) Copyright 2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_KEYMILE_POWERPC_H diff --git a/include/configs/km82xx.h b/include/configs/km82xx.h index 726c646bc5..986c65f1e6 100644 --- a/include/configs/km82xx.h +++ b/include/configs/km82xx.h @@ -2,7 +2,7 @@ * (C) Copyright 2007-2011 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/kvme080.h b/include/configs/kvme080.h index 5485a42fcc..23270e68f5 100644 --- a/include/configs/kvme080.h +++ b/include/configs/kvme080.h @@ -2,7 +2,7 @@ * (C) Copyright 2005 * Sangmoon Kim, dogoil@etinsys.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/linkstation.h b/include/configs/linkstation.h index 932dac36ad..1bd467f59f 100644 --- a/include/configs/linkstation.h +++ b/include/configs/linkstation.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2006 Mihai Georgian <u-boot@linuxnotincluded.org.uk> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/luan.h b/include/configs/luan.h index 8ecdf8049d..67f75c79a1 100644 --- a/include/configs/luan.h +++ b/include/configs/luan.h @@ -3,7 +3,7 @@ * Stefan Roese, DENX Software Engineering, sr@denx.de. * John Otken, jotken@softadvances.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/lubbock.h b/include/configs/lubbock.h index 08d633ba17..bab71f2aec 100644 --- a/include/configs/lubbock.h +++ b/include/configs/lubbock.h @@ -8,7 +8,7 @@ * * Configuation settings for the LUBBOCK board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/lwmon.h b/include/configs/lwmon.h index 459c047b71..a2aa56bd2d 100644 --- a/include/configs/lwmon.h +++ b/include/configs/lwmon.h @@ -2,7 +2,7 @@ * (C) Copyright 2001-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index eba875954d..bb1fa44d80 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -2,7 +2,7 @@ * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com> * on behalf of DENX Software Engineering GmbH * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIGS_M28EVK_H__ #define __CONFIGS_M28EVK_H__ diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index ccb07e3384..024d3a5aaf 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -2,7 +2,7 @@ * DENX M53 configuration * Copyright (C) 2012-2013 Marek Vasut <marex@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __M53EVK_CONFIG_H__ diff --git a/include/configs/magnesium.h b/include/configs/magnesium.h index d2da12fd06..3364bde71f 100644 --- a/include/configs/magnesium.h +++ b/include/configs/magnesium.h @@ -4,7 +4,7 @@ * based on: * Copyright (C) 2009 Ilya Yanok <yanok@emcraft.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/makalu.h b/include/configs/makalu.h index e7ed917f84..d6207eb11f 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -5,7 +5,7 @@ * (C) Copyright 2007-2008 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h index c316599288..a55b39b4bf 100644 --- a/include/configs/manroland/common.h +++ b/include/configs/manroland/common.h @@ -2,7 +2,7 @@ * (C) Copyright 2009 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MANROLAND_COMMON_H diff --git a/include/configs/manroland/mpc5200-common.h b/include/configs/manroland/mpc5200-common.h index 29ea3043df..98bfcc5506 100644 --- a/include/configs/manroland/mpc5200-common.h +++ b/include/configs/manroland/mpc5200-common.h @@ -2,7 +2,7 @@ * (C) Copyright 2009 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MANROLAND_MPC52XX__COMMON_H diff --git a/include/configs/mcc200.h b/include/configs/mcc200.h index 487574f6a7..d73d2e4373 100644 --- a/include/configs/mcc200.h +++ b/include/configs/mcc200.h @@ -2,7 +2,7 @@ * (C) Copyright 2006-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mecp5200.h b/include/configs/mecp5200.h index 601bb79d1c..8b1e092208 100644 --- a/include/configs/mecp5200.h +++ b/include/configs/mecp5200.h @@ -2,7 +2,7 @@ * (C) Copyright 2003-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index d7383a62c6..2a81849875 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -4,7 +4,7 @@ * * Based on Motion-PRO board config file by Robert McCullough, rob@promessinc.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 85ae3671f1..2af947a231 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2007-2009 DENX Software Engineering * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/mpc7448hpc2.h b/include/configs/mpc7448hpc2.h index f8c46278ad..37cc4349f6 100644 --- a/include/configs/mpc7448hpc2.h +++ b/include/configs/mpc7448hpc2.h @@ -5,7 +5,7 @@ * Alex Bounine , Tundra Semiconductor Corp. * Roy Zang , <tie-fei.zang@freescale.com> Freescale Corp. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/muas3001.h b/include/configs/muas3001.h index 950d71b5ce..8eba0228b2 100644 --- a/include/configs/muas3001.h +++ b/include/configs/muas3001.h @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mucmc52.h b/include/configs/mucmc52.h index d875901d56..ff75ead295 100644 --- a/include/configs/mucmc52.h +++ b/include/configs/mucmc52.h @@ -5,7 +5,7 @@ * (C) Copyright 2003-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/munices.h b/include/configs/munices.h index 7700a1d57d..f98360d96d 100644 --- a/include/configs/munices.h +++ b/include/configs/munices.h @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx1ads.h b/include/configs/mx1ads.h index 4de4324f74..70d1dee6aa 100644 --- a/include/configs/mx1ads.h +++ b/include/configs/mx1ads.h @@ -9,7 +9,7 @@ * * This is the Configuration setting for Motorola MX1ADS board * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 575fe2a22d..e377fea24a 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2013 Marek Vasut <marex@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIGS_MX23_OLINUXINO_H__ #define __CONFIGS_MX23_OLINUXINO_H__ diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index b1b68528a3..2736e3d7dc 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -3,7 +3,7 @@ * * Configuration settings for the MX31ADS Freescale board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 69045da131..d41f2cd411 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -8,7 +8,7 @@ * * Configuration settings for the Freescale i.MX31 PDK board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index a25b20e4af..2f59104b83 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -7,7 +7,7 @@ * * Configuration for the MX35pdk Freescale board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx51_efikamx.h b/include/configs/mx51_efikamx.h index f0c677640e..0772dd23c8 100644 --- a/include/configs/mx51_efikamx.h +++ b/include/configs/mx51_efikamx.h @@ -5,7 +5,7 @@ * * Configuration settings for the MX51EVK Board * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 122ffd074d..7956083c35 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -3,7 +3,7 @@ * * Configuration settings for the MX53ARD Freescale board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index d39ce7b664..fe5cf3c701 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -3,7 +3,7 @@ * * Configuration settings for the MX53-EVK Freescale board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 7237da5939..bd2fa43b95 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -4,7 +4,7 @@ * * Configuration settings for Freescale MX53 low cost board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 7e4e1c9661..12b2c0de86 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -3,7 +3,7 @@ * * Configuration settings for the MX53SMD Freescale board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/mx6qarm2.h b/include/configs/mx6qarm2.h index 1c5c837d3b..ef3058c18f 100644 --- a/include/configs/mx6qarm2.h +++ b/include/configs/mx6qarm2.h @@ -3,7 +3,7 @@ * * Configuration settings for the Freescale i.MX6Q Armadillo2 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/neo.h b/include/configs/neo.h index ccbb1fa9b1..62ea8eca86 100644 --- a/include/configs/neo.h +++ b/include/configs/neo.h @@ -2,7 +2,7 @@ * (C) Copyright 2007-2008 * Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/nhk8815.h b/include/configs/nhk8815.h index 0997f49859..181a6bfd41 100644 --- a/include/configs/nhk8815.h +++ b/include/configs/nhk8815.h @@ -4,7 +4,7 @@ * Configuration settings for the "Nomadik Hardware Kit" NHK-8815, * the evaluation board for the Nomadik 8815 System on Chip. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/nios2-generic.h b/include/configs/nios2-generic.h index b528f5a622..3f34496065 100644 --- a/include/configs/nios2-generic.h +++ b/include/configs/nios2-generic.h @@ -3,7 +3,7 @@ * Scott McNutt <smcnutt@psyent.com> * (C) Copyright 2010, Thomas Chou <thomas@wytron.com.tw> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index cfc5f1205e..64db0eb944 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -13,7 +13,7 @@ * * Configuration settings for the Nokia RX-51 aka N900. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 90c45d5c47..f079289c5a 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -7,7 +7,7 @@ * (C) Copyright 2012 * DENX Software Engineering, Anatolij Gustschin <agust@denx.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __O2D_CONFIG_H diff --git a/include/configs/ocotea.h b/include/configs/ocotea.h index 60ee8da558..f3fb5852f9 100644 --- a/include/configs/ocotea.h +++ b/include/configs/ocotea.h @@ -4,7 +4,7 @@ * (C) Copyright 2005 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index c1245e7b84..9fcd50b523 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -6,7 +6,7 @@ * * Configuration settings for the TI OMAP3530 Beagle board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index fc1ffea55b..3ace8bb6e5 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -11,7 +11,7 @@ * * Manikandan Pillai <mani.pillai@ti.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __OMAP3EVM_CONFIG_H diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index ee6db51274..42cea012da 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -5,7 +5,7 @@ * Configuration settings for the Logic OMAP35x/DM37x SOM LV/Torpedo * reference boards. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/omap3_mvblx.h b/include/configs/omap3_mvblx.h index 0c88419f24..73d5d30f01 100644 --- a/include/configs/omap3_mvblx.h +++ b/include/configs/omap3_mvblx.h @@ -9,7 +9,7 @@ * * Configuration settings for the TI OMAP3530 Beagle board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/omap3_pandora.h b/include/configs/omap3_pandora.h index 91a25684c7..ee448bb812 100644 --- a/include/configs/omap3_pandora.h +++ b/include/configs/omap3_pandora.h @@ -4,7 +4,7 @@ * * Configuration settings for the OMAP3 Pandora. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/omap3_sdp3430.h b/include/configs/omap3_sdp3430.h index a5e469ce32..fc219fa478 100644 --- a/include/configs/omap3_sdp3430.h +++ b/include/configs/omap3_sdp3430.h @@ -7,7 +7,7 @@ * * Configuration settings for the 3430 TI SDP3430 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/omap3_zoom1.h b/include/configs/omap3_zoom1.h index c747d5247b..a4a739e4a0 100644 --- a/include/configs/omap3_zoom1.h +++ b/include/configs/omap3_zoom1.h @@ -7,7 +7,7 @@ * * Configuration settings for the TI OMAP3430 Zoom MDK board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 18800f3cc1..82946229a4 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -6,7 +6,7 @@ * Configuration settings for the TI OMAP4 Panda board. * See omap4_common.h for OMAP4 common part * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_PANDA_H diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index f40e0b718f..acced46062 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -7,7 +7,7 @@ * Configuration settings for the TI SDP4430 board. * See omap4_common.h for OMAP4 common part * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_SDP4430_H diff --git a/include/configs/omap5912osk.h b/include/configs/omap5912osk.h index 75488de761..c2b9e13c72 100644 --- a/include/configs/omap5912osk.h +++ b/include/configs/omap5912osk.h @@ -4,7 +4,7 @@ * Kshitij Gupta <kshitij@ti.com> * Configuation settings for the TI OMAP Innovator board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/omap5_common.h b/include/configs/omap5_common.h index eade6375cd..827eaabca8 100644 --- a/include/configs/omap5_common.h +++ b/include/configs/omap5_common.h @@ -8,7 +8,7 @@ * * TI OMAP5 AND DRA7XX common configuration settings * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ * * For more details, please see the technical documents listed at * http://www.ti.com/product/omap5432 diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 0d1c43c2eb..4d3a800298 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -6,7 +6,7 @@ * Configuration settings for the TI EVM5430 board. * See omap5_common.h for omap5 common settings. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_OMAP5_EVM_H diff --git a/include/configs/openrisc-generic.h b/include/configs/openrisc-generic.h index dfe0258402..ad3775e031 100644 --- a/include/configs/openrisc-generic.h +++ b/include/configs/openrisc-generic.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2011, Stefan Kristiansson, stefan.kristianssons@saunalahti.fi * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h index d1c7a1a2d4..8157f47cce 100644 --- a/include/configs/p3mx.h +++ b/include/configs/p3mx.h @@ -5,7 +5,7 @@ * Based on original work by * Roel Loeffen, (C) Copyright 2006 Prodrive B.V. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ @@ -194,7 +194,7 @@ "flash_self=run ramargs addip addtty;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ + "bootm\0" \ "rootpath=/opt/eldk/ppc_6xx\0" \ "u-boot=p3mx/u-boot/u-boot.bin\0" \ "load=tftp 100000 ${u-boot}\0" \ diff --git a/include/configs/p3p440.h b/include/configs/p3p440.h index c4c50932c3..f6cb813bc8 100644 --- a/include/configs/p3p440.h +++ b/include/configs/p3p440.h @@ -4,7 +4,7 @@ * * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ @@ -129,7 +129,7 @@ "flash_self=run ramargs addip addtty;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ + "bootm\0" \ "rootpath=/opt/eldk/ppc_4xx\0" \ "bootfile=/tftpboot/p3p440/uImage\0" \ "kernel_addr=ff800000\0" \ diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index a608c872d5..423e2fa6db 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -8,7 +8,7 @@ * (C) Copyright 2009 * Jon Smirl <jonsmirl@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/pcs440ep.h b/include/configs/pcs440ep.h index 5de8e98aca..7cf22ba763 100644 --- a/include/configs/pcs440ep.h +++ b/include/configs/pcs440ep.h @@ -2,7 +2,7 @@ * (C) Copyright 2006 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ @@ -157,7 +157,7 @@ "flash_self=run ramargs addip addtty;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ + "bootm\0" \ "rootpath=/opt/eldk/ppc_4xx\0" \ "bootfile=/tftpboot/pcs440ep/uImage\0" \ "kernel_addr=FFF00000\0" \ diff --git a/include/configs/pdm360ng.h b/include/configs/pdm360ng.h index 50321199c1..d31c137967 100644 --- a/include/configs/pdm360ng.h +++ b/include/configs/pdm360ng.h @@ -2,7 +2,7 @@ * (C) Copyright 2009-2010 * Michael Weiß, ifm ecomatic gmbh, michael.weiss@ifm.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/pdnb3.h b/include/configs/pdnb3.h index c664010067..d3e9017a00 100644 --- a/include/configs/pdnb3.h +++ b/include/configs/pdnb3.h @@ -131,7 +131,7 @@ "flash_self=run ramargs addip addtty;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ + "bootm\0" \ "rootpath=/opt/buildroot\0" \ "bootfile=/tftpboot/netbox/uImage\0" \ "kernel_addr=50080000\0" \ @@ -280,7 +280,7 @@ #define I2C_TRISTATE GPIO_OUTPUT_DISABLE(CONFIG_SYS_GPIO_I2C_SDA) #define I2C_READ ((*IXP425_GPIO_GPINR & PB_SDA) != 0) #define I2C_SDA(bit) if (bit) GPIO_OUTPUT_SET(CONFIG_SYS_GPIO_I2C_SDA); \ - else GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_I2C_SDA) + else GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_I2C_SDA) #define I2C_SCL(bit) if (bit) GPIO_OUTPUT_SET(CONFIG_SYS_GPIO_I2C_SCL); \ else GPIO_OUTPUT_CLEAR(CONFIG_SYS_GPIO_I2C_SCL) #define I2C_DELAY udelay(3) /* 1/4 I2C clock duration */ diff --git a/include/configs/pf5200.h b/include/configs/pf5200.h index 027ddd2d98..bb3351812e 100644 --- a/include/configs/pf5200.h +++ b/include/configs/pf5200.h @@ -2,7 +2,7 @@ * (C) Copyright 2003-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************* diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h index 7cf12ba0f6..752321c2fb 100644 --- a/include/configs/ppmc8260.h +++ b/include/configs/ppmc8260.h @@ -12,7 +12,7 @@ * * Configuation settings for the WindRiver PPMC8260 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h index e5e801508e..5856ee180b 100644 --- a/include/configs/pxa-common.h +++ b/include/configs/pxa-common.h @@ -3,7 +3,7 @@ * * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_PXA_COMMON_H__ diff --git a/include/configs/pxa255_idp.h b/include/configs/pxa255_idp.h index cd3dd763f7..5ea7e67da5 100644 --- a/include/configs/pxa255_idp.h +++ b/include/configs/pxa255_idp.h @@ -13,7 +13,7 @@ * Cliff Brake <cliff.brake@gmail.com> * Configuation settings for the Accelent/Vibren PXA255 IDP * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/qong.h b/include/configs/qong.h index c57fddd672..ee2ff7f043 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -3,7 +3,7 @@ * * Configuration settings for the Dave/DENX QongEVB-LITE board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index a51f2d4faf..e0925f6934 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -2,7 +2,7 @@ * (C) Copyright 2008 * Gary Jennejohn, DENX Software Engineering GmbH, garyj@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/quantum.h b/include/configs/quantum.h index aaf97ebe0c..73156498ff 100644 --- a/include/configs/quantum.h +++ b/include/configs/quantum.h @@ -2,7 +2,7 @@ * (C) Copyright 2003-2010 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h index 0feef1eabb..033c1f30de 100644 --- a/include/configs/sacsng.h +++ b/include/configs/sacsng.h @@ -12,7 +12,7 @@ * * Configuration settings for the SACSng 8260 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/sbc405.h b/include/configs/sbc405.h index 072f97e602..a139590be8 100644 --- a/include/configs/sbc405.h +++ b/include/configs/sbc405.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2001 * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/sbc8349.h b/include/configs/sbc8349.h index 6f912ed2c3..63ee4537d6 100644 --- a/include/configs/sbc8349.h +++ b/include/configs/sbc8349.h @@ -5,7 +5,7 @@ * Paul Gortmaker <paul.gortmaker@windriver.com> * Based on the MPC8349EMDS config. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index cf97db94c8..a489bb1211 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -7,7 +7,7 @@ * * Srikanth Srinivasan (srikanth.srinivasan@freescale.com) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/sc3.h b/include/configs/sc3.h index a96ffbcec3..60710ba829 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -6,7 +6,7 @@ * (C) Copyright 2003 * Juergen Beisert, EuroDesign embedded technologies, jbeisert@eurodsn.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index 58ffa36dd9..16d2e2d22b 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -4,7 +4,7 @@ * Copyright (C) 2012 Marek Vasut <marex@denx.de> * on behalf of DENX Software Engineering GmbH * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIGS_SC_SPS_1_H__ #define __CONFIGS_SC_SPS_1_H__ diff --git a/include/configs/socrates.h b/include/configs/socrates.h index e73f9c174c..5250d47166 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -7,7 +7,7 @@ * (C) Copyright 2002,2003 Motorola,Inc. * Xianghua Xiao <X.Xiao@motorola.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/spc1920.h b/include/configs/spc1920.h index 564f3645c9..a5b3b781ae 100644 --- a/include/configs/spc1920.h +++ b/include/configs/spc1920.h @@ -4,7 +4,7 @@ * * Configuation settings for the SPC1920 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __H diff --git a/include/configs/spieval.h b/include/configs/spieval.h index e91f5ae47a..231263f2b5 100644 --- a/include/configs/spieval.h +++ b/include/configs/spieval.h @@ -5,7 +5,7 @@ * (C) Copyright 2004-2005 * Martin Krause, TQ-Systems GmbH, martin.krause@tqs.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/stxgp3.h b/include/configs/stxgp3.h index c7689a7290..100dae742e 100644 --- a/include/configs/stxgp3.h +++ b/include/configs/stxgp3.h @@ -7,7 +7,7 @@ * (C) Copyright 2002,2003 Motorola,Inc. * Xianghua Xiao <X.Xiao@motorola.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* mpc8560ads board configuration file */ diff --git a/include/configs/stxssa.h b/include/configs/stxssa.h index f5f7f54348..e82a4b1c6f 100644 --- a/include/configs/stxssa.h +++ b/include/configs/stxssa.h @@ -7,7 +7,7 @@ * (C) Copyright 2002,2003 Motorola,Inc. * Xianghua Xiao <X.Xiao@motorola.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* mpc8560ads board configuration file */ diff --git a/include/configs/taihu.h b/include/configs/taihu.h index e8d191e7f9..4ebaf2e2a5 100644 --- a/include/configs/taihu.h +++ b/include/configs/taihu.h @@ -5,7 +5,7 @@ * (C) Copyright 2005-2007 * Beijing UD Technology Co., Ltd., taihusupport@amcc.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/tb0229.h b/include/configs/tb0229.h index a1b7720796..132e299167 100644 --- a/include/configs/tb0229.h +++ b/include/configs/tb0229.h @@ -2,7 +2,7 @@ * (C) Copyright 2003 * Masami Komiya <mkomiya@sonare.it> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/trats2.h b/include/configs/trats2.h new file mode 100644 index 0000000000..0e93836c0c --- /dev/null +++ b/include/configs/trats2.h @@ -0,0 +1,311 @@ +/* + * Copyright (C) 2013 Samsung Electronics + * Sanghee Kim <sh0130.kim@samsung.com> + * Piotr Wilczek <p.wilczek@samsung.com> + * + * Configuation settings for the SAMSUNG TRATS2 (EXYNOS4412) board. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +/* + * High Level Configuration Options + * (easy to change) + */ +#define CONFIG_SAMSUNG /* in a SAMSUNG core */ +#define CONFIG_S5P /* which is in a S5P Family */ +#define CONFIG_EXYNOS4 /* which is in a EXYNOS4XXX */ +#define CONFIG_TIZEN /* TIZEN lib */ + +#define PLATFORM_NO_UNALIGNED + +#include <asm/arch/cpu.h> /* get chip and board defs */ + +#define CONFIG_ARCH_CPU_INIT +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_SKIP_LOWLEVEL_INIT + +#define CONFIG_SYS_CACHELINE_SIZE 32 + +#ifndef CONFIG_SYS_L2CACHE_OFF +#define CONFIG_SYS_L2_PL310 +#define CONFIG_SYS_PL310_BASE 0x10502000 +#endif + +#define CONFIG_NR_DRAM_BANKS 4 +#define PHYS_SDRAM_1 0x40000000 /* LDDDR2 DMC 0 */ +#define PHYS_SDRAM_1_SIZE (256 << 20) /* 256 MB in CS 0 */ +#define PHYS_SDRAM_2 0x50000000 /* LPDDR2 DMC 1 */ +#define PHYS_SDRAM_2_SIZE (256 << 20) /* 256 MB in CS 0 */ +#define PHYS_SDRAM_3 0x60000000 /* LPDDR2 DMC 1 */ +#define PHYS_SDRAM_3_SIZE (256 << 20) /* 256 MB in CS 0 */ +#define PHYS_SDRAM_4 0x70000000 /* LPDDR2 DMC 1 */ +#define PHYS_SDRAM_4_SIZE (256 << 20) /* 256 MB in CS 0 */ +#define PHYS_SDRAM_END 0x80000000 + +#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */ + +#define CONFIG_SYS_SDRAM_BASE (PHYS_SDRAM_1) +#define CONFIG_SYS_TEXT_BASE 0x78100000 + +#define CONFIG_SYS_CLK_FREQ 24000000 + +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_CMDLINE_TAG +#define CONFIG_REVISION_TAG + +/* MACH_TYPE_TRATS2 */ +#define MACH_TYPE_TRATS2 3765 +#define CONFIG_MACH_TYPE MACH_TYPE_TRATS2 + +#define CONFIG_DISPLAY_CPUINFO + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (2 << 20)) + +/* select serial console configuration */ +#define CONFIG_SERIAL2 + +#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " + +#define CONFIG_CMDLINE_EDITING + +#define CONFIG_BAUDRATE 115200 + +/* It should define before config_cmd_default.h */ +#define CONFIG_SYS_NO_FLASH + +/*********************************************************** + * Command definition + ***********************************************************/ +#include <config_cmd_default.h> + +#undef CONFIG_CMD_ECHO +#undef CONFIG_CMD_FPGA +#undef CONFIG_CMD_FLASH +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_NAND +#undef CONFIG_CMD_MISC +#undef CONFIG_CMD_NFS +#undef CONFIG_CMD_SOURCE +#undef CONFIG_CMD_XIMG +#define CONFIG_CMD_CACHE +#define CONFIG_CMD_I2C +#define CONFIG_CMD_MMC +#define CONFIG_CMD_GPT +#define CONFIG_CMD_PMIC + +#define CONFIG_BOOTDELAY 3 +#define CONFIG_ZERO_BOOTDELAY_CHECK + +#define CONFIG_CMD_FAT +#define CONFIG_FAT_WRITE + +/* EXT4 */ +#define CONFIG_CMD_EXT4 +#define CONFIG_CMD_EXT4_WRITE + +/* To use the TFTPBOOT over USB, Please enable the CONFIG_CMD_NET */ +#undef CONFIG_CMD_NET + +/* MMC */ +#define CONFIG_GENERIC_MMC +#define CONFIG_MMC +#define CONFIG_S5P_SDHCI +#define CONFIG_SDHCI +#define CONFIG_MMC_SDMA +#define CONFIG_MMC_DEFAULT_DEV 0 + +/* PWM */ +#define CONFIG_PWM + +#define CONFIG_BOOTARGS "Please use defined boot" +#define CONFIG_BOOTCOMMAND "run mmcboot" +#define CONFIG_DEFAULT_CONSOLE "console=ttySAC2,115200n8\0" + +#define CONFIG_ENV_OVERWRITE +#define CONFIG_SYS_CONSOLE_INFO_QUIET +#define CONFIG_SYS_CONSOLE_IS_IN_ENV + +/* Tizen - partitions definitions */ +#define PARTS_CSA "csa-mmc" +#define PARTS_BOOTLOADER "u-boot" +#define PARTS_BOOT "boot" +#define PARTS_ROOT "platform" +#define PARTS_DATA "data" +#define PARTS_CSC "csc" +#define PARTS_UMS "ums" + +#define PARTS_DEFAULT \ + "uuid_disk=${uuid_gpt_disk};" \ + "name="PARTS_CSA",size=8MiB,uuid=${uuid_gpt_"PARTS_CSA"};" \ + "name="PARTS_BOOTLOADER",size=60MiB," \ + "uuid=${uuid_gpt_"PARTS_BOOTLOADER"};" \ + "name="PARTS_BOOT",size=100MiB,uuid=${uuid_gpt_"PARTS_BOOT"};" \ + "name="PARTS_ROOT",size=1GiB,uuid=${uuid_gpt_"PARTS_ROOT"};" \ + "name="PARTS_DATA",size=3GiB,uuid=${uuid_gpt_"PARTS_DATA"};" \ + "name="PARTS_CSC",size=150MiB,uuid=${uuid_gpt_"PARTS_CSC"};" \ + "name="PARTS_UMS",size=-,uuid=${uuid_gpt_"PARTS_UMS"}\0" \ + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "bootk=" \ + "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \ + "updatemmc=" \ + "mmc boot 0 1 1 1; mmc write 0x42008000 0 0x200;" \ + "mmc boot 0 1 1 0\0" \ + "updatebackup=" \ + "mmc boot 0 1 1 2; mmc write 0x42100000 0 0x200;" \ + " mmc boot 0 1 1 0\0" \ + "updatebootb=" \ + "mmc read 0x51000000 0x80 0x200; run updatebackup\0" \ + "updateuboot=" \ + "mmc write 0x50000000 0x80 0x400\0" \ + "mmcboot=" \ + "setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \ + "${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \ + "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \ + "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \ + "boottrace=setenv opts initcall_debug; run bootcmd\0" \ + "verify=n\0" \ + "rootfstype=ext4\0" \ + "console=" CONFIG_DEFAULT_CONSOLE \ + "kernelname=uImage\0" \ + "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 uImage\0" \ + "0x40007FC0 ${kernelname}\0" \ + "loaddtb=ext4load mmc ${mmcdev}:${mmcbootpart} ${fdtaddr} " \ + "${fdtfile}\0" \ + "mmcdev=0\0" \ + "mmcbootpart=2\0" \ + "mmcrootpart=5\0" \ + "opts=always_resume=1\0" \ + "partitions=" PARTS_DEFAULT \ + "uartpath=ap\0" \ + "usbpath=ap\0" \ + "consoleon=set console console=ttySAC2,115200n8; save; reset\0" \ + "consoleoff=set console console=ram; save; reset\0" \ + "spladdr=0x40000100\0" \ + "splsize=0x200\0" \ + "splfile=falcon.bin\0" \ + "spl_export=" \ + "setexpr spl_imgsize ${splsize} + 8 ;" \ + "setenv spl_imgsize 0x${spl_imgsize};" \ + "setexpr spl_imgaddr ${spladdr} - 8 ;" \ + "setexpr spl_addr_tmp ${spladdr} - 4 ;" \ + "mw.b ${spl_imgaddr} 0x00 ${spl_imgsize};run loaduimage;" \ + "setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \ + "${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo};" \ + "spl export atags 0x40007FC0;" \ + "crc32 ${spladdr} ${splsize} ${spl_imgaddr};" \ + "mw.l ${spl_addr_tmp} ${splsize};" \ + "ext4write mmc ${mmcdev}:${mmcbootpart}" \ + " /${splfile} ${spl_imgaddr} ${spl_imgsize};" \ + "setenv spl_imgsize;" \ + "setenv spl_imgaddr;" \ + "setenv spl_addr_tmp;\0" \ + "fdtaddr=40800000\0" \ + "fdtfile=exynos4412-trats2.dtb\0" + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "Trats2 # " /* Monitor Command Prompt */ +#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +#define CONFIG_SYS_PBSIZE 384 /* Print Buffer Size */ +#define CONFIG_SYS_MAXARGS 32 /* max number of command args */ + +/* Boot Argument Buffer Size */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +/* memtest works on */ +#define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x5000000) +#define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) + +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ + - GENERATED_GBL_DATA_SIZE) + +#define CONFIG_SYS_HZ 1000 + +/* valid baudrates */ +#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } + +#define CONFIG_SYS_MONITOR_BASE 0x00000000 + +/*----------------------------------------------------------------------- + * FLASH and environment organization + */ + +#define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 2 sectors */ + +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV CONFIG_MMC_DEFAULT_DEV +#define CONFIG_ENV_SIZE 4096 +#define CONFIG_ENV_OFFSET ((32 - 4) << 10) /* 32KiB - 4KiB */ +#define CONFIG_EFI_PARTITION +#define CONFIG_PARTITION_UUIDS + +#define CONFIG_MISC_INIT_R +#define CONFIG_BOARD_EARLY_INIT_F + +/* I2C */ +#include <asm/arch/gpio.h> + +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_SOFT /* I2C bit-banged */ +#define CONFIG_SYS_I2C_SOFT_SPEED 50000 +#define CONFIG_SYS_I2C_SOFT_SLAVE 0x00 +#define I2C_SOFT_DECLARATIONS2 +#define CONFIG_SYS_I2C_SOFT_SPEED_2 50000 +#define CONFIG_SYS_I2C_SOFT_SLAVE_2 0x00 +#define I2C_SOFT_DECLARATIONS3 +#define CONFIG_SYS_I2C_SOFT_SPEED_3 50000 +#define CONFIG_SYS_I2C_SOFT_SLAVE_3 0x00 +#define CONFIG_SOFT_I2C_READ_REPEATED_START +#define CONFIG_SYS_I2C_INIT_BOARD +#define CONFIG_I2C_MULTI_BUS +#define CONFIG_SOFT_I2C_MULTI_BUS +#define CONFIG_SYS_MAX_I2C_BUS 15 + +#define CONFIG_SOFT_I2C_I2C5_SCL exynos4x12_gpio_part1_get_nr(d0, 3) +#define CONFIG_SOFT_I2C_I2C5_SDA exynos4x12_gpio_part1_get_nr(d0, 2) +#define CONFIG_SOFT_I2C_I2C9_SCL exynos4x12_gpio_part1_get_nr(f1, 4) +#define CONFIG_SOFT_I2C_I2C9_SDA exynos4x12_gpio_part1_get_nr(f1, 5) +#define CONFIG_SOFT_I2C_I2C10_SCL exynos4x12_gpio_part2_get_nr(m2, 1) +#define CONFIG_SOFT_I2C_I2C10_SDA exynos4x12_gpio_part2_get_nr(m2, 0) +#define CONFIG_SOFT_I2C_GPIO_SCL get_multi_scl_pin() +#define CONFIG_SOFT_I2C_GPIO_SDA get_multi_sda_pin() +#define I2C_INIT multi_i2c_init() + +/* POWER */ +#define CONFIG_POWER +#define CONFIG_POWER_I2C +#define CONFIG_POWER_MAX77686 +#define CONFIG_POWER_PMIC_MAX77693 +#define CONFIG_POWER_MUIC_MAX77693 +#define CONFIG_POWER_FG_MAX77693 +#define CONFIG_POWER_BATTERY_TRATS2 + +/* LCD */ +#define CONFIG_EXYNOS_FB +#define CONFIG_LCD +#define CONFIG_CMD_BMP +#define CONFIG_BMP_32BPP +#define CONFIG_FB_ADDR 0x52504000 +#define CONFIG_S6E8AX0 +#define CONFIG_EXYNOS_MIPI_DSIM +#define CONFIG_VIDEO_BMP_GZIP +#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 250 * 4) + (1 << 12)) + +/* Pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 + +#endif /* __CONFIG_H */ diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index a9b271464a..b102739a0e 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -10,7 +10,7 @@ * * Configuration settings for the Tricorder board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/trizepsiv.h b/include/configs/trizepsiv.h index c7c6952d2b..885b3eeddc 100644 --- a/include/configs/trizepsiv.h +++ b/include/configs/trizepsiv.h @@ -14,7 +14,7 @@ * * Configuation settings for the LUBBOCK board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/tt01.h b/include/configs/tt01.h index a755d520d7..5942bdf21d 100644 --- a/include/configs/tt01.h +++ b/include/configs/tt01.h @@ -4,7 +4,7 @@ * * Configuration settings for the HALE TT-01 board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/tx25.h b/include/configs/tx25.h index 93dd3c58a8..6910036492 100644 --- a/include/configs/tx25.h +++ b/include/configs/tx25.h @@ -2,7 +2,7 @@ * (C) Copyright 2009 DENX Software Engineering * Author: John Rigby <jrigby@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/uc100.h b/include/configs/uc100.h index 8bf7353bc1..faae7ffd26 100644 --- a/include/configs/uc100.h +++ b/include/configs/uc100.h @@ -65,7 +65,7 @@ "flash_self=run ramargs addip addtty;" \ "bootm ${kernel_addr} ${ramdisk_addr}\0" \ "net_nfs=tftp 200000 ${bootfile};run nfsargs addip addtty;" \ - "bootm\0" \ + "bootm\0" \ "rootpath=/opt/eldk/ppc_8xx\0" \ "bootfile=/tftpboot/uc100/uImage\0" \ "kernel_addr=40000000\0" \ diff --git a/include/configs/uc101.h b/include/configs/uc101.h index a11745fdb9..f93dea7b37 100644 --- a/include/configs/uc101.h +++ b/include/configs/uc101.h @@ -2,7 +2,7 @@ * (C) Copyright 2003-2009 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h index bf044456ce..8f4a4702ac 100644 --- a/include/configs/utx8245.h +++ b/include/configs/utx8245.h @@ -7,7 +7,7 @@ * Matthew E. Karger, karger@arlut.utexas.edu * Applied Research Laboratories, The University of Texas at Austin * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/ve8313.h b/include/configs/ve8313.h index a4b4732ce5..5527511df2 100644 --- a/include/configs/ve8313.h +++ b/include/configs/ve8313.h @@ -4,7 +4,7 @@ * (C) Copyright 2010 * Heiko Schocher, DENX Software Engineering, hs@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* * ve8313 board configuration file diff --git a/include/configs/versatile.h b/include/configs/versatile.h index 8d3ff6aab7..36daeb34a0 100644 --- a/include/configs/versatile.h +++ b/include/configs/versatile.h @@ -9,7 +9,7 @@ * Philippe Robin, <philippe.robin@arm.com> * Configuration for Versatile PB. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/vexpress_ca15_tc2.h b/include/configs/vexpress_ca15_tc2.h index 0806034096..982f4a75ef 100644 --- a/include/configs/vexpress_ca15_tc2.h +++ b/include/configs/vexpress_ca15_tc2.h @@ -5,7 +5,7 @@ * Configuration for Versatile Express. Parts were derived from other ARM * configurations. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __VEXPRESS_CA15X2_TC2_h diff --git a/include/configs/vexpress_ca5x2.h b/include/configs/vexpress_ca5x2.h index 7926905b22..7719d59e15 100644 --- a/include/configs/vexpress_ca5x2.h +++ b/include/configs/vexpress_ca5x2.h @@ -5,7 +5,7 @@ * Configuration for Versatile Express. Parts were derived from other ARM * configurations. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __VEXPRESS_CA5X2_h diff --git a/include/configs/vexpress_ca9x4.h b/include/configs/vexpress_ca9x4.h index 2c08caaa01..38ac4ed38d 100644 --- a/include/configs/vexpress_ca9x4.h +++ b/include/configs/vexpress_ca9x4.h @@ -5,7 +5,7 @@ * Configuration for Versatile Express. Parts were derived from other ARM * configurations. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __VEXPRESS_CA9X4_H diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 75a45000ec..5598961aa7 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -6,7 +6,7 @@ * Configuration for Versatile Express. Parts were derived from other ARM * configurations. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __VEXPRESS_COMMON_H diff --git a/include/configs/vision2.h b/include/configs/vision2.h index c24ce9c057..4744d7cb68 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -5,7 +5,7 @@ * * Configuration settings for the MX51-3Stack Freescale board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/vme8349.h b/include/configs/vme8349.h index b450ab5e17..d5666227e3 100644 --- a/include/configs/vme8349.h +++ b/include/configs/vme8349.h @@ -8,7 +8,7 @@ * reinhard.arlt@esd-electronics.de * Based on the MPC8349EMDS config. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/walnut.h b/include/configs/walnut.h index b23824bd0a..a5691825ee 100644 --- a/include/configs/walnut.h +++ b/include/configs/walnut.h @@ -2,7 +2,7 @@ * (C) Copyright 2000-2005 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/woodburn.h b/include/configs/woodburn.h index 3191ff98ae..c14f7d47d0 100644 --- a/include/configs/woodburn.h +++ b/include/configs/woodburn.h @@ -5,7 +5,7 @@ * * Configuration for the woodburn board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 6b7e81f307..5c442ad865 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -5,7 +5,7 @@ * * Configuration for the woodburn board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __WOODBURN_COMMON_CONFIG_H diff --git a/include/configs/woodburn_sd.h b/include/configs/woodburn_sd.h index c86692da5c..10e1d170ba 100644 --- a/include/configs/woodburn_sd.h +++ b/include/configs/woodburn_sd.h @@ -5,7 +5,7 @@ * * Configuration for the woodburn board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h index 28c84db032..5f34fc7694 100644 --- a/include/configs/xaeniax.h +++ b/include/configs/xaeniax.h @@ -14,7 +14,7 @@ * * Configuation settings for the xaeniax board. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/configs/xpedite1000.h b/include/configs/xpedite1000.h index ea270509c1..a1dea657af 100644 --- a/include/configs/xpedite1000.h +++ b/include/configs/xpedite1000.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2002 Scott McNutt <smcnutt@artesyncp.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index 4d3abf08bd..2dd742e327 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -2,7 +2,7 @@ * (C) Copyright 2005-2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 386f9deb70..237fcb1512 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -2,7 +2,7 @@ * (C) Copyright 2007 * Stefan Roese, DENX Software Engineering, sr@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /************************************************************************ @@ -322,7 +322,7 @@ " ramdisk_size=${ramdisk_size}\0" \ "addip=setenv bootargs ${bootargs} " \ "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ - ":${hostname}:${netdev}:off panic=1\0" \ + ":${hostname}:${netdev}:off panic=1\0" \ "addtty=setenv bootargs ${bootargs} console=ttyS0," \ "${baudrate}\0" \ "net_nfs=tftp ${kernel_mem_addr} ${file_kernel};" \ @@ -352,7 +352,7 @@ "file_fs=/zeus/rootfs_ba.img\0" \ "tftp_fs=tftp 100000 ${file_fs}\0" \ "update_fs=protect off ff300000 ff87ffff;era ff300000 ff87ffff;"\ - "cp.b 100000 ff300000 580000\0" \ + "cp.b 100000 ff300000 580000\0" \ "upd_fs=run tftp_fs;run update_fs\0" \ "bootcmd=chkreset;run ramargs addip addtty addmisc;" \ "bootm ${kernel_fl_addr} ${ramdisk_fl_addr}\0" \ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index c2dbdcb99f..69aafa74cd 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -3,7 +3,7 @@ * * Copyright (C) 2009-2010 Marek Vasut <marek.vasut@gmail.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __CONFIG_H diff --git a/include/dataflash.h b/include/dataflash.h index 769354914f..142b55546f 100644 --- a/include/dataflash.h +++ b/include/dataflash.h @@ -3,7 +3,7 @@ * Data Flash Atmel Description File * Author : Hamid Ikdoumi (Atmel) * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* File Name : dataflash.h */ diff --git a/include/ddr_spd.h b/include/ddr_spd.h index 9e74d8729e..f5809e5e1b 100644 --- a/include/ddr_spd.h +++ b/include/ddr_spd.h @@ -39,7 +39,7 @@ typedef struct ddr1_spd_eeprom_s { unsigned char dev_attr; /* 22 SDRAM Device Attributes */ unsigned char clk_cycle2; /* 23 Min SDRAM Cycle time @ CL=X-0.5 */ unsigned char clk_access2; /* 24 SDRAM Access from - Clk @ CL=X-0.5 (tAC) */ + Clk @ CL=X-0.5 (tAC) */ unsigned char clk_cycle3; /* 25 Min SDRAM Cycle time @ CL=X-1 */ unsigned char clk_access3; /* 26 Max Access from Clk @ CL=X-1 (tAC) */ unsigned char trp; /* 27 Min Row Precharge Time (tRP)*/ @@ -112,9 +112,9 @@ typedef struct ddr2_spd_eeprom_s { unsigned char ca_setup; /* 32 Addr+Cmd Setup Time Before Clk (tIS) */ unsigned char ca_hold; /* 33 Addr+Cmd Hold Time After Clk (tIH) */ unsigned char data_setup; /* 34 Data Input Setup Time - Before Strobe (tDS) */ + Before Strobe (tDS) */ unsigned char data_hold; /* 35 Data Input Hold Time - After Strobe (tDH) */ + After Strobe (tDH) */ unsigned char twr; /* 36 Write Recovery time tWR */ unsigned char twtr; /* 37 Int write to read delay tWTR */ unsigned char trtp; /* 38 Int read to precharge delay tRTP */ @@ -128,40 +128,40 @@ typedef struct ddr2_spd_eeprom_s { unsigned char pll_relock; /* 46 PLL Relock time */ unsigned char Tcasemax; /* 47 Tcasemax */ unsigned char psiTAdram; /* 48 Thermal Resistance of DRAM Package from - Top (Case) to Ambient (Psi T-A DRAM) */ + Top (Case) to Ambient (Psi T-A DRAM) */ unsigned char dt0_mode; /* 49 DRAM Case Temperature Rise from Ambient - due to Activate-Precharge/Mode Bits + due to Activate-Precharge/Mode Bits (DT0/Mode Bits) */ unsigned char dt2n_dt2q; /* 50 DRAM Case Temperature Rise from Ambient - due to Precharge/Quiet Standby + due to Precharge/Quiet Standby (DT2N/DT2Q) */ unsigned char dt2p; /* 51 DRAM Case Temperature Rise from Ambient - due to Precharge Power-Down (DT2P) */ + due to Precharge Power-Down (DT2P) */ unsigned char dt3n; /* 52 DRAM Case Temperature Rise from Ambient - due to Active Standby (DT3N) */ + due to Active Standby (DT3N) */ unsigned char dt3pfast; /* 53 DRAM Case Temperature Rise from Ambient - due to Active Power-Down with + due to Active Power-Down with Fast PDN Exit (DT3Pfast) */ unsigned char dt3pslow; /* 54 DRAM Case Temperature Rise from Ambient - due to Active Power-Down with Slow + due to Active Power-Down with Slow PDN Exit (DT3Pslow) */ unsigned char dt4r_dt4r4w; /* 55 DRAM Case Temperature Rise from Ambient - due to Page Open Burst Read/DT4R4W + due to Page Open Burst Read/DT4R4W Mode Bit (DT4R/DT4R4W Mode Bit) */ unsigned char dt5b; /* 56 DRAM Case Temperature Rise from Ambient - due to Burst Refresh (DT5B) */ + due to Burst Refresh (DT5B) */ unsigned char dt7; /* 57 DRAM Case Temperature Rise from Ambient - due to Bank Interleave Reads with + due to Bank Interleave Reads with Auto-Precharge (DT7) */ unsigned char psiTApll; /* 58 Thermal Resistance of PLL Package form - Top (Case) to Ambient (Psi T-A PLL) */ + Top (Case) to Ambient (Psi T-A PLL) */ unsigned char psiTAreg; /* 59 Thermal Reisitance of Register Package - from Top (Case) to Ambient + from Top (Case) to Ambient (Psi T-A Register) */ unsigned char dtpllactive; /* 60 PLL Case Temperature Rise from Ambient - due to PLL Active (DT PLL Active) */ + due to PLL Active (DT PLL Active) */ unsigned char dtregact; /* 61 Register Case Temperature Rise from - Ambient due to Register Active/Mode Bit + Ambient due to Register Active/Mode Bit (DT Register Active/Mode Bit) */ unsigned char spd_rev; /* 62 SPD Data Revision Code */ unsigned char cksum; /* 63 Checksum for bytes 0-62 */ diff --git a/include/dtt.h b/include/dtt.h index 29268f64ea..058bca4d5d 100644 --- a/include/dtt.h +++ b/include/dtt.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/env_default.h b/include/env_default.h index a7010269d3..90431beb19 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -5,7 +5,7 @@ * (C) Copyright 2001 Sysgo Real-Time Solutions, GmbH <www.elinos.com> * Andreas Heppel <aheppel@sysgo.de> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <env_callback.h> diff --git a/include/flash.h b/include/flash.h index 77f8b7e47a..5454c9ea21 100644 --- a/include/flash.h +++ b/include/flash.h @@ -2,7 +2,7 @@ * (C) Copyright 2000-2005 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _FLASH_H_ diff --git a/include/gdsys_fpga.h b/include/gdsys_fpga.h index f50e0e2733..85ddbcb93b 100644 --- a/include/gdsys_fpga.h +++ b/include/gdsys_fpga.h @@ -2,7 +2,7 @@ * (C) Copyright 2010 * Dirk Eibach, Guntermann & Drunck GmbH, eibach@gdsys.de * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __GDSYS_FPGA_H diff --git a/include/jffs2/load_kernel.h b/include/jffs2/load_kernel.h index e1943e507c..dd0d23fa52 100644 --- a/include/jffs2/load_kernel.h +++ b/include/jffs2/load_kernel.h @@ -32,8 +32,8 @@ struct part_info { struct list_head link; char *name; /* partition name */ u8 auto_name; /* set to 1 for generated name */ - u32 size; /* total size of the partition */ - u32 offset; /* offset within device */ + u64 size; /* total size of the partition */ + u64 offset; /* offset within device */ void *jffs2_priv; /* used internaly by jffs2 */ u32 mask_flags; /* kernel MTD mask flags */ u32 sector_size; /* size of sector */ @@ -44,7 +44,7 @@ struct mtdids { struct list_head link; u8 type; /* device type */ u8 num; /* device number */ - u32 size; /* device size */ + u64 size; /* device size */ char *mtd_id; /* linux kernel device id */ }; diff --git a/include/lcd.h b/include/lcd.h index b54255a51e..40e8d2a86b 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -7,7 +7,7 @@ * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _LCD_H_ diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 2055584374..0546565593 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -464,6 +464,8 @@ struct nand_buffers { * @pagemask: [INTERN] page number mask = number of (pages / chip) - 1 * @pagebuf: [INTERN] holds the pagenumber which is currently in * data_buf. + * @pagebuf_bitflips: [INTERN] holds the bitflip count for the page which is + * currently in data_buf. * @subpagesize: [INTERN] holds the subpagesize * @onfi_version: [INTERN] holds the chip ONFI version (BCD encoded), * non 0 if ONFI supported. @@ -531,6 +533,7 @@ struct nand_chip { uint64_t chipsize; int pagemask; int pagebuf; + unsigned int pagebuf_bitflips; int subpagesize; uint8_t cellinfo; int badblockpos; diff --git a/include/lynxkdi.h b/include/lynxkdi.h index df214a1798..8e45a81f92 100644 --- a/include/lynxkdi.h +++ b/include/lynxkdi.h @@ -2,7 +2,7 @@ * (C) Copyright 2003 * Orbacom Systems, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __LYNXKDI_H__ diff --git a/include/mpc824x.h b/include/mpc824x.h index 975a5dd2a7..31d6f693da 100644 --- a/include/mpc824x.h +++ b/include/mpc824x.h @@ -2,7 +2,7 @@ * Copyright Rob Taylor, Flying Pig Systems Ltd. 2000. * Copyright (C) 2001, James Dougherty, jfd@cs.stanford.edu * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __MPC824X_H__ diff --git a/include/mpc8xx.h b/include/mpc8xx.h index 3cde26b940..33a2cd8057 100644 --- a/include/mpc8xx.h +++ b/include/mpc8xx.h @@ -2,7 +2,7 @@ * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/nand.h b/include/nand.h index ed4ba8d2b6..84116f4937 100644 --- a/include/nand.h +++ b/include/nand.h @@ -8,7 +8,7 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * version 2 as published by the Free Software Foundation. */ #ifndef _NAND_H_ diff --git a/include/part.h b/include/part.h index ff62407d05..ce840bd841 100644 --- a/include/part.h +++ b/include/part.h @@ -2,7 +2,7 @@ * (C) Copyright 2000-2004 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _PART_H #define _PART_H diff --git a/include/part_efi.h b/include/part_efi.h index 33cd3be75c..d68ef3bb37 100644 --- a/include/part_efi.h +++ b/include/part_efi.h @@ -2,7 +2,7 @@ * Copyright (C) 2008 RuggedCom, Inc. * Richard Retanubun <RichardRetanubun@RuggedCom.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h index c98db1b75d..16e9016089 100644 --- a/include/power/max77686_pmic.h +++ b/include/power/max77686_pmic.h @@ -36,7 +36,7 @@ enum { MAX77686_REG_PMIC_BUCK2DVS7, MAX77686_REG_PMIC_BUCK2DVS8, MAX77686_REG_PMIC_BUCK3CTRL, - MAX77686_REG_PMIC_BUCK3DVS1, + MAX77686_REG_PMIC_BUCK3DVS1 = 0x1e, MAX77686_REG_PMIC_BUCK3DVS2, MAX77686_REG_PMIC_BUCK3DVS3, MAX77686_REG_PMIC_BUCK3DVS4, diff --git a/include/power/max77693_fg.h b/include/power/max77693_fg.h new file mode 100644 index 0000000000..42626ed839 --- /dev/null +++ b/include/power/max77693_fg.h @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2013 Samsung Electronics + * Piotr Wilczek <p.wilczek@samsung.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __MAX77693_FG_H_ +#define __MAX77693_FG_H_ + +/* MAX 77693 registers */ +enum { + MAX77693_STATUS = 0x00, + MAX77693_SOCREP = 0x06, + MAX77693_VCELL = 0x09, + MAX77693_CURRENT = 0x0A, + MAX77693_AVG_CURRENT = 0x0B, + MAX77693_SOCMIX = 0x0D, + MAX77693_SOCAV = 0x0E, + MAX77693_DESIGN_CAP = 0x18, + MAX77693_AVG_VCELL = 0x19, + MAX77693_CONFIG = 0x1D, + MAX77693_VERSION = 0x21, + MAX77693_LEARNCFG = 0x28, + MAX77693_FILTERCFG = 0x29, + MAX77693_RELAXCFG = 0x2A, + MAX77693_MISCCFG = 0x2B, + MAX77693_CGAIN = 0x2E, + MAX77693_COFF = 0x2F, + MAX77693_RCOMP0 = 0x38, + MAX77693_TEMPCO = 0x39, + MAX77693_FSTAT = 0x3D, + MAX77693_VFOCV = 0xEE, + MAX77693_VFSOC = 0xFF, + + FG_NUM_OF_REGS = 0x100, +}; + +#define MAX77693_POR (1 << 1) + +#define MODEL_UNLOCK1 0x0059 +#define MODEL_UNLOCK2 0x00c4 +#define MODEL_LOCK1 0x0000 +#define MODEL_LOCK2 0x0000 + +#define MAX77693_FUEL_I2C_ADDR (0x6C >> 1) + +int power_fg_init(unsigned char bus); +#endif /* __MAX77693_FG_H_ */ diff --git a/include/power/max77693_muic.h b/include/power/max77693_muic.h new file mode 100644 index 0000000000..a2c29eb6ce --- /dev/null +++ b/include/power/max77693_muic.h @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2013 Samsung Electronics + * Piotr Wilczek <p.wilczek@samsung.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __MAX77693_MUIC_H_ +#define __MAX77693_MUIC_H_ + +#include <power/power_chrg.h> + +/* + * MUIC REGISTER + */ + +#define MAX77693_MUIC_PREFIX "max77693-muic:" + +/* MAX77693_MUIC_STATUS1 */ +#define MAX77693_MUIC_ADC_MASK 0x1F + +/* MAX77693_MUIC_STATUS2 */ +#define MAX77693_MUIC_CHG_NO 0x00 +#define MAX77693_MUIC_CHG_USB 0x01 +#define MAX77693_MUIC_CHG_USB_D 0x02 +#define MAX77693_MUIC_CHG_TA 0x03 +#define MAX77693_MUIC_CHG_TA_500 0x04 +#define MAX77693_MUIC_CHG_TA_1A 0x05 +#define MAX77693_MUIC_CHG_MASK 0x07 + +/* MAX77693_MUIC_CONTROL1 */ +#define MAX77693_MUIC_CTRL1_DN1DP2 ((0x1 << 3) | 0x1) +#define MAX77693_MUIC_CTRL1_UT1UR2 ((0x3 << 3) | 0x3) +#define MAX77693_MUIC_CTRL1_ADN1ADP2 ((0x4 << 3) | 0x4) +#define MAX77693_MUIC_CTRL1_AUT1AUR2 ((0x5 << 3) | 0x5) +#define MAX77693_MUIC_CTRL1_MASK 0xC0 + +#define MUIC_PATH_USB 0 +#define MUIC_PATH_UART 1 + +#define MUIC_PATH_CP 0 +#define MUIC_PATH_AP 1 + +enum muic_path { + MUIC_PATH_USB_CP, + MUIC_PATH_USB_AP, + MUIC_PATH_UART_CP, + MUIC_PATH_UART_AP, +}; + +/* MAX 777693 MUIC registers */ +enum { + MAX77693_MUIC_ID = 0x00, + MAX77693_MUIC_INT1 = 0x01, + MAX77693_MUIC_INT2 = 0x02, + MAX77693_MUIC_INT3 = 0x03, + MAX77693_MUIC_STATUS1 = 0x04, + MAX77693_MUIC_STATUS2 = 0x05, + MAX77693_MUIC_STATUS3 = 0x06, + MAX77693_MUIC_INTMASK1 = 0x07, + MAX77693_MUIC_INTMASK2 = 0x08, + MAX77693_MUIC_INTMASK3 = 0x09, + MAX77693_MUIC_CDETCTRL = 0x0A, + MAX77693_MUIC_CONTROL1 = 0x0C, + MAX77693_MUIC_CONTROL2 = 0x0D, + MAX77693_MUIC_CONTROL3 = 0x0E, + + MUIC_NUM_OF_REGS = 0x0F, +}; + +#define MAX77693_MUIC_I2C_ADDR (0x4A >> 1) + +int power_muic_init(unsigned int bus); +#endif /* __MAX77693_MUIC_H_ */ diff --git a/include/power/max77693_pmic.h b/include/power/max77693_pmic.h new file mode 100644 index 0000000000..616d051f17 --- /dev/null +++ b/include/power/max77693_pmic.h @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2013 Samsung Electronics + * Piotr Wilczek <p.wilczek@samsung.com> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __MAX77693_PMIC_H_ +#define __MAX77693_PMIC_H_ + +#include <power/power_chrg.h> + +enum {CHARGER_ENABLE, CHARGER_DISABLE}; + +#define CHARGER_MIN_CURRENT 200 +#define CHARGER_MAX_CURRENT 2000 + +#define MAX77693_CHG_PREFIX "max77693-chg:" + +/* Registers */ + +#define MAX77693_CHG_BASE 0xB0 +#define MAX77693_CHG_INT_OK 0xB2 +#define MAX77693_CHG_CNFG_00 0xB7 +#define MAX77693_CHG_CNFG_02 0xB9 +#define MAX77693_CHG_CNFG_06 0xBD +#define MAX77693_SAFEOUT 0xC6 + +#define PMIC_NUM_OF_REGS 0xC7 + +#define MAX77693_CHG_DETBAT (0x1 << 7) /* MAX77693_CHG_INT_OK */ +#define MAX77693_CHG_MODE_ON 0x05 /* MAX77693_CHG_CNFG_00 */ +#define MAX77693_CHG_CC 0x3F /* MAX77693_CHG_CNFG_02 */ +#define MAX77693_CHG_LOCK (0x0 << 2) /* MAX77693_CHG_CNFG_06 */ +#define MAX77693_CHG_UNLOCK (0x3 << 2) /* MAX77693_CHG_CNFG_06 */ + +#define MAX77693_ENSAFEOUT1 (1 << 6) +#define MAX77693_ENSAFEOUT2 (1 << 7) + +#define MAX77693_PMIC_I2C_ADDR (0xCC >> 1) + +int pmic_init_max77693(unsigned char bus); +#endif /* __MAX77693_PMIC_H_ */ diff --git a/include/spi_flash.h b/include/spi_flash.h index 1ff5af4dfc..25ca8f177b 100644 --- a/include/spi_flash.h +++ b/include/spi_flash.h @@ -9,7 +9,7 @@ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License - * version 2 as published by the Free Software Foundation. + * version 2 as published by the Free Software Foundation. */ #ifndef _SPI_FLASH_H_ diff --git a/include/tsi148.h b/include/tsi148.h index a0beba73e4..9b635e150a 100644 --- a/include/tsi148.h +++ b/include/tsi148.h @@ -5,7 +5,7 @@ * * (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _tsi148_h diff --git a/include/universe.h b/include/universe.h index 535b403a62..eb81e073d8 100644 --- a/include/universe.h +++ b/include/universe.h @@ -1,7 +1,7 @@ /* * (C) Copyright 2003 Stefan Roese, stefan.roese@esd-electronics.com * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _universe_h diff --git a/include/video_ad7176.h b/include/video_ad7176.h index 6447b15f20..6a0230e5a1 100644 --- a/include/video_ad7176.h +++ b/include/video_ad7176.h @@ -2,7 +2,7 @@ * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _VIDEO_AD7176_H_ diff --git a/include/video_ad7177.h b/include/video_ad7177.h index 7226ed2e2f..38436d6414 100644 --- a/include/video_ad7177.h +++ b/include/video_ad7177.h @@ -2,7 +2,7 @@ * (C) Copyright 2000 * Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _VIDEO_AD7177_H_ diff --git a/include/video_font_4x6.h b/include/video_font_4x6.h index d1778d5b5b..0dcd2debcb 100644 --- a/include/video_font_4x6.h +++ b/include/video_font_4x6.h @@ -18,15 +18,15 @@ s{((0x)?[0-9a-fA-F]+)(.*\[([\*\ ]{4})\])}{ ($num,$pat,$bits) = ($1,$3,$4); - + $bits =~ s/([^\s0])|(.)/ defined($1) + 0 /ge; - + $num = ord(pack("B8", $bits)); $num |= $num >> 4; $num = sprintf("0x%.2x", $num); - + #print "$num,$pat,$bits\n"; - + $num . $pat; }ge; diff --git a/include/vsprintf.h b/include/vsprintf.h index 2ac41d1923..5624482d57 100644 --- a/include/vsprintf.h +++ b/include/vsprintf.h @@ -2,7 +2,7 @@ * (C) Copyright 2000-2009 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef __VSPRINTF_H diff --git a/include/watchdog.h b/include/watchdog.h index b2219044dd..aacacb970a 100644 --- a/include/watchdog.h +++ b/include/watchdog.h @@ -2,7 +2,7 @@ * (C) Copyright 2001 * Erik Theisen, Wave 7 Optics, etheisen@mindspring.com. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/lib/libfdt/fdt_empty_tree.c b/lib/libfdt/fdt_empty_tree.c index ac6c1fb04f..34f1c84431 100644 --- a/lib/libfdt/fdt_empty_tree.c +++ b/lib/libfdt/fdt_empty_tree.c @@ -36,4 +36,3 @@ int fdt_create_empty_tree(void *buf, int bufsize) return fdt_open_into(buf, buf, bufsize); } - diff --git a/lib/slre.c b/lib/slre.c index 8cdd192ea3..f90749f8ed 100644 --- a/lib/slre.c +++ b/lib/slre.c @@ -688,7 +688,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Error compiling slre: %s\n", slre.err_str); return 1; } - + slre_dump(&slre, stderr); while (fgets(data, sizeof(data), fp) != NULL) { diff --git a/lib/string.c b/lib/string.c index 3a82efab61..29c2ca7ef6 100644 --- a/lib/string.c +++ b/lib/string.c @@ -675,4 +675,3 @@ void *memchr_inv(const void *start, int c, size_t bytes) return check_bytes8(start, value, bytes % 8); } #endif - diff --git a/nand_spl/nand_boot_fsl_elbc.c b/nand_spl/nand_boot_fsl_elbc.c index 03e25f37ea..1afa1a27a9 100644 --- a/nand_spl/nand_boot_fsl_elbc.c +++ b/nand_spl/nand_boot_fsl_elbc.c @@ -126,7 +126,7 @@ void nand_boot(void) * Load U-Boot image from NAND into RAM */ nand_load(CONFIG_SYS_NAND_U_BOOT_OFFS, CONFIG_SYS_NAND_U_BOOT_SIZE, - (uchar *)CONFIG_SYS_NAND_U_BOOT_DST); + (uchar *)CONFIG_SYS_NAND_U_BOOT_DST); /* * Jump to U-Boot image diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c index 878b2ca7ab..8a4b89b983 100644 --- a/post/lib_powerpc/andi.c +++ b/post/lib_powerpc/andi.c @@ -89,7 +89,7 @@ int cpu_post_test_andi (void) if (ret != 0) { - post_log ("Error at andi test %d !\n", i); + post_log ("Error at andi test %d !\n", i); } } } diff --git a/post/lib_powerpc/cpu_asm.h b/post/lib_powerpc/cpu_asm.h index 66adad8f79..b5c588919e 100644 --- a/post/lib_powerpc/cpu_asm.h +++ b/post/lib_powerpc/cpu_asm.h @@ -112,64 +112,64 @@ #define ASM_0(opcode) (opcode) #define ASM_1(opcode, rd) ((opcode) + \ - ((rd) << 21)) + ((rd) << 21)) #define ASM_1C(opcode, cr) ((opcode) + \ - ((cr) << 23)) + ((cr) << 23)) #define ASM_11(opcode, rd, rs) ((opcode) + \ - ((rd) << 21) + \ + ((rd) << 21) + \ ((rs) << 16)) #define ASM_11C(opcode, cd, cs) ((opcode) + \ - ((cd) << 23) + \ + ((cd) << 23) + \ ((cs) << 18)) #define ASM_11X(opcode, rd, rs) ((opcode) + \ - ((rs) << 21) + \ + ((rs) << 21) + \ ((rd) << 16)) #define ASM_11I(opcode, rd, rs, simm) ((opcode) + \ - ((rd) << 21) + \ + ((rd) << 21) + \ ((rs) << 16) + \ ((simm) & 0xffff)) #define ASM_11IF(opcode, rd, rs, simm) ((opcode) + \ - ((rd) << 21) + \ + ((rd) << 21) + \ ((rs) << 16) + \ ((simm) << 11)) #define ASM_11S(opcode, rd, rs, sh) ((opcode) + \ - ((rs) << 21) + \ + ((rs) << 21) + \ ((rd) << 16) + \ ((sh) << 11)) #define ASM_11IX(opcode, rd, rs, imm) ((opcode) + \ - ((rs) << 21) + \ + ((rs) << 21) + \ ((rd) << 16) + \ ((imm) & 0xffff)) #define ASM_12(opcode, rd, rs1, rs2) ((opcode) + \ - ((rd) << 21) + \ + ((rd) << 21) + \ ((rs1) << 16) + \ ((rs2) << 11)) #define ASM_12F(opcode, fd, fs1, fs2) ((opcode) + \ - ((fd) << 21) + \ + ((fd) << 21) + \ ((fs1) << 16) + \ ((fs2) << 11)) #define ASM_12X(opcode, rd, rs1, rs2) ((opcode) + \ - ((rs1) << 21) + \ + ((rs1) << 21) + \ ((rd) << 16) + \ ((rs2) << 11)) #define ASM_2C(opcode, cr, rs1, rs2) ((opcode) + \ - ((cr) << 23) + \ + ((cr) << 23) + \ ((rs1) << 16) + \ ((rs2) << 11)) #define ASM_1IC(opcode, cr, rs, imm) ((opcode) + \ - ((cr) << 23) + \ + ((cr) << 23) + \ ((rs) << 16) + \ ((imm) & 0xffff)) #define ASM_122(opcode, rd, rs1, rs2, imm1, imm2) \ ((opcode) + \ - ((rs1) << 21) + \ + ((rs1) << 21) + \ ((rd) << 16) + \ ((rs2) << 11) + \ ((imm1) << 6) + \ ((imm2) << 1)) #define ASM_113(opcode, rd, rs, imm1, imm2, imm3) \ ((opcode) + \ - ((rs) << 21) + \ + ((rs) << 21) + \ ((rd) << 16) + \ ((imm1) << 11) + \ ((imm2) << 6) + \ diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c index eccf71daa3..6bd53d06cb 100644 --- a/post/lib_powerpc/rlwimi.c +++ b/post/lib_powerpc/rlwimi.c @@ -114,7 +114,7 @@ int cpu_post_test_rlwimi (void) if (ret != 0) { - post_log ("Error at rlwimi test %d !\n", i); + post_log ("Error at rlwimi test %d !\n", i); } } @@ -127,8 +127,8 @@ int cpu_post_test_rlwimi (void) if (ret != 0) { - post_log ("Error at rlwimi test %d !\n", i); - } + post_log ("Error at rlwimi test %d !\n", i); + } } } } diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c index 5eaf30b8e7..35a1a40fc9 100644 --- a/post/lib_powerpc/rlwinm.c +++ b/post/lib_powerpc/rlwinm.c @@ -107,7 +107,7 @@ int cpu_post_test_rlwinm (void) if (ret != 0) { - post_log ("Error at rlwinm test %d !\n", i); + post_log ("Error at rlwinm test %d !\n", i); } } @@ -120,8 +120,8 @@ int cpu_post_test_rlwinm (void) if (ret != 0) { - post_log ("Error at rlwinm test %d !\n", i); - } + post_log ("Error at rlwinm test %d !\n", i); + } } } } diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c index 83ee70b52d..6e828939e0 100644 --- a/post/lib_powerpc/rlwnm.c +++ b/post/lib_powerpc/rlwnm.c @@ -117,7 +117,7 @@ int cpu_post_test_rlwnm (void) if (ret != 0) { - post_log ("Error at rlwnm test %d !\n", i); + post_log ("Error at rlwnm test %d !\n", i); } } @@ -130,8 +130,8 @@ int cpu_post_test_rlwnm (void) if (ret != 0) { - post_log ("Error at rlwnm test %d !\n", i); - } + post_log ("Error at rlwnm test %d !\n", i); + } } } } diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c index b2760140b5..3723e339b9 100644 --- a/post/lib_powerpc/srawi.c +++ b/post/lib_powerpc/srawi.c @@ -108,7 +108,7 @@ int cpu_post_test_srawi (void) if (ret != 0) { - post_log ("Error at srawi test %d !\n", i); + post_log ("Error at srawi test %d !\n", i); } } @@ -121,8 +121,8 @@ int cpu_post_test_srawi (void) if (ret != 0) { - post_log ("Error at srawi test %d !\n", i); - } + post_log ("Error at srawi test %d !\n", i); + } } } } diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c index f7317dded0..c3e7f681ab 100644 --- a/post/lib_powerpc/three.c +++ b/post/lib_powerpc/three.c @@ -211,7 +211,7 @@ int cpu_post_test_three (void) if (ret != 0) { - post_log ("Error at three test %d !\n", i); + post_log ("Error at three test %d !\n", i); } } @@ -224,8 +224,8 @@ int cpu_post_test_three (void) if (ret != 0) { - post_log ("Error at three test %d !\n", i); - } + post_log ("Error at three test %d !\n", i); + } } } } diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c index f6d9052532..1d40e1af33 100644 --- a/post/lib_powerpc/threei.c +++ b/post/lib_powerpc/threei.c @@ -103,7 +103,7 @@ int cpu_post_test_threei (void) if (ret != 0) { - post_log ("Error at threei test %d !\n", i); + post_log ("Error at threei test %d !\n", i); } } } diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c index 906fefd0d3..ce1edf89db 100644 --- a/post/lib_powerpc/threex.c +++ b/post/lib_powerpc/threex.c @@ -181,7 +181,7 @@ int cpu_post_test_threex (void) if (ret != 0) { - post_log ("Error at threex test %d !\n", i); + post_log ("Error at threex test %d !\n", i); } } @@ -194,8 +194,8 @@ int cpu_post_test_threex (void) if (ret != 0) { - post_log ("Error at threex test %d !\n", i); - } + post_log ("Error at threex test %d !\n", i); + } } } } diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c index 3a9b13684f..9549dbb750 100644 --- a/post/lib_powerpc/twox.c +++ b/post/lib_powerpc/twox.c @@ -128,7 +128,7 @@ int cpu_post_test_twox (void) if (ret != 0) { - post_log ("Error at twox test %d !\n", i); + post_log ("Error at twox test %d !\n", i); } } @@ -141,8 +141,8 @@ int cpu_post_test_twox (void) if (ret != 0) { - post_log ("Error at twox test %d !\n", i); - } + post_log ("Error at twox test %d !\n", i); + } } } } diff --git a/test/compression.c b/test/compression.c index 8834d5e8ab..139ea019f2 100644 --- a/test/compression.c +++ b/test/compression.c @@ -127,8 +127,8 @@ static int uncompress_using_gzip(void *in, unsigned long in_size, } static int compress_using_bzip2(void *in, unsigned long in_size, - void *out, unsigned long out_max, - unsigned long *out_size) + void *out, unsigned long out_max, + unsigned long *out_size) { /* There is no bzip2 compression in u-boot, so fake it. */ assert(in_size == strlen(plain)); diff --git a/tools/Makefile b/tools/Makefile index c36cde2007..ca76f947e5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -162,7 +162,7 @@ HOSTCPPFLAGS = -include $(SRCTREE)/include/libfdt_env.h \ -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include \ - -I $(SRCTREE)/lib/libfdt \ + -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) \ -DUSE_HOSTCC \ diff --git a/tools/aisimage.c b/tools/aisimage.c index 980bf2e1a7..04fb649899 100644 --- a/tools/aisimage.c +++ b/tools/aisimage.c @@ -2,7 +2,7 @@ * (C) Copyright 2011 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include "mkimage.h" diff --git a/tools/aisimage.h b/tools/aisimage.h index 1f092dbc7e..e1aa3ef703 100644 --- a/tools/aisimage.h +++ b/tools/aisimage.h @@ -2,7 +2,7 @@ * (C) Copyright 2011 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _AISIMAGE_H_ diff --git a/tools/bddb/defs.php b/tools/bddb/defs.php index b7518e3f79..0b50602823 100644 --- a/tools/bddb/defs.php +++ b/tools/bddb/defs.php @@ -178,7 +178,7 @@ function enum_to_index($name, $vals) { $index = array_search($GLOBALS[$name], $vals); if ($vals[0] != '') - $index++; + $index++; return $index; } diff --git a/tools/buildman/README b/tools/buildman/README index f63f278673..090b653116 100644 --- a/tools/buildman/README +++ b/tools/buildman/README @@ -677,7 +677,6 @@ the build speed by building all commits for a board instead of the other way around. - Simon Glass sjg@chromium.org Halloween 2012 diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index 6208293790..aff471ba19 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -2,7 +2,7 @@ * (C) Copyright 2002-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* Pull in the current config to define the default environment */ diff --git a/tools/env/fw_env_main.c b/tools/env/fw_env_main.c index 5f42df3889..2b85d78864 100644 --- a/tools/env/fw_env_main.c +++ b/tools/env/fw_env_main.c @@ -2,7 +2,7 @@ * (C) Copyright 2000-2008 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ /* diff --git a/tools/imls/Makefile b/tools/imls/Makefile index 1be1edb16a..e371983275 100644 --- a/tools/imls/Makefile +++ b/tools/imls/Makefile @@ -39,7 +39,7 @@ LIBFDT_OBJS := $(addprefix $(obj),$(LIBFDT_OBJ_FILES-y)) HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include \ - -I $(SRCTREE)/lib/libfdt \ + -I $(SRCTREE)/lib/libfdt \ -I $(SRCTREE)/tools \ -DUSE_HOSTCC -D__KERNEL_STRICT_NAMES diff --git a/tools/imximage.c b/tools/imximage.c index 32e4efe423..511e3f2038 100644 --- a/tools/imximage.c +++ b/tools/imximage.c @@ -6,7 +6,7 @@ * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include "mkimage.h" diff --git a/tools/imximage.h b/tools/imximage.h index efe6a88d9e..01f861e7a5 100644 --- a/tools/imximage.h +++ b/tools/imximage.h @@ -2,7 +2,7 @@ * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _IMXIMAGE_H_ diff --git a/tools/kernel-doc/docproc.c b/tools/kernel-doc/docproc.c index d4fc42e4cc..a9b49c59a0 100644 --- a/tools/kernel-doc/docproc.c +++ b/tools/kernel-doc/docproc.c @@ -153,7 +153,7 @@ int symfilecnt = 0; static void add_new_symbol(struct symfile *sym, char * symname) { sym->symbollist = - realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); + realloc(sym->symbollist, (sym->symbolcnt + 1) * sizeof(char *)); sym->symbollist[sym->symbolcnt++].name = strdup(symname); } @@ -214,7 +214,7 @@ static void find_export_symbols(char * filename) char *p; char *e; if (((p = strstr(line, "EXPORT_SYMBOL_GPL")) != NULL) || - ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) { + ((p = strstr(line, "EXPORT_SYMBOL")) != NULL)) { /* Skip EXPORT_SYMBOL{_GPL} */ while (isalnum(*p) || *p == '_') p++; @@ -290,24 +290,24 @@ static void extfunc(char * filename) { docfunctions(filename, FUNCTION); } static void singfunc(char * filename, char * line) { char *vec[200]; /* Enough for specific functions */ - int i, idx = 0; - int startofsym = 1; + int i, idx = 0; + int startofsym = 1; vec[idx++] = KERNELDOC; vec[idx++] = DOCBOOK; - /* Split line up in individual parameters preceded by FUNCTION */ - for (i=0; line[i]; i++) { - if (isspace(line[i])) { - line[i] = '\0'; - startofsym = 1; - continue; - } - if (startofsym) { - startofsym = 0; - vec[idx++] = FUNCTION; - vec[idx++] = &line[i]; - } - } + /* Split line up in individual parameters preceded by FUNCTION */ + for (i=0; line[i]; i++) { + if (isspace(line[i])) { + line[i] = '\0'; + startofsym = 1; + continue; + } + if (startofsym) { + startofsym = 0; + vec[idx++] = FUNCTION; + vec[idx++] = &line[i]; + } + } for (i = 0; i < idx; i++) { if (strcmp(vec[i], FUNCTION)) continue; @@ -456,14 +456,14 @@ static void parse_file(FILE *infile) break; case 'D': while (*s && !isspace(*s)) s++; - *s = '\0'; - symbolsonly(line+2); - break; + *s = '\0'; + symbolsonly(line+2); + break; case 'F': /* filename */ while (*s && !isspace(*s)) s++; *s++ = '\0'; - /* function names */ + /* function names */ while (isspace(*s)) s++; singlefunctions(line +2, s); @@ -511,11 +511,11 @@ int main(int argc, char *argv[]) } /* Open file, exit on error */ infile = fopen(argv[2], "r"); - if (infile == NULL) { - fprintf(stderr, "docproc: "); - perror(argv[2]); - exit(2); - } + if (infile == NULL) { + fprintf(stderr, "docproc: "); + perror(argv[2]); + exit(2); + } if (strcmp("doc", argv[1]) == 0) { /* Need to do this in two passes. diff --git a/tools/kernel-doc/kernel-doc b/tools/kernel-doc/kernel-doc index 6347418904..cbbf34c27c 100755 --- a/tools/kernel-doc/kernel-doc +++ b/tools/kernel-doc/kernel-doc @@ -432,7 +432,7 @@ sub dump_doc_section { my $contents = join "\n", @_; if ($no_doc_sections) { - return; + return; } if (($function_only == 0) || diff --git a/tools/omapimage.c b/tools/omapimage.c index 00853dd741..8774a7e3ac 100644 --- a/tools/omapimage.c +++ b/tools/omapimage.c @@ -11,7 +11,7 @@ * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include "mkimage.h" diff --git a/tools/omapimage.h b/tools/omapimage.h index 058013498b..45d14eaf9c 100644 --- a/tools/omapimage.h +++ b/tools/omapimage.h @@ -4,7 +4,7 @@ * Author John Rigby <john.rigby@linaro.org> * Based on TI's signGP.c * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _OMAPIMAGE_H_ diff --git a/tools/pblimage.h b/tools/pblimage.h index a0f1fc53ab..12bece50a7 100644 --- a/tools/pblimage.h +++ b/tools/pblimage.h @@ -1,7 +1,7 @@ /* * Copyright 2012 Freescale Semiconductor, Inc. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef PBLIMAGE_H diff --git a/tools/reformat.py b/tools/reformat.py index 7e038905c2..61306d0235 100755 --- a/tools/reformat.py +++ b/tools/reformat.py @@ -49,7 +49,7 @@ try: ["ignore-case","default","split="]) except getopt.GetoptError as err: print str(err) # will print something like "option -a not recognized" - sys.exit(2) + sys.exit(2) for o, a in opts: if o in ("-s", "--split"): diff --git a/tools/ublimage.c b/tools/ublimage.c index b4ef7f080e..aafe248758 100644 --- a/tools/ublimage.c +++ b/tools/ublimage.c @@ -10,7 +10,7 @@ * Marvell Semiconductor <www.marvell.com> * Written-by: Prafulla Wadaskar <prafulla@marvell.com> * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include "mkimage.h" diff --git a/tools/ublimage.h b/tools/ublimage.h index b7318e9535..32cc5822ca 100644 --- a/tools/ublimage.h +++ b/tools/ublimage.h @@ -6,7 +6,7 @@ * (C) Copyright 2009 * Stefano Babic, DENX Software Engineering, sbabic@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _UBLIMAGE_H_ diff --git a/tools/ubsha1.c b/tools/ubsha1.c index c003f9ad19..1041588d0b 100644 --- a/tools/ubsha1.c +++ b/tools/ubsha1.c @@ -63,10 +63,10 @@ int main (int argc, char **argv) sha1_csum ((unsigned char *) data, len, (unsigned char *)output); printf ("U-Boot sum:\n"); - for (i = 0; i < 20 ; i++) { - printf ("%02X ", output[i]); - } - printf ("\n"); + for (i = 0; i < 20 ; i++) { + printf ("%02X ", output[i]); + } + printf ("\n"); /* overwrite the sum in the bin file, with the actual */ lseek (ifd, SHA1_SUM_POS, SEEK_END); if (write (ifd, output, SHA1_SUM_LEN) != SHA1_SUM_LEN) { diff --git a/tools/updater/flash_hw.c b/tools/updater/flash_hw.c index 254493345d..54a910b178 100644 --- a/tools/updater/flash_hw.c +++ b/tools/updater/flash_hw.c @@ -5,7 +5,7 @@ * (C) Copyright 2002 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * SPDX-License-Identifier: GPL-2.0+ + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> |