March 2013 - U-Boot

[U-Boot] [PATCH] Generalize "cls" command
by Anatolij Gustschin 06 May '13

06 May '13

From: Pali Rohár <pali.rohar(a)gmail.com> Add unified command "cls". Previously this command existed only as part of the LCD driver, now it is available for other users as well and supports clearing ANSI terminal. The command is enabled for all boards defining CONFIG_LCD to be backward compatible. Also add command description to README and fix nokia_rx51 board config file to enable the "cls" command. Signed-off-by: Pali Rohár <pali.rohar(a)gmail.com> Cc: Marcel Mol <marcel(a)mesa.nl> Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- This patch is a rework based on the original patch http://patchwork.ozlabs.org/patch/217492/ README | 1 + common/Makefile | 1 + common/cmd_cls.c | 37 +++++++++++++++++++++++++++++++++++++ common/lcd.c | 13 ------------- include/common.h | 9 +++++++++ include/configs/nokia_rx51.h | 2 +- 6 files changed, 49 insertions(+), 14 deletions(-) create mode 100644 common/cmd_cls.c diff --git a/README b/README index 7f2506a..b0ea592 100644 --- a/README +++ b/README @@ -819,6 +819,7 @@ The following options need to be configured: CONFIG_CMD_BSP * Board specific commands CONFIG_CMD_BOOTD bootd CONFIG_CMD_CACHE * icache, dcache + CONFIG_CMD_CLS clear screen CONFIG_CMD_CONSOLE coninfo CONFIG_CMD_CRC32 * crc32 CONFIG_CMD_DATE * support for RTC, date/time... diff --git a/common/Makefile b/common/Makefile index f631311..a4f780a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -80,6 +80,7 @@ COBJS-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o COBJS-$(CONFIG_CMD_BOOTSTAGE) += cmd_bootstage.o COBJS-$(CONFIG_CMD_CACHE) += cmd_cache.o COBJS-$(CONFIG_CMD_CBFS) += cmd_cbfs.o +COBJS-$(CONFIG_CMD_CLS) += cmd_cls.o COBJS-$(CONFIG_CMD_CONSOLE) += cmd_console.o COBJS-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o COBJS-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o diff --git a/common/cmd_cls.c b/common/cmd_cls.c new file mode 100644 index 0000000..c220558 --- /dev/null +++ b/common/cmd_cls.c @@ -0,0 +1,37 @@ +/* + * Copyright 2011 + * Marcel Mol, MESA Consulting, marcel(a)mesa.nl + * + * Copyright 2011 + * Pali Rohár, pali.rohar(a)gmail.com + * + * 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. + */ + +#include <common.h> +#include <command.h> +#include <ansi.h> +#include <lcd.h> + +static int do_clear(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ +#ifdef CONFIG_LCD + lcd_clear(); +#else + puts(ANSI_CLEAR_CONSOLE); + printf(ANSI_CURSOR_POSITION, 1, 1); +#endif + return 0; +} + +U_BOOT_CMD( + cls, 1, 1, do_clear, + "clear screen", + "" +); diff --git a/common/lcd.c b/common/lcd.c index 590bbb9..c511193 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -449,19 +449,6 @@ void lcd_clear(void) lcd_sync(); } -static int do_lcd_clear(cmd_tbl_t *cmdtp, int flag, int argc, - char *const argv[]) -{ - lcd_clear(); - return 0; -} - -U_BOOT_CMD( - cls, 1, 1, do_lcd_clear, - "clear screen", - "" -); - /*----------------------------------------------------------------------*/ static int lcd_init(void *lcdbase) diff --git a/include/common.h b/include/common.h index d41aeb4..69eeea4 100644 --- a/include/common.h +++ b/include/common.h @@ -1015,4 +1015,13 @@ static inline void unmap_sysmem(const void *vaddr) # include <environment.h> #endif +/* + * Boards with LCD support always provided the "cls" command. + * Enable this command for these boards to be backward + * compatible. + */ +#if defined(CONFIG_LCD) +#define CONFIG_CMD_CLS +#endif + #endif /* __COMMON_H_ */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 8506604..1a9b365 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -148,7 +148,7 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ #define CONFIG_AUTO_COMPLETE /* add autocompletion support */ -#define CONFIG_CMD_CLEAR /* ANSI terminal clear screen command */ +#define CONFIG_CMD_CLS /* ANSI terminal clear screen command */ #ifdef ONENAND_SUPPORT -- 1.7.5.4

