February 2013 - U-Boot

Re: [U-Boot] [PATCH 05/10] am33xx: add ti814x specific register definitions
by Matt Porter 25 Feb '13

25 Feb '13

On Mon, Feb 18, 2013 at 03:18:42PM +0000, Tom Rini wrote: > On Sun, Feb 17, 2013 at 09:28:33PM +0100, Peter Korsgaard wrote: > > >>>>> "Matt" == Matt Porter <mporter(a)ti.com> writes: > > > > Matt> Support the ti814x specific register definitions within > > Matt> arch-am33xx. > > > > Matt> Signed-off-by: Matt Porter <mporter(a)ti.com> > > Matt> --- > > Matt> arch/arm/cpu/armv7/am33xx/sys_info.c | 3 +++ > > Matt> arch/arm/include/asm/arch-am33xx/cpu.h | 11 +++++---- > > Matt> arch/arm/include/asm/arch-am33xx/hardware.h | 32 +++++++++++++++++++++++++++ > > Matt> arch/arm/include/asm/arch-am33xx/omap.h | 7 ++++++ > > Matt> arch/arm/include/asm/arch-am33xx/spl.h | 5 +++++ > > Matt> 5 files changed, 54 insertions(+), 4 deletions(-) > > > > Matt> diff --git a/arch/arm/include/asm/arch-am33xx/hardware.h b/arch/arm/include/asm/arch-am33xx/hardware.h > > Matt> index 41ab2c0..786c159 100644 > > Matt> --- a/arch/arm/include/asm/arch-am33xx/hardware.h > > Matt> +++ b/arch/arm/include/asm/arch-am33xx/hardware.h > > Matt> @@ -20,9 +20,14 @@ > > Matt> #define __AM33XX_HARDWARE_H > > > > Matt> #include <asm/arch/omap.h> > > Matt> +#include <config.h> > > > > Quite some of the base addresses are similar, but I wonder if it > > wouldn't be cleaner to simply have a hardware-am33xx.h / > > hardware-ti814x.h instead of all these ifdef / elif? > > Since I suspect the things common from ti814x and am33xx are also common > to ti816x (which has been left as an exercise to whomever needs that > next), I think we can re-structure this into something like that, but > keeping the common parts within hardware.h still. Sounds good. I'll restructure with only the common parts in hardware.h. > > Matt> /* Control Module Base Address */ > > Matt> +#ifdef CONFIG_AM33XX > > Matt> #define CTRL_BASE 0x44E10000 > > Matt> #define CTRL_DEVICE_BASE 0x44E10600 > > Matt> +#elif defined(CONFIG_TI814X) > > Matt> +#define CTRL_BASE 0x48140000 > > Matt> +#endif > > > > No CTRL_DEVICE_BASE on ti814x? > > I think this is a side-effect of Matt not supporting the things attached > to it (USB in the case of am335x). I tried to avoid defining things I'm not yet using. For CTRL_DEVICE_BASE, I would add it once I get to adding cpsw support as we need to read the efused macid value from that area. > > Matt> --- a/arch/arm/include/asm/arch-am33xx/spl.h > > Matt> +++ b/arch/arm/include/asm/arch-am33xx/spl.h > > Matt> @@ -25,8 +25,13 @@ > > > > Matt> #define BOOT_DEVICE_XIP 2 > > Matt> #define BOOT_DEVICE_NAND 5 > > Matt> +#ifdef CONFIG_AM33XX > > Matt> #define BOOT_DEVICE_MMC1 8 > > Matt> #define BOOT_DEVICE_MMC2 9 /* eMMC or daughter card */ > > Matt> +#elif defined(CONFIG_TI814X) > > Matt> +#define BOOT_DEVICE_MMC1 9 > > Matt> +#define BOOT_DEVICE_MMC2 8 /* ROM only supports 2nd instance */ > > > > Argh! Couldn't we just swap the meaning of mmc1/mmc2 or would that be > > too confusing? > > IMHO, that will lead to further confusion down the line. I talked with > Matt about this before and well, it's funky. This is definitely a quirky area wrt TI814x. AFAIK it's the only OMAP-ish part where the ROM only allows boot from a single MMC instance. Further, that single MMC instance is actually the 2nd one as noted in the comment. This means to keep all the existing SPL mmc init logic intact, we need to define as above so that the unimplemented first MMC instance (which does exist on the part) does not get intialized when the ROM drops a bootdevice of "8". -Matt

