February 2013 - U-Boot

[U-Boot] Fwd: pull request for u-boot-tegra/master into ARM/master
by Tom Warren 12 Feb '13

12 Feb '13

Dropped the list from the PR. Sorry 'bout that. ---------- Forwarded message ---------- From: Tom Warren <twarren.nvidia(a)gmail.com> Date: Mon, Feb 11, 2013 at 11:05 AM Subject: pull request for u-boot-tegra/master into ARM/master To: Albert ARIBAUD <albert.u.boot(a)aribaud.net> Cc: Tom Warren <twarren(a)nvidia.com>, Stephen Warren <swarren(a)nvidia.com>, Simon Glass <sjg(a)chromium.org>, Wolfgang Denk <wd(a)denx.de>, Allen Martin <amartin(a)nvidia.com>, Lucas Stach <dev(a)lynxeye.de> Albert, Please pull u-boot-tegra/master into ARM/master. Thanks! ./MAKEALL -a arm completed over the weekend w/o any new errors, and checkpatch is clean. The following changes since commit 8978f860a64eecfa088c1088bc0c2002ec316362: Tom Rini (1): am33xx: Drop gpio0_7_pin_mux from phytec pcm051 are available in the git repository at: git://git.denx.de/u-boot-tegra master Allen Martin (8): tegra: fdt: add back missing host1x node tegra20: fdt: add SPI SFLASH node tegra: spi: add fdt support to tegra SPI SFLASH driver tegra30: add SBC1 to periph id mapping table tegra30: fdt: add SPI SLINK nodes tegra: add addresses of SPI SLINK controllers tegra: add SPI SLINK driver tegra: cardhu: config: enable SPI Lucas Stach (1): arm: fix CONFIG_DELAY_ENVIRONMENT to act like it claims in the README Stephen Warren (2): tegra: rename FUNCMUX_UART2_UARTB tegra: don't hard-code LCD into default TEGRA_DEVICE_SETTINGS Tom Warren (9): Tegra: T20: Remove unused 'SLOW' SoC ID and PLLX table entry Tegra: Move common clock code to arch/arm/cpu/tegra-common/clock.c Tegra114: Add arch-tegra114 include files Tegra114: Add AVP (arm720t) files Tegra114: Add CPU (armv7) files Tegra114: Add common CPU (shared) files Tegra114: Dalmore: Add DT files Tegra114: Add generic Tegra114 build support Tegra114: Add/enable Dalmore build (T114 reference board) arch/arm/cpu/arm720t/tegra-common/cpu.c | 78 ++-- arch/arm/cpu/arm720t/tegra-common/cpu.h | 8 +- arch/arm/cpu/arm720t/tegra114/Makefile | 42 ++ arch/arm/cpu/arm720t/tegra114/config.mk | 19 + arch/arm/cpu/arm720t/tegra114/cpu.c | 297 +++++++++ arch/arm/cpu/armv7/tegra114/Makefile | 40 ++ arch/arm/cpu/armv7/tegra114/config.mk | 19 + arch/arm/cpu/tegra-common/Makefile | 2 +- arch/arm/cpu/tegra-common/ap.c | 9 +- arch/arm/cpu/tegra-common/board.c | 25 +- arch/arm/cpu/tegra-common/clock.c | 560 ++++++++++++++++ arch/arm/cpu/tegra114-common/Makefile | 41 ++ arch/arm/cpu/tegra114-common/clock.c | 655 +++++++++++++++++++ arch/arm/cpu/tegra114-common/funcmux.c | 63 ++ arch/arm/cpu/tegra114-common/pinmux.c | 506 +++++++++++++++ arch/arm/cpu/tegra20-common/clock.c | 605 +----------------- arch/arm/cpu/tegra20-common/funcmux.c | 2 +- arch/arm/cpu/tegra30-common/clock.c | 712 ++++----------------- arch/arm/dts/tegra114.dtsi | 5 + arch/arm/dts/tegra20.dtsi | 12 + arch/arm/dts/tegra30.dtsi | 72 ++ arch/arm/include/asm/arch-tegra/clk_rst.h | 58 ++- arch/arm/include/asm/arch-tegra/clock.h | 59 ++- arch/arm/include/asm/arch-tegra/gp_padctrl.h | 1 + arch/arm/include/asm/arch-tegra/pmc.h | 8 + arch/arm/include/asm/arch-tegra/tegra.h | 9 +- arch/arm/include/asm/arch-tegra/tegra_slink.h | 84 +++ arch/arm/include/asm/arch-tegra114/clock-tables.h | 402 ++++++++++++ arch/arm/include/asm/arch-tegra114/clock.h | 28 + arch/arm/include/asm/arch-tegra114/flow.h | 35 + arch/arm/include/asm/arch-tegra114/funcmux.h | 31 + arch/arm/include/asm/arch-tegra114/gp_padctrl.h | 59 ++ arch/arm/include/asm/arch-tegra114/gpio.h | 30 + arch/arm/include/asm/arch-tegra114/hardware.h | 22 + arch/arm/include/asm/arch-tegra114/pinmux.h | 618 ++++++++++++++++++ arch/arm/include/asm/arch-tegra114/pmu.h | 23 + arch/arm/include/asm/arch-tegra114/spl.h | 22 + arch/arm/include/asm/arch-tegra114/tegra.h | 33 + arch/arm/include/asm/arch-tegra20/clock-tables.h | 4 + arch/arm/include/asm/arch-tegra20/clock.h | 4 + arch/arm/include/asm/arch-tegra20/funcmux.h | 2 +- arch/arm/include/asm/arch-tegra20/tegra.h | 2 + arch/arm/include/asm/arch-tegra30/clock.h | 4 + arch/arm/include/asm/arch-tegra30/tegra.h | 2 + arch/arm/lib/board.c | 2 +- board/compulab/dts/tegra20-trimslice.dts | 5 + board/nvidia/common/board.c | 5 +- board/nvidia/dalmore/Makefile | 36 + board/nvidia/dalmore/dalmore.c | 32 + board/nvidia/dalmore/pinmux-config-dalmore.h | 249 +++++++ board/nvidia/dts/tegra114-dalmore.dts | 13 + board/nvidia/dts/tegra20-seaboard.dts | 11 + board/nvidia/dts/tegra30-cardhu.dts | 5 + boards.cfg | 1 + drivers/spi/Makefile | 1 + drivers/spi/tegra_slink.c | 343 ++++++++++ drivers/spi/tegra_spi.c | 45 ++- include/configs/cardhu.h | 11 + include/configs/dalmore.h | 50 ++ include/configs/tegra-common-post.h | 11 +- include/configs/tegra114-common.h | 79 +++ include/fdtdec.h | 2 + lib/fdtdec.c | 2 + 63 files changed, 4963 insertions(+), 1252 deletions(-) create mode 100644 arch/arm/cpu/arm720t/tegra114/Makefile create mode 100644 arch/arm/cpu/arm720t/tegra114/config.mk create mode 100644 arch/arm/cpu/arm720t/tegra114/cpu.c create mode 100644 arch/arm/cpu/armv7/tegra114/Makefile create mode 100644 arch/arm/cpu/armv7/tegra114/config.mk create mode 100644 arch/arm/cpu/tegra-common/clock.c create mode 100644 arch/arm/cpu/tegra114-common/Makefile create mode 100644 arch/arm/cpu/tegra114-common/clock.c create mode 100644 arch/arm/cpu/tegra114-common/funcmux.c create mode 100644 arch/arm/cpu/tegra114-common/pinmux.c create mode 100644 arch/arm/dts/tegra114.dtsi create mode 100644 arch/arm/include/asm/arch-tegra/tegra_slink.h create mode 100644 arch/arm/include/asm/arch-tegra114/clock-tables.h create mode 100644 arch/arm/include/asm/arch-tegra114/clock.h create mode 100644 arch/arm/include/asm/arch-tegra114/flow.h create mode 100644 arch/arm/include/asm/arch-tegra114/funcmux.h create mode 100644 arch/arm/include/asm/arch-tegra114/gp_padctrl.h create mode 100644 arch/arm/include/asm/arch-tegra114/gpio.h create mode 100644 arch/arm/include/asm/arch-tegra114/hardware.h create mode 100644 arch/arm/include/asm/arch-tegra114/pinmux.h create mode 100644 arch/arm/include/asm/arch-tegra114/pmu.h create mode 100644 arch/arm/include/asm/arch-tegra114/spl.h create mode 100644 arch/arm/include/asm/arch-tegra114/tegra.h create mode 100644 board/nvidia/dalmore/Makefile create mode 100644 board/nvidia/dalmore/dalmore.c create mode 100644 board/nvidia/dalmore/pinmux-config-dalmore.h create mode 100644 board/nvidia/dts/tegra114-dalmore.dts create mode 100644 drivers/spi/tegra_slink.c create mode 100644 include/configs/dalmore.h create mode 100644 include/configs/tegra114-common.h

2 1

[U-Boot] [PATCH v3] mx6: Disable Power Down Bit of watchdog
by Fabio Estevam 12 Feb '13

12 Feb '13

