November 2015 - U-Boot

[U-Boot] [PATCH 1/1] Change e-mail address of Kamil Lulko
by Kamil Lulko 06 Dec '15

06 Dec '15

Signed-off-by: Kamil Lulko <kamil.lulko(a)gmail.com> --- arch/arm/cpu/armv7m/config.mk | 2 +- arch/arm/cpu/armv7m/cpu.c | 2 +- arch/arm/cpu/armv7m/start.S | 2 +- arch/arm/cpu/armv7m/stm32f1/Makefile | 2 +- arch/arm/cpu/armv7m/stm32f1/clock.c | 2 +- arch/arm/cpu/armv7m/stm32f1/flash.c | 2 +- arch/arm/cpu/armv7m/stm32f1/soc.c | 2 +- arch/arm/cpu/armv7m/stm32f1/timer.c | 2 +- arch/arm/cpu/armv7m/stm32f4/Makefile | 2 +- arch/arm/cpu/armv7m/stm32f4/clock.c | 2 +- arch/arm/cpu/armv7m/stm32f4/flash.c | 2 +- arch/arm/cpu/armv7m/stm32f4/soc.c | 2 +- arch/arm/cpu/armv7m/stm32f4/timer.c | 2 +- arch/arm/include/asm/arch-stm32f1/gpio.h | 2 +- arch/arm/include/asm/arch-stm32f1/stm32.h | 2 +- arch/arm/include/asm/arch-stm32f4/fmc.h | 2 +- arch/arm/include/asm/arch-stm32f4/gpio.h | 2 +- arch/arm/include/asm/armv7m.h | 2 +- arch/arm/lib/interrupts_m.c | 2 +- arch/arm/lib/vectors_m.S | 2 +- board/st/stm32f429-discovery/MAINTAINERS | 2 +- board/st/stm32f429-discovery/Makefile | 2 +- board/st/stm32f429-discovery/led.c | 2 +- drivers/gpio/stm32_gpio.c | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/arch/arm/cpu/armv7m/config.mk b/arch/arm/cpu/armv7m/config.mk index 0b31e44..4a53006 100644 --- a/arch/arm/cpu/armv7m/config.mk +++ b/arch/arm/cpu/armv7m/config.mk @@ -1,6 +1,6 @@ # # (C) Copyright 2015 -# Kamil Lulko, <rev13(a)wp.pl> +# Kamil Lulko, <kamil.lulko(a)gmail.com> # # SPDX-License-Identifier: GPL-2.0+ # diff --git a/arch/arm/cpu/armv7m/cpu.c b/arch/arm/cpu/armv7m/cpu.c index d3ab862..58cde93 100644 --- a/arch/arm/cpu/armv7m/cpu.c +++ b/arch/arm/cpu/armv7m/cpu.c @@ -3,7 +3,7 @@ * Vladimir Khusainov, Emcraft Systems, vlad(a)emcraft.com * * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/cpu/armv7m/start.S b/arch/arm/cpu/armv7m/start.S index e05e984..49f2720 100644 --- a/arch/arm/cpu/armv7m/start.S +++ b/arch/arm/cpu/armv7m/start.S @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/cpu/armv7m/stm32f1/Makefile b/arch/arm/cpu/armv7m/stm32f1/Makefile index 4faf435..e2081db 100644 --- a/arch/arm/cpu/armv7m/stm32f1/Makefile +++ b/arch/arm/cpu/armv7m/stm32f1/Makefile @@ -3,7 +3,7 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # # (C) Copyright 2015 -# Kamil Lulko, <rev13(a)wp.pl> +# Kamil Lulko, <kamil.lulko(a)gmail.com> # # Copyright 2015 ATS Advanced Telematics Systems GmbH # Copyright 2015 Konsulko Group, Matt Porter <mporter(a)konsulko.com> diff --git a/arch/arm/cpu/armv7m/stm32f1/clock.c b/arch/arm/cpu/armv7m/stm32f1/clock.c index acad116..2820848 100644 --- a/arch/arm/cpu/armv7m/stm32f1/clock.c +++ b/arch/arm/cpu/armv7m/stm32f1/clock.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * Copyright 2015 ATS Advanced Telematics Systems GmbH * Copyright 2015 Konsulko Group, Matt Porter <mporter(a)konsulko.com> diff --git a/arch/arm/cpu/armv7m/stm32f1/flash.c b/arch/arm/cpu/armv7m/stm32f1/flash.c index bb88f23..7d41f63 100644 --- a/arch/arm/cpu/armv7m/stm32f1/flash.c +++ b/arch/arm/cpu/armv7m/stm32f1/flash.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * Copyright 2015 ATS Advanced Telematics Systems GmbH * Copyright 2015 Konsulko Group, Matt Porter <mporter(a)konsulko.com> diff --git a/arch/arm/cpu/armv7m/stm32f1/soc.c b/arch/arm/cpu/armv7m/stm32f1/soc.c index 8275ad7..4438621 100644 --- a/arch/arm/cpu/armv7m/stm32f1/soc.c +++ b/arch/arm/cpu/armv7m/stm32f1/soc.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * Copyright 2015 ATS Advanced Telematics Systems GmbH * Copyright 2015 Konsulko Group, Matt Porter <mporter(a)konsulko.com> diff --git a/arch/arm/cpu/armv7m/stm32f1/timer.c b/arch/arm/cpu/armv7m/stm32f1/timer.c index c6292b5..6a26198 100644 --- a/arch/arm/cpu/armv7m/stm32f1/timer.c +++ b/arch/arm/cpu/armv7m/stm32f1/timer.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * Copyright 2015 ATS Advanced Telematics Systems GmbH * Copyright 2015 Konsulko Group, Matt Porter <mporter(a)konsulko.com> diff --git a/arch/arm/cpu/armv7m/stm32f4/Makefile b/arch/arm/cpu/armv7m/stm32f4/Makefile index e982830..42d01db 100644 --- a/arch/arm/cpu/armv7m/stm32f4/Makefile +++ b/arch/arm/cpu/armv7m/stm32f4/Makefile @@ -3,7 +3,7 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # # (C) Copyright 2015 -# Kamil Lulko, <rev13(a)wp.pl> +# Kamil Lulko, <kamil.lulko(a)gmail.com> # # SPDX-License-Identifier: GPL-2.0+ # diff --git a/arch/arm/cpu/armv7m/stm32f4/clock.c b/arch/arm/cpu/armv7m/stm32f4/clock.c index d520a13..3deb17a 100644 --- a/arch/arm/cpu/armv7m/stm32f4/clock.c +++ b/arch/arm/cpu/armv7m/stm32f4/clock.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * (C) Copyright 2014 * STMicroelectronics diff --git a/arch/arm/cpu/armv7m/stm32f4/flash.c b/arch/arm/cpu/armv7m/stm32f4/flash.c index dd058bd..a379f47 100644 --- a/arch/arm/cpu/armv7m/stm32f4/flash.c +++ b/arch/arm/cpu/armv7m/stm32f4/flash.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/cpu/armv7m/stm32f4/soc.c b/arch/arm/cpu/armv7m/stm32f4/soc.c index 202a126..b5d06db 100644 --- a/arch/arm/cpu/armv7m/stm32f4/soc.c +++ b/arch/arm/cpu/armv7m/stm32f4/soc.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/cpu/armv7m/stm32f4/timer.c b/arch/arm/cpu/armv7m/stm32f4/timer.c index 102ae6d..1dee190 100644 --- a/arch/arm/cpu/armv7m/stm32f4/timer.c +++ b/arch/arm/cpu/armv7m/stm32f4/timer.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/include/asm/arch-stm32f1/gpio.h b/arch/arm/include/asm/arch-stm32f1/gpio.h index 6976e1f..8e8712f 100644 --- a/arch/arm/include/asm/arch-stm32f1/gpio.h +++ b/arch/arm/include/asm/arch-stm32f1/gpio.h @@ -3,7 +3,7 @@ * Yuri Tikhonov, Emcraft Systems, yur(a)emcraft.com * * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * Copyright 2015 ATS Advanced Telematics Systems GmbH * Copyright 2015 Konsulko Group, Matt Porter <mporter(a)konsulko.com> diff --git a/arch/arm/include/asm/arch-stm32f1/stm32.h b/arch/arm/include/asm/arch-stm32f1/stm32.h index 686cb4f..4094a75 100644 --- a/arch/arm/include/asm/arch-stm32f1/stm32.h +++ b/arch/arm/include/asm/arch-stm32f1/stm32.h @@ -3,7 +3,7 @@ * Yuri Tikhonov, Emcraft Systems, yur(a)emcraft.com * * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * Copyright 2015 ATS Advanced Telematics Systems GmbH * Copyright 2015 Konsulko Group, Matt Porter <mporter(a)konsulko.com> diff --git a/arch/arm/include/asm/arch-stm32f4/fmc.h b/arch/arm/include/asm/arch-stm32f4/fmc.h index 4ab3031..7dd5077 100644 --- a/arch/arm/include/asm/arch-stm32f4/fmc.h +++ b/arch/arm/include/asm/arch-stm32f4/fmc.h @@ -3,7 +3,7 @@ * Pavel Boldin, Emcraft Systems, paboldin(a)emcraft.com * * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/include/asm/arch-stm32f4/gpio.h b/arch/arm/include/asm/arch-stm32f4/gpio.h index dd33b96..831c542 100644 --- a/arch/arm/include/asm/arch-stm32f4/gpio.h +++ b/arch/arm/include/asm/arch-stm32f4/gpio.h @@ -3,7 +3,7 @@ * Yuri Tikhonov, Emcraft Systems, yur(a)emcraft.com * * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/include/asm/armv7m.h b/arch/arm/include/asm/armv7m.h index d2aa1c4..200444d 100644 --- a/arch/arm/include/asm/armv7m.h +++ b/arch/arm/include/asm/armv7m.h @@ -3,7 +3,7 @@ * Vladimir Khusainov, Emcraft Systems, vlad(a)emcraft.com * * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/lib/interrupts_m.c b/arch/arm/lib/interrupts_m.c index 89ce493..8a36c18 100644 --- a/arch/arm/lib/interrupts_m.c +++ b/arch/arm/lib/interrupts_m.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/arch/arm/lib/vectors_m.S b/arch/arm/lib/vectors_m.S index abc7f88..cf14a34 100644 --- a/arch/arm/lib/vectors_m.S +++ b/arch/arm/lib/vectors_m.S @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/board/st/stm32f429-discovery/MAINTAINERS b/board/st/stm32f429-discovery/MAINTAINERS index 641f26a..fdb62e9 100644 --- a/board/st/stm32f429-discovery/MAINTAINERS +++ b/board/st/stm32f429-discovery/MAINTAINERS @@ -1,5 +1,5 @@ STM32F429-DISCOVERY BOARD -M: Kamil Lulko <rev13(a)wp.pl> +M: Kamil Lulko <kamil.lulko(a)gmail.com> S: Maintained F: board/st/stm32f429-discovery/ F: include/configs/stm32f429-discovery.h diff --git a/board/st/stm32f429-discovery/Makefile b/board/st/stm32f429-discovery/Makefile index 7e764e3..d94059d 100644 --- a/board/st/stm32f429-discovery/Makefile +++ b/board/st/stm32f429-discovery/Makefile @@ -3,7 +3,7 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # # (C) Copyright 2015 -# Kamil Lulko, <rev13(a)wp.pl> +# Kamil Lulko, <kamil.lulko(a)gmail.com> # # SPDX-License-Identifier: GPL-2.0+ # diff --git a/board/st/stm32f429-discovery/led.c b/board/st/stm32f429-discovery/led.c index 306e550..ee22009 100644 --- a/board/st/stm32f429-discovery/led.c +++ b/board/st/stm32f429-discovery/led.c @@ -1,6 +1,6 @@ /* * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/gpio/stm32_gpio.c b/drivers/gpio/stm32_gpio.c index d7a194e..75a84e1 100644 --- a/drivers/gpio/stm32_gpio.c +++ b/drivers/gpio/stm32_gpio.c @@ -3,7 +3,7 @@ * Yuri Tikhonov, Emcraft Systems, yur(a)emcraft.com * * (C) Copyright 2015 - * Kamil Lulko, <rev13(a)wp.pl> + * Kamil Lulko, <kamil.lulko(a)gmail.com> * * Copyright 2015 ATS Advanced Telematics Systems GmbH * Copyright 2015 Konsulko Group, Matt Porter <mporter(a)konsulko.com> -- 2.5.0

