June 2013 - U-Boot

[U-Boot] [PATCH v5 0/3] Add TI816X EVM support
by TENART Antoine 28 Jun '13

28 Jun '13

This serie introduce the support of the TI816X EVM board. The serie fits into the existing AM33XX SoC support and reuse some definitions from the TI814X. Based on the implementation in the TI-PSP-04.00.02.14 vendor tree: http://arago-project.org/git/projects/?p=u-boot-omap3.git;a=summary It has been tested booting up a Linux kernel on TI8168 refs F and C cards, with an MMC. SPL is working fine too. This serie applies on top of "ARM: AM33xx: Cleanup clocks and hwinit", which is on top of u-boot merged with u-boot-arm: http://u-boot.10912.n7.nabble.com/PATCH-0-4-ARM-AM33xx-Cleanup-clocks-and-h… 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

1 0

[U-Boot] [PATCH v5 1/2] vf610twr: Add default environment in line with other Freescale boards
by Otavio Salvador 28 Jun '13

28 Jun '13

This adds a default environment which should be able to support both 3.0.15 from Timesys and upcoming 3.11. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v5: - remove mem=128M param (Alison/Andy/Fabio) Changes in v4: - revert sys text address change (Alison) - add mem=128M to bootargs/netargs (Andy) Changes in v3: - add dt boot support - use ttyLP1 as console - change loadaddr and sys text as iMX6SL - NOTE: It needs to be boot tested as I don't have the board Changes in v2: - fix console for ttymxc1 (Fabio) include/configs/vf610twr.h | 91 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 77fe893..af772ca 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -83,8 +83,96 @@ #define CONFIG_BOOTDELAY 3 +#define CONFIG_LOADADDR 0x82000000 #define CONFIG_SYS_TEXT_BASE 0x3f008000 +#define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ + "uimage=uImage\0" \ + "console=ttyLP1\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "fdt_file=vf610-twr.dtb\0" \ + "fdt_addr=0x81000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ + "mmcpart=1\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "update_sd_firmware_filename=u-boot.imx\0" \ + "update_sd_firmware=" \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "if mmc dev ${mmcdev}; then " \ + "if ${get_cmd} ${update_sd_firmware_filename}; then " \ + "setexpr fw_sz ${filesize} / 0x200; " \ + "setexpr fw_sz ${fw_sz} + 1; " \ + "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ + "fi; " \ + "fi\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "root=${mmcroot}\0" \ + "loadbootscript=" \ + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootm; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootm; " \ + "fi;\0" \ + "netargs=setenv bootargs console=${console},${baudrate} " \ + "root=/dev/nfs " \ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ + "netboot=echo Booting from net ...; " \ + "run netargs; " \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "${get_cmd} ${uimage}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootm; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootm; " \ + "fi;\0" + +#define CONFIG_BOOTCOMMAND \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "else run netboot; " \ + "fi; " \ + "fi; " \ + "else run netboot; fi" + /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ @@ -101,8 +189,7 @@ #define CONFIG_SYS_MEMTEST_START 0x80010000 #define CONFIG_SYS_MEMTEST_END 0x87C00000 -#define CONFIG_SYS_LOAD_ADDR 0x80010000 - +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* -- 1.8.3.1

3 5

[U-Boot] [PATCH] video: mxsfb: Break the line in videomode message
by Fabio Estevam 28 Jun '13

28 Jun '13

Currently we have the following on boot: CPU: Freescale i.MX28 rev1.2 at 454 MHz BOOT: SSP SD/MMC #0, 3V3 DRAM: 128 MiB MMC: MXS MMC: 0 Video: MXSFB: 'videomode' variable not set!In: serial Break the line of the warning message in order to have a better reading format. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- drivers/video/mxsfb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c index b189419..411d356 100644 --- a/drivers/video/mxsfb.c +++ b/drivers/video/mxsfb.c @@ -137,7 +137,7 @@ void *video_hw_init(void) /* Suck display configuration from "videomode" variable */ penv = getenv("videomode"); if (!penv) { - printf("MXSFB: 'videomode' variable not set!"); + printf("MXSFB: 'videomode' variable not set!\n"); return NULL; } -- 1.8.1.2

4 3

[U-Boot] [PATCH] MAINTAINERS: Add an entry to the mx6q wandboard variant
by Fabio Estevam 28 Jun '13

28 Jun '13

Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index e753e03..001b42d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -664,7 +664,7 @@ Fabio Estevam <fabio.estevam(a)freescale.com> mx53smd i.MX53 mx6sabresd i.MX6Q/DL mx6qsabreauto i.MX6Q - wandboard i.MX6DL/S + wandboard i.MX6DL/S/Q mx6slevk i.MX6SL Daniel Gorsulowski <daniel.gorsulowski(a)esd.eu> -- 1.8.1.2

