September 2013 - U-Boot

[U-Boot] [PATCH] cosmetic: doc: uImage.FIT: fix typos
by Masahiro Yamada 21 Sep '13

21 Sep '13

Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- doc/uImage.FIT/command_syntax_extensions.txt | 2 +- doc/uImage.FIT/source_file_format.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/uImage.FIT/command_syntax_extensions.txt b/doc/uImage.FIT/command_syntax_extensions.txt index 002818c..6c99b1c 100644 --- a/doc/uImage.FIT/command_syntax_extensions.txt +++ b/doc/uImage.FIT/command_syntax_extensions.txt @@ -170,7 +170,7 @@ bootm 200000 In case of the new uImage argument syntax, the address portion of any argument can be omitted. If <addr3> is omitted, then it is assumed that image at -<addr2> should be used. Similarly, when <addr2> is omitted, is is assumed that +<addr2> should be used. Similarly, when <addr2> is omitted, it is assumed that image at <addr1> should be used. If <addr1> is omitted, it is assumed that the current image address is to be used. For example, consider the following commands: diff --git a/doc/uImage.FIT/source_file_format.txt b/doc/uImage.FIT/source_file_format.txt index 6d20707..160b2d0 100644 --- a/doc/uImage.FIT/source_file_format.txt +++ b/doc/uImage.FIT/source_file_format.txt @@ -62,7 +62,7 @@ c) Image building procedure The following picture shows how the new uImage is prepared. Input consists of image source file (.its) and a set of data files. Image is created with the help of standard U-boot mkimage tool which in turn uses dtc (device tree -compiler) to produce image tree blob (.itb). Resulting .itb file is is the +compiler) to produce image tree blob (.itb). Resulting .itb file is the actual binary of a new uImage. -- 1.8.1.2

3 2

[U-Boot] [PATCH] boards.cfg: show info about boards.cfg instead of MAINTAINERS
by Roger Meier 21 Sep '13

21 Sep '13