1 1

Re: [U-Boot] [PATCH] video: cfb_console: flush dcache for frame buffer in DRAM
by Eric Nelson 06 May '13

06 May '13

Hi Anatolij, I hate to come in late to the discussion, but while testing [1] with cache enabled, I started down the path of fixing up code paths within drivers/video/cfb_console.c that are followed by SABRE Lite as you did in [2]. [1] [PATCH V2 0/2] i.MX6: mx6qsabrelite: Add splash screen support http://lists.denx.de/pipermail/u-boot/2012-September/134241.html [2] [PATCH] video: cfb_console: flush dcache for frame buffer in DRAM http://lists.denx.de/pipermail/u-boot/2012-April/123333.html That code essentially looks like this: void video_drawchars(...) { ... switch (VIDEO_DATA_FORMAT) { case GDF__8BIT_INDEX: case GDF__8BIT_332RGB: case GDF_15BIT_555RGB: case GDF_16BIT_565RGB: ... cache not flushed in these cases case GDF_32BIT_X888RGB: ... cache is flushed here } SABRE Lite (ipu3) code happens to use the RGB565 frame buffer format, so it needs additional fixup. Continuing this pattern seems to be a mistake though. There are a lot of cases, with all sorts of different alignments (most of which won't sync with cache line boundaries) and it seems that there's little to no benefit in the fine granularity. It seems that by the time we fix up all of the individual spots where we're writing to a line in the frame buffer, the cache can never get dirty in the first place. It seems much more sensible to simply use flush_dcache_range() on the entire frame buffer in each of the public calls and let the MMU figure out what needs flushing. Is there something I'm missing? My other immediate thought was that we should really place the frame buffer in un-cacheable memory, but then we really will be doing more memory accesses. Please advise, Eric

2 3

[U-Boot] freescale i.MX28 mxsboot NAND booting on mx28evk bad blocks
by Paul B. Henson 04 May '13

04 May '13