3 2

[U-Boot] [PATCH v4 1/2] vf610twr: Add default environment in line with other Freescale boards
by Otavio Salvador 28 Jun '13

28 Jun '13

This adds a default environment which should be able to support both 3.0.15 from Timesys and upcoming 3.11. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> --- Changes in v4: - revert sys text address change (Alison) - add mem=128M to bootargs/netargs (Andy) Changes in v3: - add dt boot support - use ttyLP1 as console - change loadaddr and sys text as iMX6SL - NOTE: It needs to be boot tested as I don't have the board Changes in v2: - fix console for ttymxc1 (Fabio) include/configs/vf610twr.h | 91 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 89 insertions(+), 2 deletions(-) diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index 77fe893..9474aeb 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -83,8 +83,96 @@ #define CONFIG_BOOTDELAY 3 +#define CONFIG_LOADADDR 0x82000000 #define CONFIG_SYS_TEXT_BASE 0x3f008000 +#define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ + "uimage=uImage\0" \ + "console=ttyLP1\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "fdt_file=vf610-twr.dtb\0" \ + "fdt_addr=0x81000000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ + "mmcpart=1\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "update_sd_firmware_filename=u-boot.imx\0" \ + "update_sd_firmware=" \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "if mmc dev ${mmcdev}; then " \ + "if ${get_cmd} ${update_sd_firmware_filename}; then " \ + "setexpr fw_sz ${filesize} / 0x200; " \ + "setexpr fw_sz ${fw_sz} + 1; " \ + "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ + "fi; " \ + "fi\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ + "root=${mmcroot} mem=128M\0" \ + "loadbootscript=" \ + "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \ + "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ + "mmcboot=echo Booting from mmc ...; " \ + "run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootm; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootm; " \ + "fi;\0" \ + "netargs=setenv bootargs console=${console},${baudrate} " \ + "root=/dev/nfs mem=128M " \ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ + "netboot=echo Booting from net ...; " \ + "run netargs; " \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "${get_cmd} ${uimage}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ + "bootm ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootm; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootm; " \ + "fi;\0" + +#define CONFIG_BOOTCOMMAND \ + "mmc dev ${mmcdev}; if mmc rescan; then " \ + "if run loadbootscript; then " \ + "run bootscript; " \ + "else " \ + "if run loaduimage; then " \ + "run mmcboot; " \ + "else run netboot; " \ + "fi; " \ + "fi; " \ + "else run netboot; fi" + /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ @@ -101,8 +189,7 @@ #define CONFIG_SYS_MEMTEST_START 0x80010000 #define CONFIG_SYS_MEMTEST_END 0x87C00000 -#define CONFIG_SYS_LOAD_ADDR 0x80010000 - +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #define CONFIG_SYS_HZ 1000 /* -- 1.8.3.1

4 11

[U-Boot] [PATCH v3 1/2] console: usbkbd: Improve TFTP booting performance
by Jim Lin 28 Jun '13

28 Jun '13