On a mx6qsabresd revision C board with rev1.2 mx6q, the system gets resetted and it is not able to reach the Linux prompt. Comparing the watchdog behaviour on a revB versus revC board: - On a mx6qsabresd revB: U-Boot > reset resetting ... U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46) CPU: Freescale i.MX6Q rev1.1 at 792 MHz Reset cause: WDOG ... - On a mx6qsabresd revC: U-Boot > reset resetting ... U-Boot 2013.01-10524-g432a3aa-dirty (Feb 07 2013 - 13:34:46) CPU: Freescale i.MX6Q rev1.1 at 792 MHz Reset cause: POR So due to revC POR/watchdog circuitry whenever a watchdog occurs, it causes a POR. Clearing the PDE - Power Down Enable bit of WMCR registers fixes the problem and is also safe for all mx6 boards. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v2: - Using bool can make the code cleaner Changes since v1: - Improve commit log arch/arm/cpu/armv7/mx6/soc.c | 12 ++++++++++++ arch/arm/include/asm/arch-mx6/imx-regs.h | 8 ++++++++ 2 files changed, 20 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index a8aad5d..6b089f3 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -30,6 +30,7 @@ #include <asm/arch/clock.h> #include <asm/arch/sys_proto.h> #include <asm/imx-common/boot_mode.h> +#include <stdbool.h> struct scu_regs { u32 ctrl; @@ -121,12 +122,23 @@ void set_vddsoc(u32 mv) writel(reg, &anatop->reg_core); } +static void imx_set_wdog_powerdown(bool enable) +{ + struct wdog_regs *wdog1 = (struct wdog_regs *)WDOG1_BASE_ADDR; + struct wdog_regs *wdog2 = (struct wdog_regs *)WDOG2_BASE_ADDR; + + /* Write to the PDE (Power Down Enable) bit */ + writew(enable, &wdog1->wmcr); + writew(enable, &wdog2->wmcr); +} + int arch_cpu_init(void) { init_aips(); set_vddsoc(1200); /* Set VDDSOC to 1.2V */ + imx_set_wdog_powerdown(false); /* Disable PDE bit of WMCR register */ return 0; } diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index 3eb0081..eaa7439 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -601,5 +601,13 @@ struct iomuxc_base_regs { u32 daisy[104]; /* 0x7b0..94c */ }; +struct wdog_regs { + u16 wcr; /* Control */ + u16 wsr; /* Service */ + u16 wrsr; /* Reset Status */ + u16 wicr; /* Interrupt Control */ + u16 wmcr; /* Miscellaneous Control */ +}; + #endif /* __ASSEMBLER__*/ #endif /* __ASM_ARCH_MX6_IMX_REGS_H__ */ -- 1.7.9.5

3 3

[U-Boot] [PATCH 1/6] imx: mx6q DDR3 init: Fix tMRD
by Benoît Thébaudeau 12 Feb '13

12 Feb '13

MMDC1_MDCFG1.tMRD should be set to max(tMRD, tMOD) for DDR3. For all DDR3 speed bins: tMRD(min) = 4 nCK tMOD(min) = max(12 nCK, 15 ns) Hence, MMDC1_MDCFG1.tMRD should be set to max(12 nCK, 15 ns), which is 12 nCK at 532 MHz, encoded as 0xB in the bit-field MMDC1_MDCFG1[8:5]. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> --- board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg b/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg index c86cd40..9ac8027 100644 --- a/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg +++ b/board/freescale/imx/ddr/mx6q_4x_mt41j128.cfg @@ -110,7 +110,7 @@ DATA 4 0x021b0018 0x00081740 DATA 4 0x021b001c 0x00008000 DATA 4 0x021b000c 0x555A7975 -DATA 4 0x021b0010 0xFF538E64 +DATA 4 0x021b0010 0xFF538F64 DATA 4 0x021b0014 0x01FF00DB DATA 4 0x021b002c 0x000026D2 -- 1.7.10.4

3 10

[U-Boot] [PATCH V3 0/5] ARM: OMAP5: Add support for OMAP543x ES2.0 Socs
by R Sricharan 12 Feb '13

12 Feb '13

ES2.0 is the latest silicon revision for OMAP543X socs. The SOC supports enhanced opps for MPU (up to 1.5GHz). This series essentially adds the support for both 5430 and 5432 versions. This is on top of the below U-Boot cleanup series. http://comments.gmane.org/gmane.comp.boot-loaders.u-boot/152834 Both the cleanup and ES2.0 support series against mainline is available here git://gitorious.org/u-boot-shared/u-boot.git omap5_es2 Lokesh Vutla (2): ARM: OMAP5: Add DDR changes required for OMAP543X ES2.0 SOCs ARM: OMAP5: srcomp: enable slew rate compensation cells after powerup R Sricharan (3): ARM: OMAP5: Add silicon id support for ES2.0 revision. ARM: OMAP5: clock: Add the prcm register changes required for ES2.0 ARM: OMAP5: clocks: Add OPP settings required for OMAP543X ES2.0 soc arch/arm/cpu/armv7/omap-common/clocks-common.c | 9 +- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 6 + arch/arm/cpu/armv7/omap4/hw_data.c | 164 +++++++------- arch/arm/cpu/armv7/omap5/hw_data.c | 254 +++++++++++++-------- arch/arm/cpu/armv7/omap5/hwinit.c | 143 +++++++++++- arch/arm/cpu/armv7/omap5/prcm-regs.c | 286 ++++++++++++++++++++++++ arch/arm/cpu/armv7/omap5/sdram.c | 75 ++++++- arch/arm/include/asm/arch-omap5/clocks.h | 39 +++- arch/arm/include/asm/arch-omap5/omap.h | 27 +++ arch/arm/include/asm/arch-omap5/sys_proto.h | 1 + arch/arm/include/asm/armv7.h | 1 + arch/arm/include/asm/emif.h | 1 + arch/arm/include/asm/omap_common.h | 14 +- 13 files changed, 828 insertions(+), 192 deletions(-) -- 1.7.9.5

1 5

[U-Boot] [PATCH] usb: ehci: exynos: Enable non-dt path
by Vivek Gautam 12 Feb '13

12 Feb '13

Enabling the non-dt path for the driver so that we don't get any build errors for non-dt configuration. Signed-off-by: Vivek Gautam <gautam.vivek(a)samsung.com> --- Earlier we had moved to fdt support for ehci-exynos driver, but missed out the non-dt path. Although this driver serves for exysno5 onward only but better to keep the non-dt path also available. drivers/usb/host/ehci-exynos.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/drivers/usb/host/ehci-exynos.c b/drivers/usb/host/ehci-exynos.c index 3ca4c5c..6f0c6c3 100644 --- a/drivers/usb/host/ehci-exynos.c +++ b/drivers/usb/host/ehci-exynos.c @@ -153,7 +153,12 @@ int ehci_hcd_init(int index, struct ehci_hccr **hccr, struct ehci_hcor **hcor) return -ENOMEM; } +#ifdef CONFIG_OF_CONTROL exynos_usb_parse_dt(gd->fdt_blob, exynos); +#else + exynos->usb = (struct exynos_usb_phy *)samsung_get_base_usb_phy(); + exynos->hcd = samsung_get_base_usb_ehci(); +#endif setup_usb_phy(exynos->usb); @@ -185,7 +190,12 @@ int ehci_hcd_stop(int index) return -ENOMEM; } +#ifdef CONFIG_OF_CONTROL exynos_usb_parse_dt(gd->fdt_blob, exynos); +#else + exynos->usb = (struct exynos_usb_phy *)samsung_get_base_usb_phy(); + exynos->hcd = samsung_get_base_usb_ehci(); +#endif reset_usb_phy(exynos->usb); -- 1.7.6.5

5 5

[U-Boot] [PATCH 2/2 v4] tools: add support for Dove to kwboot
by Luka Perkov 12 Feb '13

12 Feb '13