1 0

Re: [U-Boot] [PATCH 04/10] am33xx: refactor am33xx mux support and add ti814x support
by Matt Porter 25 Feb '13

25 Feb '13

On Sun, Feb 17, 2013 at 08:18:57PM +0000, Peter Korsgaard wrote: > >>>>> "Matt" == Matt Porter <mporter(a)ti.com> writes: > > Matt> AM33XX and TI814X have a similar mux though the pinmux register > Matt> layout and address space differ. Add a separate ti814x mux include > Matt> to support the TI814X-specific differences. > > Same comment about the file headers as patch 03, otherwise it looks > good. Will clean the headers. -Matt > Acked-by: Peter Korsgaard <jacmet(a)sunsite.dk> > > -- > Bye, Peter Korsgaard

1 0

[U-Boot] [PATCH 00/10] Add TI814x EVM Support
by Matt Porter 25 Feb '13

25 Feb '13

This series adds support for the PG1.0 TI814x EVM board. TI814x fits into the existing AM33XX SoC support with some refactoring of the AM33XX-specific emif4, clock, and mux code. It has been tested booting up a Linux kernel and regression tested on BeagleBone and EVM-SK AM33XX boards. Matt Porter (10): am33xx: convert defines from am33xx-specific to generic names am33xx: refactor emif4/ddr to support multiple EMIF instances am33xx: refactor am33xx clocks and add ti814x support am33xx: refactor am33xx mux support and add ti814x support am33xx: add ti814x specific register definitions am33xx: add dmm support to emif4 library ti814x_evm: add ti814x evm board support ns16550: enable quirks for ti814x ti814x_evm: enable ti814x evm build MAINTAINERS: add ti814x_evm maintainer MAINTAINERS | 4 + Makefile | 2 +- arch/arm/cpu/armv7/Makefile | 2 +- arch/arm/cpu/armv7/am33xx/Makefile | 3 +- arch/arm/cpu/armv7/am33xx/board.c | 4 +- arch/arm/cpu/armv7/am33xx/clock-am335x.c | 374 ++++++++++++++++++++++ arch/arm/cpu/armv7/am33xx/clock-ti814x.c | 234 ++++++++++++++ arch/arm/cpu/armv7/am33xx/clock.c | 374 ---------------------- arch/arm/cpu/armv7/am33xx/ddr.c | 99 +++--- arch/arm/cpu/armv7/am33xx/emif4.c | 55 ++-- arch/arm/cpu/armv7/am33xx/sys_info.c | 3 + arch/arm/cpu/armv7/omap-common/Makefile | 2 +- arch/arm/include/asm/arch-am33xx/clock.h | 4 + arch/arm/include/asm/arch-am33xx/clocks_ti814x.h | 112 +++++++ arch/arm/include/asm/arch-am33xx/cpu.h | 11 +- arch/arm/include/asm/arch-am33xx/ddr_defs.h | 57 +++- arch/arm/include/asm/arch-am33xx/hardware.h | 60 +++- arch/arm/include/asm/arch-am33xx/mux-am335x.h | 246 ++++++++++++++ arch/arm/include/asm/arch-am33xx/mux-ti814x.h | 310 ++++++++++++++++++ arch/arm/include/asm/arch-am33xx/mux.h | 230 +------------ arch/arm/include/asm/arch-am33xx/omap.h | 7 + arch/arm/include/asm/arch-am33xx/spl.h | 5 + board/ti/am335x/board.c | 10 +- board/ti/ti814x/Makefile | 46 +++ board/ti/ti814x/evm.c | 198 ++++++++++++ board/ti/ti814x/evm.h | 7 + board/ti/ti814x/mux.c | 51 +++ boards.cfg | 1 + drivers/serial/ns16550.c | 5 +- include/configs/ti814x_evm.h | 213 ++++++++++++ spl/Makefile | 2 +- 31 files changed, 2044 insertions(+), 687 deletions(-) create mode 100644 arch/arm/cpu/armv7/am33xx/clock-am335x.c create mode 100644 arch/arm/cpu/armv7/am33xx/clock-ti814x.c delete mode 100644 arch/arm/cpu/armv7/am33xx/clock.c create mode 100644 arch/arm/include/asm/arch-am33xx/clocks_ti814x.h create mode 100644 arch/arm/include/asm/arch-am33xx/mux-am335x.h create mode 100644 arch/arm/include/asm/arch-am33xx/mux-ti814x.h create mode 100644 board/ti/ti814x/Makefile create mode 100644 board/ti/ti814x/evm.c create mode 100644 board/ti/ti814x/evm.h create mode 100644 board/ti/ti814x/mux.c create mode 100644 include/configs/ti814x_evm.h -- 1.7.9.5