TFTP booting is observed a little bit slow, especially when a USB keyboard is installed. The fix is to move polling to every second if we sense that other task like TFTP boot is running. Signed-off-by: Jim Lin <jilin(a)nvidia.com> --- Changes in v2: 1. Change configuration name from CONFIG_CTRLC_POLL_MS to CONFIG_CTRLC_POLL_S. 2. New code will be executed only when CONFIG_CTRLC_POLL_S is defined in configuration header file. 3. Add description in README.console. Changes in v3: 1. Move changes to common/usb_kbd.c and doc/README.usb 2. Rename config setting to CONFIG_USBKB_TESTC_PERIOD. 3. Remove slow response on USB-keyboard input when TFTP boot is not running. common/usb_kbd.c | 20 ++++++++++++++++++++ doc/README.usb | 15 ++++++++++++++- 2 files changed, 34 insertions(+), 1 deletions(-) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index 3174b5e..25bf677 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -121,6 +121,11 @@ struct usb_kbd_pdata { uint8_t flags; }; +#ifdef CONFIG_USBKB_TESTC_PERIOD +/* The period of time between two calls of usb_kbd_testc(). */ +static unsigned long kbd_testc_tms; +#endif + /* Generic keyboard event polling. */ void usb_kbd_generic_poll(void) { @@ -366,6 +371,21 @@ static int usb_kbd_testc(void) struct usb_device *usb_kbd_dev; struct usb_kbd_pdata *data; +#ifdef CONFIG_USBKB_TESTC_PERIOD + /* + * T is the time between two calls of usb_kbd_testc(). + * If CONFIG_USBKB_TESTC_PERIOD ms < T < 1000 ms, + * it implies other task like TFTP boot is running, + * then we reduce polling to every second + * to improve TFTP booting performance. + */ + if ((get_timer(kbd_testc_tms) >= + (CONFIG_USBKB_TESTC_PERIOD * CONFIG_SYS_HZ / 1000)) && + (get_timer(kbd_testc_tms) < CONFIG_SYS_HZ)) + return 0; + else + kbd_testc_tms = get_timer(0); +#endif dev = stdio_get_by_name(DEVNAME); usb_kbd_dev = (struct usb_device *)dev->priv; data = usb_kbd_dev->privptr; diff --git a/doc/README.usb b/doc/README.usb index b4c3ef5..ff4ee6f 100644 --- a/doc/README.usb +++ b/doc/README.usb @@ -80,7 +80,20 @@ CONFIG_USB_UHCI defines the lowlevel part.A lowlevel part must be defined CONFIG_USB_KEYBOARD enables the USB Keyboard CONFIG_USB_STORAGE enables the USB storage devices CONFIG_USB_HOST_ETHER enables USB ethernet adapter support - +CONFIG_USBKB_TESTC_PERIOD defines the average time (in ms) between two calls + of usb_kbd_testc() when TFTP boot is not running + In u-boot console, usb_kbd_testc() will be called + periodically. + When this configuration is defined and other task like + TFTP boot is running, USB keyboard will be polled less + frequently and will be polled every second. + This is to improve TFTP booting performance when USB + keyboard is installed. + In u-boot console, no impact on keyboard input if TFTP + boot is not running. + Example: + Define the following in configuration header file + #define CONFIG_USBKB_TESTC_PERIOD 100 USB Host Networking =================== -- 1.7.7

2 5

[U-Boot] [PATCH] powerpc/srio-pcie-boot: Avoid the NOR_BOOT macro when boot from SRIO/PCIE
by Liu Gang 28 Jun '13

28 Jun '13

When a board (slave) boots from SRIO/PCIE, it would get the instructions from a remote board (master) by SRIO/PCIE interface, and the slave's u-boot image should be built with the SYS_TEXT_BASE=0xFFF80000; So the u-boot of the slave should avoid the NOR_BOOT branch at the booting stage. For example, when a P2041RDB boots from SRIO/PCIE, it will set TLB entry 15 from base address "CONFIG_SYS_MONITOR_BASE & 0xffc00000", and with the 4M size as the boot window in NOR_BOOT branch. Because the CONFIG_SYS_MONITOR_BASE = CONFIG_SYS_TEXT_BASE = 0xFFF80000, so the TLB entry will be from base address 0xffc00000 and with 4M size. Then the u-boot will set TLB entry 14 from base address "CONFIG_SYS_INIT_RAM_ADDR", and with the 16K size as the initial stack window. For the P2041RDB platform, the CONFIG_SYS_INIT_RAM_ADDR = 0xffd00000. So the TLB entry 14 and 15 will be in confliction. There will be right TLB entries configurations when avoid the NOR_BOOT branch and set the boot window from 0xfff00000 with 1M size space. Signed-off-by: Liu Gang <Gang.Liu(a)freescale.com> --- arch/powerpc/cpu/mpc85xx/start.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc85xx/start.S b/arch/powerpc/cpu/mpc85xx/start.S index 2657982..786b7e2 100644 --- a/arch/powerpc/cpu/mpc85xx/start.S +++ b/arch/powerpc/cpu/mpc85xx/start.S @@ -49,7 +49,8 @@ #define MINIMAL_SPL #endif -#if !defined(CONFIG_SPL) && !defined(CONFIG_SYS_RAMBOOT) && !defined(CONFIG_SECURE_BOOT) +#if !defined(CONFIG_SPL) && !defined(CONFIG_SYS_RAMBOOT) && \ + !defined(CONFIG_SECURE_BOOT) && !defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) #define NOR_BOOT #endif -- 1.7.9.5

1 0

[U-Boot] [PULL] u-boot-pxa/master
by Marek Vasut 28 Jun '13

28 Jun '13