I'm prototyping a project that's going to need to boot linux from NAND on a mx28evk board. I was able to successfully use the u-boot mxsboot utility to generate a nand image and burn it, then boot from it. I noticed one anomaly though, when using mxsboot/u-boot to generate and burn the bootstream to NAND, when the linux kernel boots it finds bad blocks: [ 1.090000] NAND device: Manufacturer ID: 0x2c, Chip ID: 0xf1 (Micron MT29F14 [ 1.100000] Scanning device for bad blocks [ 1.110000] Bad eraseblock 0 at 0x000000000000 [ 1.110000] Bad eraseblock 1 at 0x000000020000 [ 1.120000] Bad eraseblock 2 at 0x000000040000 [ 1.120000] Bad eraseblock 3 at 0x000000060000 When I burn the exact same bootstream with kobs-ng, linux does not find any bad blocks, so it seems to be a byproduct of either the image generated by mxsboot or the u-boot burning. I don't think this is having any functional impact, as the scrub component of burning a new nand image wipes out the bad blocks, and once linux is booted it really has no need to read the bootstream from the bootloader mtd partition. However, it seems anomalous, and I was wondering if other people are have seen it, and whether or not it is something that might be fixed. Thanks much…

4 22

[U-Boot] [PATCH] mpc512x: remove dead code
by Anatolij Gustschin 02 May '13

02 May '13

The prt_mpc512x_clks() function isn't referenced anywhere and its prototype is wrong. Remove it. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- arch/powerpc/cpu/mpc512x/speed.c | 6 ------ include/common.h | 3 --- 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/cpu/mpc512x/speed.c b/arch/powerpc/cpu/mpc512x/speed.c index 9a8f315..6761877 100644 --- a/arch/powerpc/cpu/mpc512x/speed.c +++ b/arch/powerpc/cpu/mpc512x/speed.c @@ -151,9 +151,3 @@ U_BOOT_CMD(clocks, 1, 0, do_clocks, "print clock configuration", " clocks" ); - -int prt_mpc512x_clks (void) -{ - do_clocks (NULL, 0, 0, NULL); - return (0); -} diff --git a/include/common.h b/include/common.h index 69eeea4..96e3504 100644 --- a/include/common.h +++ b/include/common.h @@ -631,9 +631,6 @@ int prt_8260_clks (void); #elif defined(CONFIG_MPC5xxx) int prt_mpc5xxx_clks (void); #endif -#if defined(CONFIG_MPC512X) -int prt_mpc512xxx_clks (void); -#endif #if defined(CONFIG_MPC8220) int prt_mpc8220_clks (void); #endif -- 1.7.5.4

2 1

[U-Boot] [PATCH] disk: part_dos: check harder for partition table.
by egbert.eich＠googlemail.com 02 May '13

02 May '13

From: Egbert Eich <eich(a)suse.com> Devices that used to have a whole disk FAT filesystem but got then partitioned will most likely still have a FAT or FAT32 signature in the first sector as this sector does not get overwritten by a partitioning tool (otherwise the tool would risk to kill the mbr). The current partition search algorithm will erronosly detect such a device as a raw FAT device. Instead of looking for the FAT or FAT32 signatures immediately we use the same algorithm as used by the Linux kernel and first check for a valid boot indicator flag on each of the 4 partitions. If the value of this flag is invalid for the first entry we then do the raw partition check. If the flag for any higher partition is wrong we assume the device is neiter a MBR nor PBR device. Signed-off-by: Egbert Eich <eich(a)suse.com> --- disk/part_dos.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/disk/part_dos.c b/disk/part_dos.c index 37087a6..8a23495 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -74,13 +74,23 @@ static void print_one_part(dos_partition_t *p, int ext_part_sector, static int test_block_type(unsigned char *buffer) { + int slot; + struct dos_partition *p; + if((buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) || (buffer[DOS_PART_MAGIC_OFFSET + 1] != 0xaa) ) { return (-1); } /* no DOS Signature at all */ - if (strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],"FAT",3)==0 || - strncmp((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET],"FAT32",5)==0) { - return DOS_PBR; /* is PBR */ + p = ( struct dos_partition *)&buffer[DOS_PART_TBL_OFFSET]; + for (slot = 0; slot < 3; slot++) { + if (p->boot_ind != 0 && p->boot_ind != 0x80) { + if (!slot && + (strncmp((char *)&buffer[DOS_PBR_FSTYPE_OFFSET],"FAT",3)==0 || + strncmp((char *)&buffer[DOS_PBR32_FSTYPE_OFFSET],"FAT32",5)==0)) { + return DOS_PBR; /* is PBR */ + } else + return -1; + } } return DOS_MBR; /* Is MBR */ } -- 1.7.7

4 4

[U-Boot] [PATCH v2 0/11] Add Regular Expressions Support
by Wolfgang Denk 02 May '13

02 May '13

The following patch series adds the SLRE "Super Light Regular Expression" library and uses this to add regex support for the "env grep" (aka "grepenv") command, and new functions (or operators?) "gsub" and "sub" to the "setexpr" command. The rework to "env grep" also fixed a few bugs (which caused it to dump always _all_ environment variables on some systems), and adds the capability to grep in either the variable name, or the value, or in both (the old version always did the latter). Instead of special functions we now use common code (i. e. hexport_r()) for the variable look-up, which gives us sorted output as a free additional benefit. This allows to do things like - print all MAC addresses: => env grep -e eth.*addr eth1addr=00:10:ec:80:c5:15 ethaddr=00:10:ec:00:c5:15 - print all variables that have at least 2 colons in their value: => env grep -v -e :.*: addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off panic=1 eth1addr=00:10:ec:80:c5:15 ethaddr=00:10:ec:00:c5:15 ver=U-Boot 2013.04-rc1-00289-g497746b-dirty (Mar 22 2013 - 12:50:25) - Generate broadcast address by substituting the last two numbers of the IP address by "255.255": => print ipaddr ipaddr=192.168.1.104 => setexpr broadcast sub "(.*\\.).*\\..*" "\\1255.255" $ipaddr broadcast=192.168.255.255 - Depending on keyboard configuration (German vs. US keyboard) a bar code scanner may initialize the MAC address as C0:E5:4E:02:06:DC or as C0>E5>4E>02>06>DC. Make sure we always have a correct value: => print ethaddr ethaddr=C0>E5>4E>02>06>DC => setexpr ethaddr gsub > : ethaddr=C0:E5:4E:02:06:DC etc. Regex support can be enabled by defining CONFIG_REGEX in the board config file. Notes: - This patch series has been compile-tested (and found to be clean with ELDK v5.3) on all of the following boards: ARM: m28evk PPC4xx: acadia bamboo bluestone bubinga canyonlands dlvision-10g dlvision ebony gdppc440etx icon intip io io64 iocon katmai kilauea luan makalu neo ocotea redwood sequoia t3corp taihu taishan walnut yosemite yucca - Runtime / functional testing has been done mostly on PPC (Sequoia board). Changes in v2: - fixed trailing whitespace errors - Note 1: The "line over 80 characters" warning will NOT be fixed due to the "never break user-visible strings" rule. - Note 2: The "Alignment should match open parenthesis" check will NOT be fixed due to the "indent by TABs only" rule. - Fix ERROR: "foo * bar" should be "foo *bar" errors - Fix trailing whitespace error - Note: the "Alignment should match open parenthesis" check will not be fixed due to the "indent always byy TABs" rule. - no changes; most of this is imported code and is intentionally left as is - the "Alignment should match open parenthesis" check is left due to the "indent only by TABs" rule - the "line over 80 characters" warning is left due to the "never break user-visible strings" rule - Fix trailing whitespace error - fix "No space is necessary after a cast" checks - fix "space prohibited before semicolon" and "space required after that ';'" errors (but I onsider the result less readable :-( ) - Note: the remaining warnings ("line over 80 characters") and checks ("Alignment should match open parenthesis") are intentionally left as is. - Do the white space cleanup globally, and as separate patch Wolfgang Denk (11): hashtable: preparations to use hexport_r() for "env grep" "env grep" - reimplement command using hexport_r() "env grep" - add options to grep in name, value, or both. Add SLRE - Super Light Regular Expression library "env grep" - add support for regular expression matches setexpr: simplify code, improve help message setexpr: add regex substring matching and substitution m28evk: white space cleanup m28evk: enable "env grep" and regexp support amcc-common.h: minor white space cleanup amcc-common.h: enable support for "env grep", "setexpr", and regex. README | 7 + common/cmd_nvedit.c | 87 +++-- common/cmd_setexpr.c | 296 ++++++++++++++++- include/configs/amcc-common.h | 9 +- include/configs/m28evk.h | 259 +++++++-------- include/search.h | 15 +- include/slre.h | 100 ++++++ lib/Makefile | 1 + lib/hashtable.c | 93 ++++-- lib/slre.c | 724 ++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 1391 insertions(+), 200 deletions(-) create mode 100644 include/slre.h create mode 100644 lib/slre.c -- 1.8.1.4

4 15

[U-Boot] [PATCH] spl_mmc: cleanup variable types
by Peter Korsgaard 02 May '13

02 May '13

block_read returns unsigned long, so it doesn't make sense to check for < 0. and neither does marking the header structure as const and then casting away the constness to load data into it. Also cleanup some unneeded pointer casting while we're at it. Signed-off-by: Peter Korsgaard <peter.korsgaard(a)barco.com> --- drivers/mmc/spl_mmc.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/mmc/spl_mmc.c b/drivers/mmc/spl_mmc.c index 753c6a0..7efdcb8 100644 --- a/drivers/mmc/spl_mmc.c +++ b/drivers/mmc/spl_mmc.c @@ -34,8 +34,9 @@ DECLARE_GLOBAL_DATA_PTR; static void mmc_load_image_raw(struct mmc *mmc) { - u32 image_size_sectors, err; - const struct image_header *header; + unsigned long err; + u32 image_size_sectors; + struct image_header *header; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - sizeof(struct image_header)); @@ -43,9 +44,9 @@ static void mmc_load_image_raw(struct mmc *mmc) /* read image header to find the image size & load address */ err = mmc->block_dev.block_read(0, CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR, 1, - (void *)header); + header); - if (err <= 0) + if (err == 0) goto end; spl_parse_image_header(header); @@ -60,8 +61,8 @@ static void mmc_load_image_raw(struct mmc *mmc) image_size_sectors, (void *)spl_image.load_addr); end: - if (err <= 0) { - printf("spl: mmc blk read err - %d\n", err); + if (err == 0) { + printf("spl: mmc blk read err - %lu\n", err); hang(); } } @@ -69,7 +70,7 @@ end: #ifdef CONFIG_SPL_FAT_SUPPORT static void mmc_load_image_fat(struct mmc *mmc) { - s32 err; + int err; struct image_header *header; header = (struct image_header *)(CONFIG_SYS_TEXT_BASE - @@ -83,7 +84,7 @@ static void mmc_load_image_fat(struct mmc *mmc) } err = file_fat_read(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME, - (u8 *)header, sizeof(struct image_header)); + header, sizeof(struct image_header)); if (err <= 0) goto end; -- 1.7.10.4

