October 2014 - U-Boot

[U-Boot] [PATCH] multiconfig.sh: replace GNU sed specific match
by Jeroen Hofstee 10 Oct '14

10 Oct '14

A SPL/TPL enabled target would was not recognized as such by BSD sed, since it relies on a GNU extension. Instead of or-ing just spell out both matches. Cc: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- https://www.gnu.org/software/sed/manual/sed.html: regexp1\|regexp2 Matches either regexp1 or regexp2. Use parentheses to use complex alternative regular expressions. The matching process tries each alternative in turn, from left to right, and the first one that succeeds is used. It is a GNU extension. --- scripts/multiconfig.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/multiconfig.sh b/scripts/multiconfig.sh index 4a8737f..c489c7f 100644 --- a/scripts/multiconfig.sh +++ b/scripts/multiconfig.sh @@ -69,8 +69,8 @@ get_enabled_subimages() { # CONFIG_SPL=y -> spl # CONFIG_TPL=y -> tpl - sed -n -e 's/^CONFIG_$SPL\|TPL$=y$/\1/p' $KCONFIG_CONFIG | \ - tr '[A-Z]' '[a-z]' + sed -n -e 's/^CONFIG_SPL=y$/spl/p' -e 's/^CONFIG_TPL=y$/tpl/p' \ + $KCONFIG_CONFIG } do_silentoldconfig () { -- 2.1.0

3 2

[U-Boot] [PATCH] VCMA9: remove EXT2 support
by David Müller 10 Oct '14

10 Oct '14

remove the seldomly used EXT2 support because the U-Boot binary will not fit into the 512KiB flash otherwise. Signed-off-by: David Müller <d.mueller(a)elsoft.ch> --- include/configs/VCMA9.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/configs/VCMA9.h b/include/configs/VCMA9.h index 0d8a13c..a97f5fa 100644 --- a/include/configs/VCMA9.h +++ b/include/configs/VCMA9.h @@ -216,7 +216,6 @@ /* File system */ #define CONFIG_CMD_FAT -#define CONFIG_CMD_EXT2 #define CONFIG_CMD_UBI #define CONFIG_CMD_UBIFS #define CONFIG_CMD_JFFS2 -- 1.8.4

2 1

[U-Boot] Activate generic board feature on all MPL boards
by David Müller 10 Oct '14

10 Oct '14

[PATCH 1/4] PIP405: convert to generic board [PATCH 2/4] MIP405: convert to generic board [PATCH 3/4] VCMA9: convert to generic board [PATCH 4/4] PATI: convert to generic board

2 8

[U-Boot] [PATCH] SPDX License cleanup for LiMon imported files
by Wolfgang Denk 10 Oct '14

10 Oct '14