The following changes since commit fbf87b1823dd5ebc2a384711ea2c677543019ece: arm: optimize relocate_code routine (2013-06-21 23:05:50 +0200) are available in the git repository at: git://git.denx.de/u-boot-pxa.git master for you to fetch changes up to 9dc8fef2583f23ca6a99c6f5e709a8b80018364f: pxa: fix memory coherency problem after relocation (2013-06-22 15:25:28 +0200) ---------------------------------------------------------------- Mike Dunn (5): pxa: add support for palmtreo680 board pxa: palmtreo680 flash programming utility pxa: turn icache off in cpu_init_crit() pxa: use -mcpu=xscale compiler option pxa: fix memory coherency problem after relocation CREDITS | 4 + MAINTAINERS | 3 + arch/arm/cpu/pxa/config.mk | 2 +- arch/arm/cpu/pxa/start.S | 3 +- arch/arm/lib/relocate.S | 9 +++ board/palmtreo680/Makefile | 34 +++++++++ board/palmtreo680/README | 581 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ board/palmtreo680/palmtreo680.c | 148 +++++++++++++++++++++++++++++++++++ boards.cfg | 1 + include/configs/palmtreo680.h | 286 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/palmtreo680/flash_u-boot.c | 177 ++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 1245 insertions(+), 3 deletions(-) create mode 100644 board/palmtreo680/Makefile create mode 100644 board/palmtreo680/README create mode 100644 board/palmtreo680/palmtreo680.c create mode 100644 include/configs/palmtreo680.h create mode 100644 tools/palmtreo680/flash_u-boot.c

4 8

[U-Boot] [PATCH v2 0/21] Add tracing functionality to U-Boot
by Simon Glass 28 Jun '13

28 Jun '13

This series adds a tracing feature to U-Boot which is useful for profiling boot time and other purposes. The core trace library relies on standard gcc function instrumentation and a microsecond timer which should work correctly on almost any architecture. Generic board is used to avoid the need to add the same code in multiple places (CONFIG_SYS_GENERIC_BOARD). Tracing must be built into the U-Boot image at build time, but can be paused and resumed while running. A trace buffer is used to collect trace information. This buffer can then be transmitted to a host for processing. A host-based processing tool is provided which converts the data to the same format used by Linux, and that can be read by the pytimechart GUI tool. A U-Boot 'trace' command provides access to the trace information, including support for writing it to memory in a few forms. Support is provided for stopping tracing at the last possible moment in the bootm process (just before U-Boot jumps to the OS). This is done with a new 'fake go' command, which allows bootm to go through the motions of an OS boot without actually committing to it. Once the 'fake go' is complete, U-Boot can stop tracing and continue execution to transmit the trace information to the host, before jumping to the OS for real. The system is tested on sandbox, x86 and smdk5250/snow. It may work correctly on Tegra and other machines but unfortunately has not been tested. A simple test script is provided for sandbox, along with documentation on how to use the feature. This feature has been successfully used alongside bootstage to locate bottlenecks and reduce overall boot time. Changes in v2: - Add cast to clarfy argument type on sandbox and x86 - Add new patch to convert PCI inline functions to static inline - Add new patch to enable tracing on Exynos5 - Add new patch to enable tracing on coreboot - Add new patch to fix FIT compile error for x86 - Add new patch to fix compiler warning in do_mem_loop() - Add new patch to support tracing on x86 - Add notification that the trace test has passed - Adjust printf() type to avoid warning on x86 - Change init sequence so that mon_len is set up before trace - Fix bracket typo - Fix missing BOOTM_STATE_OS_PREP in do_bootm() - Fix tag to use : instead of ; - Rebase on top of mainline - Remove unneeded debug printf()s for non RFC version - Update board_f support for new mainline relocaddr use Simon Glass (21): pci: Convert extern inline functions to static inline x86: Correct missing local variable in bootm Fix missing return in do_mem_loop() Show stdout on error in fit-test bootstage: Correct printf types Add function to print a number with grouped digits Add trace library Add a trace command Support tracing in config.mk when enabled Add trace support to generic board Add proftool to decode profile data sandbox: Support trace feature Add a simple test for sandbox trace Clarify bootm OS arguments Refactor the bootm command to reduce code duplication Add a 'fake' go command to the bootm command arm: Implement the 'fake' go command exynos: Avoid function instrumentation for microsecond timer exynos: config: Add tracing options x86: Support tracing function x86: config: Add tracing options Makefile | 3 +- arch/arm/cpu/armv7/s5p-common/timer.c | 2 +- arch/arm/include/asm/arch-exynos/cpu.h | 10 +- arch/arm/lib/bootm.c | 33 +- arch/microblaze/lib/bootm.c | 4 +- arch/nios2/lib/bootm.c | 4 +- arch/openrisc/lib/bootm.c | 4 +- arch/sandbox/cpu/cpu.c | 2 +- arch/sandbox/cpu/os.c | 2 +- arch/x86/include/asm/global_data.h | 2 +- arch/x86/include/asm/msr.h | 3 +- arch/x86/include/asm/u-boot-x86.h | 2 +- arch/x86/lib/bootm.c | 2 + arch/x86/lib/gcc.c | 4 +- arch/x86/lib/tsc_timer.c | 6 +- common/Makefile | 1 + common/board_f.c | 17 +- common/board_r.c | 11 + common/bootstage.c | 26 +- common/cmd_bootm.c | 514 ++++++++++++++------------- common/cmd_mem.c | 2 + common/cmd_trace.c | 133 +++++++ common/image-fdt.c | 13 +- common/image.c | 22 +- config.mk | 11 +- doc/README.trace | 361 +++++++++++++++++++ include/asm-generic/global_data.h | 3 + include/common.h | 4 + include/configs/coreboot.h | 7 + include/configs/exynos5250-dt.h | 8 + include/configs/sandbox.h | 13 + include/image.h | 17 +- include/pci.h | 4 +- include/trace.h | 125 +++++++ include/vsprintf.h | 11 + lib/Makefile | 1 + lib/trace.c | 379 ++++++++++++++++++++ lib/vsprintf.c | 16 + test/image/test-fit.py | 19 +- test/trace/test-trace.sh | 89 +++++ tools/.gitignore | 1 + tools/Makefile | 6 + tools/proftool.c | 611 +++++++++++++++++++++++++++++++++ 43 files changed, 2164 insertions(+), 344 deletions(-) create mode 100644 common/cmd_trace.c create mode 100644 doc/README.trace create mode 100644 include/trace.h create mode 100644 lib/trace.c create mode 100755 test/trace/test-trace.sh create mode 100644 tools/proftool.c -- 1.8.3

