June 2012 - U-Boot

Re: [U-Boot] [PATCH v9 0/4] Kirkwood: add lschlv2 and lsxhl board support
by Michael Walle 11 Jun '12

11 Jun '12

Hi Albert, On Wed, June 6, 2012 13:26, Prafulla Wadaskar wrote: >> -----Original Message----- >> From: Michael Walle [mailto:michael@walle.cc] >> Sent: 06 June 2012 12:39 >> To: Joe Hershberger >> Cc: Prafulla Wadaskar; u-boot(a)lists.denx.de >> Subject: Re: [U-Boot] [PATCH v9 0/4] Kirkwood: add lschlv2 and lsxhl board support >> Joe Hershberger <joe.hershberger(a)gmail.com> schrieb: >> >Hi Prafulla, >> >On Tue, Jun 5, 2012 at 4:36 PM, Michael Walle <michael(a)walle.cc> >> wrote: >> >> Hi Prafulla, >> >> Am Dienstag 05 Juni 2012, 23:33:13 schrieb Michael Walle: >> >>> Changes: >> >>> v9: >> >>> - rebase to marvell custodian tree, merged with wolfgangs master >> >> [..snip..] >> >> I had to merge your tree with wolfgangs master, because my second >> net >> >patch >> >> depends on the latest net patches by Joe. >> >> So please make sure you merge wolfgangs master with your tree >> before >> >applying >> >> these patches. > u-boot-marvell.git is cloned from u-boot-arm.git, and I always sync with this before any task. And just to keep it clean for pull requests I would > not like to pull any other repository in it. > Copying Albert on this, who can sync u-boot.git into u-boot-arm.git if something is missing. Could you please sync your tree to uboot master? Hopefully, that way, we can get my patches into mainline soon ;) >> >It seems a better way to handle this is to rebase marvell onto WD's master and push that to the marvell tree, allowing Michael to rebase his patches onto that version. It seems there should not be a merge here. >> that should work too. but my patcheset v9 should apply cleanly >> regardless of which way you choose. -- michael

1 0

[U-Boot] [u-boot-imx] Pull request for u-boot-imx tree
by Otavio Salvador 11 Jun '12

11 Jun '12

Hello Stefano, I have prepared a branch with the patches I got acked on the mailing list while you were in VAC. The following changes since commit baff308162c3980e7616b624e19889a4d757aae8: i.MX28: Avoid redefining serial_put[cs]() (2012-05-09 12:49:14 +0200) are available in the git repository at: git://github.com/otavio/u-boot.git pending for you to fetch changes up to e54fdc58c639a94e2c4805612a4d69613eaa9586: m28evk: use same notation to alloc the 128kB stack (2012-06-11 11:30:01 -0300) ---------------------------------------------------------------- Otavio Salvador (6): i.MX28: Fix a typo in mx28_reg_8 macro m28evk: fix board config include guardian macro name mx28evk: ensure command definition is in alphabetic order mx28evk: fix board config include guardian macro name m28evk: drop duplicated definition of CONFIG_OF_LIBFDT m28evk: use same notation to alloc the 128kB stack arch/arm/include/asm/arch-mx28/regs-common.h | 2 +- include/configs/m28evk.h | 10 ++++------ include/configs/mx28evk.h | 8 ++++---- 3 files changed, 9 insertions(+), 11 deletions(-) -- Otavio Salvador O.S. Systems E-mail: otavio(a)ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br

2 2

Re: [U-Boot] U-boot failed
by Marek Vasut 11 Jun '12

11 Jun '12