2 2

[U-Boot] [PATCH] powerpc/mpc85xx: add setting of clock-frequency for mpic node
by Wang Dongsheng 02 May '13

02 May '13

Set the device tree property associated with the mpic source frequency. The frequency is used for mpic timer. Signed-off-by: Wang Dongsheng <dongsheng.wang(a)freescale.com> --- arch/powerpc/cpu/mpc85xx/fdt.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 3a268aa..f07d1cf 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -663,6 +663,11 @@ void ft_cpu_setup(void *blob, bd_t *bd) #ifdef CONFIG_FSL_CORENET do_fixup_by_compat_u32(blob, "fsl,qoriq-clockgen-1.0", "clock-frequency", CONFIG_SYS_CLK_FREQ, 1); + do_fixup_by_compat_u32(blob, "fsl,mpic", + "clock-frequency", get_bus_freq(0)/2, 1); +#else + do_fixup_by_compat_u32(blob, "fsl,mpic", + "clock-frequency", get_bus_freq(0), 1); #endif fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); -- 1.7.5.1

2 4

[U-Boot] [PATCH v2 0/45] Verified boot implementation based on FIT
by Simon Glass 01 May '13

01 May '13

This series implemented a verified boot system based around FIT images as discussed on the U-Boot mailing list, including on this thread: http://permalink.gmane.org/gmane.comp.boot-loaders.u-boot/147830 RSA is used to implement the encryption. Images are signed by mkimage using private keys created by the user. Public keys are written into U-Boot control FDT (CONFIG_OF_CONTROL) for access by bootm etc. at run-time. The control FDT must be stored in a secure place where it cannot be changed after manufacture. Some notes are provided in the documentaion on how this can be achieved. The implementation is fairly efficient and fits nicely into U-Boot. FIT plus RSA adds around 18KB to SPL size which is manageable on modern SoCs. When images are loaded, they are verified with the public keys. Some minor restructuring of the image code is included in this series, since we now support signatures as well as hashes. It is important to have a test framework for this series. For this, sandbox is used, and a script is provided which signs images and gets sandbox to load them using a script, to check that all is well. So some of the patches here related to adding image support for sandbox. A follow-on series is somewhat more agressive in further refactoring the FIT image support to clean it up improve maintainability. Rollback prevention has been added in a separate TPM patch. This ensures that an attacker cannot boot your system with an old image that has been compromised. Support for this is not built into bootm, but instead must be scripted in U-Boot. It is possible that a standard scheme for this could be devised by adding version number tags to the signing procedure. However scripts do provide more flexibility. The TPM patch is here: http://patchwork.ozlabs.org/patch/224163/ This series is available at: http://git.denx.de/u-boot-x86.git in the branch 'vboot'. I have received a number of off-list comments - please do copy the list when replying so that everyone can see your comments. Changes in v2: - Add IMAGE_ENABLE_IGNORE to avoid #ifdef around ignore property handling - Add comment about why mkimage needs to open FIT with O_RDWR - Add new patch to control FIT image printing in SPL - Add new patch to remove #ifdefs in image-fit.c - Add sanity checks on key sizes in RSA (improves security) - Adjust how signing enable works in image.h - Adjust mkimage help to separate out signing options - Allow the control FDT to be set even if there is currently no control FDT - Avoid using malloc in RSA routines (for smaller SPL code size) - Build signing support unconditionally in mkimage - Change hash_block() to use an unsigned int len - Clarify use of output_size parameter to hash_block() - Correct bug in setting control FDT - Fix FDT error handling in fit_image_write_sig() - Fix checkpatch checks about parenthesis alignment - Fix checkpatch warnings about space after cast - Fix checkpatch warnings about split strings - Fix line continuation problem - Fix spelling of multiply in rsa-verify.c - Fix spelling of quite - Fix typo "os defined" -> "is defined" - Move sandbox's command list patch from a later series - Only build RSA support into mkimage if CONFIG_RSA is defined - Put err_msgp strings on a single line - Put params before description in fit_conf_get_prop_node() comment - Rebase on previous patches - Rebase to use updated fdt_valid() function - Rename commit message to say "function" instead of "function" - Require CONFIG_FIT_SIGNATURE in image.h for mkimage to support signing - Revert the whole change including the set_working_fdt_addr() part - Support RSA library version without ERR_remove_thread_state() - Tweak tools/Makefile to make image signing optional - Update README to fix typos - Update README to fix typos and clarify some points - Use U-Boot's -c option instead of hard-coding a boot script - Use gd->arch.ram_buf instead of gd->ram_buf (now that generic board is in) - Use stack instead of calloc() within U-Boot's signature verification code - fdt_valid() sets the FDT pointer to NULL on error, to simplify callers - gd->fdt_blob is now available on all archs (generic board landed) Simon Glass (45): sandbox: config: Enable CONFIG_FIT and CONFIG_CMD_FIT bootstage: Don't build for HOSTCC mkimage: Move ARRAY_SIZE to header file libfdt: Add fdt_next_subnode() to permit easy subnode iteration image: Move timestamp #ifdefs to header file image: Export fit_check_ramdisk() image: Split FIT code into new image-fit.c image: Move HOSTCC image code to tools/ image: Split hash node processing into its own function image: Convert fit_image_hash_set_value() to static, and rename image: Rename fit_image_check_hashes() to fit_image_verify() image: Move hash checking into its own function image: Move error! string to common place image: Export fit_conf_get_prop_node() image: Rename fit_add_hashes() to fit_add_verification_data() image: Rename hash printing to fit_image_print_verification_data() sandbox: Add CONFIG_OF_HOSTFILE to read FDT from host file fdt: Add a parameter to fdt_valid() Add getenv_hex() to return an environment variable as hex fdt: Allow fdt command to check and update control FDT sandbox: fdt: Support fdt command for sandbox env: Fix minor comment typos in cmd_nvedit fdt: Skip checking FDT if the pointer is NULL Revert "fdt- Tell the FDT library where the device tree is" Add stdarg to vsprintf.h Add minor updates to README.fdt-control hash: Add a way to calculate a hash for any algortihm sandbox: config: Enable FIT signatures with RSA sandbox: Provide a way to map from host RAM to U-Boot RAM sandbox: image: Add support for booting images in sandbox image: Add signing infrastructure image: Support signing of images image: Add RSA support for image signing mkimage: Put FIT loading in function and tidy error handling mkimage: Add -k option to specify key directory mkimage: Add -K to write public keys to an FDT blob mkimage: Add -F option to modify an existing .fit file mkimage: Add -c option to specify a comment for key signing mkimage: Add -r option to specify keys that must be verified libfdt: Add fdt_find_regions() image: Add support for signing of FIT configurations image: Remove remaining #ifdefs in image-fit.c image: Add CONFIG_FIT_SPL_PRINT to control FIT image printing in SPL sandbox: Allow -c argument to provide a command list Add verified boot information and test Makefile | 1 + README | 21 + arch/sandbox/cpu/cpu.c | 5 + arch/sandbox/cpu/start.c | 9 +- arch/sandbox/include/asm/io.h | 2 + arch/sandbox/include/asm/state.h | 1 + arch/sandbox/lib/board.c | 38 +- common/Makefile | 2 + common/cmd_bootm.c | 37 +- common/cmd_fdt.c | 87 +- common/cmd_fpga.c | 2 +- common/cmd_nvedit.c | 19 +- common/cmd_source.c | 2 +- common/cmd_ximg.c | 2 +- common/hash.c | 23 + common/image-fit.c | 1533 ++++++++++++++++++++++++++++++++++ common/image-sig.c | 430 ++++++++++ common/image.c | 1686 +------------------------------------- common/main.c | 8 - common/update.c | 2 +- config.mk | 1 + doc/README.fdt-control | 13 +- doc/mkimage.1 | 73 +- doc/uImage.FIT/sign-configs.its | 45 + doc/uImage.FIT/sign-images.its | 42 + doc/uImage.FIT/signature.txt | 382 +++++++++ doc/uImage.FIT/verified-boot.txt | 104 +++ include/bootstage.h | 5 +- include/common.h | 18 + include/configs/sandbox.h | 6 + include/hash.h | 22 + include/image.h | 265 +++++- include/libfdt.h | 81 ++ include/rsa.h | 108 +++ include/vsprintf.h | 2 + lib/fdtdec.c | 3 +- lib/libfdt/fdt.c | 12 + lib/libfdt/fdt_wip.c | 129 +++ lib/rsa/Makefile | 48 ++ lib/rsa/rsa-sign.c | 460 +++++++++++ lib/rsa/rsa-verify.c | 385 +++++++++ test/vboot/.gitignore | 3 + test/vboot/sandbox-kernel.dts | 7 + test/vboot/sandbox-u-boot.dts | 7 + test/vboot/sign-configs.its | 45 + test/vboot/sign-images.its | 42 + test/vboot/vboot_test.sh | 126 +++ tools/Makefile | 23 +- tools/aisimage.c | 1 - tools/fit_image.c | 136 +-- tools/image-host.c | 722 ++++++++++++++++ tools/mkimage.c | 36 +- tools/mkimage.h | 6 + 53 files changed, 5485 insertions(+), 1783 deletions(-) create mode 100644 common/image-fit.c create mode 100644 common/image-sig.c create mode 100644 doc/uImage.FIT/sign-configs.its create mode 100644 doc/uImage.FIT/sign-images.its create mode 100644 doc/uImage.FIT/signature.txt create mode 100644 doc/uImage.FIT/verified-boot.txt create mode 100644 include/rsa.h create mode 100644 lib/rsa/Makefile create mode 100644 lib/rsa/rsa-sign.c create mode 100644 lib/rsa/rsa-verify.c create mode 100644 test/vboot/.gitignore create mode 100644 test/vboot/sandbox-kernel.dts create mode 100644 test/vboot/sandbox-u-boot.dts create mode 100644 test/vboot/sign-configs.its create mode 100644 test/vboot/sign-images.its create mode 100755 test/vboot/vboot_test.sh create mode 100644 tools/image-host.c -- 1.8.1.3

