July 2013 - U-Boot

[U-Boot] [PATCH 1/3] bootm: Move fixup_silent_linux() earlier in the bootm stages
by Simon Glass 18 Aug '13

18 Aug '13

Before the bootm refactor, fixup_silent_linux() was done only in the monolithic bootm case, not in the subcommand case. With the refactor, it is done always, which is good. Unfortunately it is done too late, since it is the PREP or CMDLINE stages that set up the command line for Linux. Move fixup_silent_linux() into the LOADOS stage, which is where we find out the OS being used, and can thus decide whether to perform this step. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/cmd_bootm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index c18157c..c0eabd2 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -542,10 +542,6 @@ static int boot_selected_os(int argc, char * const argv[], int state, bootm_start_standalone(argc, argv); return 0; } -#ifdef CONFIG_SILENT_CONSOLE - if (images->os.os == IH_OS_LINUX) - fixup_silent_linux(); -#endif arch_preboot_os(); boot_fn(state, argc, argv, images); if (state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */ @@ -656,6 +652,10 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, goto err; else if (ret == BOOTM_ERR_OVERLAP) ret = 0; +#ifdef CONFIG_SILENT_CONSOLE + if (images->os.os == IH_OS_LINUX) + fixup_silent_linux(); +#endif } /* Relocate the ramdisk */ -- 1.8.3

2 6

[U-Boot] [PATCH] SPL: Limit image name print length
by Taras Kondratiuk 18 Aug '13

18 Aug '13

