January 2013 - U-Boot

[U-Boot] [PATCH] FAT: make FAT compile without VFAT
by Richard Genoud 04 Feb '13

04 Feb '13

Signed-off-by: Richard Genoud <richard.genoud(a)gmail.com> --- fs/fat/fat.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index 393c378..defdd74 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -589,7 +589,9 @@ static dir_entry *get_dentfromdir(fsdata *mydata, int startsect, char *filename, dir_entry *retdent, int dols) { +#ifdef CONFIG_SUPPORT_VFAT __u16 prevcksum = 0xffff; +#endif __u32 curclust = START(retdent); int files = 0, dirs = 0; @@ -828,7 +830,9 @@ do_fat_read_at(const char *filename, unsigned long pos, void *buffer, fsdata datablock; fsdata *mydata = &datablock; dir_entry *dentptr = NULL; +#ifdef CONFIG_SUPPORT_VFAT __u16 prevcksum = 0xffff; +#endif char *subname = ""; __u32 cursect; int idx, isdir = 0; @@ -944,7 +948,9 @@ do_fat_read_at(const char *filename, unsigned long pos, void *buffer, for (i = 0; i < DIRENTSPERBLOCK; i++) { char s_name[14], l_name[VFAT_MAXLEN_BYTES]; +#ifdef CONFIG_SUPPORT_VFAT __u8 csum; +#endif l_name[0] = '\0'; if (dentptr->name[0] == DELETED_FLAG) { @@ -952,7 +958,9 @@ do_fat_read_at(const char *filename, unsigned long pos, void *buffer, continue; } +#ifdef CONFIG_SUPPORT_VFAT csum = mkcksum(dentptr->name, dentptr->ext); +#endif if (dentptr->attr & ATTR_VOLUME) { #ifdef CONFIG_SUPPORT_VFAT if ((dentptr->attr & ATTR_VFAT) == ATTR_VFAT && -- 1.7.2.5

4 23

[U-Boot] [PATCHv2] cmd_time: merge run_command_and_time_it with cmd_process
by Richard Genoud 04 Feb '13

04 Feb '13

As far as every arch has a get_timer function, run_command_and_time_it code can now disappear. Signed-off-by: Richard Genoud <richard.genoud(a)gmail.com> --- common/cmd_time.c | 33 ++------------------------------- common/command.c | 6 +++++- common/hush.c | 2 +- common/main.c | 2 +- include/command.h | 4 +++- 5 files changed, 12 insertions(+), 35 deletions(-) diff --git a/common/cmd_time.c b/common/cmd_time.c index 6dbdbbf..9808cd6 100644 --- a/common/cmd_time.c +++ b/common/cmd_time.c @@ -22,36 +22,6 @@ #include <common.h> #include <command.h> -/* - * TODO(clchiou): This function actually minics the bottom-half of the - * run_command() function. Since this function has ARM-dependent timer - * codes, we cannot merge it with the run_command() for now. - */ -static int run_command_and_time_it(int flag, int argc, char * const argv[], - ulong *cycles) -{ - cmd_tbl_t *cmdtp = find_cmd(argv[0]); - int retval = 0; - - if (!cmdtp) { - printf("%s: command not found\n", argv[0]); - return 1; - } - if (argc > cmdtp->maxargs) - return CMD_RET_USAGE; - - /* - * TODO(clchiou): get_timer_masked() is only defined in certain ARM - * boards. We could use the new timer API that Graeme is proposing - * so that this piece of code would be arch-independent. - */ - *cycles = get_timer_masked(); - retval = cmdtp->cmd(cmdtp, flag, argc, argv); - *cycles = get_timer_masked() - *cycles; - - return retval; -} - static void report_time(ulong cycles) { ulong minutes, seconds, milliseconds; @@ -75,11 +45,12 @@ static int do_time(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { ulong cycles = 0; int retval = 0; + int repeatable; if (argc == 1) return CMD_RET_USAGE; - retval = run_command_and_time_it(0, argc - 1, argv + 1, &cycles); + retval = cmd_process(0, argc - 1, argv + 1, &repeatable, &cycles); report_time(cycles); return retval; diff --git a/common/command.c b/common/command.c index 50c8429..305a236 100644 --- a/common/command.c +++ b/common/command.c @@ -513,7 +513,7 @@ static int cmd_call(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } enum command_ret_t cmd_process(int flag, int argc, char * const argv[], - int *repeatable) + int *repeatable, ulong *ticks) { enum command_ret_t rc = CMD_RET_SUCCESS; cmd_tbl_t *cmdtp; @@ -543,7 +543,11 @@ enum command_ret_t cmd_process(int flag, int argc, char * const argv[], /* If OK so far, then do the command */ if (!rc) { + if (ticks) + *ticks = get_timer(0); rc = cmd_call(cmdtp, flag, argc, argv); + if (ticks) + *ticks = get_timer(*ticks); *repeatable &= cmdtp->repeatable; } if (rc == CMD_RET_USAGE) diff --git a/common/hush.c b/common/hush.c index eb6c879..cc81c9c 100644 --- a/common/hush.c +++ b/common/hush.c @@ -1665,7 +1665,7 @@ static int run_pipe_real(struct pipe *pi) } /* Process the command */ return cmd_process(flag, child->argc, child->argv, - &flag_repeat); + &flag_repeat, NULL); #endif } #ifndef __U_BOOT__ diff --git a/common/main.c b/common/main.c index 5362781..7bdba3e 100644 --- a/common/main.c +++ b/common/main.c @@ -1442,7 +1442,7 @@ static int builtin_run_command(const char *cmd, int flag) continue; } - if (cmd_process(flag, argc, argv, &repeatable)) + if (cmd_process(flag, argc, argv, &repeatable, NULL)) rc = -1; /* Did the user stop this? */ diff --git a/include/command.h b/include/command.h index 10bc260..1344d71 100644 --- a/include/command.h +++ b/include/command.h @@ -139,10 +139,12 @@ enum command_ret_t { * @param repeatable This function sets this to 0 if the command is not * repeatable. If the command is repeatable, the value * is left unchanged. + * @param ticks If ticks is not null, this function set it to the + * number of ticks the command took to complete. * @return 0 if the command succeeded, 1 if it failed */ int cmd_process(int flag, int argc, char * const argv[], - int *repeatable); + int *repeatable, ulong *ticks); #endif /* __ASSEMBLY__ */ -- 1.7.2.5

3 2

[U-Boot] serial: CONFIG_ARM_DCC_MULTI failures
by Michal Simek 04 Feb '13

04 Feb '13

Hi Marek and others, I have found that in uboot is arm-dcc driver (drivers/serial/arm_dcc.c) which is 1. not compiled by any configuration 2. when it is enabled is causing compilation failures because of SERIAL_MULTI removal The problem is with this code. #ifndef CONFIG_ARM_DCC_MULTI #define arm_dcc_init serial_init void serial_setbrg(void) {} #define arm_dcc_getc serial_getc #define arm_dcc_putc serial_putc #define arm_dcc_puts serial_puts #define arm_dcc_tstc serial_tstc #endif It means that CONFIG_ARM_DCC_MULTI should be always enabled and we can remove this option entirely. Then there is missing default_serial_console() if there is no another serial driver. Also I am sending the second patch which fix compilation warning. Thanks, Michal

5 8

[U-Boot] [PATCH] board sc3: fix warning about nested comment
by Jeroen Hofstee 04 Feb '13

04 Feb '13

cc: Heiko Schocher <hs(a)denx.de> Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- board/sc3/init.S | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/sc3/init.S b/board/sc3/init.S index d374db4..6352368 100644 --- a/board/sc3/init.S +++ b/board/sc3/init.S @@ -71,7 +71,8 @@ ext_bus_cntlr_init: * This is need for the external flash access */ lis r25,0x0800 - ori r25,r25,0x0280 /* 0000 1000 0xxx 0000 0000 0010 100x xxxx = 0x03800280 + /* 0000 1000 0xxx 0000 0000 0010 100x xxxx = 0x03800280 */ + ori r25,r25,0x0280 /* * Second, create a fast timing: * 90ns first cycle - 3 clock access @@ -79,7 +80,8 @@ ext_bus_cntlr_init: * This is used for the internal access */ lis r26,0x8900 - ori r26,r26,0x0280 /* 1000 1001 0xxx 0000 0000 0010 100x xxxx + /* 1000 1001 0xxx 0000 0000 0010 100x xxxx */ + ori r26,r26,0x0280 /* * We can't change settings on CS# if we currently use them. * -> load a few instructions into cache and run this code from cache -- 1.7.9.5

2 1

[U-Boot] [PATCH] sf: stmicro: add support for N25Q064
by Jagannadha Sutradharudu Teki 04 Feb '13

04 Feb '13

Add support for Numonyx N25Q064 SPI flash. Signed-off-by: Jagannadha Sutradharudu Teki <jagannadh.teki(a)gmail.com> --- drivers/mtd/spi/stmicro.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/spi/stmicro.c b/drivers/mtd/spi/stmicro.c index 30b626a..9ec938a 100644 --- a/drivers/mtd/spi/stmicro.c +++ b/drivers/mtd/spi/stmicro.c @@ -93,6 +93,12 @@ static const struct stmicro_spi_flash_params stmicro_spi_flash_table[] = { .name = "M25P128", }, { + .id = 0xba17, + .pages_per_sector = 256, + .nr_sectors = 128, + .name = "N25Q064", + }, + { .id = 0xba18, .pages_per_sector = 256, .nr_sectors = 256, -- 1.7.0.4

2 1

[U-Boot] [PATCH] common/cmd_bootm.c: prevent running of subcommands before 'bootm start'
by Gabor Juhos 04 Feb '13

04 Feb '13

The execution order of the bootm subcommands is fixed. Although here is a sanity check in the state machine which should prevent running the subcommands in wrong order but it does not catch all possible errors. It is possible to run any subcommand without running 'bootm start' first which leads to unexpected behaviour. For example, running 'bootm loados' without 'bootm start' causes a hang: U-Boot> bootm loados XIP Invalid Image ... OK OK Add a sanity check to 'do_bootm_subcommand' in order to ensure that no subcommands can be executed before 'bootm start'. After the patch running of any subcommand without running 'bootm start' will cause an error like this: U-Boot> bootm loados Trying to execute a command out of order bootm - boot application image from memory Usage: bootm [addr [arg ...]] - boot application image stored in memory ... Signed-off-by: Gabor Juhos <juhosg(a)openwrt.org> --- common/cmd_bootm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 2eb0c29..addde86 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -498,7 +498,8 @@ static int do_bootm_subcommand(cmd_tbl_t *cmdtp, int flag, int argc, return CMD_RET_USAGE; } - if (images.state >= state) { + if (images.state < BOOTM_STATE_START || + images.state >= state) { printf("Trying to execute a command out of order\n"); return CMD_RET_USAGE; } -- 1.7.10

2 1

[U-Boot] [PATCH] common: env_mmc: Use __weak annotation to simplify code
by Fabio Estevam 04 Feb '13

04 Feb '13

Using the __weak annotation can make the code cleaner. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- common/env_mmc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/env_mmc.c b/common/env_mmc.c index ce21671..02bd5ae 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -46,13 +46,11 @@ DECLARE_GLOBAL_DATA_PTR; #define CONFIG_ENV_OFFSET 0 #endif -static int __mmc_get_env_addr(struct mmc *mmc, u32 *env_addr) +__weak int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr) { *env_addr = CONFIG_ENV_OFFSET; return 0; } -int mmc_get_env_addr(struct mmc *mmc, u32 *env_addr) - __attribute__((weak, alias("__mmc_get_env_addr"))); int env_init(void) { -- 1.7.9.5

4 3

[U-Boot] [PATCH] configs:Remove unused macro CONFIG_DISCOVER_PHY
by Ashok Kumar Reddy 04 Feb '13

04 Feb '13

Remove unused macro CONFIG_DISCOVER_PHY from configs. Signed-off-by: Ashok Kumar Reddy <ashokkourla2000(a)gmail.com> --- include/configs/apx4devkit.h | 1 - include/configs/sc_sps_1.h | 1 - 2 files changed, 2 deletions(-) diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index 6764b47..73c66af 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -175,7 +175,6 @@ #define CONFIG_FEC_MXC_PHYADDR 0 #define IMX_FEC_BASE MXS_ENET0_BASE #define CONFIG_MII -#define CONFIG_DISCOVER_PHY #define CONFIG_FEC_XCV_TYPE RMII #endif diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index f5dc393..6140d5b 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -160,7 +160,6 @@ #define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_MULTI #define CONFIG_MII -#define CONFIG_DISCOVER_PHY #define CONFIG_FEC_XCV_TYPE RMII #define CONFIG_PHYLIB #define CONFIG_PHY_SMSC -- 1.7.9.5

3 3

[U-Boot] [PATCH] drivers/block/systemace - fixed data type in "systemace_read" to match prototype in "block_dev_desc_t"
by Alexey Brodkin 04 Feb '13

04 Feb '13

Currently we have "unsigned long blkcnt" which is fine with CONFIG_SYS_64BIT_LBA undefined because "lbaint_t" is basically the same "unsigned long". If CONFIG_SYS_64BIT_LBA gets defined "lbaint_t" is defined as "unsigned long long". Even though not many embedded systems have CONFIG_SYS_64BIT_LBA defined it's good to have types in function implementation that match exactly with prototypes. Signed-off-by: Alexey Brodkin <alexey.brodkin(a)gmail.com> --- drivers/block/systemace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/systemace.c b/drivers/block/systemace.c index 247cf06..80076b4 100644 --- a/drivers/block/systemace.c +++ b/drivers/block/systemace.c @@ -83,7 +83,7 @@ static u16 ace_readw(unsigned off) } static unsigned long systemace_read(int dev, unsigned long start, - unsigned long blkcnt, void *buffer); + lbaint_t blkcnt, void *buffer); static block_dev_desc_t systemace_dev = { 0 }; @@ -149,7 +149,7 @@ block_dev_desc_t *systemace_get_dev(int dev) * number of blocks read. A zero return indicates an error. */ static unsigned long systemace_read(int dev, unsigned long start, - unsigned long blkcnt, void *buffer) + lbaint_t blkcnt, void *buffer) { int retry; unsigned blk_countdown; -- 1.7.10.4

2 1

[U-Boot] [U-boot] mkimage -F parameter
by TigerLiu＠viatech.com.cn 04 Feb '13

04 Feb '13

Hi, experts: It seems mkimage has supported signing a image. So, I have a question about signed linux kernel image: 1. if kernel image is signed by mkimage tool. Could uboot verify this signed linux kernel image bf jumping to its entry point function? 2. if uboot could verify the signed linux kernel image how to management these different vendors' public keys in uboot code? Using env variable? Best wishes,

3 5