4 40

[U-Boot] [PATCH 1/2] Revert "Add a 'fake' go command to the bootm command"
by Simon Glass 28 Jun '13

28 Jun '13

This reverts commit d0ae31eb0714a8b44dcdb644f8b68dafdbc1c197. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/cmd_bootm.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index ba0bcd4..0cd9cc3 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -499,7 +499,6 @@ static cmd_tbl_t cmd_bootm_sub[] = { U_BOOT_CMD_MKENT(cmdline, 0, 1, (void *)BOOTM_STATE_OS_CMDLINE, "", ""), U_BOOT_CMD_MKENT(bdt, 0, 1, (void *)BOOTM_STATE_OS_BD_T, "", ""), U_BOOT_CMD_MKENT(prep, 0, 1, (void *)BOOTM_STATE_OS_PREP, "", ""), - U_BOOT_CMD_MKENT(fake, 0, 1, (void *)BOOTM_STATE_OS_FAKE_GO, "", ""), U_BOOT_CMD_MKENT(go, 0, 1, (void *)BOOTM_STATE_OS_GO, "", ""), }; @@ -540,8 +539,6 @@ static int boot_selected_os(int argc, char * const argv[], int state, #endif arch_preboot_os(); boot_fn(state, argc, argv, images); - if (state == BOOTM_STATE_OS_FAKE_GO) /* We expect to return */ - return 0; bootstage_error(BOOTSTAGE_ID_BOOT_OS_RETURNED); #ifdef DEBUG puts("\n## Control returned to monitor - resetting...\n"); @@ -648,17 +645,6 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, if (!ret && (states & BOOTM_STATE_OS_PREP)) ret = boot_fn(BOOTM_STATE_OS_PREP, argc, argv, images); -#ifdef CONFIG_TRACE - /* Pretend to run the OS, then run a user command */ - if (!ret && (states & BOOTM_STATE_OS_FAKE_GO)) { - char *cmd_list = getenv("fakegocmd"); - - ret = boot_selected_os(argc, argv, BOOTM_STATE_OS_FAKE_GO, - images, boot_fn, &iflag); - if (!ret && cmd_list) - ret = run_command_list(cmd_list, -1, flag); - } -#endif /* Now run the OS! We hope this doesn't return */ if (!ret && (states & BOOTM_STATE_OS_GO)) ret = boot_selected_os(argc, argv, BOOTM_STATE_OS_GO, @@ -768,7 +754,7 @@ int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START | BOOTM_STATE_FINDOS | BOOTM_STATE_FINDOTHER | BOOTM_STATE_LOADOS | BOOTM_STATE_OS_PREP | - BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO, &images, 1); + BOOTM_STATE_OS_GO, &images, 1); } int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd) @@ -1767,8 +1753,7 @@ int do_bootz(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; ret = do_bootm_states(cmdtp, flag, argc, argv, - BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO, - &images, 1); + BOOTM_STATE_OS_GO, &images, 1); return ret; } -- 1.8.3

1 1