Dear Zeyad A, > Dear Marek Vasut, > I have already done the CC, but the mail was rejected from u-boot mailing > list because the message size is too large. So i am not doing it for now > and I am sorry for the quoting of my reply. The matter is not so clear for > me. > Ok, I have done the command in u-boot that you given and the output is, > > U-Boot# printenv bootargs > ## Error: "bootargs" not defined > U-Boot# > > Got an error and I don't know why it is! Well ... define bootargs properly, it should fix your issue. (bootargs == kernel command line, see my previous reply). > > On Fri, Jun 8, 2012 at 9:48 AM, Marek Vasut <marex(a)denx.de> wrote: > > Dear Zeyad A, > > > > > Dear Mark, > > > Yeah sure, I'll do the CC and what you mean by 'fix the quote in my > > > mailer'?? > > > > When you reply on an email, you usually get the old email you reply to > > prefixed > > with these ">" (quotes). And I guess your mailed doesn't do that. > > > > > If my u-boot is broken then what will I do? > > > > If it was mainline, you'd simply report a problem and possibly send a > > patch. If > > it's a vendor-supplied u-boot, that's problematic. Do you have the > > sources? > > > > > Sorry, I am a little > > > weak in this linux things. > > > > That's ok. > > > > > So please just help to do it.. > > > Here I am attaching a screen shot of the kernel loading process. After > > > > the > > > > > end there is no response in the terminal, only just blinking the > > > cursor. > > > > No > > > > > kernel startup and all... > > > > I see! So the kernel started the decompressor at least. Now, check the > > following: > > > > In U-Boot, run "printenv bootargs" and see if you pass correct serial > > port to > > the kernel (argument "console=<something>"). This is what I can think of > > from > > the top of my head. You can adjust it by running "setenv bootargs", then > > boot as > > usual. This new bootargs won't be saved, so powercycling the board will > > get you > > back to previous state, no damage done. Once you figure out the correct > > bootargs, run "saveenv" afterwards. > > > > > On Fri, Jun 8, 2012 at 6:42 AM, Marek Vasut <marex(a)denx.de> wrote: > > > > Dear Zeyad A, > > > > > > > > Ok, let's first adjust your posting so it's easier for everyone > > > > around > > > > to > > > > > > read > > > > and reply. Firstly please, always CC the u-boot mailing list. > > > > Secondly, fix the > > > > quoting in your mailer please. > > > > > > > > > Thank you very much for your reply. Please read the my answers > > > > below.. > > > > > > > On Wed, Jun 6, 2012 at 1:52 AM, Marek Vasut <marex(a)denx.de> wrote: > > > > > > Dear Zeyad A, > > > > > > > > > > > > > Hello, > > > > > > > > > > > > > > Please help me to configure u-boot in my NC600 board. > > > > > > > > > > > > What's this board? Is it supported mainline? What CPU does it > > > > > > have, > > > > > > > > what > > > > > > > > > > version > > > > > > of uboot etc? > > > > > > > > > > > > > > > > > > > > > > > > My board is the thin-client NC600 board with POLLUX loaded(same > > > > > > as > > > > > > > > the device in this link: > > https://code.jeffkent.net/trac/nc600/wiki/Hardware/Devices/NC600#no1) > > > > > > > > . > > > > > > > > It > > > > > > > > > > has 64 MB of ram and 64 MB of storage space. I had followed the > > > > > > > > writings > > > > > > > > > > in this link: https://code.jeffkent.net/trac/nc600 > > > > > > > > I don't see this being supported by mainline u-boot, right? So what > > > > version does > > > > your board run? It might be that the u-boot you run is broken too. > > > > > > > > > > > I have reached near > > > > > > > to u-boot, but the kernel is not booting. After the kernel > > > > > > > image > > > > > > > > upload > > > > > > > > > > via > > > > > > > > > > > > > serial boot mode it is giving no response. > > > > > > > > > > > > Kernel or uboot? Maybe your xyzmodem uploader doesn't work with > > > > > > uboot? Minicom > > > > > > worked for me. > > > > > > > > > > > > > > > > > > > > > > > > I have done all these in ubuntu 11.04 as per the link. In the > > > > > > terminal > > > > > > > > in > > > > > > > > > > ubuntu, i can start the u-boot by ./boot-uboot command and my > > > > > > FTDI > > > > > > > > serial > > > > > > > > > > communicator is working fine. All the things are sending to the > > > > board > > > > > > and > > > > > > > > > > it is entering to u-boot. The commands are working fine in > > > > > > u-boot. > > > > > > > > Ok, so you have u-boot running and it's the kernel that doesn't boot? > > > > What is > > > > the last think you see? > > > > > > > > > > > If the kernel image upload > > > > > > > become complete it is not giving any command line in the u-boot > > > > as > > > > > > > > > shown > > > > > > > > > > > > in > > > > > > > > > > > > > the guide. > > > > > > > > > > > > I see ... what terminal emulator do you use to communicate with > > > > > > uboot? btw. uploading via tftp over the ethernet is usually much > > > > > > faster. > > > > > > > > > > > > > > > > > > > > > > > > I am using ubuntu terminal and it's working good. I tried both > > > > > > tftp upload and direct flash memory upload by plugging the flash > > > > > > in my board's usb port. But in tftp upload the kernel image > > > > > > upload was successful. The led indicator in the board is > > > > > > blinking at the time > > > > of > > > > > > > > kernel upload. But after upload, there is not getting any > > > > > > response in the terminal. I can't do any commands in the > > > > > > terminal. > > > > > > > > > > > > > The memory is not getting flashed. > > > > > > > > > > > > Why of course, the loady command downloads data to RAM, you have > > > > > > to > > > > > > > > flash > > > > > > > > > > it via > > > > > > "nand write" or such command afterwards. > > > > > > > > > > > > > > > > > > > > > > > > Yes the data is uploading to RAM. After that i can't do any > > > > commands. > > > > > > > > This the only problem i have... > > > > > > > > Ok, so you're uploading it to RAM, are you sure you don't overwrite > > > > u-boot? Check where u-boot is located (run bdinfo) and avoid that > > > > location. > > > > > > > > > > > It is again booting the same > > > > > > > old windows CE in the nand boot mode. > > > > > > > > > > > > > > Thanking you, > > > > > > > Regards > > > > > > > > > > > > Best regards, > > > > > > Marek Vasut > > > > > > > > > > Thanking you > > > > > > > > Best regards, > > > > Marek Vasut > > > > Best regards, > > Marek Vasut