A number of network related files were imported from the LiMon project; these contain a somewhat unclear license statement: Copyright 1994 - 2000 Neil Russell. (See License) I analyzed the source code of LiMon v1.4.2 which was used for this import. It does not contain any "License" file, but the top level directory contains a file "COPYING", which turns out to be GPL v2 of June 1991. So it is legitimate to conclude that the LiMon derived files are also to be released under GPLv2. Mark them as such. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- include/net.h | 2 +- net/arp.c | 1 + net/arp.h | 1 + net/cdp.c | 1 + net/cdp.h | 1 + net/net.c | 1 + net/ping.c | 1 + net/ping.h | 1 + 8 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/net.h b/include/net.h index 735b0b9..18d279e 100644 --- a/include/net.h +++ b/include/net.h @@ -3,7 +3,7 @@ * * Copyright 1994 - 2000 Neil Russell. * (See License) - * + * SPDX-License-Identifier: GPL-2.0 * * History * 9/16/00 bor adapted to TQM823L/STK8xxL board, RARP/TFTP boot added diff --git a/net/arp.c b/net/arp.c index 20c6b2d..21ed31b 100644 --- a/net/arp.c +++ b/net/arp.c @@ -6,6 +6,7 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de + * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/net/arp.h b/net/arp.h index bfd57e0..3a0a13a 100644 --- a/net/arp.h +++ b/net/arp.h @@ -6,6 +6,7 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de + * SPDX-License-Identifier: GPL-2.0 */ #ifndef __ARP_H__ diff --git a/net/cdp.c b/net/cdp.c index 3d9559e..2d8fa03 100644 --- a/net/cdp.c +++ b/net/cdp.c @@ -6,6 +6,7 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de + * SPDX-License-Identifier: GPL-2.0 */ #include <common.h> diff --git a/net/cdp.h b/net/cdp.h index ec7315a..95e4ce0 100644 --- a/net/cdp.h +++ b/net/cdp.h @@ -6,6 +6,7 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de + * SPDX-License-Identifier: GPL-2.0 */ #if defined(CONFIG_CMD_CDP) diff --git a/net/net.c b/net/net.c index 722089f..2bea07b 100644 --- a/net/net.c +++ b/net/net.c @@ -6,6 +6,7 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de + * SPDX-License-Identifier: GPL-2.0 */ /* diff --git a/net/ping.c b/net/ping.c index 0710b92..2be56ed 100644 --- a/net/ping.c +++ b/net/ping.c @@ -6,6 +6,7 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de + * SPDX-License-Identifier: GPL-2.0 */ #include "ping.h" diff --git a/net/ping.h b/net/ping.h index 8c71be4..b672b95 100644 --- a/net/ping.h +++ b/net/ping.h @@ -6,6 +6,7 @@ * Copyright 2000 Roland Borde * Copyright 2000 Paolo Scaffardi * Copyright 2000-2002 Wolfgang Denk, wd(a)denx.de + * SPDX-License-Identifier: GPL-2.0 */ #ifndef __PING_H__ -- 1.8.3.1

2 1

[U-Boot] [PATCH] beagleboard: Remove side effects of i2c2 pullup resisters initialization code
by Alexander Kochetkov 10 Oct '14

10 Oct '14

Fix typo of commit d4e53f063dd25e071444b87303573e7440deeb89. i2c2 pullup resisters are controlled by bit 0 of CONTROL_PROG_IO1. It's value after reset is 0x00100001. In order to clear bit 0, original code write 0xfffffffe to CONTROL_PROG_IO1 and toggle almost all default values. Original code affect following: * disable i2c1 pullup resisters * increase far end load setting for many modules * setup invalid SC/LB combination Signed-off-by: Alexander Kochetkov <al.kochet(a)gmail.com> CC: Tom Rini <trini(a)ti.com> CC: Steve Kipisz <s-kipisz2(a)ti.com> --- board/ti/beagle/beagle.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index 0674afd..94b99bf 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -317,9 +317,12 @@ int misc_init_r(void) struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE; struct control_prog_io *prog_io_base = (struct control_prog_io *)OMAP34XX_CTRL_BASE; bool generate_fake_mac = false; + u32 value; /* Enable i2c2 pullup resisters */ - writel(~(PRG_I2C2_PULLUPRESX), &prog_io_base->io1); + value = readl(&prog_io_base->io1); + value &= ~(PRG_I2C2_PULLUPRESX); + writel(value, &prog_io_base->io1); switch (get_board_revision()) { case REVISION_AXBX: -- 1.7.9.5

2 1

[U-Boot] [PATCH 0/5] powerpc: remove some orphan boards
by Masahiro Yamada 10 Oct '14

10 Oct '14