2 1

[U-Boot] [PATCH V2] common: cli_hush: avoid memory leak
by Peng Fan 06 Dec '15

06 Dec '15

Need to free memory avoid memory leak, when error. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- Changes V2: Take Simon's comments, fix another memory leak when child->argv is NULL. Add Simon's review tag. common/cli_hush.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/common/cli_hush.c b/common/cli_hush.c index f075459..7f69c06 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -2471,11 +2471,16 @@ static int done_word(o_string *dest, struct p_context *ctx) } argc = ++child->argc; child->argv = realloc(child->argv, (argc+1)*sizeof(*child->argv)); - if (child->argv == NULL) return 1; + if (child->argv == NULL) { + free(str); + return 1; + } child->argv_nonnull = realloc(child->argv_nonnull, (argc+1)*sizeof(*child->argv_nonnull)); - if (child->argv_nonnull == NULL) + if (child->argv_nonnull == NULL) { + free(str); return 1; + } child->argv[argc-1]=str; child->argv_nonnull[argc-1] = dest->nonnull; child->argv[argc]=NULL; -- 2.6.2

3 2

[U-Boot] [PATCH] common/Makefile: Compile fdt_support is enabled in SPL
by Stefan Roese 06 Dec '15

06 Dec '15

When CONFIG_SPL_OF_TRANSLATE is enabled fdt_support.c needs to get compiled. Otherwise fdt_translate_address() is missing which is needed in dev_get_addr(). Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> --- common/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/common/Makefile b/common/Makefile index d8dc892..2a1d9f8 100644 --- a/common/Makefile +++ b/common/Makefile @@ -227,6 +227,7 @@ ifdef CONFIG_SPL_BUILD obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o +obj-$(CONFIG_SPL_OF_TRANSLATE) += fdt_support.o ifdef CONFIG_SPL_USB_HOST_SUPPORT obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o obj-$(CONFIG_USB_STORAGE) += usb_storage.o -- 2.6.3