4 32

Re: [U-Boot] Problems around fatwrite command from uboot
by Jean Louis 25 Feb '13

25 Feb '13

Hi Lukasz, I test with an extended timeout and no effect. I already test multiples SD with very good quality SD Card with same problem (30-40 MB read / 10-20 MB write + SLC) ( just under the UHS-I SD cards ) The problem appears when FAT (or FAT entries) is inconsistent and despite a repair, the problem persists on writes of other futures files by the ubbot fatwrite command. Thanks for your help. ---- 2013/2/22 Lukasz Majewski <l.majewski(a)samsung.com> > Hi Jean, > > > Hi, > > > > I use the last uboot from your git and boot with it on AM3517 EVM > > from SD card > > without NAND. > > > > I use this option in uboot config : #define CONFIG_FAT_WRITE 1 > > > > I use intensively fatload / fatwrite commands at the boot before > > kernel loading. > > > > Sometimes, in about 2% of cases of boot, the FAT becomes inconsistent > > and I have > > systematically these messages at boot when I use fatwrite command : > > > > U-Boot 2013.01-gd3b9a66-dirty (Feb 21 2013 - 11:02:33) > > ... > > writing MODIFYME.001 > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > Those kind of errors are caused by exceeding timeout for receiving > response from your SD card. > > Could you try with other (different manufacturer) card? > > It seems like card/vendor specific - it depends on the firmware on the > SD card. > > Please look into a similar thread: > > http://article.gmane.org/gmane.comp.boot-loaders.u-boot/150636/match=rfc+mm… > > > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > mmc_send_cmd: timedout waiting on cmd inhibit to clear > > 42428 bytes written > > ... > > > > > -- > Best regards, > > Lukasz Majewski > > Samsung R&D Poland (SRPOL) | Linux Platform Group >

1 0

[U-Boot] Read uEnv.txt from EXT4 partition
by uMinded Strikes Again 25 Feb '13

25 Feb '13

I am running U-Boot 2013.01-05972-gd80f33a. When I power the board I get: ** Unrecognized filesystem type ** 206 bytes read in 21 ms (8.8 KiB/s) Loaded environment from uEnv.txt ** Unrecognized filesystem type ** ** File not found boot.scr ** ** File not found boot/boot.scr ** ** Unrecognized filesystem type ** uboot# So I issue these commands: setenv bootargs 'root=/dev/mmcblk0p1 rw rootwait=3 console=ttyS0,115200n8 loglevel=7 mem=256M@0x40000000' ext4load mmc 0 0x43000000 /boot/script.bin; ext4load mmc 0 0x48000000 /boot/uImage; bootm 0x48000000 And the system boots as expected. So I know that uboot can read from my EXT4 partition. Is their any way to change the default filesystem type from FAT or change the default boot scan to search for uEnv.txt in /boot as well as different filesystems? Thanks!

1 0

[U-Boot] [PATCH] powerpc/b4: Fix the wrong register offset of B4 PCIE module
by Liu Gang 25 Feb '13

25 Feb '13

B4420/B4860 PCIE can not work because of the wrong definition of the PCIE register offset in the file: arch/powerpc/include/asm/immap_85xx.h Add the judgement of B4420/B4860 to make the register offset to: #define CONFIG_SYS_MPC85xx_PCIE1_OFFSET 0x200000 Signed-off-by: Liu Gang <Gang.Liu(a)freescale.com> --- arch/powerpc/include/asm/immap_85xx.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 4eb3f79..1c8d1ac 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -2914,7 +2914,8 @@ struct ccsr_pman { #define CONFIG_SYS_MPC85xx_IFC_OFFSET 0x124000 #define CONFIG_SYS_MPC85xx_GPIO_OFFSET 0x130000 #define CONFIG_SYS_FSL_CORENET_RMAN_OFFSET 0x1e0000 -#ifdef CONFIG_SYS_FSL_QORIQ_CHASSIS2 +#if defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) && !defined(CONFIG_PPC_B4860)\ + && !defined(CONFIG_PPC_B4420) #define CONFIG_SYS_MPC85xx_PCIE1_OFFSET 0x240000 #define CONFIG_SYS_MPC85xx_PCIE2_OFFSET 0x250000 #define CONFIG_SYS_MPC85xx_PCIE3_OFFSET 0x260000 -- 1.7.1