6 months have passed since these boards were moved to Orphan. I built all the other boards to confirm this series has no impact to them. Masahiro Yamada (5): powerpc: ppc4xx: remove board support for KAREF and METROBOX powerpc: ppc4xx: remove board support for CRAYL1 powerpc: ppc4xx: remove board support for bluestone powerpc: mpc83xx: remove board support for MERGERBOX and MVBLM7 powerpc: mpc5xxx: remove board support for MVBC_P and MVSMR arch/powerpc/cpu/mpc5xxx/Kconfig | 8 - arch/powerpc/cpu/mpc83xx/Kconfig | 8 - arch/powerpc/cpu/ppc4xx/Kconfig | 16 - arch/powerpc/cpu/ppc4xx/cpu.c | 14 - arch/powerpc/cpu/ppc4xx/cpu_init.c | 4 +- arch/powerpc/cpu/ppc4xx/speed.c | 75 +-- arch/powerpc/cpu/ppc4xx/start.S | 8 +- arch/powerpc/include/asm/apm821xx.h | 59 -- arch/powerpc/include/asm/ppc4xx-ebc.h | 3 +- arch/powerpc/include/asm/ppc4xx-isram.h | 10 +- arch/powerpc/include/asm/ppc4xx-sdram.h | 12 +- arch/powerpc/include/asm/ppc4xx-uic.h | 5 +- arch/powerpc/include/asm/ppc4xx.h | 4 - board/amcc/bluestone/Kconfig | 12 - board/amcc/bluestone/MAINTAINERS | 6 - board/amcc/bluestone/Makefile | 9 - board/amcc/bluestone/bluestone.c | 99 ---- board/amcc/bluestone/config.mk | 18 - board/amcc/bluestone/init.S | 45 -- board/cray/L1/.gitignore | 2 - board/cray/L1/Kconfig | 12 - board/cray/L1/L1.c | 350 ----------- board/cray/L1/MAINTAINERS | 6 - board/cray/L1/Makefile | 23 - board/cray/L1/bootscript.hush | 117 ---- board/cray/L1/flash.c | 451 --------------- board/cray/L1/init.S | 117 ---- board/cray/L1/patchme | 30 - board/cray/L1/u-boot.lds.debug | 121 ---- board/cray/L1/x2c.awk | 6 - board/matrix_vision/mergerbox/Kconfig | 12 - board/matrix_vision/mergerbox/MAINTAINERS | 6 - board/matrix_vision/mergerbox/Makefile | 8 - board/matrix_vision/mergerbox/README | 59 -- board/matrix_vision/mergerbox/fpga.c | 158 ----- board/matrix_vision/mergerbox/fpga.h | 13 - board/matrix_vision/mergerbox/mergerbox.c | 235 -------- board/matrix_vision/mergerbox/mergerbox.h | 61 -- board/matrix_vision/mergerbox/pci.c | 128 ---- board/matrix_vision/mergerbox/sm107.c | 120 ---- board/matrix_vision/mvbc_p/Kconfig | 12 - board/matrix_vision/mvbc_p/MAINTAINERS | 6 - board/matrix_vision/mvbc_p/Makefile | 11 - board/matrix_vision/mvbc_p/README.mvbc_p | 73 --- board/matrix_vision/mvbc_p/fpga.c | 157 ----- board/matrix_vision/mvbc_p/fpga.h | 17 - board/matrix_vision/mvbc_p/mvbc_p.c | 255 -------- board/matrix_vision/mvbc_p/mvbc_p.h | 43 -- board/matrix_vision/mvbc_p/mvbc_p_autoscript | 48 -- board/matrix_vision/mvblm7/.gitignore | 1 - board/matrix_vision/mvblm7/Kconfig | 12 - board/matrix_vision/mvblm7/MAINTAINERS | 6 - board/matrix_vision/mvblm7/Makefile | 14 - board/matrix_vision/mvblm7/README.mvblm7 | 84 --- board/matrix_vision/mvblm7/bootscript | 43 -- board/matrix_vision/mvblm7/fpga.c | 169 ------ board/matrix_vision/mvblm7/fpga.h | 17 - board/matrix_vision/mvblm7/mvblm7.c | 136 ----- board/matrix_vision/mvblm7/mvblm7.h | 20 - board/matrix_vision/mvblm7/pci.c | 89 --- board/matrix_vision/mvsmr/.gitignore | 1 - board/matrix_vision/mvsmr/Kconfig | 12 - board/matrix_vision/mvsmr/MAINTAINERS | 6 - board/matrix_vision/mvsmr/Makefile | 18 - board/matrix_vision/mvsmr/README.mvsmr | 55 -- board/matrix_vision/mvsmr/bootscript | 42 -- board/matrix_vision/mvsmr/fpga.c | 112 ---- board/matrix_vision/mvsmr/fpga.h | 15 - board/matrix_vision/mvsmr/mvsmr.c | 248 -------- board/matrix_vision/mvsmr/mvsmr.h | 43 -- board/matrix_vision/mvsmr/u-boot.lds | 89 --- board/sandburst/common/flash.c | 493 ---------------- board/sandburst/common/sb_common.c | 349 ----------- board/sandburst/common/sb_common.h | 60 -- board/sandburst/karef/Kconfig | 12 - board/sandburst/karef/MAINTAINERS | 6 - board/sandburst/karef/Makefile | 16 - board/sandburst/karef/config.mk | 21 - board/sandburst/karef/hal_ka_of_auto.h | 324 ----------- board/sandburst/karef/hal_ka_sc_auto.h | 836 --------------------------- board/sandburst/karef/init.S | 39 -- board/sandburst/karef/karef.c | 595 ------------------- board/sandburst/karef/karef.h | 60 -- board/sandburst/karef/karef_version.h | 10 - board/sandburst/karef/u-boot.lds.debug | 130 ----- board/sandburst/metrobox/Kconfig | 12 - board/sandburst/metrobox/MAINTAINERS | 6 - board/sandburst/metrobox/Makefile | 15 - board/sandburst/metrobox/config.mk | 16 - board/sandburst/metrobox/hal_xc_auto.h | 553 ------------------ board/sandburst/metrobox/init.S | 37 -- board/sandburst/metrobox/metrobox.c | 561 ------------------ board/sandburst/metrobox/metrobox.h | 29 - board/sandburst/metrobox/metrobox_version.h | 11 - board/sandburst/metrobox/u-boot.lds.debug | 130 ----- configs/CRAYL1_defconfig | 3 - configs/KAREF_defconfig | 3 - configs/MERGERBOX_defconfig | 3 - configs/METROBOX_defconfig | 3 - configs/MVBC_P_defconfig | 4 - configs/MVBLM7_defconfig | 3 - configs/MVSMR_defconfig | 3 - configs/bluestone_defconfig | 3 - doc/README.scrapyard | 8 + include/configs/CRAYL1.h | 228 -------- include/configs/KAREF.h | 284 --------- include/configs/MERGERBOX.h | 599 ------------------- include/configs/METROBOX.h | 349 ----------- include/configs/MVBC_P.h | 300 ---------- include/configs/MVBLM7.h | 491 ---------------- include/configs/MVSMR.h | 270 --------- include/configs/bluestone.h | 168 ------ 112 files changed, 26 insertions(+), 11321 deletions(-) delete mode 100644 arch/powerpc/include/asm/apm821xx.h delete mode 100644 board/amcc/bluestone/Kconfig delete mode 100644 board/amcc/bluestone/MAINTAINERS delete mode 100644 board/amcc/bluestone/Makefile delete mode 100644 board/amcc/bluestone/bluestone.c delete mode 100644 board/amcc/bluestone/config.mk delete mode 100644 board/amcc/bluestone/init.S delete mode 100644 board/cray/L1/.gitignore delete mode 100644 board/cray/L1/Kconfig delete mode 100644 board/cray/L1/L1.c delete mode 100644 board/cray/L1/MAINTAINERS delete mode 100644 board/cray/L1/Makefile delete mode 100644 board/cray/L1/bootscript.hush delete mode 100644 board/cray/L1/flash.c delete mode 100644 board/cray/L1/init.S delete mode 100644 board/cray/L1/patchme delete mode 100644 board/cray/L1/u-boot.lds.debug delete mode 100644 board/cray/L1/x2c.awk delete mode 100644 board/matrix_vision/mergerbox/Kconfig delete mode 100644 board/matrix_vision/mergerbox/MAINTAINERS delete mode 100644 board/matrix_vision/mergerbox/Makefile delete mode 100644 board/matrix_vision/mergerbox/README delete mode 100644 board/matrix_vision/mergerbox/fpga.c delete mode 100644 board/matrix_vision/mergerbox/fpga.h delete mode 100644 board/matrix_vision/mergerbox/mergerbox.c delete mode 100644 board/matrix_vision/mergerbox/mergerbox.h delete mode 100644 board/matrix_vision/mergerbox/pci.c delete mode 100644 board/matrix_vision/mergerbox/sm107.c delete mode 100644 board/matrix_vision/mvbc_p/Kconfig delete mode 100644 board/matrix_vision/mvbc_p/MAINTAINERS delete mode 100644 board/matrix_vision/mvbc_p/Makefile delete mode 100644 board/matrix_vision/mvbc_p/README.mvbc_p delete mode 100644 board/matrix_vision/mvbc_p/fpga.c delete mode 100644 board/matrix_vision/mvbc_p/fpga.h delete mode 100644 board/matrix_vision/mvbc_p/mvbc_p.c delete mode 100644 board/matrix_vision/mvbc_p/mvbc_p.h delete mode 100644 board/matrix_vision/mvbc_p/mvbc_p_autoscript delete mode 100644 board/matrix_vision/mvblm7/.gitignore delete mode 100644 board/matrix_vision/mvblm7/Kconfig delete mode 100644 board/matrix_vision/mvblm7/MAINTAINERS delete mode 100644 board/matrix_vision/mvblm7/Makefile delete mode 100644 board/matrix_vision/mvblm7/README.mvblm7 delete mode 100644 board/matrix_vision/mvblm7/bootscript delete mode 100644 board/matrix_vision/mvblm7/fpga.c delete mode 100644 board/matrix_vision/mvblm7/fpga.h delete mode 100644 board/matrix_vision/mvblm7/mvblm7.c delete mode 100644 board/matrix_vision/mvblm7/mvblm7.h delete mode 100644 board/matrix_vision/mvblm7/pci.c delete mode 100644 board/matrix_vision/mvsmr/.gitignore delete mode 100644 board/matrix_vision/mvsmr/Kconfig delete mode 100644 board/matrix_vision/mvsmr/MAINTAINERS delete mode 100644 board/matrix_vision/mvsmr/Makefile delete mode 100644 board/matrix_vision/mvsmr/README.mvsmr delete mode 100644 board/matrix_vision/mvsmr/bootscript delete mode 100644 board/matrix_vision/mvsmr/fpga.c delete mode 100644 board/matrix_vision/mvsmr/fpga.h delete mode 100644 board/matrix_vision/mvsmr/mvsmr.c delete mode 100644 board/matrix_vision/mvsmr/mvsmr.h delete mode 100644 board/matrix_vision/mvsmr/u-boot.lds delete mode 100644 board/sandburst/common/flash.c delete mode 100644 board/sandburst/common/sb_common.c delete mode 100644 board/sandburst/common/sb_common.h delete mode 100644 board/sandburst/karef/Kconfig delete mode 100644 board/sandburst/karef/MAINTAINERS delete mode 100644 board/sandburst/karef/Makefile delete mode 100644 board/sandburst/karef/config.mk delete mode 100644 board/sandburst/karef/hal_ka_of_auto.h delete mode 100644 board/sandburst/karef/hal_ka_sc_auto.h delete mode 100644 board/sandburst/karef/init.S delete mode 100644 board/sandburst/karef/karef.c delete mode 100644 board/sandburst/karef/karef.h delete mode 100644 board/sandburst/karef/karef_version.h delete mode 100644 board/sandburst/karef/u-boot.lds.debug delete mode 100644 board/sandburst/metrobox/Kconfig delete mode 100644 board/sandburst/metrobox/MAINTAINERS delete mode 100644 board/sandburst/metrobox/Makefile delete mode 100644 board/sandburst/metrobox/config.mk delete mode 100644 board/sandburst/metrobox/hal_xc_auto.h delete mode 100644 board/sandburst/metrobox/init.S delete mode 100644 board/sandburst/metrobox/metrobox.c delete mode 100644 board/sandburst/metrobox/metrobox.h delete mode 100644 board/sandburst/metrobox/metrobox_version.h delete mode 100644 board/sandburst/metrobox/u-boot.lds.debug delete mode 100644 configs/CRAYL1_defconfig delete mode 100644 configs/KAREF_defconfig delete mode 100644 configs/MERGERBOX_defconfig delete mode 100644 configs/METROBOX_defconfig delete mode 100644 configs/MVBC_P_defconfig delete mode 100644 configs/MVBLM7_defconfig delete mode 100644 configs/MVSMR_defconfig delete mode 100644 configs/bluestone_defconfig delete mode 100644 include/configs/CRAYL1.h delete mode 100644 include/configs/KAREF.h delete mode 100644 include/configs/MERGERBOX.h delete mode 100644 include/configs/METROBOX.h delete mode 100644 include/configs/MVBC_P.h delete mode 100644 include/configs/MVBLM7.h delete mode 100644 include/configs/MVSMR.h delete mode 100644 include/configs/bluestone.h -- 1.9.1