4 55

[U-Boot] [PATCH V2] arm: omap: emif: Fix DDR3 init after warm reset
by Lokesh Vutla 29 Apr '13

29 Apr '13

EMIF supports a global warm reset mode, during which the EMIF keeps the SDRAM content. But if leveling is enabled at the time of warm reset for DDR3, the following steps needs to be done after warm reset: 1) Keep EMIF in self refresh mode. 2) Reset PHY to bring back the PHY to a known state. 3) Start Levelling procedure. Doing the same. And also enabling DLL lock and code output after warm reset. Tested on OMAP5432 ES2.0 Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- Changes since V1: - Changed $subject - Removed redundant in_sdram check arch/arm/cpu/armv7/omap-common/emif-common.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/omap-common/emif-common.c b/arch/arm/cpu/armv7/omap-common/emif-common.c index 9eb1279..3e3f3ea 100644 --- a/arch/arm/cpu/armv7/omap-common/emif-common.c +++ b/arch/arm/cpu/armv7/omap-common/emif-common.c @@ -1072,6 +1072,11 @@ static void do_sdram_init(u32 base) else ddr3_init(base, regs); } + if (warm_reset() && (emif_sdram_type() == EMIF_SDRAM_TYPE_DDR3)) { + set_lpmode_selfrefresh(base); + emif_reset_phy(base); + ddr3_leveling(base, regs); + } /* Write to the shadow registers */ emif_update_timings(base, regs); @@ -1259,10 +1264,10 @@ void sdram_init(void) in_sdram = running_from_sdram(); debug("in_sdram = %d\n", in_sdram); - if (!(in_sdram || warm_reset())) { - if (sdram_type == EMIF_SDRAM_TYPE_LPDDR2) + if (!in_sdram) { + if ((sdram_type == EMIF_SDRAM_TYPE_LPDDR2) && !warm_reset()) bypass_dpll((*prcm)->cm_clkmode_dpll_core); - else + else if (sdram_type == EMIF_SDRAM_TYPE_DDR3) writel(CM_DLL_CTRL_NO_OVERRIDE, (*prcm)->cm_dll_ctrl); } -- 1.7.9.5

2 1