1 0

[U-Boot] PERSIST_SECONDARY_BOOT in imx53
by Sarvesh Gupta 25 Feb '13

25 Feb '13

Dear All, I am trying to use the redundant boot option of imx53, that is working with with freescale's v2009.08, but when I am trying it on v2013.01, system is unable to boot from secondary location(when primary is corrupted). I think it is not supporting booting from any other location except 0x400, even I put the secondary image table at 0x200. Please suggest.. ________________________________ DISCLAIMER: This email may contain confidential information and is intended only for the use of the specific individual(s) to which it is addressed. If you are not the intended recipient of this email, you are hereby notified that any unauthorized use, dissemination or copying of this email or the information contained in it or attached to it is strictly prohibited. If you received this message in error, please immediately notify the sender at Infotech and delete the original message.

1 0

[U-Boot] [PATCH v4 17/22] Roll crc32 into hash infrastructure
by Simon Glass 25 Feb '13

25 Feb '13

Add the CRC32 algorithm to the list of available hashes, and make the crc32 command use hash_command(). Add a new crc32_wd_buf() to make this possible, which puts its result in a buffer rather than returning it as a 32-bit value. Note: For some boards the hash command is not enabled, neither are sha1, sha256 or the verify option. In this case the full hash implementation adds about 500 bytes of overhead. So as a special case, we use #ifdef to select very simple bahaviour in that case. The justification for this is that it is currently a very common case (virtually all boards enable crc32 but only some enable more advanced features). Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v4: - Use CONFIG_CMD_SHA1SUM instead of the non-existent CONFIG_CMD_SHA1 Changes in v3: - Fix 'bahviour' typo - Make sha1 code dependent on CONFIG_CMD_SHA1, for code size reasons Changes in v2: - Rewrite crc32 support in hash to improve code size common/cmd_mem.c | 75 +++----------------------------- common/hash.c | 118 ++++++++++++++++++++++++++++++++++----------------- include/hash.h | 2 +- include/u-boot/crc.h | 11 +++++ lib/crc32.c | 9 ++++ 5 files changed, 108 insertions(+), 107 deletions(-) diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 12dbc16..95b49b2 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -32,6 +32,7 @@ #ifdef CONFIG_HAS_DATAFLASH #include <dataflash.h> #endif +#include <hash.h> #include <watchdog.h> #include <asm/io.h> #include <linux/compiler.h> @@ -1098,89 +1099,27 @@ mod_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char * const argv[]) #ifdef CONFIG_CMD_CRC32 -#ifndef CONFIG_CRC32_VERIFY - static int do_mem_crc(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - ulong addr, length; - ulong crc; - ulong *ptr; - - if (argc < 3) - return CMD_RET_USAGE; - - addr = simple_strtoul (argv[1], NULL, 16); - addr += base_address; - - length = simple_strtoul (argv[2], NULL, 16); - - crc = crc32_wd (0, (const uchar *) addr, length, CHUNKSZ_CRC32); - - printf ("CRC32 for %08lx ... %08lx ==> %08lx\n", - addr, addr + length - 1, crc); - - if (argc > 3) { - ptr = (ulong *) simple_strtoul (argv[3], NULL, 16); - *ptr = crc; - } - - return 0; -} - -#else /* CONFIG_CRC32_VERIFY */ - -int do_mem_crc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - ulong addr, length; - ulong crc; - ulong *ptr; - ulong vcrc; - int verify; + int flags = 0; int ac; char * const *av; - if (argc < 3) { -usage: + if (argc < 3) return CMD_RET_USAGE; - } av = argv + 1; ac = argc - 1; +#ifdef CONFIG_HASH_VERIFY if (strcmp(*av, "-v") == 0) { - verify = 1; + flags |= HASH_FLAG_VERIFY; av++; ac--; - if (ac < 3) - goto usage; - } else - verify = 0; - - addr = simple_strtoul(*av++, NULL, 16); - addr += base_address; - length = simple_strtoul(*av++, NULL, 16); - - crc = crc32_wd (0, (const uchar *) addr, length, CHUNKSZ_CRC32); - - if (!verify) { - printf ("CRC32 for %08lx ... %08lx ==> %08lx\n", - addr, addr + length - 1, crc); - if (ac > 2) { - ptr = (ulong *) simple_strtoul (*av++, NULL, 16); - *ptr = crc; - } - } else { - vcrc = simple_strtoul(*av++, NULL, 16); - if (vcrc != crc) { - printf ("CRC32 for %08lx ... %08lx ==> %08lx != %08lx ** ERROR **\n", - addr, addr + length - 1, crc, vcrc); - return 1; - } } +#endif - return 0; - + return hash_command("crc32", flags, cmdtp, flag, ac, av); } -#endif /* CONFIG_CRC32_VERIFY */ #endif diff --git a/common/hash.c b/common/hash.c index 462853d..ef6fe37 100644 --- a/common/hash.c +++ b/common/hash.c @@ -34,13 +34,19 @@ * crypto could perhaps add named version of these algorithms here. */ static struct hash_algo hash_algo[] = { -#ifdef CONFIG_SHA1 + /* + * This is CONFIG_CMD_SHA1SUM instead of CONFIG_SHA1 since otherwise + * it bloats the code for boards which use SHA1 but not the 'hash' + * or 'sha1sum' commands. + */ +#ifdef CONFIG_CMD_SHA1SUM { "SHA1", SHA1_SUM_LEN, sha1_csum_wd, CHUNKSZ_SHA1, }, +#define MULTI_HASH #endif #ifdef CONFIG_SHA256 { @@ -49,9 +55,27 @@ static struct hash_algo hash_algo[] = { sha256_csum_wd, CHUNKSZ_SHA256, }, +#define MULTI_HASH #endif + { + "CRC32", + 4, + crc32_wd_buf, + CHUNKSZ_CRC32, + }, }; +#if defined(CONFIG_HASH_VERIFY) || defined(CONFIG_CMD_HASH) +#define MULTI_HASH +#endif + +/* Try to minimize code size for boards that don't want much hashing */ +#ifdef MULTI_HASH +#define multi_hash() 1 +#else +#define multi_hash() 0 +#endif + /** * store_result: Store the resulting sum to an address or variable * @@ -192,10 +216,7 @@ static void show_hash(struct hash_algo *algo, ulong addr, ulong len, int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - struct hash_algo *algo; ulong addr, len; - u8 output[HASH_MAX_DIGEST_SIZE]; - u8 vsum[HASH_MAX_DIGEST_SIZE]; if (argc < 2) return CMD_RET_USAGE; @@ -203,52 +224,73 @@ int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, addr = simple_strtoul(*argv++, NULL, 16); len = simple_strtoul(*argv++, NULL, 16); - algo = find_hash_algo(algo_name); - if (!algo) { - printf("Unknown hash algorithm '%s'\n", algo_name); - return CMD_RET_USAGE; - } - argc -= 2; + if (multi_hash()) { + struct hash_algo *algo; + u8 output[HASH_MAX_DIGEST_SIZE]; + u8 vsum[HASH_MAX_DIGEST_SIZE]; - if (algo->digest_size > HASH_MAX_DIGEST_SIZE) { - puts("HASH_MAX_DIGEST_SIZE exceeded\n"); - return 1; - } + algo = find_hash_algo(algo_name); + if (!algo) { + printf("Unknown hash algorithm '%s'\n", algo_name); + return CMD_RET_USAGE; + } + argc -= 2; + + if (algo->digest_size > HASH_MAX_DIGEST_SIZE) { + puts("HASH_MAX_DIGEST_SIZE exceeded\n"); + return 1; + } - algo->hash_func_ws((const unsigned char *)addr, len, output, - algo->chunk_size); + algo->hash_func_ws((const unsigned char *)addr, len, output, + algo->chunk_size); - /* Try to avoid code bloat when verify is not needed */ + /* Try to avoid code bloat when verify is not needed */ #ifdef CONFIG_HASH_VERIFY - if (flags & HASH_FLAG_VERIFY) { + if (flags & HASH_FLAG_VERIFY) { #else - if (0) { + if (0) { #endif - if (!argc) - return CMD_RET_USAGE; - if (parse_verify_sum(algo, *argv, vsum, + if (!argc) + return CMD_RET_USAGE; + if (parse_verify_sum(algo, *argv, vsum, flags & HASH_FLAG_ENV)) { - printf("ERROR: %s does not contain a valid %s sum\n", - *argv, algo->name); - return 1; - } - if (memcmp(output, vsum, algo->digest_size) != 0) { - int i; + printf("ERROR: %s does not contain a valid " + "%s sum\n", *argv, algo->name); + return 1; + } + if (memcmp(output, vsum, algo->digest_size) != 0) { + int i; + show_hash(algo, addr, len, output); + printf(" != "); + for (i = 0; i < algo->digest_size; i++) + printf("%02x", vsum[i]); + puts(" ** ERROR **\n"); + return 1; + } + } else { show_hash(algo, addr, len, output); - printf(" != "); - for (i = 0; i < algo->digest_size; i++) - printf("%02x", vsum[i]); - puts(" ** ERROR **\n"); - return 1; + printf("\n"); + + if (argc) { + store_result(algo, output, *argv, + flags & HASH_FLAG_ENV); + } } + + /* Horrible code size hack for boards that just want crc32 */ } else { - show_hash(algo, addr, len, output); - printf("\n"); + ulong crc; + ulong *ptr; + + crc = crc32_wd(0, (const uchar *)addr, len, CHUNKSZ_CRC32); + + printf("CRC32 for %08lx ... %08lx ==> %08lx\n", + addr, addr + len - 1, crc); - if (argc) { - store_result(algo, output, *argv, - flags & HASH_FLAG_ENV); + if (argc > 3) { + ptr = (ulong *)simple_strtoul(argv[3], NULL, 16); + *ptr = crc; } } diff --git a/include/hash.h b/include/hash.h index 88fa2b5..f2b2c45 100644 --- a/include/hash.h +++ b/include/hash.h @@ -22,7 +22,7 @@ #ifndef _HASH_H #define _HASH_H -#ifdef CONFIG_SHA1SUM_VERIFY +#if defined(CONFIG_SHA1SUM_VERIFY) || defined(CONFIG_CRC32_VERIFY) #define CONFIG_HASH_VERIFY #endif diff --git a/include/u-boot/crc.h b/include/u-boot/crc.h index 07badbf..08e509e 100644 --- a/include/u-boot/crc.h +++ b/include/u-boot/crc.h @@ -30,4 +30,15 @@ uint32_t crc32 (uint32_t, const unsigned char *, uint); uint32_t crc32_wd (uint32_t, const unsigned char *, uint, uint); uint32_t crc32_no_comp (uint32_t, const unsigned char *, uint); +/** + * crc32_wd_buf - Perform CRC32 on a buffer and return result in buffer + * + * @input: Input buffer + * @ilen: Input buffer length + * @output: Place to put checksum result (4 bytes) + * @chunk_sz: Trigger watchdog after processing this many bytes + */ +void crc32_wd_buf(const unsigned char *input, uint ilen, + unsigned char *output, uint chunk_sz); + #endif /* _UBOOT_CRC_H */ diff --git a/lib/crc32.c b/lib/crc32.c index 27335a3..76205da 100644 --- a/lib/crc32.c +++ b/lib/crc32.c @@ -249,3 +249,12 @@ uint32_t ZEXPORT crc32_wd (uint32_t crc, return crc; } + +void crc32_wd_buf(const unsigned char *input, unsigned int ilen, + unsigned char *output, unsigned int chunk_sz) +{ + uint32_t crc; + + crc = crc32_wd(0, input, ilen, chunk_sz); + memcpy(output, &crc, sizeof(crc)); +} -- 1.8.1.3