1 0

[U-Boot] [PATCH v3 1/7] tegra: Rework Tamonten support
by Thierry Reding 11 Jun '12

11 Jun '12

This commit uses the common Tegra board implementation instead of duplicating a lot of the code. In addition, the Plutux and Medcom specific board files can be removed as the MMC/SD setup is common among all Tamonten-based boards. Signed-off-by: Thierry Reding <thierry.reding(a)avionic-design.de> Acked-by: Stephen Warren <swarren(a)wwwdotorg.org> --- Changes in v3: - none Changes in v2: - new patch board/avionic-design/common/tamonten.c | 49 +++++--------------------------- board/avionic-design/common/tamonten.h | 32 --------------------- board/avionic-design/medcom/Makefile | 6 ++-- board/avionic-design/medcom/medcom.c | 45 ----------------------------- board/avionic-design/plutux/Makefile | 6 ++-- board/avionic-design/plutux/plutux.c | 45 ----------------------------- 6 files changed, 13 insertions(+), 170 deletions(-) delete mode 100644 board/avionic-design/common/tamonten.h delete mode 100644 board/avionic-design/medcom/medcom.c delete mode 100644 board/avionic-design/plutux/plutux.c diff --git a/board/avionic-design/common/tamonten.c b/board/avionic-design/common/tamonten.c index f23b657..d9ecd23 100644 --- a/board/avionic-design/common/tamonten.c +++ b/board/avionic-design/common/tamonten.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> - * (C) Copyright 2011 + * (C) Copyright 2011-2012 * Avionic Design GmbH <www.avionic-design.de> * * See file CREDITS for list of people who contributed to this @@ -36,25 +36,17 @@ #include <asm/arch/pinmux.h> #include <asm/arch/uart.h> #include <asm/arch/mmc.h> -#include "tamonten.h" #ifdef CONFIG_TEGRA2_MMC #include <mmc.h> #endif -DECLARE_GLOBAL_DATA_PTR; - -const struct tegra2_sysinfo sysinfo = { - CONFIG_TEGRA2_BOARD_STRING -}; - /* - * Routine: timer_init - * Description: init the timestamp and lastinc value + * Routine: gpio_config_uart + * Description: Does nothing on Tamonten - no conflict w/SPI. */ -int timer_init(void) +void gpio_config_uart(void) { - return 0; } #ifdef CONFIG_TEGRA2_MMC @@ -65,46 +57,19 @@ int timer_init(void) static void pin_mux_mmc(void) { funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT); + /* for CD GPIO PH2 */ + pinmux_tristate_disable(PINGRP_ATD); } -#endif - -/* - * Routine: board_init - * Description: Early hardware init. - */ -int board_init(void) -{ - clock_init(); - clock_verify(); - - /* boot param addr */ - gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100); - return 0; -} - -#ifdef CONFIG_TEGRA2_MMC /* this is a weak define that we are overriding */ int board_mmc_init(bd_t *bd) { - debug("board_mmc_init called\n"); /* Enable muxes, etc. for SDMMC controllers */ pin_mux_mmc(); - gpio_config_mmc(); - debug("board_mmc_init: init eMMC\n"); - /* init dev 0, eMMC chip, with 4-bit bus */ + /* init dev 0, SD slot, with 4-bit bus */ tegra2_mmc_init(0, 4, -1, GPIO_PH2); return 0; } #endif - -#ifdef CONFIG_BOARD_EARLY_INIT_F -int board_early_init_f(void) -{ - /* Initialize selected UARTs */ - board_init_uart_f(); - return 0; -} -#endif /* EARLY_INIT */ diff --git a/board/avionic-design/common/tamonten.h b/board/avionic-design/common/tamonten.h deleted file mode 100644 index 0e60b0f..0000000 --- a/board/avionic-design/common/tamonten.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * (C) Copyright 2010,2011 - * NVIDIA Corporation <www.nvidia.com> - * (C) Copyright 2011 - * Avionic Design GmbH <www.avionic-design.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef _TAMONTEN_H_ -#define _TAMONTEN_H_ - -void tegra2_start(void); -void gpio_config_mmc(void); - -#endif /* TAMONTEN_H */ diff --git a/board/avionic-design/medcom/Makefile b/board/avionic-design/medcom/Makefile index b0c318c..d96d043 100644 --- a/board/avionic-design/medcom/Makefile +++ b/board/avionic-design/medcom/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> -# (C) Copyright 2011 +# (C) Copyright 2011,2012 # Avionic Design GmbH <www.avionic-design.de> # # See file CREDITS for list of people who contributed to this @@ -26,12 +26,12 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../common) +$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) endif LIB = $(obj)lib$(BOARD).o -COBJS := $(BOARD).o +COBJS := ../../nvidia/common/board.o COBJS += ../common/tamonten.o SRCS := $(COBJS:.o=.c) diff --git a/board/avionic-design/medcom/medcom.c b/board/avionic-design/medcom/medcom.c deleted file mode 100644 index 42c8094..0000000 --- a/board/avionic-design/medcom/medcom.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2010,2011 - * NVIDIA Corporation <www.nvidia.com> - * (C) Copyright 2011 - * Avionic Design GmbH <www.avionic-design.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include <common.h> -#include <asm/io.h> -#include <asm/gpio.h> -#include <asm/arch/tegra2.h> -#ifdef CONFIG_TEGRA2_MMC -#include <mmc.h> -#endif - -#ifdef CONFIG_TEGRA2_MMC -/* - * Routine: gpio_config_mmc - * Description: Set GPIOs for SD card - */ -void gpio_config_mmc(void) -{ - /* configure pin as input for card detect */ - gpio_request(GPIO_PH2, "SD4 CD"); - gpio_direction_input(GPIO_PH2); -} -#endif diff --git a/board/avionic-design/plutux/Makefile b/board/avionic-design/plutux/Makefile index b0c318c..d96d043 100644 --- a/board/avionic-design/plutux/Makefile +++ b/board/avionic-design/plutux/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> -# (C) Copyright 2011 +# (C) Copyright 2011,2012 # Avionic Design GmbH <www.avionic-design.de> # # See file CREDITS for list of people who contributed to this @@ -26,12 +26,12 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../common) +$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) endif LIB = $(obj)lib$(BOARD).o -COBJS := $(BOARD).o +COBJS := ../../nvidia/common/board.o COBJS += ../common/tamonten.o SRCS := $(COBJS:.o=.c) diff --git a/board/avionic-design/plutux/plutux.c b/board/avionic-design/plutux/plutux.c deleted file mode 100644 index 42c8094..0000000 --- a/board/avionic-design/plutux/plutux.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2010,2011 - * NVIDIA Corporation <www.nvidia.com> - * (C) Copyright 2011 - * Avionic Design GmbH <www.avionic-design.de> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#include <common.h> -#include <asm/io.h> -#include <asm/gpio.h> -#include <asm/arch/tegra2.h> -#ifdef CONFIG_TEGRA2_MMC -#include <mmc.h> -#endif - -#ifdef CONFIG_TEGRA2_MMC -/* - * Routine: gpio_config_mmc - * Description: Set GPIOs for SD card - */ -void gpio_config_mmc(void) -{ - /* configure pin as input for card detect */ - gpio_request(GPIO_PH2, "SD4 CD"); - gpio_direction_input(GPIO_PH2); -} -#endif -- 1.7.10.3

