November 2013 - U-Boot

[U-Boot] [PATCH] boards.cfg: remove git leftovers
by Luka Perkov 08 Nov '13

08 Nov '13

Remove 'HEAD' line which is most likely left there while rebasing. It was introduced in commit 877bfe37dc00b0ae59f37742954a62bce3fdf3a0. Signed-off-by: Luka Perkov <luka(a)openwrt.org> --- boards.cfg | 1 - 1 file changed, 1 deletion(-) diff --git a/boards.cfg b/boards.cfg index 5e10125..9fecbed 100644 --- a/boards.cfg +++ b/boards.cfg @@ -43,7 +43,6 @@ # Status, Arch, CPU:SPLCPU, SoC, Vendor, Board name, Target, Options, Maintainers ########################################################################################################### -<<<<<<< HEAD Active arm arm1136 - armltd integrator integratorcp_cm1136 integratorcp:CM1136 Linus Walleij <linus.walleij(a)linaro.org> Active arm arm1136 mx31 - - imx31_phycore - - Active arm arm1136 mx31 davedenx - qong - Wolfgang Denk <wd(a)denx.de> -- 1.8.4.2

2 1

[U-Boot] [PATCH] boards.cfg: remove trailing whitespace
by Paul Burton 08 Nov '13

08 Nov '13

Commit 93e14596 "Coding Style cleanup: replace leading SPACEs by TABs" added trailing whitespace to a single line of boards.cfg. I presume this was unintentional, and it causes the file to change after running it through the reformat.py script. Remove the offending character. Signed-off-by: Paul Burton <paul.burton(a)imgtec.com> --- boards.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards.cfg b/boards.cfg index 2305087..5a774d4 100644 --- a/boards.cfg +++ b/boards.cfg @@ -196,7 +196,7 @@ Active arm arm926ejs mb86r0x syteco jadecpu Active arm arm926ejs mx25 freescale mx25pdk mx25pdk mx25pdk:IMX_CONFIG=board/freescale/mx25pdk/imximage.cfg Fabio Estevam <fabio.estevam(a)freescale.com> Active arm arm926ejs mx25 karo tx25 tx25 - John Rigby <jcrigby(a)gmail.com> Active arm arm926ejs mx25 syteco zmx25 zmx25 - Matthias Weisser <weisserm(a)arcor.de> -Active arm arm926ejs mx27 armadeus apf27 apf27 - Philippe Reynes <tremyfr(a)yahoo.fr>:Eric Jarrige <eric.jarrige(a)armadeus.org> +Active arm arm926ejs mx27 armadeus apf27 apf27 - Philippe Reynes <tremyfr(a)yahoo.fr>:Eric Jarrige <eric.jarrige(a)armadeus.org> Active arm arm926ejs mx27 logicpd imx27lite imx27lite - Wolfgang Denk <wd(a)denx.de> Active arm arm926ejs mx27 logicpd imx27lite magnesium - Heiko Schocher <hs(a)denx.de> Active arm arm926ejs mxs bluegiga apx4devkit apx4devkit apx4devkit Lauri Hintsala <lauri.hintsala(a)bluegiga.com> -- 1.8.4

2 1

[U-Boot] [PATCH] cmd_nvedit.c: Add env exists command
by Andrew Ruder 08 Nov '13

08 Nov '13

env exists is a way to test (in hush) if an environment variable exists. A workaround existed using printenv but this new command doesn't require all the stdout/stderr redirection to prevent printing information to the screen. Example: $ set testexists 1 $ env exists testexists && echo "yes" yes $ env exists testexists || echo "no" $ set testexists $ env exists testexists && echo "yes" $ env exists testexists || echo "no" no $ Signed-off-by: Andrew Ruder <andrew.ruder(a)elecsyscorp.com> --- README | 1 + common/cmd_nvedit.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/README b/README index 09662a4..0718459 100644 --- a/README +++ b/README @@ -843,6 +843,7 @@ The following options need to be configured: CONFIG_CMD_ELF * bootelf, bootvx CONFIG_CMD_ENV_CALLBACK * display details about env callbacks CONFIG_CMD_ENV_FLAGS * display details about env flags + CONFIG_CMD_ENV_EXISTS * check existence of env variable CONFIG_CMD_EXPORTENV * export the environment CONFIG_CMD_EXT2 * ext2 command support CONFIG_CMD_EXT4 * ext4 command support diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index ba9ba16..0d4d02c 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -1059,6 +1059,23 @@ sep_err: } #endif +#if defined(CONFIG_CMD_ENV_EXISTS) +static int do_env_exists(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + ENTRY e, *ep; + + if (argc < 2) + return CMD_RET_USAGE; + + e.key = argv[1]; + e.data = NULL; + hsearch_r(e, FIND, &ep, &env_htab, 0); + + return (ep == NULL) ? 1 : 0; +} +#endif + /* * New command line interface: "env" command with subcommands */ @@ -1094,6 +1111,9 @@ static cmd_tbl_t cmd_env_sub[] = { U_BOOT_CMD_MKENT(save, 1, 0, do_env_save, "", ""), #endif U_BOOT_CMD_MKENT(set, CONFIG_SYS_MAXARGS, 0, do_env_set, "", ""), +#if defined(CONFIG_CMD_ENV_EXISTS) + U_BOOT_CMD_MKENT(exists, 2, 0, do_env_exists, "", ""), +#endif }; #if defined(CONFIG_NEEDS_MANUAL_RELOC) @@ -1136,6 +1156,9 @@ static char env_help_text[] = #if defined(CONFIG_CMD_EDITENV) "env edit name - edit environment variable\n" #endif +#if defined(CONFIG_CMD_ENV_EXISTS) + "env exists name - tests for existence of variable\n" +#endif #if defined(CONFIG_CMD_EXPORTENV) "env export [-t | -b | -c] [-s size] addr [var ...] - export environment\n" #endif -- 1.8.4.rc3