From: Sebastian Hesselbarth <sebastian.hesselbarth(a)gmail.com> On Dove mvboot can also be used to boot an u-boot image into RAM. In contrast to Kirkwood, Dove does not support the UART boot mode sequence but requires the UART boot mode to be selected through strap pins. The SolidRun CuBox has a push button to allow uart boot mode but fails on the boot sequence sent by mvboot. This patch adds another cmdline option to allow to send a boot image without the boot sequence and adds support for Dove. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth(a)gmail.com> Signed-off-by: Daniel Stodden <daniel.stodden(a)gmail.com> Signed-off-by: Luka Perkov <luka(a)openwrt.org> Cc: Prafulla Wadaskar <prafulla(a)marvell.com> Cc: Rabeeh Khoury <rabeeh(a)solid-run.com> --- changes from v1 to v2: * update documentation changes from v2 to v3: * none changes from v3 to v4: * move to separate patch series * fix wrong flag in the man page * document Dove support in the header of mvboot.c doc/mvboot.1 | 13 ++++++++++--- tools/Makefile | 2 ++ tools/mvboot.c | 27 ++++++++++++++++++++------- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/doc/mvboot.1 b/doc/mvboot.1 index 563d0e5..0978351 100644 --- a/doc/mvboot.1 +++ b/doc/mvboot.1 @@ -1,17 +1,18 @@ -.TH MVBOOT 1 "2012-05-19" +.TH MVBOOT 1 "2013-02-12" .SH NAME -mvboot \- Boot Marvell Kirkwood SoCs over a serial link. +mvboot \- Boot Marvell Kirkwood/Dove SoCs over a serial link. .SH SYNOPSIS .B mvboot .RB [ "-b \fIimage\fP" ] +.RB [ "-n" ] .RB [ "-p" ] .RB [ "-t" ] .RB [ "-B \fIbaudrate\fP" ] .RB \fITTY\fP .SH "DESCRIPTION" -The \fBmkimage\fP program boots boards based on Marvell's Kirkwood +The \fBmkimage\fP program boots boards based on Marvell's Kirkwood/Dove platform over their integrated UART. Boot image files will typically contain a second stage boot loader, such as U-Boot. The image file must conform to Marvell's BootROM firmware image format @@ -68,6 +69,12 @@ If standard I/O streams connect to a console, this mode will terminate after receiving 'ctrl-\\' followed by 'c' from console input. .TP +.BI "\-n" +Disables the UART boot mode sequence for platforms that do not support +it (e.g. Dove). Usually, the UART boot mode must be selected by pressing +a push button on power-up. + +.TP .BI "\-B \fIbaudrate\fP" Adjust the baud rate on \fITTY\fP. Default rate is 115200. diff --git a/tools/Makefile b/tools/Makefile index adfb643..db4def5 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -72,6 +72,7 @@ BIN_FILES-$(CONFIG_SMDK5250) += mksmdk5250spl$(SFX) BIN_FILES-$(CONFIG_MX28) += mxsboot$(SFX) BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX) BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX) +BIN_FILES-$(CONFIG_DOVE) += mvboot$(SFX) BIN_FILES-$(CONFIG_KIRKWOOD) += mvboot$(SFX) # Source files which exist outside the tools directory @@ -103,6 +104,7 @@ OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o NOPED_OBJ_FILES-y += os_support.o OBJ_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1.o NOPED_OBJ_FILES-y += ublimage.o +OBJ_FILES-$(CONFIG_DOVE) += mvboot.o OBJ_FILES-$(CONFIG_KIRKWOOD) += mvboot.o # Don't build by default diff --git a/tools/mvboot.c b/tools/mvboot.c index 94fb0dd..ea12f58 100644 --- a/tools/mvboot.c +++ b/tools/mvboot.c @@ -1,5 +1,5 @@ /* - * Boot a Marvell Kirkwood SoC, with Xmodem over UART0. + * Boot a Marvell Kirkwood and Dove SoCs, with Xmodem over UART0. * * (c) 2012 Daniel Stodden <daniel.stodden(a)gmail.com> * @@ -37,6 +37,10 @@ static unsigned char mvboot_msg_boot[] = { 0xBB, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 }; +static unsigned char mvboot_msg_none[] = { + 0x00 +}; + #define MVBOOT_MSG_REQ_DELAY 10 /* ms */ #define MVBOOT_MSG_RSP_TIMEO 50 /* ms */ @@ -268,17 +272,21 @@ mvboot_bootmsg(int tty, void *msg) int rc; char c; - mvboot_printv("Sending boot message. Please reboot the target..."); + mvboot_printv(msg != mvboot_msg_none + ? "Sending boot message. Please reboot the target..." + : "Sensing target. Please reboot target into UART mode..."); do { rc = tcflush(tty, TCIOFLUSH); if (rc) break; - rc = mvboot_tty_send(tty, msg, 8); - if (rc) { - usleep(MVBOOT_MSG_REQ_DELAY * 1000); - continue; + if (msg != mvboot_msg_none) { + rc = mvboot_tty_send(tty, msg, 8); + if (rc) { + usleep(MVBOOT_MSG_REQ_DELAY * 1000); + continue; + } } rc = mvboot_tty_recv(tty, &c, 1, MVBOOT_MSG_RSP_TIMEO); @@ -607,6 +615,7 @@ mvboot_usage(FILE *stream, char *progname) fprintf(stream, " -b <image>: boot <image>\n"); fprintf(stream, " -p: patch <image> to type 0x69 (uart boot)\n"); fprintf(stream, "\n"); + fprintf(stream, " -n: don't send boot message\n"); fprintf(stream, " -t: mini terminal\n"); fprintf(stream, "\n"); fprintf(stream, " -B <baud>: set baud rate\n"); @@ -636,7 +645,7 @@ main(int argc, char **argv) mvboot_verbose = isatty(STDOUT_FILENO); do { - int c = getopt(argc, argv, "hb:ptB:"); + int c = getopt(argc, argv, "hb:nptB:"); if (c < 0) break; @@ -646,6 +655,10 @@ main(int argc, char **argv) imgpath = optarg; break; + case 'n': + bootmsg = mvboot_msg_none; + break; + case 'p': patch = 1; break; -- 1.8.1.2

1 0

[U-Boot] [PATCH 1/2] tools: rename kwboot to mvboot
by Luka Perkov 12 Feb '13

12 Feb '13