2 8

[U-Boot] Please pull u-boot-ti/master
by Tom Rini 10 Jun '12

10 Jun '12

Hello, The following changes since commit 2ca4a209a5b961ad1be8782c68dabe326d77dfaf: OMAP4/5: Change omap4_sdp, omap4_panda, omap5_evm maintainer (2012-05-15 08:31:41 +0200) are available in the git repository at: git://git.denx.de/u-boot-ti.git master for you to fetch changes up to aa54ece4e24f6ddd14914ca8c0c02ce5f279020e: cm-t35: print PCB revision information (2012-05-25 07:58:41 -0700) ---------------------------------------------------------------- Heiko Schocher (1): arm,davinci: update for enbw_cmc board Igor Grinberg (1): cm-t35: reduce the environment size Lokesh Vutla (7): OMAP5: Adding correct Control id code for OMAP5430 OMAP5: ADD chip detection for OMAP5432 SOC OMAP5: Configure the io settings for omap5432 uevm board OMAP5: ADD precalculated timings for ddr3 OMAP5: EMIF: Add support for DDR3 device OMAP5: DPLL core lock for OMAP5432 OMAP5: Change voltages for omap5432 Nikita Kiryanov (3): cm-t35: fix incorrect BOARD_REV_SIZE value cm-t35: fix legacy board revision representation cm-t35: print PCB revision information SRICHARAN R (5): ARM: OMAP4+: dmm: Take care of overlapping dmm and trap sections. ARM: OMAP5: dmm: Create a tiler trap section. ARM: OMAP5: Align memory used for testing to the power of 2 ARM: OMAP5: Correct the DRAM_ADDR_SPACE_END macro. ARM: OMAP4: Correct the lpddr2 io settings register value. Thomas Weber (1): omap4/5: Use CPUDIR for .lds script Tom Rini (10): am33xx: Do not call init_timer twice Revert "I2C: OMAP: detect more devices when probing an i2c bus" am335x: Correct i2c sysc offset am33xx: Fill in more cm_wkuppll / cm_perpll am33xx: Fix i2c sampling rate typo omap24xx_i2c: Add AM33XX support OMAP3 Beagle: Set BOOTDELAY to 3 omap3evm: Set BOOTDELAY to 3 omap3_beagle: Add CONFIG_CMD_ASKENV omap3evm: Add CONFIG_CMD_ASKENV Troy Kisky (1): DaVinci: fix ddr2 vtp i/o calibration arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S | 7 +- arch/arm/cpu/armv7/am33xx/board.c | 30 +- arch/arm/cpu/armv7/omap-common/clocks-common.c | 8 +- arch/arm/cpu/armv7/omap-common/emif-common.c | 121 ++++++++- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 20 +- arch/arm/cpu/armv7/omap4/hwinit.c | 5 + arch/arm/cpu/armv7/omap4/sdram_elpida.c | 1 + arch/arm/cpu/armv7/omap5/clocks.c | 31 ++- arch/arm/cpu/armv7/omap5/hwinit.c | 123 +++++++-- arch/arm/cpu/armv7/omap5/sdram.c | 56 +++- arch/arm/include/asm/arch-am33xx/cpu.h | 42 ++- arch/arm/include/asm/arch-am33xx/i2c.h | 8 +- arch/arm/include/asm/arch-omap4/clocks.h | 5 + arch/arm/include/asm/arch-omap4/omap.h | 2 +- arch/arm/include/asm/arch-omap5/clocks.h | 15 + arch/arm/include/asm/arch-omap5/omap.h | 20 +- arch/arm/include/asm/emif.h | 50 +++- arch/arm/include/asm/omap_common.h | 1 + board/cm_t35/cm_t35.c | 33 +++ board/cm_t35/eeprom.c | 26 +- board/cm_t35/eeprom.h | 5 + board/enbw/enbw_cmc/enbw_cmc.c | 347 ++++++++++++++++++++++-- board/ti/am335x/evm.c | 13 +- doc/README.switch_config | 25 ++ drivers/i2c/omap24xx_i2c.c | 46 +++- include/configs/cm_t35.h | 3 +- include/configs/enbw_cmc.h | 20 +- include/configs/omap3_beagle.h | 4 +- include/configs/omap3_evm.h | 4 +- include/configs/omap4_common.h | 2 +- include/configs/omap5_evm.h | 2 +- 31 files changed, 922 insertions(+), 153 deletions(-) create mode 100644 doc/README.switch_config With this, I'm considering anything that's not a bugfix to existing code (that's in my custodial area) to be for the 'next' branch and not for the v2012.07 release (since we're a little bit past the official merge window closing). -- Tom