1 0

[U-Boot] [PATCH v4 18/22] sandbox: config: Enable hash functions and mtest
by Simon Glass 25 Feb '13

25 Feb '13

Enable the hash command and sha1/256 hashing for sandbox. Also use a better address for memory testing (since the existing one is set up for linux host memory space). Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v4: None Changes in v3: None Changes in v2: None include/configs/sandbox.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 9c431bf..9f51a0b 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -63,8 +63,8 @@ #define CONFIG_SYS_HZ 1000 /* Memory things - we don't really want a memory test */ -#define CONFIG_SYS_LOAD_ADDR 0x10000000 -#define CONFIG_SYS_MEMTEST_START 0x10000000 +#define CONFIG_SYS_LOAD_ADDR 0x00000000 +#define CONFIG_SYS_MEMTEST_START 0x00100000 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x1000) #define CONFIG_PHYS_64BIT @@ -85,6 +85,11 @@ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS +#define CONFIG_CMD_HASH +#define CONFIG_HASH_VERIFY +#define CONFIG_SHA1 +#define CONFIG_SHA256 + #define CONFIG_BOOTARGS "" #define CONFIG_EXTRA_ENV_SETTINGS "stdin=serial\0" \ -- 1.8.1.3

1 0

[U-Boot] [PATCH v2 16/21] hash: Add a flag to support saving hashes in the environment
by Simon Glass 25 Feb '13