kwboot tool is used to boot Marvell Kirkwood SoCs over the serial link. Before adding support for other Marvell SoCs, such as Dove or Armada, this patch renames the tool so it's name makes more sense in the future. Signed-off-by: Luka Perkov <luka(a)openwrt.org> CC: Prafulla Wadaskar <prafulla(a)marvell.com> CC: Sebastian Hesselbarth <sebastian.hesselbarth(a)gmail.com> CC: Daniel Stodden <daniel.stodden(a)gmail.com> --- doc/kwboot.1 | 84 ------- doc/mvboot.1 | 84 +++++++ tools/.gitignore | 2 +- tools/Makefile | 6 +- tools/kwboot.c | 742 ------------------------------------------------------- tools/mvboot.c | 742 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 830 insertions(+), 830 deletions(-) delete mode 100644 doc/kwboot.1 create mode 100644 doc/mvboot.1 delete mode 100644 tools/kwboot.c create mode 100644 tools/mvboot.c diff --git a/doc/kwboot.1 b/doc/kwboot.1 deleted file mode 100644 index 25fe69a..0000000 --- a/doc/kwboot.1 +++ /dev/null @@ -1,84 +0,0 @@ -.TH KWBOOT 1 "2012-05-19" - -.SH NAME -kwboot \- Boot Marvell Kirkwood SoCs over a serial link. -.SH SYNOPSIS -.B kwboot -.RB [ "-b \fIimage\fP" ] -.RB [ "-p" ] -.RB [ "-t" ] -.RB [ "-B \fIbaudrate\fP" ] -.RB \fITTY\fP -.SH "DESCRIPTION" - -The \fBmkimage\fP program boots boards based on Marvell's Kirkwood -platform over their integrated UART. Boot image files will typically -contain a second stage boot loader, such as U-Boot. The image file -must conform to Marvell's BootROM firmware image format -(\fIkwbimage\fP), created using a tool such as \fBmkimage\fP. - -Following power-up or a system reset, system BootROM code polls the -UART for a brief period of time, sensing a handshake message which -initiates an image upload. This program sends this boot message until -it receives a positive acknowledgement. The image is transfered using -Xmodem. - -Additionally, this program implements a minimal terminal mode, which -can be used either standalone, or entered immediately following boot -image transfer completion. This is often useful to catch early boot -messages, or to manually interrupt a default boot procedure performed -by the second-stage loader. - -.SH "OPTIONS" - -.TP -.BI "\-b \fIimage\fP" -Handshake; then upload file \fIimage\fP over \fITTY\fP. - -Note that for the encapsulated boot code to be executed, \fIimage\fP -must be of type "UART boot" (0x69). Boot images of different types, -such as backup images of vendor firmware downloaded from flash memory -(type 0x8B), will not work (or not as expected). See \fB-p\fP for a -workaround. - -This mode writes handshake status and upload progress indication to -stdout. - -.TP -.BI "\-p" -In combination with \fB-b\fP, patches the header in \fIimage\fP prior -to upload, to "UART boot" type. - -This option attempts on-the-fly conversion of some none-UART image -types, such as images which were originally formatted to be stored in -flash memory. - -Conversion is performed in memory. The contents of \fIimage\fP will -not be altered. - -.TP -.BI "\-t" -Run a terminal program, connecting standard input and output to -.RB \fITTY\fP. - -If used in combination with \fB-b\fP, terminal mode is entered -immediately following a successful image upload. - -If standard I/O streams connect to a console, this mode will terminate -after receiving 'ctrl-\\' followed by 'c' from console input. - -.TP -.BI "\-B \fIbaudrate\fP" -Adjust the baud rate on \fITTY\fP. Default rate is 115200. - -.SH "SEE ALSO" -.PP -\fBmkimage\fP(1) - -.SH "AUTHORS" - -Daniel Stodden <daniel.stodden(a)gmail.com> -.br -Luka Perkov <luka(a)openwrt.org> -.br -David Purdy <david.c.purdy(a)gmail.com> diff --git a/doc/mvboot.1 b/doc/mvboot.1 new file mode 100644 index 0000000..563d0e5 --- /dev/null +++ b/doc/mvboot.1 @@ -0,0 +1,84 @@ +.TH MVBOOT 1 "2012-05-19" + +.SH NAME +mvboot \- Boot Marvell Kirkwood SoCs over a serial link. +.SH SYNOPSIS +.B mvboot +.RB [ "-b \fIimage\fP" ] +.RB [ "-p" ] +.RB [ "-t" ] +.RB [ "-B \fIbaudrate\fP" ] +.RB \fITTY\fP +.SH "DESCRIPTION" + +The \fBmkimage\fP program boots boards based on Marvell's Kirkwood +platform over their integrated UART. Boot image files will typically +contain a second stage boot loader, such as U-Boot. The image file +must conform to Marvell's BootROM firmware image format +(\fIkwbimage\fP), created using a tool such as \fBmkimage\fP. + +Following power-up or a system reset, system BootROM code polls the +UART for a brief period of time, sensing a handshake message which +initiates an image upload. This program sends this boot message until +it receives a positive acknowledgement. The image is transfered using +Xmodem. + +Additionally, this program implements a minimal terminal mode, which +can be used either standalone, or entered immediately following boot +image transfer completion. This is often useful to catch early boot +messages, or to manually interrupt a default boot procedure performed +by the second-stage loader. + +.SH "OPTIONS" + +.TP +.BI "\-b \fIimage\fP" +Handshake; then upload file \fIimage\fP over \fITTY\fP. + +Note that for the encapsulated boot code to be executed, \fIimage\fP +must be of type "UART boot" (0x69). Boot images of different types, +such as backup images of vendor firmware downloaded from flash memory +(type 0x8B), will not work (or not as expected). See \fB-p\fP for a +workaround. + +This mode writes handshake status and upload progress indication to +stdout. + +.TP +.BI "\-p" +In combination with \fB-b\fP, patches the header in \fIimage\fP prior +to upload, to "UART boot" type. + +This option attempts on-the-fly conversion of some none-UART image +types, such as images which were originally formatted to be stored in +flash memory. + +Conversion is performed in memory. The contents of \fIimage\fP will +not be altered. + +.TP +.BI "\-t" +Run a terminal program, connecting standard input and output to +.RB \fITTY\fP. + +If used in combination with \fB-b\fP, terminal mode is entered +immediately following a successful image upload. + +If standard I/O streams connect to a console, this mode will terminate +after receiving 'ctrl-\\' followed by 'c' from console input. + +.TP +.BI "\-B \fIbaudrate\fP" +Adjust the baud rate on \fITTY\fP. Default rate is 115200. + +.SH "SEE ALSO" +.PP +\fBmkimage\fP(1) + +.SH "AUTHORS" + +Daniel Stodden <daniel.stodden(a)gmail.com> +.br +Luka Perkov <luka(a)openwrt.org> +.br +David Purdy <david.c.purdy(a)gmail.com> diff --git a/tools/.gitignore b/tools/.gitignore index 9bce719..89debe3 100644 --- a/tools/.gitignore +++ b/tools/.gitignore @@ -2,10 +2,10 @@ /envcrc /gen_eth_addr /img2srec -/kwboot /mkenvimage /mkimage /mpc86x_clk +/mvboot /mxsboot /ncb /ncp diff --git a/tools/Makefile b/tools/Makefile index 686840a..adfb643 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -72,7 +72,7 @@ BIN_FILES-$(CONFIG_SMDK5250) += mksmdk5250spl$(SFX) BIN_FILES-$(CONFIG_MX28) += mxsboot$(SFX) BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX) BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX) -BIN_FILES-$(CONFIG_KIRKWOOD) += kwboot$(SFX) +BIN_FILES-$(CONFIG_KIRKWOOD) += mvboot$(SFX) # Source files which exist outside the tools directory EXT_OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += common/env_embedded.o @@ -103,7 +103,7 @@ OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o NOPED_OBJ_FILES-y += os_support.o OBJ_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1.o NOPED_OBJ_FILES-y += ublimage.o -OBJ_FILES-$(CONFIG_KIRKWOOD) += kwboot.o +OBJ_FILES-$(CONFIG_KIRKWOOD) += mvboot.o # Don't build by default #ifeq ($(ARCH),ppc) @@ -239,7 +239,7 @@ $(obj)ncb$(SFX): $(obj)ncb.o $(obj)ubsha1$(SFX): $(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ -$(obj)kwboot$(SFX): $(obj)kwboot.o +$(obj)mvboot$(SFX): $(obj)mvboot.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ $(HOSTSTRIP) $@ diff --git a/tools/kwboot.c b/tools/kwboot.c deleted file mode 100644 index e773f01..0000000 --- a/tools/kwboot.c +++ /dev/null @@ -1,742 +0,0 @@ -/* - * Boot a Marvell Kirkwood SoC, with Xmodem over UART0. - * - * (c) 2012 Daniel Stodden <daniel.stodden(a)gmail.com> - * - * References: marvell.com, "88F6180, 88F6190, 88F6192, and 88F6281 - * Integrated Controller: Functional Specifications" December 2, - * 2008. Chapter 24.2 "BootROM Firmware". - */ - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <stdarg.h> -#include <libgen.h> -#include <fcntl.h> -#include <errno.h> -#include <unistd.h> -#include <stdint.h> -#include <termios.h> -#include <sys/mman.h> -#include <sys/stat.h> - -#include "kwbimage.h" - -#ifdef __GNUC__ -#define PACKED __attribute((packed)) -#else -#define PACKED -#endif - -/* - * Marvell BootROM UART Sensing - */ - -static unsigned char kwboot_msg_boot[] = { - 0xBB, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 -}; - -#define KWBOOT_MSG_REQ_DELAY 10 /* ms */ -#define KWBOOT_MSG_RSP_TIMEO 50 /* ms */ - -/* - * Xmodem Transfers - */ - -#define SOH 1 /* sender start of block header */ -#define EOT 4 /* sender end of block transfer */ -#define ACK 6 /* target block ack */ -#define NAK 21 /* target block negative ack */ -#define CAN 24 /* target/sender transfer cancellation */ - -struct kwboot_block { - uint8_t soh; - uint8_t pnum; - uint8_t _pnum; - uint8_t data[128]; - uint8_t csum; -} PACKED; - -#define KWBOOT_BLK_RSP_TIMEO 1000 /* ms */ - -static int kwboot_verbose; - -static void -kwboot_printv(const char *fmt, ...) -{ - va_list ap; - - if (kwboot_verbose) { - va_start(ap, fmt); - vprintf(fmt, ap); - va_end(ap); - fflush(stdout); - } -} - -static void -__spinner(void) -{ - const char seq[] = { '-', '\\', '|', '/' }; - const int div = 8; - static int state, bs; - - if (state % div == 0) { - fputc(bs, stdout); - fputc(seq[state / div % sizeof(seq)], stdout); - fflush(stdout); - } - - bs = '\b'; - state++; -} - -static void -kwboot_spinner(void) -{ - if (kwboot_verbose) - __spinner(); -} - -static void -__progress(int pct, char c) -{ - const int width = 70; - static const char *nl = ""; - static int pos; - - if (pos % width == 0) - printf("%s%3d %% [", nl, pct); - - fputc(c, stdout); - - nl = "]\n"; - pos++; - - if (pct == 100) { - while (pos++ < width) - fputc(' ', stdout); - fputs(nl, stdout); - } - - fflush(stdout); - -} - -static void -kwboot_progress(int _pct, char c) -{ - static int pct; - - if (_pct != -1) - pct = _pct; - - if (kwboot_verbose) - __progress(pct, c); -} - -static int -kwboot_tty_recv(int fd, void *buf, size_t len, int timeo) -{ - int rc, nfds; - fd_set rfds; - struct timeval tv; - ssize_t n; - - rc = -1; - - FD_ZERO(&rfds); - FD_SET(fd, &rfds); - - tv.tv_sec = 0; - tv.tv_usec = timeo * 1000; - if (tv.tv_usec > 1000000) { - tv.tv_sec += tv.tv_usec / 1000000; - tv.tv_usec %= 1000000; - } - - do { - nfds = select(fd + 1, &rfds, NULL, NULL, &tv); - if (nfds < 0) - goto out; - if (!nfds) { - errno = ETIMEDOUT; - goto out; - } - - n = read(fd, buf, len); - if (n < 0) - goto out; - - buf = (char *)buf + n; - len -= n; - } while (len > 0); - - rc = 0; -out: - return rc; -} - -static int -kwboot_tty_send(int fd, const void *buf, size_t len) -{ - int rc; - ssize_t n; - - rc = -1; - - do { - n = write(fd, buf, len); - if (n < 0) - goto out; - - buf = (char *)buf + n; - len -= n; - } while (len > 0); - - rc = tcdrain(fd); -out: - return rc; -} - -static int -kwboot_tty_send_char(int fd, unsigned char c) -{ - return kwboot_tty_send(fd, &c, 1); -} - -static speed_t -kwboot_tty_speed(int baudrate) -{ - switch (baudrate) { - case 115200: - return B115200; - case 57600: - return B57600; - case 38400: - return B38400; - case 19200: - return B19200; - case 9600: - return B9600; - } - - return -1; -} - -static int -kwboot_open_tty(const char *path, speed_t speed) -{ - int rc, fd; - struct termios tio; - - rc = -1; - - fd = open(path, O_RDWR|O_NOCTTY|O_NDELAY); - if (fd < 0) - goto out; - - memset(&tio, 0, sizeof(tio)); - - tio.c_iflag = 0; - tio.c_cflag = CREAD|CLOCAL|CS8; - - tio.c_cc[VMIN] = 1; - tio.c_cc[VTIME] = 10; - - cfsetospeed(&tio, speed); - cfsetispeed(&tio, speed); - - rc = tcsetattr(fd, TCSANOW, &tio); - if (rc) - goto out; - - rc = fd; -out: - if (rc < 0) { - if (fd >= 0) - close(fd); - } - - return rc; -} - -static int -kwboot_bootmsg(int tty, void *msg) -{ - int rc; - char c; - - kwboot_printv("Sending boot message. Please reboot the target..."); - - do { - rc = tcflush(tty, TCIOFLUSH); - if (rc) - break; - - rc = kwboot_tty_send(tty, msg, 8); - if (rc) { - usleep(KWBOOT_MSG_REQ_DELAY * 1000); - continue; - } - - rc = kwboot_tty_recv(tty, &c, 1, KWBOOT_MSG_RSP_TIMEO); - - kwboot_spinner(); - - } while (rc || c != NAK); - - kwboot_printv("\n"); - - return rc; -} - -static int -kwboot_xm_makeblock(struct kwboot_block *block, const void *data, - size_t size, int pnum) -{ - const size_t blksz = sizeof(block->data); - size_t n; - int i; - - block->pnum = pnum; - block->_pnum = ~block->pnum; - - n = size < blksz ? size : blksz; - memcpy(&block->data[0], data, n); - memset(&block->data[n], 0, blksz - n); - - block->csum = 0; - for (i = 0; i < n; i++) - block->csum += block->data[i]; - - return n; -} - -static int -kwboot_xm_sendblock(int fd, struct kwboot_block *block) -{ - int rc, retries; - char c; - - retries = 16; - do { - rc = kwboot_tty_send(fd, block, sizeof(*block)); - if (rc) - break; - - rc = kwboot_tty_recv(fd, &c, 1, KWBOOT_BLK_RSP_TIMEO); - if (rc) - break; - - if (c != ACK) - kwboot_progress(-1, '+'); - - } while (c == NAK && retries-- > 0); - - rc = -1; - - switch (c) { - case ACK: - rc = 0; - break; - case NAK: - errno = EBADMSG; - break; - case CAN: - errno = ECANCELED; - break; - default: - errno = EPROTO; - break; - } - - return rc; -} - -static int -kwboot_xmodem(int tty, const void *_data, size_t size) -{ - const uint8_t *data = _data; - int rc, pnum, N, err; - - pnum = 1; - N = 0; - - kwboot_printv("Sending boot image...\n"); - - do { - struct kwboot_block block; - int n; - - n = kwboot_xm_makeblock(&block, - data + N, size - N, - pnum++); - if (n < 0) - goto can; - - if (!n) - break; - - rc = kwboot_xm_sendblock(tty, &block); - if (rc) - goto out; - - N += n; - kwboot_progress(N * 100 / size, '.'); - } while (1); - - rc = kwboot_tty_send_char(tty, EOT); - -out: - return rc; - -can: - err = errno; - kwboot_tty_send_char(tty, CAN); - errno = err; - goto out; -} - -static int -kwboot_term_pipe(int in, int out, char *quit, int *s) -{ - ssize_t nin, nout; - char _buf[128], *buf = _buf; - - nin = read(in, buf, sizeof(buf)); - if (nin < 0) - return -1; - - if (quit) { - int i; - - for (i = 0; i < nin; i++) { - if (*buf == quit[*s]) { - (*s)++; - if (!quit[*s]) - return 0; - buf++; - nin--; - } else - while (*s > 0) { - nout = write(out, quit, *s); - if (nout <= 0) - return -1; - (*s) -= nout; - } - } - } - - while (nin > 0) { - nout = write(out, buf, nin); - if (nout <= 0) - return -1; - nin -= nout; - } - - return 0; -} - -static int -kwboot_terminal(int tty) -{ - int rc, in, s; - char *quit = "\34c"; - struct termios otio, tio; - - rc = -1; - - in = STDIN_FILENO; - if (isatty(in)) { - rc = tcgetattr(in, &otio); - if (!rc) { - tio = otio; - cfmakeraw(&tio); - rc = tcsetattr(in, TCSANOW, &tio); - } - if (rc) { - perror("tcsetattr"); - goto out; - } - - kwboot_printv("[Type Ctrl-%c + %c to quit]\r\n", - quit[0]|0100, quit[1]); - } else - in = -1; - - rc = 0; - s = 0; - - do { - fd_set rfds; - int nfds = 0; - - FD_SET(tty, &rfds); - nfds = nfds < tty ? tty : nfds; - - if (in >= 0) { - FD_SET(in, &rfds); - nfds = nfds < in ? in : nfds; - } - - nfds = select(nfds + 1, &rfds, NULL, NULL, NULL); - if (nfds < 0) - break; - - if (FD_ISSET(tty, &rfds)) { - rc = kwboot_term_pipe(tty, STDOUT_FILENO, NULL, NULL); - if (rc) - break; - } - - if (FD_ISSET(in, &rfds)) { - rc = kwboot_term_pipe(in, tty, quit, &s); - if (rc) - break; - } - } while (quit[s] != 0); - - tcsetattr(in, TCSANOW, &otio); -out: - return rc; -} - -static void * -kwboot_mmap_image(const char *path, size_t *size, int prot) -{ - int rc, fd, flags; - struct stat st; - void *img; - - rc = -1; - fd = -1; - img = NULL; - - fd = open(path, O_RDONLY); - if (fd < 0) - goto out; - - rc = fstat(fd, &st); - if (rc) - goto out; - - flags = (prot & PROT_WRITE) ? MAP_PRIVATE : MAP_SHARED; - - img = mmap(NULL, st.st_size, prot, flags, fd, 0); - if (img == MAP_FAILED) { - img = NULL; - goto out; - } - - rc = 0; - *size = st.st_size; -out: - if (rc && img) { - munmap(img, st.st_size); - img = NULL; - } - if (fd >= 0) - close(fd); - - return img; -} - -static uint8_t -kwboot_img_csum8(void *_data, size_t size) -{ - uint8_t *data = _data, csum; - - for (csum = 0; size-- > 0; data++) - csum += *data; - - return csum; -} - -static int -kwboot_img_patch_hdr(void *img, size_t size) -{ - int rc; - bhr_t *hdr; - uint8_t csum; - const size_t hdrsz = sizeof(*hdr); - - rc = -1; - hdr = img; - - if (size < hdrsz) { - errno = EINVAL; - goto out; - } - - csum = kwboot_img_csum8(hdr, hdrsz) - hdr->checkSum; - if (csum != hdr->checkSum) { - errno = EINVAL; - goto out; - } - - if (hdr->blockid == IBR_HDR_UART_ID) { - rc = 0; - goto out; - } - - hdr->blockid = IBR_HDR_UART_ID; - - hdr->nandeccmode = IBR_HDR_ECC_DISABLED; - hdr->nandpagesize = 0; - - hdr->srcaddr = hdr->ext - ? sizeof(struct kwb_header) - : sizeof(*hdr); - - hdr->checkSum = kwboot_img_csum8(hdr, hdrsz) - csum; - - rc = 0; -out: - return rc; -} - -static void -kwboot_usage(FILE *stream, char *progname) -{ - fprintf(stream, - "Usage: %s -b <image> [ -p ] [ -t ] " - "[-B <baud> ] <TTY>\n", progname); - fprintf(stream, "\n"); - fprintf(stream, " -b <image>: boot <image>\n"); - fprintf(stream, " -p: patch <image> to type 0x69 (uart boot)\n"); - fprintf(stream, "\n"); - fprintf(stream, " -t: mini terminal\n"); - fprintf(stream, "\n"); - fprintf(stream, " -B <baud>: set baud rate\n"); - fprintf(stream, "\n"); -} - -int -main(int argc, char **argv) -{ - const char *ttypath, *imgpath; - int rv, rc, tty, term, prot, patch; - void *bootmsg; - void *img; - size_t size; - speed_t speed; - - rv = 1; - tty = -1; - bootmsg = NULL; - imgpath = NULL; - img = NULL; - term = 0; - patch = 0; - size = 0; - speed = B115200; - - kwboot_verbose = isatty(STDOUT_FILENO); - - do { - int c = getopt(argc, argv, "hb:ptB:"); - if (c < 0) - break; - - switch (c) { - case 'b': - bootmsg = kwboot_msg_boot; - imgpath = optarg; - break; - - case 'p': - patch = 1; - break; - - case 't': - term = 1; - break; - - case 'B': - speed = kwboot_tty_speed(atoi(optarg)); - if (speed == -1) - goto usage; - break; - - case 'h': - rv = 0; - default: - goto usage; - } - } while (1); - - if (!bootmsg && !term) - goto usage; - - if (patch && !imgpath) - goto usage; - - if (argc - optind < 1) - goto usage; - - ttypath = argv[optind++]; - - tty = kwboot_open_tty(ttypath, speed); - if (tty < 0) { - perror(ttypath); - goto out; - } - - if (imgpath) { - prot = PROT_READ | (patch ? PROT_WRITE : 0); - - img = kwboot_mmap_image(imgpath, &size, prot); - if (!img) { - perror(imgpath); - goto out; - } - } - - if (patch) { - rc = kwboot_img_patch_hdr(img, size); - if (rc) { - fprintf(stderr, "%s: Invalid image.\n", imgpath); - goto out; - } - } - - if (bootmsg) { - rc = kwboot_bootmsg(tty, bootmsg); - if (rc) { - perror("bootmsg"); - goto out; - } - } - - if (img) { - rc = kwboot_xmodem(tty, img, size); - if (rc) { - perror("xmodem"); - goto out; - } - } - - if (term) { - rc = kwboot_terminal(tty); - if (rc && !(errno == EINTR)) { - perror("terminal"); - goto out; - } - } - - rv = 0; -out: - if (tty >= 0) - close(tty); - - if (img) - munmap(img, size); - - return rv; - -usage: - kwboot_usage(rv ? stderr : stdout, basename(argv[0])); - goto out; -} diff --git a/tools/mvboot.c b/tools/mvboot.c new file mode 100644 index 0000000..94fb0dd --- /dev/null +++ b/tools/mvboot.c @@ -0,0 +1,742 @@ +/* + * Boot a Marvell Kirkwood SoC, with Xmodem over UART0. + * + * (c) 2012 Daniel Stodden <daniel.stodden(a)gmail.com> + * + * References: marvell.com, "88F6180, 88F6190, 88F6192, and 88F6281 + * Integrated Controller: Functional Specifications" December 2, + * 2008. Chapter 24.2 "BootROM Firmware". + */ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <stdarg.h> +#include <libgen.h> +#include <fcntl.h> +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <termios.h> +#include <sys/mman.h> +#include <sys/stat.h> + +#include "kwbimage.h" + +#ifdef __GNUC__ +#define PACKED __attribute((packed)) +#else +#define PACKED +#endif + +/* + * Marvell BootROM UART Sensing + */ + +static unsigned char mvboot_msg_boot[] = { + 0xBB, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 +}; + +#define MVBOOT_MSG_REQ_DELAY 10 /* ms */ +#define MVBOOT_MSG_RSP_TIMEO 50 /* ms */ + +/* + * Xmodem Transfers + */ + +#define SOH 1 /* sender start of block header */ +#define EOT 4 /* sender end of block transfer */ +#define ACK 6 /* target block ack */ +#define NAK 21 /* target block negative ack */ +#define CAN 24 /* target/sender transfer cancellation */ + +struct mvboot_block { + uint8_t soh; + uint8_t pnum; + uint8_t _pnum; + uint8_t data[128]; + uint8_t csum; +} PACKED; + +#define MVBOOT_BLK_RSP_TIMEO 1000 /* ms */ + +static int mvboot_verbose; + +static void +mvboot_printv(const char *fmt, ...) +{ + va_list ap; + + if (mvboot_verbose) { + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + fflush(stdout); + } +} + +static void +__spinner(void) +{ + const char seq[] = { '-', '\\', '|', '/' }; + const int div = 8; + static int state, bs; + + if (state % div == 0) { + fputc(bs, stdout); + fputc(seq[state / div % sizeof(seq)], stdout); + fflush(stdout); + } + + bs = '\b'; + state++; +} + +static void +mvboot_spinner(void) +{ + if (mvboot_verbose) + __spinner(); +} + +static void +__progress(int pct, char c) +{ + const int width = 70; + static const char *nl = ""; + static int pos; + + if (pos % width == 0) + printf("%s%3d %% [", nl, pct); + + fputc(c, stdout); + + nl = "]\n"; + pos++; + + if (pct == 100) { + while (pos++ < width) + fputc(' ', stdout); + fputs(nl, stdout); + } + + fflush(stdout); + +} + +static void +mvboot_progress(int _pct, char c) +{ + static int pct; + + if (_pct != -1) + pct = _pct; + + if (mvboot_verbose) + __progress(pct, c); +} + +static int +mvboot_tty_recv(int fd, void *buf, size_t len, int timeo) +{ + int rc, nfds; + fd_set rfds; + struct timeval tv; + ssize_t n; + + rc = -1; + + FD_ZERO(&rfds); + FD_SET(fd, &rfds); + + tv.tv_sec = 0; + tv.tv_usec = timeo * 1000; + if (tv.tv_usec > 1000000) { + tv.tv_sec += tv.tv_usec / 1000000; + tv.tv_usec %= 1000000; + } + + do { + nfds = select(fd + 1, &rfds, NULL, NULL, &tv); + if (nfds < 0) + goto out; + if (!nfds) { + errno = ETIMEDOUT; + goto out; + } + + n = read(fd, buf, len); + if (n < 0) + goto out; + + buf = (char *)buf + n; + len -= n; + } while (len > 0); + + rc = 0; +out: + return rc; +} + +static int +mvboot_tty_send(int fd, const void *buf, size_t len) +{ + int rc; + ssize_t n; + + rc = -1; + + do { + n = write(fd, buf, len); + if (n < 0) + goto out; + + buf = (char *)buf + n; + len -= n; + } while (len > 0); + + rc = tcdrain(fd); +out: + return rc; +} + +static int +mvboot_tty_send_char(int fd, unsigned char c) +{ + return mvboot_tty_send(fd, &c, 1); +} + +static speed_t +mvboot_tty_speed(int baudrate) +{ + switch (baudrate) { + case 115200: + return B115200; + case 57600: + return B57600; + case 38400: + return B38400; + case 19200: + return B19200; + case 9600: + return B9600; + } + + return -1; +} + +static int +mvboot_open_tty(const char *path, speed_t speed) +{ + int rc, fd; + struct termios tio; + + rc = -1; + + fd = open(path, O_RDWR|O_NOCTTY|O_NDELAY); + if (fd < 0) + goto out; + + memset(&tio, 0, sizeof(tio)); + + tio.c_iflag = 0; + tio.c_cflag = CREAD|CLOCAL|CS8; + + tio.c_cc[VMIN] = 1; + tio.c_cc[VTIME] = 10; + + cfsetospeed(&tio, speed); + cfsetispeed(&tio, speed); + + rc = tcsetattr(fd, TCSANOW, &tio); + if (rc) + goto out; + + rc = fd; +out: + if (rc < 0) { + if (fd >= 0) + close(fd); + } + + return rc; +} + +static int +mvboot_bootmsg(int tty, void *msg) +{ + int rc; + char c; + + mvboot_printv("Sending boot message. Please reboot the target..."); + + do { + rc = tcflush(tty, TCIOFLUSH); + if (rc) + break; + + rc = mvboot_tty_send(tty, msg, 8); + if (rc) { + usleep(MVBOOT_MSG_REQ_DELAY * 1000); + continue; + } + + rc = mvboot_tty_recv(tty, &c, 1, MVBOOT_MSG_RSP_TIMEO); + + mvboot_spinner(); + + } while (rc || c != NAK); + + mvboot_printv("\n"); + + return rc; +} + +static int +mvboot_xm_makeblock(struct mvboot_block *block, const void *data, + size_t size, int pnum) +{ + const size_t blksz = sizeof(block->data); + size_t n; + int i; + + block->pnum = pnum; + block->_pnum = ~block->pnum; + + n = size < blksz ? size : blksz; + memcpy(&block->data[0], data, n); + memset(&block->data[n], 0, blksz - n); + + block->csum = 0; + for (i = 0; i < n; i++) + block->csum += block->data[i]; + + return n; +} + +static int +mvboot_xm_sendblock(int fd, struct mvboot_block *block) +{ + int rc, retries; + char c; + + retries = 16; + do { + rc = mvboot_tty_send(fd, block, sizeof(*block)); + if (rc) + break; + + rc = mvboot_tty_recv(fd, &c, 1, MVBOOT_BLK_RSP_TIMEO); + if (rc) + break; + + if (c != ACK) + mvboot_progress(-1, '+'); + + } while (c == NAK && retries-- > 0); + + rc = -1; + + switch (c) { + case ACK: + rc = 0; + break; + case NAK: + errno = EBADMSG; + break; + case CAN: + errno = ECANCELED; + break; + default: + errno = EPROTO; + break; + } + + return rc; +} + +static int +mvboot_xmodem(int tty, const void *_data, size_t size) +{ + const uint8_t *data = _data; + int rc, pnum, N, err; + + pnum = 1; + N = 0; + + mvboot_printv("Sending boot image...\n"); + + do { + struct mvboot_block block; + int n; + + n = mvboot_xm_makeblock(&block, + data + N, size - N, + pnum++); + if (n < 0) + goto can; + + if (!n) + break; + + rc = mvboot_xm_sendblock(tty, &block); + if (rc) + goto out; + + N += n; + mvboot_progress(N * 100 / size, '.'); + } while (1); + + rc = mvboot_tty_send_char(tty, EOT); + +out: + return rc; + +can: + err = errno; + mvboot_tty_send_char(tty, CAN); + errno = err; + goto out; +} + +static int +mvboot_term_pipe(int in, int out, char *quit, int *s) +{ + ssize_t nin, nout; + char _buf[128], *buf = _buf; + + nin = read(in, buf, sizeof(buf)); + if (nin < 0) + return -1; + + if (quit) { + int i; + + for (i = 0; i < nin; i++) { + if (*buf == quit[*s]) { + (*s)++; + if (!quit[*s]) + return 0; + buf++; + nin--; + } else + while (*s > 0) { + nout = write(out, quit, *s); + if (nout <= 0) + return -1; + (*s) -= nout; + } + } + } + + while (nin > 0) { + nout = write(out, buf, nin); + if (nout <= 0) + return -1; + nin -= nout; + } + + return 0; +} + +static int +mvboot_terminal(int tty) +{ + int rc, in, s; + char *quit = "\34c"; + struct termios otio, tio; + + rc = -1; + + in = STDIN_FILENO; + if (isatty(in)) { + rc = tcgetattr(in, &otio); + if (!rc) { + tio = otio; + cfmakeraw(&tio); + rc = tcsetattr(in, TCSANOW, &tio); + } + if (rc) { + perror("tcsetattr"); + goto out; + } + + mvboot_printv("[Type Ctrl-%c + %c to quit]\r\n", + quit[0]|0100, quit[1]); + } else + in = -1; + + rc = 0; + s = 0; + + do { + fd_set rfds; + int nfds = 0; + + FD_SET(tty, &rfds); + nfds = nfds < tty ? tty : nfds; + + if (in >= 0) { + FD_SET(in, &rfds); + nfds = nfds < in ? in : nfds; + } + + nfds = select(nfds + 1, &rfds, NULL, NULL, NULL); + if (nfds < 0) + break; + + if (FD_ISSET(tty, &rfds)) { + rc = mvboot_term_pipe(tty, STDOUT_FILENO, NULL, NULL); + if (rc) + break; + } + + if (FD_ISSET(in, &rfds)) { + rc = mvboot_term_pipe(in, tty, quit, &s); + if (rc) + break; + } + } while (quit[s] != 0); + + tcsetattr(in, TCSANOW, &otio); +out: + return rc; +} + +static void * +mvboot_mmap_image(const char *path, size_t *size, int prot) +{ + int rc, fd, flags; + struct stat st; + void *img; + + rc = -1; + fd = -1; + img = NULL; + + fd = open(path, O_RDONLY); + if (fd < 0) + goto out; + + rc = fstat(fd, &st); + if (rc) + goto out; + + flags = (prot & PROT_WRITE) ? MAP_PRIVATE : MAP_SHARED; + + img = mmap(NULL, st.st_size, prot, flags, fd, 0); + if (img == MAP_FAILED) { + img = NULL; + goto out; + } + + rc = 0; + *size = st.st_size; +out: + if (rc && img) { + munmap(img, st.st_size); + img = NULL; + } + if (fd >= 0) + close(fd); + + return img; +} + +static uint8_t +mvboot_img_csum8(void *_data, size_t size) +{ + uint8_t *data = _data, csum; + + for (csum = 0; size-- > 0; data++) + csum += *data; + + return csum; +} + +static int +mvboot_img_patch_hdr(void *img, size_t size) +{ + int rc; + bhr_t *hdr; + uint8_t csum; + const size_t hdrsz = sizeof(*hdr); + + rc = -1; + hdr = img; + + if (size < hdrsz) { + errno = EINVAL; + goto out; + } + + csum = mvboot_img_csum8(hdr, hdrsz) - hdr->checkSum; + if (csum != hdr->checkSum) { + errno = EINVAL; + goto out; + } + + if (hdr->blockid == IBR_HDR_UART_ID) { + rc = 0; + goto out; + } + + hdr->blockid = IBR_HDR_UART_ID; + + hdr->nandeccmode = IBR_HDR_ECC_DISABLED; + hdr->nandpagesize = 0; + + hdr->srcaddr = hdr->ext + ? sizeof(struct kwb_header) + : sizeof(*hdr); + + hdr->checkSum = mvboot_img_csum8(hdr, hdrsz) - csum; + + rc = 0; +out: + return rc; +} + +static void +mvboot_usage(FILE *stream, char *progname) +{ + fprintf(stream, + "Usage: %s -b <image> [ -p ] [ -t ] " + "[-B <baud> ] <TTY>\n", progname); + fprintf(stream, "\n"); + fprintf(stream, " -b <image>: boot <image>\n"); + fprintf(stream, " -p: patch <image> to type 0x69 (uart boot)\n"); + fprintf(stream, "\n"); + fprintf(stream, " -t: mini terminal\n"); + fprintf(stream, "\n"); + fprintf(stream, " -B <baud>: set baud rate\n"); + fprintf(stream, "\n"); +} + +int +main(int argc, char **argv) +{ + const char *ttypath, *imgpath; + int rv, rc, tty, term, prot, patch; + void *bootmsg; + void *img; + size_t size; + speed_t speed; + + rv = 1; + tty = -1; + bootmsg = NULL; + imgpath = NULL; + img = NULL; + term = 0; + patch = 0; + size = 0; + speed = B115200; + + mvboot_verbose = isatty(STDOUT_FILENO); + + do { + int c = getopt(argc, argv, "hb:ptB:"); + if (c < 0) + break; + + switch (c) { + case 'b': + bootmsg = mvboot_msg_boot; + imgpath = optarg; + break; + + case 'p': + patch = 1; + break; + + case 't': + term = 1; + break; + + case 'B': + speed = mvboot_tty_speed(atoi(optarg)); + if (speed == -1) + goto usage; + break; + + case 'h': + rv = 0; + default: + goto usage; + } + } while (1); + + if (!bootmsg && !term) + goto usage; + + if (patch && !imgpath) + goto usage; + + if (argc - optind < 1) + goto usage; + + ttypath = argv[optind++]; + + tty = mvboot_open_tty(ttypath, speed); + if (tty < 0) { + perror(ttypath); + goto out; + } + + if (imgpath) { + prot = PROT_READ | (patch ? PROT_WRITE : 0); + + img = mvboot_mmap_image(imgpath, &size, prot); + if (!img) { + perror(imgpath); + goto out; + } + } + + if (patch) { + rc = mvboot_img_patch_hdr(img, size); + if (rc) { + fprintf(stderr, "%s: Invalid image.\n", imgpath); + goto out; + } + } + + if (bootmsg) { + rc = mvboot_bootmsg(tty, bootmsg); + if (rc) { + perror("bootmsg"); + goto out; + } + } + + if (img) { + rc = mvboot_xmodem(tty, img, size); + if (rc) { + perror("xmodem"); + goto out; + } + } + + if (term) { + rc = mvboot_terminal(tty); + if (rc && !(errno == EINTR)) { + perror("terminal"); + goto out; + } + } + + rv = 0; +out: + if (tty >= 0) + close(tty); + + if (img) + munmap(img, size); + + return rv; + +usage: + mvboot_usage(rv ? stderr : stdout, basename(argv[0])); + goto out; +} -- 1.8.1.2