2 10

[U-Boot] [U-boot] [Patch v3 0/6] keystone2: add k2l SoC and k2l_evm board support
by Ivan Khoronzhuk 10 Oct '14

10 Oct '14

This patch series adds Keystone II Lamar (K2L) SoC and k2l_evm board support. Based on "[U-boot] [Patch v2] keystone: usb: add support of usb xhci" https://patchwork.ozlabs.org/patch/386506/ v3..v1 - keystone2: k2l-evm: add board support Add maintainers information Enable SPL by default v2..v1 Rebased according to changes of c338f09e965a300ddd78af73e86c4af4c9464ce4 "keystone: kconfig: move board select menu and common settings" Hao Zhang (6): ARM: keystone2: add K2L device hardware definitions keystone2: clock: add K2L clock definitions and commands keystone2: msmc: add MSMC cache coherency support for K2L SOC ARM: keystone2: spl: add K2L SoC support keystone2: enable OSR clock domain for K2L SoC keystone2: k2l-evm: add board support arch/arm/cpu/armv7/keystone/Kconfig | 3 + arch/arm/cpu/armv7/keystone/Makefile | 1 + arch/arm/cpu/armv7/keystone/clock-k2l.c | 138 +++++++++++++++++++++ arch/arm/cpu/armv7/keystone/cmd_clock.c | 10 ++ arch/arm/cpu/armv7/keystone/init.c | 52 ++++++++ arch/arm/cpu/armv7/keystone/spl.c | 7 ++ arch/arm/include/asm/arch-keystone/clock-k2l.h | 94 ++++++++++++++ arch/arm/include/asm/arch-keystone/clock.h | 4 + arch/arm/include/asm/arch-keystone/hardware-k2hk.h | 2 - arch/arm/include/asm/arch-keystone/hardware-k2l.h | 99 +++++++++++++++ arch/arm/include/asm/arch-keystone/hardware.h | 14 +++ board/ti/ks2_evm/Kconfig | 16 +++ board/ti/ks2_evm/MAINTAINERS | 2 + board/ti/ks2_evm/Makefile | 2 + board/ti/ks2_evm/board_k2l.c | 60 +++++++++ board/ti/ks2_evm/ddr3_cfg.c | 36 ++++++ board/ti/ks2_evm/ddr3_cfg.h | 3 + board/ti/ks2_evm/ddr3_k2l.c | 43 +++++++ configs/k2l_evm_defconfig | 4 + include/configs/k2l_evm.h | 37 ++++++ 20 files changed, 625 insertions(+), 2 deletions(-) create mode 100644 arch/arm/cpu/armv7/keystone/clock-k2l.c create mode 100644 arch/arm/include/asm/arch-keystone/clock-k2l.h create mode 100644 arch/arm/include/asm/arch-keystone/hardware-k2l.h create mode 100644 board/ti/ks2_evm/board_k2l.c create mode 100644 board/ti/ks2_evm/ddr3_k2l.c create mode 100644 configs/k2l_evm_defconfig create mode 100644 include/configs/k2l_evm.h -- 1.8.3.2