Signed-off-by: Roger Meier <roger(a)bufferoverflow.ch> --- tools/checkpatch.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/checkpatch.pl b/tools/checkpatch.pl index 896e2bc..88c5bc7 100755 --- a/tools/checkpatch.pl +++ b/tools/checkpatch.pl @@ -398,7 +398,7 @@ sub top_of_kernel_tree { my ($root) = @_; my @tree_check = ( - "COPYING", "CREDITS", "Kbuild", "MAINTAINERS", "Makefile", + "COPYING", "CREDITS", "Kbuild", "Makefile", "README", "Documentation", "arch", "include", "drivers", "fs", "init", "ipc", "kernel", "lib", "scripts", ); @@ -3701,7 +3701,7 @@ sub process { $vname has style problems, please review. If any of these errors are false positives, please report -them to the maintainer, see CHECKPATCH in MAINTAINERS. +them to the maintainer, see boards.cfg. EOM } -- 1.7.10.4

2 1

[U-Boot] [PATCH] boards.cfg: Fix the comment for invoking tools/reformat.py from vim
by Axel Lin 21 Sep '13

21 Sep '13

Add the missing bang (!) to execute external command, otherwise it does not work. Signed-off-by: Axel Lin <axel.lin(a)ingics.com> --- boards.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boards.cfg b/boards.cfg index dbd8479..9fc77fb 100644 --- a/boards.cfg +++ b/boards.cfg @@ -38,7 +38,7 @@ # It can be used from a shell: # tools/reformat.py -i -d '-' -s 8 <boards.cfg >boards0.cfg && mv boards0.cfg boards.cfg # It can directly be invoked from vim: -# :%tools/reformat.py -i -d '-' -s 8 +# :%!tools/reformat.py -i -d '-' -s 8 # # Status, Arch, CPU:SPLCPU, SoC, Vendor, Board name, Target, Options, Maintainers ########################################################################################################### -- 1.8.1.2

2 1

[U-Boot] [PATCH 1/6] part_efi: make sure the gpt_pte is freed
by Mark Langsdorf 21 Sep '13

21 Sep '13

the gpt_pte wasn't being freed if it was checked against an invalid partition. The resulting memory leakage could make it impossible to repeatedly attempt to load non-existent files in a script. Also, downgrade the message for not finding an invalid partition from a printf() to a debug() so as to minimize message spam in perfectly normal situations. Signed-off-by: Mark Langsdorf <mark.langsdorf(a)calxeda.com> --- disk/part_efi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/disk/part_efi.c b/disk/part_efi.c index b7524d6..9c33ae7 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -164,8 +164,9 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part, if (part > le32_to_cpu(gpt_head->num_partition_entries) || !is_pte_valid(&gpt_pte[part - 1])) { - printf("%s: *** ERROR: Invalid partition number %d ***\n", + debug("%s: *** ERROR: Invalid partition number %d ***\n", __func__, part); + free(gpt_pte); return -1; } -- 1.8.1.2

2 1

[U-Boot] bootm does not work if netconsole is enabled
by Michael Walle 21 Sep '13

21 Sep '13

Hi Joe, Hi Tom, If i have the netconsole enabled i cannot boot linux using the bootm command. This bug exists at least in 2013.01.01 and 2013.04-rc2 :/ Here is the output of the serial console of a successful startup: ## Booting kernel from Legacy Image at 00100000 ... Image Name: Linux-3.8.0-rc1-00004-g270c0a0-d Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 2799632 Bytes = 2.7 MiB Load Address: 00008000 Entry Point: 00008000 Verifying Checksum ... OK ## Loading init Ramdisk from Legacy Image at 00800000 ... Image Name: Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 636966 Bytes = 622 KiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 00700000 Booting using the fdt blob at 0x00700000 Loading Kernel Image ... OK OK Loading Ramdisk to 03aad000, end 03b48826 ... OK Loading Device Tree to 03aa8000, end 03aacedd ... OK Starting kernel ... [.. more linux kernel output ..] If the netconsole is enabled, eg. "stdin = stdout = stderr = nc", i see only the following output on the netconsole and then nothing more happens: ## Booting kernel from Legacy Image at 00100000 ... Image Name: Linux-3.8.0-rc1-00004-g270c0a0-d Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 2799632 Bytes = 2.7 MiB Load Address: 00008000 Entry Point: 00008000 Verifying Checksum ... OK ## Loading init Ramdisk from Legacy Image at 00800000 ... Image Name: Image Type: ARM Linux RAMDisk Image (uncompressed) Data Size: 636966 Bytes = 622 KiB Load Address: 00000000 Entry Point: 00000000 Verifying Checksum ... OK ## Flattened Device Tree blob at 00700000 Booting using the fdt blob at 0x00700000 I've tracked this down to the eth_halt() call in cmd_bootm.c:647. What is the purpose of this call? I guess the NIC should be shut down prior to booting linux. OTOH, there are still messages printed after this call, and i suppose the netconsole tries to bring the network back up. If i remove this call, everything works as expected. Anyway, i can definitely say, that the linux kernel is not starting. Eg. it is not only the output that stops working. FYI, i'm using the mvgbe driver. Let me know if i can do some more debugging or provide more information. Hopefully this will be fixed in 2013.04 :) -- Michael

5 13

[U-Boot] [PATCH] bootm: use BOOTM_STATE_OS_CMDLINE flag for plain bootm
by Paul Burton 21 Sep '13

21 Sep '13

A plain bootm used to call the architecture specific boot function with no flags, but was modified by commit 35fc84fa "Refactor the bootm command to reduce code duplication" to call the architecture specific boot function multiple times with various flags in sequence. The BOOTM_STATE_OS_CMDLINE flag was not used, indeed it seems that at least ARM prepares the command line on BOOTM_STATE_OS_PREP. However on MIPS since commit 59e8cbdb "MIPS: bootm: refactor initialisation of kernel cmdline" the command line is not prepared in response to a BOOTM_STATE_OS_PREP flag, only on BOOTM_STATE_OS_CMDLINE or a call with no flags. The end result is that a combination of those 2 commits leads to MIPS boards booting kernels with no command line arguments. An extra invocation of the architecture specific boot function with BOOTM_STATE_OS_CMDLINE fixes this. Signed-off-by: Paul Burton <paul.burton(a)imgtec.com> --- common/cmd_bootm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 1685c14..b8255eb 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -797,8 +797,9 @@ int do_bootm(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return do_bootm_states(cmdtp, flag, argc, argv, BOOTM_STATE_START | BOOTM_STATE_FINDOS | BOOTM_STATE_FINDOTHER | - BOOTM_STATE_LOADOS | BOOTM_STATE_OS_PREP | - BOOTM_STATE_OS_FAKE_GO | BOOTM_STATE_OS_GO, &images, 1); + BOOTM_STATE_LOADOS | BOOTM_STATE_OS_CMDLINE | + BOOTM_STATE_OS_PREP | BOOTM_STATE_OS_FAKE_GO | + BOOTM_STATE_OS_GO, &images, 1); } int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd) -- 1.8.3.4