1 0

[U-Boot] [PATCH] Add README for the "Falcon" mode
by Stefano Babic 12 Feb '13

12 Feb '13

Simple howto to add support to a board for booting the kernel from SPL ("Falcon" mode). Signed-off-by: Stefano Babic <sbabic(a)denx.de> CC: Marek Vasut <marex(a)denx.de> CC: Otavio Salvador <otavio(a)ossystems.com.br> CC: Tom Rini <trini(a)ti.com> --- doc/README.falcon | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100644 doc/README.falcon diff --git a/doc/README.falcon b/doc/README.falcon new file mode 100644 index 0000000..d50b8c3 --- /dev/null +++ b/doc/README.falcon @@ -0,0 +1,124 @@ +U-Boot "Falcon" Mode +==================== + +Introduction +------------ + +This documents provides an overview how to add support for "Falcon" mode +to a board. +Falcon mode is introduced to speed up the booting process, allowing +to boot a Linux kernel (or whatever image) without a full blown U-Boot. + +Falcon mode relies on the SPL framework. In fact, to make booting faster, +U-Boot is split into two parts: the SPL (Secondary Program Loader) and U-Boot +image. In mostly implementations, SPL is used to start U-Boot when booting from +a mass storage, such as NAND or SD-Card. SPL has now support for other media, +and can be generalized seen as a way to start an image performing the minimum +required initialization. SPL initializes mainly the RAM controller, and after +that copies U-Boot image into the memory. The "Falcon" mode extends this way +allowing to start any kind of image, an in particular a Linux kernel, preparing +a snapshot of the parameters (ATAG or DT) required by the kernel to boot. + +Falcon adds a command under U-Boot to reuse all code responsible to prepare +the interface with the kernel. In usual U-boot systems, these parameters are +generated each time before loading the kernel, passing to Linux the address +in memory where the parameters can be read. +With falcon, this snapshot can be saved into persistent storage and SPL is +informed to load it before running the kernel. + +To boot the kernel, these steps under a Falcon-aware U-Boot are required: + +1. Boot the board into U-Boot. +Use the "spl export" command to generate the kernel parameters area or the DT. +U-boot runs as when it boots the kernel, but stops before passing the control +to the kernel. + +2. Saves the prepared snapshot into persistent media. +The address where to save it must be configured into board configuration +file (CONFIG_CMD_SPL_NAND_OFS for NAND). + +3. Boot the board into "Falcon" mode. SPL will load the kernel and copy +the parameters area to the address required address. + +It is required to implement a custom mechanism to select if SPL loads U-Boot +or another image. +The value of a GPIO is a simple way to operate the selection, as well as +reading a character from the SPL console if CONFIG_SPL_CONSOLE is set. + +Falcon mode is generally activated by setting CONFIG_SPL_OS_BOOT. This tells +SPL that U-Boot is not the only available image that SPL is able to start. + +Configuration +---------------------------- +CONFIG_CMD_SPL Enable the "spl export" command. + The command "spl export" is then available in U-Boot + mode +CONFIG_SPL_OS_BOOT Activate Falcon mode. + A board should implement the following functions: + +CONFIG_SPL_OS_BOOT_KEY Common name for GPIO used to select between U-Boot + and kernel image. Optional. + +CONFIG_SYS_SPL_ARGS_ADDR Address in RAM where the parameters must be + copied by SPL. + In most cases, it is <start_of_ram> + 0x100 + +CONFIG_SYS_NAND_SPL_KERNEL_OFFS Offset in NAND where the kernel is stored + +CONFIG_CMD_SPL_NAND_OFS Offset in NAND where the parameters area was saved. + +CONFIG_CMD_SPL_WRITE_SIZE Size of the parameters area to be copied + +Function that a board must implement +------------------------------------ + +void spl_board_prepare_for_linux(void) : optional + Called from SPL before starting the kernel + +spl_start_uboot() : required + Returns "0" if SPL starts the kernel, "1" if U-Boot + must be started. + + +Using spl command +----------------- + +twister => spl +spl - SPL configuration + +Usage: +spl export <img=atags|fdt> [kernel_addr] [initrd_addr] [fdt_addr if <img> = fdt] - export a kernel parameter image + initrd_img can be set to "-" if fdt_addr without initrd img isused + +img : "atags" or "fdt" +kernel_addr : kernel is loaded as part of the boot process, but it is not started. + This is the address where a kernel image is stored. +init_addr : optional for atags - the address where the parameters area is generated into RAM +fdt_addr : in case of fdt, the address of the device tree. + +Example (for the twister board): + +twister => spl export atags 0x82000000 +## Booting kernel from Legacy Image at 82000000 ... + Image Name: Linux-3.5.0-rc4-14089-gda0b7f4 + Image Type: ARM Linux Kernel Image (uncompressed) + Data Size: 3654808 Bytes = 3.5 MiB + Load Address: 80008000 + Entry Point: 80008000 + Verifying Checksum ... OK + Loading Kernel Image ... OK +OK +cmdline subcommand not supported +bdt subcommand not supported +Argument image is now in RAM at: 0x80000100 + +The parameters generated with this step can be saved into NAND at the offset +0x800000 (value for twister for CONFIG_CMD_SPL_NAND_OFS) + +Next time, the board can be started into "Falcon mode" moving the +CONFIG_SPL_OS_BOOT_KEY GPIO. +The kernel is loaded directly by the SPL without passing through U-Boot. + +Falcon mode was presented at the RMLL 2011. Slides are available at: + +http://schedule2012.rmll.info/IMG/pdf/LSM2012_UbootFalconMode_Babic.pdf -- 1.7.9.5