2 1

[U-Boot] [PATCH 0/1] tegra2: move tegra2 SoC code to arch/arm/cpu/tegra2-common
by Allen Martin 10 Jun '12

10 Jun '12

This is part of an upcoming patch set to move all armv4t code out of tegra2 u-boot and put it into an SPL, but I wanted to get some early feedback on this patch. This moves most of the tegra2 SoC code from arch/arm/cpu/armv7 to a new directory arch/arm/cpu/tegra2-common. This code will be shared between the armv7 and armv4t builds of tegra2. -Allen nvpublic

2 7

[U-Boot] Possible PHYLIB issue
by Marek Vasut 09 Jun '12

09 Jun '12

Hi Joe, I'm sending you this snipped of network-related problem (maybe). It's from u- boot IRC. 23:32 < demigod2k> you said a few hours ago to look at PHYLIB 23:32 < demigod2k> it defers the config properly 23:32 < demigod2k> however in drivers/net/phy/marvell.c for example, the values in _config don't belong in that file. they're not universal config. they're different for every board depending how you've hooked up the i/o or strapped the chip 23:33 < demigod2k> so somebody using CONFIG_PHY_MARVELL needs to modify and edit drivers/net/phy/marvell.c with values appropriate to their board 23:33 < demigod2k> no big deal I just did it in my local copy 23:49 < demigod2k> and a related problem -- with new ethernet separation, a register step and a deferred initialization step in eth_init() the variables ethprime and ethact don't work quite right 23:50 < demigod2k> README.drivers.eth doesn't say if you need to check link status in eth_init and rather few of the drivers do it.... but if you don't return an error for "link down" in eth_init the round robin behavior doesn't work and uboot won't cycle through eth0, eth1, eth2, etc.. checking for a link 23:50 < demigod2k> I'm out. Hopefully somebody sees that later!