1 6

[U-Boot] [PATCH for-v2014.10?] pxe: Ensure we don't overflow bootargs
by Ian Campbell 10 Oct '14

10 Oct '14

From: Ian Campbell <ian.campbell(a)citrix.com> On a couple of platforms I've tripped over long PXE append lines overflowing this array, due to having CONFIG_SYS_CBSIZE == 256. When doing preseeded Debian installs it's pretty trivial to exceed that. Since the symptom can be a silent hang or a crash add a check. Of course the affected boards would also need an increased CBSIZE to actually work. Note that due to the printing of the final bootargs string CONFIG_SYS_PBSIZE also needs to be sufficiently large. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- I think this is v2014.10 material? --- common/cmd_pxe.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/common/cmd_pxe.c b/common/cmd_pxe.c index 0ab1e0a..e63a031 100644 --- a/common/cmd_pxe.c +++ b/common/cmd_pxe.c @@ -674,6 +674,15 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) char bootargs[CONFIG_SYS_CBSIZE] = ""; char finalbootargs[CONFIG_SYS_CBSIZE]; + if (strlen(label->append ?: "") + + strlen(ip_str) + strlen(mac_str) + 1 > sizeof(bootargs)) { + printf("bootarg overflow %d+%d+%d+1 > %zd\n", + strlen(label->append ?: ""), + strlen(ip_str), strlen(mac_str), + sizeof(bootargs)); + return 1; + } + if (label->append) strcpy(bootargs, label->append); strcat(bootargs, ip_str); -- 2.1.0