If image name is longer than 32 bytes, then it will be truncated. This will remove '\0' at the end of the line, so printf will go out of string limit. Signed-off-by: Taras Kondratiuk <taras(a)ti.com> Reviewed-by: Tom Rini <trini(a)ti.com> --- common/spl/spl.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/spl/spl.c b/common/spl/spl.c index ff9ba7b..861ca0a 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -108,8 +108,9 @@ void spl_parse_image_header(const struct image_header *header) } spl_image.os = image_get_os(header); spl_image.name = image_get_name(header); - debug("spl: payload image: %s load addr: 0x%x size: %d\n", - spl_image.name, spl_image.load_addr, spl_image.size); + debug("spl: payload image: %.*s load addr: 0x%x size: %d\n", + sizeof(spl_image.name), spl_image.name, + spl_image.load_addr, spl_image.size); } else { /* Signature not found - assume u-boot.bin */ debug("mkimage signature not found - ih_magic = %x\n", -- 1.7.9.5

2 1

[U-Boot] [PATCH] Enable xmodem support
by Angus Ainslie 18 Aug '13

18 Aug '13

This is a trivial patch that just enables xmodem downloads using the existing ymodem framework. Signed-off-by: Angus Ainslie <angus(a)akkea.ca> --- common/cmd_load.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/common/cmd_load.c b/common/cmd_load.c index 0832e92..ed282b5 100644 --- a/common/cmd_load.c +++ b/common/cmd_load.c @@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR; #if defined(CONFIG_CMD_LOADB) -static ulong load_serial_ymodem(ulong offset); +static ulong load_serial_ymodem(ulong offset, int mode); #endif #if defined(CONFIG_CMD_LOADS) @@ -478,7 +478,15 @@ static int do_load_serial_bin(cmd_tbl_t *cmdtp, int flag, int argc, offset, load_baudrate); - addr = load_serial_ymodem(offset); + addr = load_serial_ymodem(offset, xyzModem_ymodem); + + } else if (strcmp(argv[0],"loadx")==0) { + printf("## Ready for binary (xmodem) download " + "to 0x%08lX at %d bps...\n", + offset, + load_baudrate); + + addr = load_serial_ymodem(offset, xyzModem_xmodem); } else { @@ -958,7 +966,7 @@ static int getcxmodem(void) { return (getc()); return -1; } -static ulong load_serial_ymodem(ulong offset) +static ulong load_serial_ymodem(ulong offset, int mode) { int size; int err; @@ -969,7 +977,7 @@ static ulong load_serial_ymodem(ulong offset) ulong addr = 0; size = 0; - info.mode = xyzModem_ymodem; + info.mode = mode; res = xyzModem_stream_open(&info, &err); if (!res) { @@ -1072,6 +1080,14 @@ U_BOOT_CMD( ); U_BOOT_CMD( + loadx, 3, 0, do_load_serial_bin, + "load binary file over serial line (xmodem mode)", + "[ off ] [ baud ]\n" + " - load binary file over serial line" + " with offset 'off' and baudrate 'baud'" +); + +U_BOOT_CMD( loady, 3, 0, do_load_serial_bin, "load binary file over serial line (ymodem mode)", "[ off ] [ baud ]\n" -- 1.8.1.2

2 1

[U-Boot] [PATCH] gpio: pca953x: Use ARRAY_SIZE instead of reinventing it
by Axel Lin 18 Aug '13

18 Aug '13

Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- drivers/gpio/pca953x.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index be13745..7371cd4 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c @@ -47,9 +47,6 @@ struct pca953x_chip_ngpio { static struct pca953x_chip_ngpio pca953x_chip_ngpios[] = CONFIG_SYS_I2C_PCA953X_WIDTH; -#define NUM_CHIP_GPIOS (sizeof(pca953x_chip_ngpios) / \ - sizeof(struct pca953x_chip_ngpio)) - /* * Determine the number of GPIO pins supported. If we don't know we assume * 8 pins. @@ -58,7 +55,7 @@ static int pca953x_ngpio(uint8_t chip) { int i; - for (i = 0; i < NUM_CHIP_GPIOS; i++) + for (i = 0; i < ARRAY_SIZE(pca953x_chip_ngpios); i++) if (pca953x_chip_ngpios[i].chip == chip) return pca953x_chip_ngpios[i].ngpio; -- 1.8.1.2

4 3

[U-Boot] [PATCH 1/2] omap: overo: update support for Micron 1GB POP
by ash＠gumstix.com 16 Aug '13

16 Aug '13

From: Steve Sakoman <steve(a)sakoman.com> Signed-off-by: Ash Charles <ashcharles(a)gmail.com> --- board/overo/overo.c | 6 ++++++ board/overo/overo.h | 1 + 2 files changed, 7 insertions(+) diff --git a/board/overo/overo.c b/board/overo/overo.c index c10c44c..8df077d 100644 --- a/board/overo/overo.c +++ b/board/overo/overo.c @@ -169,6 +169,12 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) timings->ctrlb = HYNIX_V_ACTIMB_165; timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_165MHz; break; + case REVISION_3: /* Micron 512MB/1024MB, 1/2 banks of 512MB */ + timings->mcfg = MCFG(512 << 20, 15); + timings->ctrla = MICRON_V_ACTIMA_200; + timings->ctrlb = MICRON_V_ACTIMB_200; + timings->rfr_ctrl = SDP_3430_SDRC_RFR_CTRL_200MHz; + break; default: timings->mcfg = MICRON_V_MCFG_165(128 << 20); timings->ctrla = MICRON_V_ACTIMA_165; diff --git a/board/overo/overo.h b/board/overo/overo.h index b41b628..b984a54 100644 --- a/board/overo/overo.h +++ b/board/overo/overo.h @@ -37,6 +37,7 @@ const omap3_sysinfo sysinfo = { #define REVISION_0 0x0 #define REVISION_1 0x1 #define REVISION_2 0x2 +#define REVISION_3 0x3 /* * IEN - Input Enable -- 1.7.10.4

2 3

[U-Boot] [PATCH 0/5] ARM: IGEP0033: Updates for next release.
by Enric Balletbo i Serra 16 Aug '13

16 Aug '13

From: Enric Balletbo i Serra <eballetbo(a)iseebcn.com> Hello, These are some updates to improve the support for IGEP COM AQUILA. Please consider adding for next release. Best regards, Enric Balletbo i Serra (5): ARM: IGEP0033: Remove undef of CONFIG_CMD_MEMTEST ARM: IGEP0033: Add support for Flattened Device Tree. ARM: IGEP0033: Remove CYGNUS name from header. ARM: IGEP0033: Add support to boot from NAND. ARM: IGEP0033: Remove duplicate / unused #defines. board/isee/igep0033/board.c | 2 +- board/isee/igep0033/board.h | 2 +- include/configs/igep0033.h | 78 +++++++++++++++++++++++---------------------- 3 files changed, 42 insertions(+), 40 deletions(-) -- 1.8.1.2

3 11

[U-Boot] [PATCH V2 0/6] ARM: AM43xx: Add Support for AM43xx Soc's
by Lokesh Vutla 16 Aug '13

16 Aug '13

AM43xx is a low cost Cortex-A9 based application processor targets higher performance applications and new specific end equipments like Point of Sale requiring stringent security requirements. This series add support for AM43xx Soc's. Data for the following is not added: -> SDRAM -> DPLL Dividers and post dividers -> Pin mux data(only uart data added). Once this data is available Ill add them. Config file is kept minimal for now, ll add the corresponding configs when they are validated. This is on top of u-boot-ti + V2 of AM33xx cleanup series. http://u-boot.10912.n7.nabble.com/PATCH-V2-0-4-ARM-AM33xx-Cleanup-clocks-an… Testing: Tested on pre-silicon platform verified ./MAKEALL --cpu=armv7 ./MAKEALL -s am33xx Changes Since V1: - Rebased on top of u-boot-ti + V2 of AM33xx Cleanup - Updated License header for new files. Lokesh Vutla (6): ARM: AM43xx: Add Board files ARM: AM43xx: Add header files ARM: AM43xx: clocks: Add dpll and clock data ARM: OMAP: Add CONFIG_OMAP_COMMON ARM: AM43xx: Add build support ARM: AM43xx: Add config file Makefile | 2 +- arch/arm/config.mk | 2 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/am33xx/Makefile | 7 +- arch/arm/cpu/armv7/am33xx/clock_am43xx.c | 110 +++++++++++++ arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/cpu/armv7/omap-common/boot-common.c | 3 +- arch/arm/include/asm/arch-am33xx/cpu.h | 164 +++++++++++++++++++- arch/arm/include/asm/arch-am33xx/hardware.h | 8 +- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 9 ++ .../{hardware_am33xx.h => hardware_am43xx.h} | 18 ++- arch/arm/include/asm/arch-am33xx/hardware_ti814x.h | 9 ++ arch/arm/include/asm/arch-am33xx/mux.h | 2 + arch/arm/include/asm/arch-am33xx/mux_am43xx.h | 143 +++++++++++++++++ arch/arm/include/asm/arch-am33xx/omap.h | 9 +- arch/arm/include/asm/arch-am33xx/spl.h | 4 +- board/ti/am43xx/Makefile | 38 +++++ board/ti/am43xx/board.c | 57 +++++++ board/ti/am43xx/board.h | 17 ++ board/ti/am43xx/mux.c | 27 ++++ boards.cfg | 1 + drivers/serial/ns16550.c | 5 +- include/configs/am335x_evm.h | 1 + include/configs/am3517_crane.h | 1 + include/configs/am3517_evm.h | 1 + include/configs/am43xx_evm.h | 135 ++++++++++++++++ include/configs/cm_t35.h | 1 + include/configs/devkit8000.h | 1 + include/configs/dig297.h | 1 + include/configs/igep0033.h | 1 + include/configs/igep00x0.h | 1 + include/configs/mcx.h | 1 + include/configs/nokia_rx51.h | 1 + include/configs/omap3_beagle.h | 1 + include/configs/omap3_evm_common.h | 1 + include/configs/omap3_logic.h | 1 + include/configs/omap3_mvblx.h | 1 + include/configs/omap3_overo.h | 1 + include/configs/omap3_pandora.h | 1 + include/configs/omap3_sdp3430.h | 1 + include/configs/omap3_zoom1.h | 1 + include/configs/omap3_zoom2.h | 1 + include/configs/omap4_common.h | 1 + include/configs/omap5_common.h | 1 + include/configs/pcm051.h | 1 + include/configs/tam3517-common.h | 1 + include/configs/ti814x_evm.h | 1 + include/configs/tricorder.h | 1 + spl/Makefile | 2 +- 49 files changed, 766 insertions(+), 35 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/clock_am43xx.c copy arch/arm/include/asm/arch-am33xx/{hardware_am33xx.h => hardware_am43xx.h} (69%) create mode 100644 arch/arm/include/asm/arch-am33xx/mux_am43xx.h create mode 100644 board/ti/am43xx/Makefile create mode 100644 board/ti/am43xx/board.c create mode 100644 board/ti/am43xx/board.h create mode 100644 board/ti/am43xx/mux.c create mode 100644 include/configs/am43xx_evm.h -- 1.7.9.5

2 7

[U-Boot] [PATCH v6 0/3] Add TI816X EVM support
by TENART Antoine 16 Aug '13

16 Aug '13

Changes for v6: - fix typo in commit message Changes for v5: - use wd_timer structure for WDT - remove some magic - remove memtest and verify from config - fix a redefinition warning (VTP1_CTRL_ADDR) - rebase on top of "ARM: AM33xx: Cleanup clocks and hwinit" Changes for v4: - add arch_cpu_init function - rework the ddr initialization and move it to clock_ti816x.c - move common definitions from clock_ti814x.c to clock_ti81xx.h Changes for v3: - fix a compile error when using DDR2 - rename misspelled CONFIG_EXTRA_ENV_SETTINGS in ti816x_evm.h (was CONFIG_EXTRA_EMV_SETTINGS) Changes for v2: - patches 2-7 squashed into a single patch "Add TI816X support" - removed all unused definitions - removed my definition of DMM_BASE and reworked the DMM initialization using the "common" config_dmm() from emif4.c - fixed coding style problems - now use the fallback CONFIG_SYS_BAUDRATE_TABLE - kept LONGHELP support - removed redefinition of the "device type" section in cpu_ti816x.h Antoine Tenart (3): Prepare for TI816X : reuse existing code from TI814X Add TI816X support Add TI816X evm board support MAINTAINERS | 4 + Makefile | 2 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/am33xx/Makefile | 1 + arch/arm/cpu/armv7/am33xx/clock_ti814x.c | 95 ----- arch/arm/cpu/armv7/am33xx/clock_ti816x.c | 445 ++++++++++++++++++++ arch/arm/cpu/armv7/am33xx/emif4.c | 2 + arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/include/asm/arch-am33xx/clock.h | 4 + arch/arm/include/asm/arch-am33xx/clock_ti81xx.h | 142 +++++++ arch/arm/include/asm/arch-am33xx/cpu.h | 2 +- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 35 +- arch/arm/include/asm/arch-am33xx/hardware.h | 10 +- arch/arm/include/asm/arch-am33xx/hardware_am33xx.h | 6 + arch/arm/include/asm/arch-am33xx/hardware_ti814x.h | 6 + arch/arm/include/asm/arch-am33xx/hardware_ti816x.h | 57 +++ arch/arm/include/asm/arch-am33xx/mmc_host_def.h | 3 + arch/arm/include/asm/arch-am33xx/mux.h | 2 + arch/arm/include/asm/arch-am33xx/mux_ti816x.h | 363 ++++++++++++++++ arch/arm/include/asm/arch-am33xx/omap.h | 2 +- arch/arm/include/asm/arch-am33xx/spl.h | 11 +- board/ti/ti816x/Makefile | 47 +++ board/ti/ti816x/evm.c | 229 ++++++++++ boards.cfg | 1 + drivers/serial/ns16550.c | 4 +- include/configs/ti816x_evm.h | 180 ++++++++ spl/Makefile | 2 +- 27 files changed, 1534 insertions(+), 125 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/clock_ti816x.c create mode 100644 arch/arm/include/asm/arch-am33xx/clock_ti81xx.h create mode 100644 arch/arm/include/asm/arch-am33xx/hardware_ti816x.h create mode 100644 arch/arm/include/asm/arch-am33xx/mux_ti816x.h create mode 100644 board/ti/ti816x/Makefile create mode 100644 board/ti/ti816x/evm.c create mode 100644 include/configs/ti816x_evm.h -- 1.7.10.4

2 5

[U-Boot] [PATCH 0/3] net: macb: add support for gigabit MAC
by Bo Shen 16 Aug '13

16 Aug '13

This patch add macb support for gigabit MAC, will be used by sama5d3. Tha patch for sama5d3 is in patchwork: http://patchwork.ozlabs.org/patch/226795/ After this patch is applied, will add gmac support for sama5d3 Bo Shen (3): net: macb: using AT91FAMILY replace #ifdeferry net: macb: using phylib to configure phy device net: macb: add support for gigabit MAC drivers/net/macb.c | 177 +++++++++++++++++++++++++++++++++++++++------------- drivers/net/macb.h | 55 ++++++++++++++-- 2 files changed, 184 insertions(+), 48 deletions(-) -- 1.7.9.5

3 9

[U-Boot] [PATCH] mkimage: add option for adding dtc binary path via argument
by Luka Perkov 14 Aug '13

14 Aug '13

Add option for configuring path to dtc binary in mkimage command. The dtc binary might not always be located in $PATH. Signed-off-by: Luka Perkov <luka(a)openwrt.org> --- doc/mkimage.1 | 4 ++++ tools/fit_image.c | 3 ++- tools/mkimage.c | 14 +++++++++++--- tools/mkimage.h | 5 +++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/doc/mkimage.1 b/doc/mkimage.1 index 39652c8..8cf5686 100644 --- a/doc/mkimage.1 +++ b/doc/mkimage.1 @@ -82,6 +82,10 @@ Set XIP (execute in place) flag. .B Create FIT image: .TP +.BI "\-B [" "dtc bin" "]" +Set path to the device tree compiler binary. + +.TP .BI "\-D [" "dtc options" "]" Provide special options to the device tree compiler that is used to create the image. diff --git a/tools/fit_image.c b/tools/fit_image.c index 76bbba1..cd4db58 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -82,7 +82,8 @@ static int fit_handle_file (struct mkimage_params *params) /* dtc -I dts -O dtb -p 500 datafile > tmpfile */ sprintf (cmd, "%s %s %s > %s", - MKIMAGE_DTC, params->dtc, params->datafile, tmpfile); + params->dtc_bin, params->dtc_options, params->datafile, + tmpfile); debug ("Trying to execute \"%s\"\n", cmd); if (system (cmd) == -1) { fprintf (stderr, "%s: system(%s) failed: %s\n", diff --git a/tools/mkimage.c b/tools/mkimage.c index e43b09f..ac4ced7 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -37,7 +37,8 @@ struct mkimage_params params = { .arch = IH_ARCH_PPC, .type = IH_TYPE_KERNEL, .comp = IH_COMP_GZIP, - .dtc = MKIMAGE_DEFAULT_DTC_OPTIONS, + .dtc_bin = MKIMAGE_DTC, + .dtc_options = MKIMAGE_DEFAULT_DTC_OPTIONS, .imagename = "", .imagename2 = "", }; @@ -189,10 +190,15 @@ main (int argc, char **argv) genimg_get_comp_id (*++argv)) < 0) usage (); goto NXTARG; + case 'B': + if (--argc <= 0) + usage (); + params.dtc_bin = *++argv; + goto NXTARG; case 'D': if (--argc <= 0) usage (); - params.dtc = *++argv; + params.dtc_options = *++argv; goto NXTARG; case 'O': @@ -623,7 +629,9 @@ usage () " -d ==> use image data from 'datafile'\n" " -x ==> set XIP (execute in place)\n", params.cmdname); - fprintf (stderr, " %s [-D dtc_options] -f fit-image.its fit-image\n", + fprintf (stderr, " %s [-B dtc_bin] [-D dtc_options] -f fit-image.its fit-image\n", + " -B ==> set path to the dtc binary\n", + " -D ==> set options that will be passed to dtc\n", params.cmdname); fprintf (stderr, " %s -V ==> print version information and exit\n", params.cmdname); diff --git a/tools/mkimage.h b/tools/mkimage.h index ea45f5c..1c3b1e1 100644 --- a/tools/mkimage.h +++ b/tools/mkimage.h @@ -46,7 +46,7 @@ #define MKIMAGE_MAX_TMPFILE_LEN 256 #define MKIMAGE_DEFAULT_DTC_OPTIONS "-I dts -O dtb -p 500" #define MKIMAGE_MAX_DTC_CMDLINE_LEN 512 -#define MKIMAGE_DTC "dtc" /* assume dtc is in $PATH */ +#define MKIMAGE_DTC "dtc" /* * This structure defines all such variables those are initialized by @@ -65,7 +65,8 @@ struct mkimage_params { int arch; int type; int comp; - char *dtc; + char *dtc_bin; + char *dtc_options; unsigned int addr; unsigned int ep; char *imagename;

4 6