4 3

[U-Boot] [PATCH v2 0/4] Fix bugs of MAKEALL
by Masahiro Yamada 08 Nov '13

08 Nov '13

Commit 27af930e9a5c91365ca639ada580b338eabe4989 changed the boards.cfg format and introduced some bugs to MAKEALL. This series fixes them. Cc: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Masahiro Yamada (4): MAKEALL: fix awk warning message MAKEALL: fix a bug to use CROSS_COMPILE_<ARCH> MAKEALL: fix boards_by_field function MAKEALL: rename boards_by_* functions to targets_by_* MAKEALL | 102 +++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 50 insertions(+), 52 deletions(-) -- 1.8.1.2

2 8

[U-Boot] [PATCH] sparc: include config.h to start.S
by Masahiro Yamada 08 Nov '13

08 Nov '13

arch/sparc/cpu/leon3/start.S requires CONFIG_SYS_SPARC_NWINDOES to be defined: #ifndef CONFIG_SYS_SPARC_NWINDOWS #error Must define number of SPARC register windows, default is 8 #endif But it missed to include <config.h>, which always ended up in compile error. This commit fixes this problem. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Daniel Hellstrom <daniel(a)gaisler.com> --- arch/sparc/cpu/leon3/start.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/sparc/cpu/leon3/start.S b/arch/sparc/cpu/leon3/start.S index 70aee78..bbc1b34 100644 --- a/arch/sparc/cpu/leon3/start.S +++ b/arch/sparc/cpu/leon3/start.S @@ -1,3 +1,5 @@ +#include <config.h> + TRAP ta 0; nop; nop; nop; /* Software trap. Treat as BAD_TRAP for the time being... */ -- 1.8.1.2

2 1

[U-Boot] [PATCH 0/2] EP88x: delete remainders of dead board
by Masahiro Yamada 08 Nov '13

08 Nov '13

I noticed some broken format in doc/README.scrapyard, so it is fixed first in 1/2. The remainders of dead board, EP88x is removed in 2/2. Masahiro Yamada (2): README.scrapyard: fix broken format EP88x: remove remainders of dead board board/ep88x/Makefile | 31 -------- board/ep88x/ep88x.c | 117 ----------------------------- board/ep88x/u-boot.lds | 79 -------------------- doc/README.scrapyard | 7 +- include/configs/EP88x.h | 190 ------------------------------------------------ 5 files changed, 4 insertions(+), 420 deletions(-) delete mode 100644 board/ep88x/Makefile delete mode 100644 board/ep88x/ep88x.c delete mode 100644 board/ep88x/u-boot.lds delete mode 100644 include/configs/EP88x.h -- 1.8.1.2

2 4

[U-Boot] [PATCH] kup: Delete an unused Makefile
by Masahiro Yamada 08 Nov '13

08 Nov '13

Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> Cc: Klaus Heydeck <heydeck(a)kieback-peter.de> --- board/${VENDOR}/${BOARD}/Makefile is used. board/${VENDOR}/common/Makefile is used if it exists. whereas, board/${VENDOR}/Makefile is never used. board/kup/Makefile | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 board/kup/Makefile diff --git a/board/kup/Makefile b/board/kup/Makefile deleted file mode 100644 index 05be72f..0000000 --- a/board/kup/Makefile +++ /dev/null @@ -1,28 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. -# -# SPDX-License-Identifier: GPL-2.0+ -# - -include $(TOPDIR)/config.mk - -LIB = $(obj)lib$(BOARD).o - -COBJS = $(BOARD).o flash.o kup.o - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(call cmd_link_o_target, $(OBJS)) - -######################################################################### - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -######################################################################### -- 1.8.1.2

2 1

[U-Boot] [PATCH v1 1/1] netconsole loses 2nd character of input
by Suriyan Ramasami 08 Nov '13

08 Nov '13