6 29

[U-Boot] Pull request for ARM zynq
by Michal Simek 12 Feb '13

12 Feb '13

Hi Albert, CC: Joe and Tom a month ago I have sent 4 Xilinx ARM zynq patches to mailing list (v2) (reminder yesterday) and I haven't got any reaction from anybody. The first patches were commented by Joe and problems fixed in the next version. There is one network driver which should require ACK from Joe and others from ARM maintainer. I would like to get these patches to mainline. Albert and Tom: Can you please look at these patches and tell me what you thing? The best will be if you can pull them to your trees. Here are links to patchwork http://patchwork.ozlabs.org/patch/177907/ http://patchwork.ozlabs.org/patch/177908/ http://patchwork.ozlabs.org/patch/177909/ http://patchwork.ozlabs.org/patch/177910/ Thanks, Michal The following changes since commit a6f0c4faa4c65a7b7048b12c9d180d7e1aad1721: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-avr32 are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git master-zynq Michal Simek (4): serial: Add Zynq serial driver net: Add driver for Zynq Gem IP arm: Support new Xilinx Zynq platform xilinx: Add new Zynq board arch/arm/cpu/armv7/zynq/Makefile | 52 ++++ arch/arm/cpu/armv7/zynq/lowlevel_init.S | 27 ++ arch/arm/cpu/armv7/zynq/timer.c | 151 ++++++++++ board/xilinx/zynq/Makefile | 54 ++++ board/xilinx/zynq/board.c | 64 +++++ boards.cfg | 1 + drivers/net/Makefile | 1 + drivers/net/zynq_gem.c | 453 +++++++++++++++++++++++++++++++ drivers/serial/Makefile | 1 + drivers/serial/serial_zynq.c | 200 ++++++++++++++ include/configs/zynq.h | 110 ++++++++ include/netdev.h | 2 +- 12 files changed, 1115 insertions(+), 1 deletions(-) create mode 100644 arch/arm/cpu/armv7/zynq/Makefile create mode 100644 arch/arm/cpu/armv7/zynq/lowlevel_init.S create mode 100644 arch/arm/cpu/armv7/zynq/timer.c create mode 100644 board/xilinx/zynq/Makefile create mode 100644 board/xilinx/zynq/board.c create mode 100644 drivers/net/zynq_gem.c create mode 100644 drivers/serial/serial_zynq.c create mode 100644 include/configs/zynq.h -- Michal Simek, Ing. (M.Eng) w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel 2.6 Microblaze Linux - http://www.monstr.eu/fdt/ Microblaze U-BOOT custodian