25 Feb '13

Some hashing commands permit saving the hash in an environment variable, and verifying a hash from there. But the crc32 command does not support this. In order to permit crc32 to use the generic hashing infrastructure, add a flag to select which behaviour to use. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Add new patch to control saving hashes in the environment common/cmd_hash.c | 8 +++--- common/cmd_sha1sum.c | 6 ++--- common/hash.c | 69 +++++++++++++++++++++++++++++++++++++++------------- include/hash.h | 9 +++++-- 4 files changed, 66 insertions(+), 26 deletions(-) diff --git a/common/cmd_hash.c b/common/cmd_hash.c index eb6a338..8c03b5c 100644 --- a/common/cmd_hash.c +++ b/common/cmd_hash.c @@ -30,22 +30,22 @@ static int do_hash(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { #ifdef CONFIG_HASH_VERIFY - int verify = 0; + int flags = HASH_FLAG_ENV; if (argc < 4) return CMD_RET_USAGE; if (!strcmp(argv[1], "-v")) { - verify = 1; + flags |= HASH_FLAG_VERIFY; argc--; argv++; } #else - const int verify = 0; + const int flags = HASH_FLAG_ENV; #endif /* Move forward to 'algorithm' parameter */ argc--; argv++; - return hash_command(*argv, verify, cmdtp, flag, argc - 1, argv + 1); + return hash_command(*argv, flags, cmdtp, flag, argc - 1, argv + 1); } #ifdef CONFIG_HASH_VERIFY diff --git a/common/cmd_sha1sum.c b/common/cmd_sha1sum.c index fe927ab..9f08629 100644 --- a/common/cmd_sha1sum.c +++ b/common/cmd_sha1sum.c @@ -31,7 +31,7 @@ int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - int verify = 0; + int flags = HASH_FLAG_ENV; int ac; char * const *av; @@ -42,13 +42,13 @@ int do_sha1sum(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ac = argc - 1; #ifdef CONFIG_SHA1SUM_VERIFY if (strcmp(*av, "-v") == 0) { - verify = 1; + flags |= HASH_FLAG_VERIFY; av++; ac--; } #endif - return hash_command("sha1", verify, cmdtp, flag, ac, av); + return hash_command("sha1", flags, cmdtp, flag, ac, av); } #ifdef CONFIG_SHA1SUM_VERIFY diff --git a/common/hash.c b/common/hash.c index e3a6e43..021c4d9 100644 --- a/common/hash.c +++ b/common/hash.c @@ -58,19 +58,31 @@ static struct hash_algo hash_algo[] = { * @algo: Hash algorithm being used * @sum: Hash digest (algo->digest_size bytes) * @dest: Destination, interpreted as a hex address if it starts - * with * or otherwise as an environment variable. + * with * (or allow_env_vars is 0) or otherwise as an + * environment variable. + * @allow_env_vars: non-zero to permit storing the result to an + * variable environment */ static void store_result(struct hash_algo *algo, const u8 *sum, - const char *dest) + const char *dest, int allow_env_vars) { unsigned int i; + int env_var = 0; - if (*dest == '*') { - u8 *ptr; + /* + * If environment variables are allowed, then we assume that 'dest' + * is an environment variable, unless it starts with *, in which + * case we assume it is an address. If not allowed, it ia always an + * address. This is to support the crc32 command. + */ + if (allow_env_vars) { + if (*dest == '*') + dest++; + else + env_var = 1; + } - ptr = (u8 *)simple_strtoul(dest + 1, NULL, 16); - memcpy(ptr, sum, algo->digest_size); - } else { + if (env_var) { char str_output[HASH_MAX_DIGEST_SIZE * 2 + 1]; char *str_ptr = str_output; @@ -80,6 +92,11 @@ static void store_result(struct hash_algo *algo, const u8 *sum, } str_ptr = '\0'; setenv(dest, str_output); + } else { + u8 *ptr; + + ptr = (u8 *)simple_strtoul(dest, NULL, 16); + memcpy(ptr, sum, algo->digest_size); } } @@ -94,14 +111,28 @@ static void store_result(struct hash_algo *algo, const u8 *sum, * Otherwise we assume it is an environment variable, and * look up its value (it must contain a hex digest). * @vsum: Returns binary digest value (algo->digest_size bytes) + * @allow_env_vars: non-zero to permit storing the result to an environment + * variable. If 0 then verify_str is assumed to be an + * address, and the * prefix is not expected. * @return 0 if ok, non-zero on error */ -static int parse_verify_sum(struct hash_algo *algo, char *verify_str, u8 *vsum) +static int parse_verify_sum(struct hash_algo *algo, char *verify_str, u8 *vsum, + int allow_env_vars) { - if (*verify_str == '*') { + int env_var = 0; + + /* See comment above in store_result() */ + if (allow_env_vars) { + if (*verify_str == '*') + verify_str++; + else + env_var = 1; + } + + if (env_var) { u8 *ptr; - ptr = (u8 *)simple_strtoul(verify_str + 1, NULL, 16); + ptr = (u8 *)simple_strtoul(verify_str, NULL, 16); memcpy(vsum, ptr, algo->digest_size); } else { unsigned int i; @@ -158,7 +189,7 @@ static void show_hash(struct hash_algo *algo, ulong addr, ulong len, printf("%02x", output[i]); } -int hash_command(const char *algo_name, int verify, cmd_tbl_t *cmdtp, int flag, +int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { struct hash_algo *algo; @@ -169,13 +200,14 @@ int hash_command(const char *algo_name, int verify, cmd_tbl_t *cmdtp, int flag, if (argc < 2) return CMD_RET_USAGE; + addr = simple_strtoul(*argv++, NULL, 16); + len = simple_strtoul(*argv++, NULL, 16); + algo = find_hash_algo(algo_name); if (!algo) { printf("Unknown hash algorithm '%s'\n", algo_name); return CMD_RET_USAGE; } - addr = simple_strtoul(*argv++, NULL, 16); - len = simple_strtoul(*argv++, NULL, 16); argc -= 2; if (algo->digest_size > HASH_MAX_DIGEST_SIZE) { @@ -188,13 +220,14 @@ int hash_command(const char *algo_name, int verify, cmd_tbl_t *cmdtp, int flag, /* Try to avoid code bloat when verify is not needed */ #ifdef CONFIG_HASH_VERIFY - if (verify) { + if (flags & HASH_FLAG_VERIFY) { #else if (0) { #endif if (!argc) return CMD_RET_USAGE; - if (parse_verify_sum(algo, *argv, vsum)) { + if (parse_verify_sum(algo, *argv, vsum, + flags & HASH_FLAG_ENV)) { printf("ERROR: %s does not contain a valid %s sum\n", *argv, algo->name); return 1; @@ -213,8 +246,10 @@ int hash_command(const char *algo_name, int verify, cmd_tbl_t *cmdtp, int flag, show_hash(algo, addr, len, output); printf("\n"); - if (argc) - store_result(algo, output, *argv); + if (argc) { + store_result(algo, output, *argv, + flags & HASH_FLAG_ENV); + } } return 0; diff --git a/include/hash.h b/include/hash.h index 34ba558..88fa2b5 100644 --- a/include/hash.h +++ b/include/hash.h @@ -51,19 +51,24 @@ struct hash_algo { */ #define HASH_MAX_DIGEST_SIZE 32 +enum { + HASH_FLAG_VERIFY = 1 << 0, /* Enable verify mode */ + HASH_FLAG_ENV = 1 << 1, /* Allow env vars */ +}; + /** * hash_command: Process a hash command for a particular algorithm * * This common function is used to implement specific hash commands. * * @algo_name: Hash algorithm being used - * @verify: Non-zero to enable verify mode + * @flags: Flags value (HASH_FLAG_...) * @cmdtp: Pointer to command table entry * @flag: Some flags normally 0 (see CMD_FLAG_.. above) * @argc: Number of arguments (arg 0 must be the command text) * @argv: Arguments */ -int hash_command(const char *algo_name, int verify, cmd_tbl_t *cmdtp, int flag, +int hash_command(const char *algo_name, int flags, cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); #endif -- 1.8.1.3

2 5