Netconsole loses the second character when used as input by either setenv stdin nc or setenv stdin serial,nc if using CONSOLE_CONSOLE_MUX Before a nc_send_packet() to echo the input, a check is done to see if nc_ether is valid. If its not, it waits for an arp request and then sends the packet (which contains the first character of line to be displayed as output). As part of reaping the arp request, the second character is consumed. We protect this by making the call to NetLoop(NETCONS) between input_recursion. Signed-off-by: Suriyan Ramasami <suriyan.r(a)gmail.com> --- drivers/net/netconsole.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index df8ab07..65c747e 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c @@ -184,7 +184,9 @@ static void nc_send_packet(const char *buf, int len) return; /* inside net loop */ output_packet = buf; output_packet_len = len; + input_recursion = 1; NetLoop(NETCONS); /* wait for arp reply and send packet */ + input_recursion = 0; output_packet_len = 0; return; } -- 1.7.1

3 2

[U-Boot] [PATCH v2 1/2] serial: xuartlite: Staticize local functions
by Axel Lin 08 Nov '13

08 Nov '13

Staticize local functions in xuartlite driver. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- v2: Also staticize userial##port##_* functions drivers/serial/serial_xuartlite.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/serial/serial_xuartlite.c b/drivers/serial/serial_xuartlite.c index 9c1d025..e613994 100644 --- a/drivers/serial/serial_xuartlite.c +++ b/drivers/serial/serial_xuartlite.c @@ -39,7 +39,7 @@ static struct uartlite *userial_ports[4] = { #endif }; -void uartlite_serial_putc(const char c, const int port) +static void uartlite_serial_putc(const char c, const int port) { struct uartlite *regs = userial_ports[port]; @@ -51,13 +51,13 @@ void uartlite_serial_putc(const char c, const int port) out_be32(&regs->tx_fifo, c & 0xff); } -void uartlite_serial_puts(const char *s, const int port) +static void uartlite_serial_puts(const char *s, const int port) { while (*s) uartlite_serial_putc(*s++, port); } -int uartlite_serial_getc(const int port) +static int uartlite_serial_getc(const int port) { struct uartlite *regs = userial_ports[port]; @@ -66,7 +66,7 @@ int uartlite_serial_getc(const int port) return in_be32(&regs->rx_fifo) & 0xff; } -int uartlite_serial_tstc(const int port) +static int uartlite_serial_tstc(const int port) { struct uartlite *regs = userial_ports[port]; @@ -82,16 +82,16 @@ static int uartlite_serial_init(const int port) /* Multi serial device functions */ #define DECLARE_ESERIAL_FUNCTIONS(port) \ - int userial##port##_init(void) \ + static int userial##port##_init(void) \ { return uartlite_serial_init(port); } \ - void userial##port##_setbrg(void) {} \ - int userial##port##_getc(void) \ + static void userial##port##_setbrg(void) {} \ + static int userial##port##_getc(void) \ { return uartlite_serial_getc(port); } \ - int userial##port##_tstc(void) \ + static int userial##port##_tstc(void) \ { return uartlite_serial_tstc(port); } \ - void userial##port##_putc(const char c) \ + static void userial##port##_putc(const char c) \ { uartlite_serial_putc(c, port); } \ - void userial##port##_puts(const char *s) \ + static void userial##port##_puts(const char *s) \ { uartlite_serial_puts(s, port); } /* Serial device descriptor */ -- 1.8.1.2

5 6

[U-Boot] [PATCH] serial: mxs_auart: Staticize local functions
by Axel Lin 08 Nov '13

08 Nov '13

Staticize local functions in mxs_auart driver. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- drivers/serial/mxs_auart.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/serial/mxs_auart.c b/drivers/serial/mxs_auart.c index 7cfe5bc..fc0fa96 100644 --- a/drivers/serial/mxs_auart.c +++ b/drivers/serial/mxs_auart.c @@ -40,7 +40,7 @@ static struct mxs_uartapp_regs *get_uartapp_registers(void) * Sets the baud rate and settings. * The settings are: 8 data bits, no parit and 1 stop bit. */ -void mxs_auart_setbrg(void) +static void mxs_auart_setbrg(void) { u32 div; u32 linectrl = 0; @@ -77,7 +77,7 @@ void mxs_auart_setbrg(void) writel(linectrl, &regs->hw_uartapp_linectrl); } -int mxs_auart_init(void) +static int mxs_auart_init(void) { struct mxs_uartapp_regs *regs = get_uartapp_registers(); /* Reset everything */ @@ -99,7 +99,7 @@ int mxs_auart_init(void) return 0; } -void mxs_auart_putc(const char c) +static void mxs_auart_putc(const char c) { struct mxs_uartapp_regs *regs = get_uartapp_registers(); /* Wait in loop while the transmit FIFO is full */ @@ -112,14 +112,14 @@ void mxs_auart_putc(const char c) mxs_auart_putc('\r'); } -int mxs_auart_tstc(void) +static int mxs_auart_tstc(void) { struct mxs_uartapp_regs *regs = get_uartapp_registers(); /* Checks if receive FIFO is empty */ return !(readl(&regs->hw_uartapp_stat) & UARTAPP_STAT_RXFE_MASK); } -int mxs_auart_getc(void) +static int mxs_auart_getc(void) { struct mxs_uartapp_regs *regs = get_uartapp_registers(); /* Wait until a character is available to read */ -- 1.8.1.2

3 3