2 2

[U-Boot] [PATCH] kconfig: fix another bug of "make savedefconfig"
by Masahiro Yamada 10 Oct '14

10 Oct '14

In some cases, the last lines of SPL or TPL are not output to a file. The entries remaining in the "unmatched" variable must be flushed. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- scripts/multiconfig.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/multiconfig.sh b/scripts/multiconfig.sh index 4a8737f..b5185a8 100644 --- a/scripts/multiconfig.sh +++ b/scripts/multiconfig.sh @@ -229,6 +229,8 @@ do_savedefconfig () { unmatched="$unmatched%$symbol:$line" fi done < defconfig + + output_lines="$output_lines%$unmatched" done rm -f defconfig -- 1.9.1

3 2

[U-Boot] [U-boot] [Patch] ARM: keystone: clock: fix main pll ratio div definitions
by Ivan Khoronzhuk 10 Oct '14

10 Oct '14

The definitions for div ratio supposed to be in hex and were added in dec by mistake. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk(a)ti.com> --- Based on u-boot-ti/master arch/arm/include/asm/arch-keystone/clock_defs.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/include/asm/arch-keystone/clock_defs.h b/arch/arm/include/asm/arch-keystone/clock_defs.h index e545341..85a046b 100644 --- a/arch/arm/include/asm/arch-keystone/clock_defs.h +++ b/arch/arm/include/asm/arch-keystone/clock_defs.h @@ -102,10 +102,10 @@ static struct pllctl_regs *pllctl_regs[] = { #define PLL_BWADJ_LO_SMASK (PLL_BWADJ_LO_MASK << PLL_BWADJ_LO_SHIFT) #define PLL_BWADJ_HI_MASK 0xf -#define PLLM_RATIO_DIV1 (PLLDIV_ENABLE | 0) -#define PLLM_RATIO_DIV2 (PLLDIV_ENABLE | 0) -#define PLLM_RATIO_DIV3 (PLLDIV_ENABLE | 1) -#define PLLM_RATIO_DIV4 (PLLDIV_ENABLE | 4) -#define PLLM_RATIO_DIV5 (PLLDIV_ENABLE | 17) +#define PLLM_RATIO_DIV1 (PLLDIV_ENABLE | 0x0) +#define PLLM_RATIO_DIV2 (PLLDIV_ENABLE | 0x0) +#define PLLM_RATIO_DIV3 (PLLDIV_ENABLE | 0x1) +#define PLLM_RATIO_DIV4 (PLLDIV_ENABLE | 0x4) +#define PLLM_RATIO_DIV5 (PLLDIV_ENABLE | 0x17) #endif /* _CLOCK_DEFS_H_ */ -- 1.8.3.2

2 1