1 0

[U-Boot] [PATCH RESEND] Fix misuse of calloc() in linux/compat.h header
by Marek Vasut 09 Jun '12

09 Jun '12

Quote from the manpage: [...] void *calloc(size_t nmemb, size_t size); [...] DESCRIPTION [...] The calloc() function allocates memory for an array of nmemb elements of size bytes each and returns a pointer to the allocated memory. The memory is set to zero. If nmemb or size is 0, then calloc() returns either NULL, or a unique pointer value that can later be successfully passed to free(). Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> --- include/linux/compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/compat.h b/include/linux/compat.h index 593b07f..9a9d7b0 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -18,7 +18,7 @@ #define KERN_DEBUG #define kmalloc(size, flags) malloc(size) -#define kzalloc(size, flags) calloc(size, 1) +#define kzalloc(size, flags) calloc(1, size) #define vmalloc(size) malloc(size) #define kfree(ptr) free(ptr) #define vfree(ptr) free(ptr) -- 1.7.10

2 4

Re: [U-Boot] U-boot failed
by Marek Vasut 08 Jun '12

08 Jun '12

Dear Zeyad A, > Dear Mark, > Yeah sure, I'll do the CC and what you mean by 'fix the quote in my > mailer'?? When you reply on an email, you usually get the old email you reply to prefixed with these ">" (quotes). And I guess your mailed doesn't do that. > If my u-boot is broken then what will I do? If it was mainline, you'd simply report a problem and possibly send a patch. If it's a vendor-supplied u-boot, that's problematic. Do you have the sources? > Sorry, I am a little > weak in this linux things. That's ok. > So please just help to do it.. > Here I am attaching a screen shot of the kernel loading process. After the > end there is no response in the terminal, only just blinking the cursor. No > kernel startup and all... I see! So the kernel started the decompressor at least. Now, check the following: In U-Boot, run "printenv bootargs" and see if you pass correct serial port to the kernel (argument "console=<something>"). This is what I can think of from the top of my head. You can adjust it by running "setenv bootargs", then boot as usual. This new bootargs won't be saved, so powercycling the board will get you back to previous state, no damage done. Once you figure out the correct bootargs, run "saveenv" afterwards. > On Fri, Jun 8, 2012 at 6:42 AM, Marek Vasut <marex(a)denx.de> wrote: > > Dear Zeyad A, > > > > Ok, let's first adjust your posting so it's easier for everyone around to > > read > > and reply. Firstly please, always CC the u-boot mailing list. Secondly, > > fix the > > quoting in your mailer please. > > > > > Thank you very much for your reply. Please read the my answers below.. > > > > > > On Wed, Jun 6, 2012 at 1:52 AM, Marek Vasut <marex(a)denx.de> wrote: > > > > Dear Zeyad A, > > > > > > > > > Hello, > > > > > > > > > > Please help me to configure u-boot in my NC600 board. > > > > > > > > What's this board? Is it supported mainline? What CPU does it have, > > > > what > > > > > > version > > > > of uboot etc? > > > > > > > > > > > > > > > > My board is the thin-client NC600 board with POLLUX loaded(same as > > > > the device in this link: > > > > https://code.jeffkent.net/trac/nc600/wiki/Hardware/Devices/NC600#no1) > > > > . > > > > It > > > > > > has 64 MB of ram and 64 MB of storage space. I had followed the > > > > writings > > > > > > in this link: https://code.jeffkent.net/trac/nc600 > > > > I don't see this being supported by mainline u-boot, right? So what > > version does > > your board run? It might be that the u-boot you run is broken too. > > > > > > > I have reached near > > > > > to u-boot, but the kernel is not booting. After the kernel image > > > > upload > > > > > > via > > > > > > > > > serial boot mode it is giving no response. > > > > > > > > Kernel or uboot? Maybe your xyzmodem uploader doesn't work with > > > > uboot? Minicom > > > > worked for me. > > > > > > > > > > > > > > > > I have done all these in ubuntu 11.04 as per the link. In the > > > > terminal > > > > in > > > > > > ubuntu, i can start the u-boot by ./boot-uboot command and my FTDI > > > > serial > > > > > > communicator is working fine. All the things are sending to the board > > > > and > > > > > > it is entering to u-boot. The commands are working fine in u-boot. > > > > Ok, so you have u-boot running and it's the kernel that doesn't boot? > > What is > > the last think you see? > > > > > > > If the kernel image upload > > > > > become complete it is not giving any command line in the u-boot as > > > > > shown > > > > > > > > in > > > > > > > > > the guide. > > > > > > > > I see ... what terminal emulator do you use to communicate with > > > > uboot? btw. uploading via tftp over the ethernet is usually much > > > > faster. > > > > > > > > > > > > > > > > I am using ubuntu terminal and it's working good. I tried both tftp > > > > upload and direct flash memory upload by plugging the flash in my > > > > board's usb port. But in tftp upload the kernel image upload was > > > > successful. The led indicator in the board is blinking at the time of > > > > kernel upload. But after upload, there is not getting any response > > > > in the terminal. I can't do any commands in the terminal. > > > > > > > > > The memory is not getting flashed. > > > > > > > > Why of course, the loady command downloads data to RAM, you have to > > > > flash > > > > > > it via > > > > "nand write" or such command afterwards. > > > > > > > > > > > > > > > > Yes the data is uploading to RAM. After that i can't do any commands. > > > > This the only problem i have... > > > > Ok, so you're uploading it to RAM, are you sure you don't overwrite > > u-boot? Check where u-boot is located (run bdinfo) and avoid that > > location. > > > > > > > It is again booting the same > > > > > old windows CE in the nand boot mode. > > > > > > > > > > Thanking you, > > > > > Regards > > > > > > > > Best regards, > > > > Marek Vasut > > > > > > Thanking you > > > > Best regards, > > Marek Vasut Best regards, Marek Vasut

1 0

[U-Boot] [PATCH v3] [resend] kwboot: boot kirkwood SoCs over a serial link
by Luka Perkov 08 Jun '12

08 Jun '12

The kwboot program boots boards based on Marvell's Kirkwood platform via Xmodem over their integrated UART. Signed-off-by: Daniel Stodden <daniel.stodden(a)googlemail.com> Acked-by: Luka Perkov <uboot(a)lukaperkov.net> Tested-By: Holger Brunck <holger.brunck(a)keymile.com> Tested-By: David Purdy <david.c.purdy(a)gmail.com> Tested-by: Simon Guinot <simon.guinot(a)sequanux.org> --- Changes from version 2: * fix timeouts in kwboot_tty_recv * revert indentation on manpage * on manpage note that TTY isn't optional * add David and Luka into the manpage Changes from version v1: * fix man page * minor cosmetic fixes in tools/kwboot.c I'm resending this patch because original version 3 was not following patch submission guidlines. doc/kwboot.1 | 84 +++++++ tools/Makefile | 6 + tools/kwboot.c | 742 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 832 insertions(+) diff --git a/doc/kwboot.1 b/doc/kwboot.1 new file mode 100644 index 0000000..ed08398 --- /dev/null +++ b/doc/kwboot.1 @@ -0,0 +1,84 @@ +.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 <uboot(a)lukaperkov.net> +.br +David Purdy <david.c.purdy(a)gmail.com> diff --git a/tools/Makefile b/tools/Makefile index 8993fdd..8097d95 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_KIRKWOOD) += kwboot$(SFX) # Source files which exist outside the tools directory EXT_OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += common/env_embedded.o @@ -101,6 +102,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 # Don't build by default #ifeq ($(ARCH),ppc) @@ -234,6 +236,10 @@ $(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 + $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ + $(HOSTSTRIP) $@ + # Some of the tool objects need to be accessed from outside the tools directory $(obj)%.o: $(SRCTREE)/common/%.c $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< diff --git a/tools/kwboot.c b/tools/kwboot.c new file mode 100644 index 0000000..e773f01 --- /dev/null +++ b/tools/kwboot.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 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; +}

3 3