1 2

[U-Boot] [Pull] u-boot-fdt/master
by Jerry Van Baren 11 Feb '13

11 Feb '13

Dear Tom, Please pull u-boot-fdt. Thanks, gvb The following changes since commit d62ef5619c9249772247d6af3b8e65207ae0c871: sf: stmicro: Add support for N25Q256A (2013-02-06 10:10:00 -0500) are available in the git repository at: git://git.denx.de/u-boot-fdt.git master for you to fetch changes up to 58864ddc7276ca7403ddbb716da5853638f37519: Clean up libfdt.h includes (2013-02-08 22:32:38 -0500) ---------------------------------------------------------------- Allen Martin (1): fdt: fix dts preprocessor options Gerald Van Baren (1): Clean up libfdt.h includes Kim Phillips (5): treewide: include libfdt_env.h before fdt.h libfdt_env.h: add fdt type definitions libfdt: update fdt.h from upstream dtc libfdt: update from upstream dtc commit 142419e common/fdt_support.c: sparse fixes arch/arm/lib/bootm.c | 1 - arch/nios2/cpu/fdt.c | 1 - arch/powerpc/cpu/mpc5xxx/cpu.c | 1 - arch/powerpc/cpu/mpc8260/cpu.c | 1 - arch/powerpc/cpu/mpc85xx/fdt.c | 2 +- arch/powerpc/cpu/mpc8xx/cpu.c | 1 - arch/powerpc/cpu/ppc4xx/fdt.c | 1 - arch/powerpc/lib/bootm.c | 2 - arch/x86/include/asm/arch-coreboot/sysinfo.h | 2 +- board/cm5200/cm5200.c | 1 - common/cmd_bootm.c | 1 - common/cmd_fdt.c | 1 - common/fdt_support.c | 87 ++++++++++++++------------ common/image.c | 1 - dts/Makefile | 2 +- include/fdt.h | 42 ++++++------- include/fdt_support.h | 4 +- include/image.h | 1 - include/libfdt.h | 32 +++++----- include/libfdt_env.h | 5 ++ lib/libfdt/fdt.c | 2 +- lib/libfdt/fdt_ro.c | 2 +- lib/libfdt/fdt_rw.c | 4 +- lib/libfdt/fdt_sw.c | 4 +- lib/libfdt/fdt_wip.c | 2 +- tools/fdt_host.h | 1 - tools/imls/imls.c | 1 - 27 files changed, 101 insertions(+), 104 deletions(-)

2 1