3 2

[U-Boot] [PATCH 0/2] Enable DM_SERIAL for dra74x evm
by Mugunthan V N 06 Dec '15

06 Dec '15

DM_SERIAL is not enabled for dra74x evm, enabling it and tested on dra74x evm. Logs [1]. [1] - http://pastebin.ubuntu.com/13513965/ Mugunthan V N (2): arm: dts: dra7-evm: add chosen node to specify serial console device defconfig: dra74_evm: enable serial driver model arch/arm/dts/dra7-evm.dts | 4 ++++ configs/dra74_evm_defconfig | 1 + 2 files changed, 5 insertions(+) -- 2.6.2.280.g74301d6

3 6

[U-Boot] [PATCH] arm: dts: omap: add reg-shift to serial device tree node
by Mugunthan V N 06 Dec '15

06 Dec '15

With the commit 'c7b9686d5d48 ("ns16550: unify serial_omap")' all TI platforms are broken with DM/DT boot as ns16550 driver expects reg-shift from DT which is not populated for TI platforms. Earlier it worked as it was hard coded to 2 in serial-omap driver. So adding the reg-shift to serial nodes for dra7, am4372 and am33xx dtsi files. Tested this patch on am437x-sk-evm, am437x-gp-evm, am335x-boneblack, dra74x-evm and dra72x-evm. Signed-off-by: Mugunthan V N <mugunthanvnm(a)ti.com> --- reg-shift was hard coded to 2 in both u-boot and kernel driver, so the DT entry was never added in TI platforms. Sending this fix first to u-boot as dm boot of TI platforms are failing to boot. Will be submitting the patch kernel also ASAP. --- arch/arm/dts/am33xx.dtsi | 6 ++++++ arch/arm/dts/am4372.dtsi | 6 ++++++ arch/arm/dts/dra7.dtsi | 10 ++++++++++ 3 files changed, 22 insertions(+) diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi index 21fcc44..b26e21b 100644 --- a/arch/arm/dts/am33xx.dtsi +++ b/arch/arm/dts/am33xx.dtsi @@ -214,6 +214,7 @@ ti,hwmods = "uart1"; clock-frequency = <48000000>; reg = <0x44e09000 0x2000>; + reg-shift = <2>; interrupts = <72>; status = "disabled"; dmas = <&edma 26>, <&edma 27>; @@ -225,6 +226,7 @@ ti,hwmods = "uart2"; clock-frequency = <48000000>; reg = <0x48022000 0x2000>; + reg-shift = <2>; interrupts = <73>; status = "disabled"; dmas = <&edma 28>, <&edma 29>; @@ -236,6 +238,7 @@ ti,hwmods = "uart3"; clock-frequency = <48000000>; reg = <0x48024000 0x2000>; + reg-shift = <2>; interrupts = <74>; status = "disabled"; dmas = <&edma 30>, <&edma 31>; @@ -247,6 +250,7 @@ ti,hwmods = "uart4"; clock-frequency = <48000000>; reg = <0x481a6000 0x2000>; + reg-shift = <2>; interrupts = <44>; status = "disabled"; }; @@ -256,6 +260,7 @@ ti,hwmods = "uart5"; clock-frequency = <48000000>; reg = <0x481a8000 0x2000>; + reg-shift = <2>; interrupts = <45>; status = "disabled"; }; @@ -265,6 +270,7 @@ ti,hwmods = "uart6"; clock-frequency = <48000000>; reg = <0x481aa000 0x2000>; + reg-shift = <2>; interrupts = <46>; status = "disabled"; }; diff --git a/arch/arm/dts/am4372.dtsi b/arch/arm/dts/am4372.dtsi index ade28c7..3fffe1e 100644 --- a/arch/arm/dts/am4372.dtsi +++ b/arch/arm/dts/am4372.dtsi @@ -152,6 +152,7 @@ uart0: serial@44e09000 { compatible = "ti,am4372-uart","ti,omap2-uart"; reg = <0x44e09000 0x2000>; + reg-shift = <2>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart1"; }; @@ -159,6 +160,7 @@ uart1: serial@48022000 { compatible = "ti,am4372-uart","ti,omap2-uart"; reg = <0x48022000 0x2000>; + reg-shift = <2>; interrupts = <GIC_SPI 73 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart2"; status = "disabled"; @@ -167,6 +169,7 @@ uart2: serial@48024000 { compatible = "ti,am4372-uart","ti,omap2-uart"; reg = <0x48024000 0x2000>; + reg-shift = <2>; interrupts = <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart3"; status = "disabled"; @@ -175,6 +178,7 @@ uart3: serial@481a6000 { compatible = "ti,am4372-uart","ti,omap2-uart"; reg = <0x481a6000 0x2000>; + reg-shift = <2>; interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart4"; status = "disabled"; @@ -183,6 +187,7 @@ uart4: serial@481a8000 { compatible = "ti,am4372-uart","ti,omap2-uart"; reg = <0x481a8000 0x2000>; + reg-shift = <2>; interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart5"; status = "disabled"; @@ -191,6 +196,7 @@ uart5: serial@481aa000 { compatible = "ti,am4372-uart","ti,omap2-uart"; reg = <0x481aa000 0x2000>; + reg-shift = <2>; interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart6"; status = "disabled"; diff --git a/arch/arm/dts/dra7.dtsi b/arch/arm/dts/dra7.dtsi index 8f1e25b..feb3708 100644 --- a/arch/arm/dts/dra7.dtsi +++ b/arch/arm/dts/dra7.dtsi @@ -399,6 +399,7 @@ uart1: serial@4806a000 { compatible = "ti,omap4-uart"; reg = <0x4806a000 0x100>; + reg-shift = <2>; interrupts-extended = <&crossbar_mpu GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart1"; clock-frequency = <48000000>; @@ -410,6 +411,7 @@ uart2: serial@4806c000 { compatible = "ti,omap4-uart"; reg = <0x4806c000 0x100>; + reg-shift = <2>; interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart2"; clock-frequency = <48000000>; @@ -421,6 +423,7 @@ uart3: serial@48020000 { compatible = "ti,omap4-uart"; reg = <0x48020000 0x100>; + reg-shift = <2>; interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart3"; clock-frequency = <48000000>; @@ -432,6 +435,7 @@ uart4: serial@4806e000 { compatible = "ti,omap4-uart"; reg = <0x4806e000 0x100>; + reg-shift = <2>; interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart4"; clock-frequency = <48000000>; @@ -443,6 +447,7 @@ uart5: serial@48066000 { compatible = "ti,omap4-uart"; reg = <0x48066000 0x100>; + reg-shift = <2>; interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart5"; clock-frequency = <48000000>; @@ -454,6 +459,7 @@ uart6: serial@48068000 { compatible = "ti,omap4-uart"; reg = <0x48068000 0x100>; + reg-shift = <2>; interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart6"; clock-frequency = <48000000>; @@ -465,6 +471,7 @@ uart7: serial@48420000 { compatible = "ti,omap4-uart"; reg = <0x48420000 0x100>; + reg-shift = <2>; interrupts = <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart7"; clock-frequency = <48000000>; @@ -474,6 +481,7 @@ uart8: serial@48422000 { compatible = "ti,omap4-uart"; reg = <0x48422000 0x100>; + reg-shift = <2>; interrupts = <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart8"; clock-frequency = <48000000>; @@ -483,6 +491,7 @@ uart9: serial@48424000 { compatible = "ti,omap4-uart"; reg = <0x48424000 0x100>; + reg-shift = <2>; interrupts = <GIC_SPI 220 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart9"; clock-frequency = <48000000>; @@ -492,6 +501,7 @@ uart10: serial@4ae2b000 { compatible = "ti,omap4-uart"; reg = <0x4ae2b000 0x100>; + reg-shift = <2>; interrupts = <GIC_SPI 221 IRQ_TYPE_LEVEL_HIGH>; ti,hwmods = "uart10"; clock-frequency = <48000000>; -- 2.6.2.280.g74301d6

4 3

[U-Boot] [PATCH] common: miiphyutil: avoid memory leak
by Peng Fan 06 Dec '15

06 Dec '15

The following code will alloc memory for new_dev and ldev: " new_dev = mdio_alloc(); ldev = malloc(sizeof(*ldev)); " Either new_dev or ldev is NULL, directly return, but this may leak memory. So before return, using free(ldev) and mdio_free(new_dev) to avoid leaking memory, also free can handle NULL pointer. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Bin Meng <bmeng.cn(a)gmail.com> --- common/miiphyutil.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/common/miiphyutil.c b/common/miiphyutil.c index 0811e09..7e41957 100644 --- a/common/miiphyutil.c +++ b/common/miiphyutil.c @@ -114,6 +114,8 @@ void miiphy_register(const char *name, if (new_dev == NULL || ldev == NULL) { printf("miiphy_register: cannot allocate memory for '%s'\n", name); + free(ldev); + mdio_free(new_dev); return; } -- 2.6.2

4 3

[U-Boot] [PATCH] common: cli_hush: avoid memory leak
by Peng Fan 06 Dec '15

06 Dec '15

Need to free memory avoid memory leak, when error. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- common/cli_hush.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/cli_hush.c b/common/cli_hush.c index f075459..ab85225 100644 --- a/common/cli_hush.c +++ b/common/cli_hush.c @@ -2474,8 +2474,10 @@ static int done_word(o_string *dest, struct p_context *ctx) if (child->argv == NULL) return 1; child->argv_nonnull = realloc(child->argv_nonnull, (argc+1)*sizeof(*child->argv_nonnull)); - if (child->argv_nonnull == NULL) + if (child->argv_nonnull == NULL) { + free(str); return 1; + } child->argv[argc-1]=str; child->argv_nonnull[argc-1] = dest->nonnull; child->argv[argc]=NULL; -- 2.6.2

4 6

[U-Boot] [PATCH] eeprom: Zap CONFIG_SYS_I2C_MULTI_EEPROMS
by Marek Vasut 06 Dec '15

06 Dec '15

This symbol is no longer used anywhere, remove it. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- include/configs/am335x_sl50.h | 1 - include/configs/baltos.h | 1 - include/configs/bav335x.h | 1 - include/configs/ot1200.h | 1 - include/configs/ti_armv7_keystone2.h | 1 - 5 files changed, 5 deletions(-) diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index f655e69..1bdb96e 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -78,7 +78,6 @@ #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#define CONFIG_SYS_I2C_MULTI_EEPROMS /* PMIC support */ #define CONFIG_POWER_TPS65217 diff --git a/include/configs/baltos.h b/include/configs/baltos.h index 5545cf0..e9b4fe1 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -213,7 +213,6 @@ #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#define CONFIG_SYS_I2C_MULTI_EEPROMS /* PMIC support */ #define CONFIG_POWER_TPS65910 diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 9917627..7ed874b 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -346,7 +346,6 @@ DEFAULT_LINUX_BOOT_ENV \ #define CONFIG_ENV_EEPROM_IS_ON_I2C #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Main EEPROM */ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 -#define CONFIG_SYS_I2C_MULTI_EEPROMS /* PMIC support */ #define CONFIG_POWER_TPS65217 diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 426ec72..4baec44 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -115,7 +115,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 1 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 3 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 5 -#define CONFIG_SYS_I2C_MULTI_EEPROMS #endif /* Miscellaneous commands */ diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index b5d2d2e..a644f90 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -159,7 +159,6 @@ #define I2C_BUS_MAX 3 /* EEPROM definitions */ -#define CONFIG_SYS_I2C_MULTI_EEPROMS #define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 #define CONFIG_SYS_EEPROM_PAGE_WRITE_BITS 6 -- 2.1.4

3 2

[U-Boot] [PATCH] Fix typo: firstly -> first.
by Vagrant Cascadian 06 Dec '15

06 Dec '15

Signed-off-by: Vagrant Cascadian <vagrant(a)debian.org> --- drivers/block/ahci.c | 4 ++-- drivers/mtd/nand/pxa3xx_nand.c | 2 +- drivers/serial/serial.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index 734fdcc..5efa821 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -818,7 +818,7 @@ static int ata_scsiop_read_capacity10(ccb *pccb) if (!ataid[pccb->target]) { printf("scsi_ahci: SCSI READ CAPACITY10 command failure. " "\tNo ATA info!\n" - "\tPlease run SCSI command INQUIRY firstly!\n"); + "\tPlease run SCSI command INQUIRY first!\n"); return -EPERM; } @@ -847,7 +847,7 @@ static int ata_scsiop_read_capacity16(ccb *pccb) if (!ataid[pccb->target]) { printf("scsi_ahci: SCSI READ CAPACITY16 command failure. " "\tNo ATA info!\n" - "\tPlease run SCSI command INQUIRY firstly!\n"); + "\tPlease run SCSI command INQUIRY first!\n"); return -EPERM; } diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 1565a9a..f65b499 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -451,7 +451,7 @@ static void pxa3xx_set_datasize(struct pxa3xx_nand_info *info, } /** - * NOTE: it is a must to set ND_RUN firstly, then write + * NOTE: it is a must to set ND_RUN first, then write * command buffer, otherwise, it does not work. * We enable all the interrupt at the same time, and * let pxa3xx_nand_irq to handle all logic. diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 422d3ae..f1bd15b 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -527,7 +527,7 @@ static const int bauds[] = CONFIG_SYS_BAUDRATE_TABLE; * * Do a loopback test of the currently selected serial port. This * function is only useful in the context of the POST testing framwork. - * The serial port is firstly configured into loopback mode and then + * The serial port is first configured into loopback mode and then * characters are sent through it. * * Returns 0 on success, value otherwise. -- 2.1.4

3 2

[U-Boot] [PATCH] Fix typo: commmand -> command.
by Vagrant Cascadian 06 Dec '15

06 Dec '15

Signed-off-by: Vagrant Cascadian <vagrant(a)debian.org> --- doc/README.nand | 2 +- doc/README.update | 2 +- drivers/block/ahci.c | 4 ++-- drivers/block/fsl_sata.c | 2 +- include/configs/astro_mcf5373l.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/README.nand b/doc/README.nand index 0ff5633..545d88c 100644 --- a/doc/README.nand +++ b/doc/README.nand @@ -94,7 +94,7 @@ Configuration Options: address of u-boot MTD partition in NAND. CONFIG_CMD_NAND - Enables NAND support and commmands. + Enables NAND support and commands. CONFIG_CMD_NAND_TORTURE Enables the torture command (see description of this command below). diff --git a/doc/README.update b/doc/README.update index eab124c..d37f2c4 100644 --- a/doc/README.update +++ b/doc/README.update @@ -51,7 +51,7 @@ the mkimage tool. dtc tool with support for binary includes, e.g. in version to be prepared. Refer to the doc/uImage.FIT/ directory for more details on FIT images. -This mechanism can be also triggered by the commmand "fitupd". +This mechanism can be also triggered by the command "fitupd". If an optional, non-zero address is provided as argument, the TFTP transfer is skipped and the image at this address is used. The fitupd command is enabled by CONFIG_CMD_FITUPD. diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index 1ad638e..734fdcc 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -818,7 +818,7 @@ static int ata_scsiop_read_capacity10(ccb *pccb) if (!ataid[pccb->target]) { printf("scsi_ahci: SCSI READ CAPACITY10 command failure. " "\tNo ATA info!\n" - "\tPlease run SCSI commmand INQUIRY firstly!\n"); + "\tPlease run SCSI command INQUIRY firstly!\n"); return -EPERM; } @@ -847,7 +847,7 @@ static int ata_scsiop_read_capacity16(ccb *pccb) if (!ataid[pccb->target]) { printf("scsi_ahci: SCSI READ CAPACITY16 command failure. " "\tNo ATA info!\n" - "\tPlease run SCSI commmand INQUIRY firstly!\n"); + "\tPlease run SCSI command INQUIRY firstly!\n"); return -EPERM; } diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c index 208a0ae..e000ebf 100644 --- a/drivers/block/fsl_sata.c +++ b/drivers/block/fsl_sata.c @@ -398,7 +398,7 @@ static int fsl_ata_exec_ata_cmd(struct fsl_sata *sata, struct sata_fis_h2d *cfis debug("attribute = %08x\n\r", val32); cmd_hdr->attribute = cpu_to_le32(val32); - /* Make sure cmd desc and cmd slot valid before commmand issue */ + /* Make sure cmd desc and cmd slot valid before command issue */ sync(); /* PMP*/ diff --git a/include/configs/astro_mcf5373l.h b/include/configs/astro_mcf5373l.h index 8606151..828bc60 100644 --- a/include/configs/astro_mcf5373l.h +++ b/include/configs/astro_mcf5373l.h @@ -57,7 +57,7 @@ #define ENABLE_JFFS 1 #endif -/* Define which commmands should be available at u-boot command prompt */ +/* Define which commands should be available at u-boot command prompt */ #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE -- 2.1.4

3 2