3 3

[U-Boot] [PATCH] Fix some obvious typoes across multiple subsystems.
by Robert P. J. Day 21 Sep '13

21 Sep '13

Typoes fixed: "partion" -> "partition" "retrive", "retreive" -> "retrieve" "th" -> "to" Signed-off-by: Robert P. J. Day <rpjday(a)crashcourse.ca> --- just my pedantic nature getting the best of me, not sure if folks preferred i submit these on a per-subsystem basis and CC all relevant maintainers. if so, i can resubmit. diff --git a/common/cmd_gpt.c b/common/cmd_gpt.c index 06767aa..a46f5cc 100644 --- a/common/cmd_gpt.c +++ b/common/cmd_gpt.c @@ -161,7 +161,7 @@ static int set_gpt_info(block_dev_desc_t *dev_desc, /* allocate memory for partitions */ parts = calloc(sizeof(disk_partition_t), p_count); - /* retrive partions data from string */ + /* retrieve partitions data from string */ for (i = 0; i < p_count; i++) { tok = strsep(&s, ";"); @@ -316,7 +316,7 @@ static int do_gpt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) U_BOOT_CMD(gpt, CONFIG_SYS_MAXARGS, 1, do_gpt, "GUID Partition Table", - "<command> <interface> <dev> <partions_list>\n" + "<command> <interface> <dev> <partitions_list>\n" " - GUID partition table restoration\n" " Restore GPT information on a device connected\n" " to interface\n" diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 1cdeb44..67a94a7 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -260,7 +260,7 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) if (!ret) mmc->part_num = part; - printf("switch to partions #%d, %s\n", + printf("switch to partitions #%d, %s\n", part, (!ret) ? "OK" : "ERROR"); } } @@ -421,7 +421,7 @@ U_BOOT_CMD( "mmc close <dev> <boot_partition>\n" " - Enable boot_part for booting and disable access to boot_part\n" "mmc bootpart <device num> <boot part size MB> <RPMB part size MB>\n" - " - change sizes of boot and RPMB partions of specified device\n" + " - change sizes of boot and RPMB partitions of specified device\n" #endif ); #endif /* !CONFIG_GENERIC_MMC */ diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index 3023479..38a6e6d 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -420,7 +420,7 @@ static int part_validate(struct mtdids *id, struct part_info *part) } /** - * Delete selected partition from the partion list of the specified device. + * Delete selected partition from the partition list of the specified device. * * @param dev device to delete partition from * @param part partition to delete diff --git a/common/image-fit.c b/common/image-fit.c index 199b4ed..7647515 100644 --- a/common/image-fit.c +++ b/common/image-fit.c @@ -1331,7 +1331,7 @@ int fit_conf_find_compat(const void *fit, const void *fdt) * * When NULL is provided in second argument fit_conf_get_node() will search * for a default configuration node instead. Default configuration node unit - * name is retrived from FIT_DEFAULT_PROP property of the '/configurations' + * name is retrieved from FIT_DEFAULT_PROP property of the '/configurations' * node. * * returns: diff --git a/drivers/block/sym53c8xx.c b/drivers/block/sym53c8xx.c index c538e37..6f1ac85 100644 --- a/drivers/block/sym53c8xx.c +++ b/drivers/block/sym53c8xx.c @@ -248,7 +248,7 @@ void scsi_print_error (ccb * pccb) /****************************************************************************** * sets-up the SCSI controller - * the base memory address is retrived via the pci_read_config_dword + * the base memory address is retrieved via the pci_read_config_dword */ void scsi_low_level_init(int busdevfunc) { diff --git a/include/libfdt.h b/include/libfdt.h index 765d84f..9eefaaf 100644 --- a/include/libfdt.h +++ b/include/libfdt.h @@ -596,9 +596,9 @@ const char *fdt_get_alias_namelen(const void *fdt, const char *name, int namelen); /** - * fdt_get_alias - retreive the path referenced by a given alias + * fdt_get_alias - retrieve the path referenced by a given alias * @fdt: pointer to the device tree blob - * @name: name of the alias th look up + * @name: name of the alias to look up * * fdt_get_alias() retrieves the value of a given alias. That is, the * value of the property named 'name' in the node /aliases. -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 1

[U-Boot] Pull request: u-boot-mmc #2
by Pantelis Antoniou 21 Sep '13

21 Sep '13

Hi Tom, The following changes since commit 46ef4faed18196472eb95216b2f74c1397ecf024: Prepare v2013.10-rc3 (2013-09-16 20:08:33 -0400) are available in the git repository at: git://git.denx.de/u-boot-mmc.git master for you to fetch changes up to 2c011847c129491084a19c753a039a3441b7dce4: Fix wrong sdhci host control register read and write (2013-09-20 19:02:29 +0300) ---------------------------------------------------------------- Jaehoon Chung (1): mmc: sdhci: use the SDHCI_QUIRK_USE_WIDE8 for samsung SoC Juhyun $Justin$ Oh (1): Fix wrong sdhci host control register read and write Lubomir Popov (1): ARM: OMAP: Enable 8-bit eMMC access for OMAP4/5/DRA7xx Mischa Jonker (3): mmc/dw_mmc: Fix DMA descriptor corruption mmc/dw_mmc: Allocate the correct amount of descriptors Add parentheses to ALLOC_ALIGN_BUFFER macro's Oleksandr Tyshchenko (2): mmc: Remove unused variable backup from mmc_send_cmd() omap_hsmmc: omap4+/am335x: modify MMC controller internal fsm reset func Paul Burton (5): spl: remove unnecessary (& ARM specific) include of asm/utils.h spl_mmc: only call printf or puts with CONFIG_SPL_LIBCOMMON_SUPPORT mmc: don't call *printf or puts when SPL & !CONFIG_SPL_LIBCOMMON_SUPPORT mmc: size optimization when !CONFIG_MMC_SPI mmc: don't support write & erase for SPL builds common/spl/spl_mmc.c | 17 +++++++++- drivers/mmc/Makefile | 2 ++ drivers/mmc/dw_mmc.c | 9 +++--- drivers/mmc/mmc.c | 205 +++++++++++++++++---------------------------------------------------------------------------------------------------- drivers/mmc/mmc_private.h | 45 ++++++++++++++++++++++++++ drivers/mmc/mmc_write.c | 179 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/omap_hsmmc.c | 41 ++++++++++++++++++++++-- drivers/mmc/s5p_sdhci.c | 4 ++- drivers/mmc/sdhci.c | 18 +++++------ include/common.h | 4 +-- include/mmc.h | 4 +++ include/sdhci.h | 3 ++ 12 files changed, 336 insertions(+), 195 deletions(-) create mode 100644 drivers/mmc/mmc_private.h create mode 100644 drivers/mmc/mmc_write.c Regards -- Pantelis

2 1

[U-Boot] [PULL] u-boot-atmel/master -> u-boot-arm/master
by Andreas Bießmann 21 Sep '13

21 Sep '13

Dear Albert Aribaud, please pull the following fix into u-boot-arm/master for 2013.10 release. The following changes since commit 771f74c3d31a265bae103b2b407286ec03a4589b: arm: dma_alloc_coherent: malloc() -> memalign() (2013-09-14 12:08:00 +0200) are available in the git repository at: git://git.denx.de/u-boot-atmel.git master for you to fetch changes up to db824479e64811959494e1f919c31d97fea9dc48: arm: atmel: cpux9k2: increase malloc space to fix crash on start u-boot (2013-09-19 10:26:48 +0200) ---------------------------------------------------------------- Jens Scharsig (BuS Elektronik) (1): arm: atmel: cpux9k2: increase malloc space to fix crash on start u-boot include/configs/eb_cpux9k2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[U-Boot] [PATCH 1/2] arm: rmobile: kzm9g: Change clock definition of SCIF from CONFIG_SYS_CLK_FREQ to CONFIG_SH_SCIF_CLK_FREQ
by Nobuhiro Iwamatsu 21 Sep '13

21 Sep '13

Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> --- include/configs/kzm9g.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 222725c..6323050 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -125,6 +125,7 @@ #define CONFIG_GLOBAL_TIMER #define CONFIG_SYS_CLK_FREQ (48000000) #define CONFIG_SYS_CPU_CLK (1196000000) +#define CONFIG_SH_SCIF_CLK_FREQ CONFIG_SYS_CLK_FREQ #define TMU_CLK_DIVIDER (4) /* 4 (default), 16, 64, 256 or 1024 */ #define CFG_HZ (1000) #define CONFIG_SYS_HZ CFG_HZ -- 1.8.3.2

2 4