March 2013 - U-Boot

[U-Boot] [PATCH] README: document the requirements for CONFIG_SYS_HZ
by Stephen Warren 27 Mar '13

27 Mar '13

CONFIG_SYS_HZ must be 1000, and get_timer() must therefore return mS. Document this. Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- README | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README b/README index 7f2506a..1871ada 100644 --- a/README +++ b/README @@ -495,6 +495,12 @@ The following options need to be configured: exists, unlike the similar options in the Linux kernel. Do not set these options unless they apply! +- CPU timer options: + CONFIG_SYS_HZ + + The frequency of the timer returned by get_timer(). This value + MUST be 1000. + - Linux Kernel Interface: CONFIG_CLOCKS_IN_MHZ -- 1.7.10.4

3 4

[U-Boot] [RFC] MAKEALL: Fix case substitution for old bash
by York Sun 27 Mar '13

27 Mar '13

Bash ver 3.x doesn't support the parameter expansion with case substitution. Use tr instead. Signed-off-by: York Sun <yorksun(a)freescale.com> --- I am not sure if using 'tr' is a good idea. Any suggestion is welcomed. MAKEALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAKEALL b/MAKEALL index c1d8957..ac92ef6 100755 --- a/MAKEALL +++ b/MAKEALL @@ -664,7 +664,7 @@ build_target() { export BUILD_DIR="${output_dir}" target_arch=$(get_target_arch ${target}) - eval cross_toolchain=\$CROSS_COMPILE_${target_arch^^} + eval cross_toolchain=\$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'` if [ "${cross_toolchain}" ] ; then MAKE="make CROSS_COMPILE=${cross_toolchain}" elif [ "${CROSS_COMPILE}" ] ; then -- 1.7.9.5

3 3

[U-Boot] [PATCH v2] image: Add support for Plan 9
by Steven Stallion 27 Mar '13

27 Mar '13

Signed-off-by: Steven Stallion <sstallion(a)gmail.com> Cc: Tom Rini <trini(a)ti.com> --- This patch adds support for Plan 9 from Bell Labs kernel images. Changes for v2: - Combined previous patches for image and bootm common/cmd_bootm.c | 39 +++++++++++++++++++++++++++++++++++++++ common/image.c | 1 + include/config_defaults.h | 1 + include/image.h | 1 + 4 files changed, 42 insertions(+) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 5d2ce00..7438469 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -128,6 +128,9 @@ static boot_os_fn do_bootm_rtems; #if defined(CONFIG_BOOTM_OSE) static boot_os_fn do_bootm_ose; #endif +#if defined(CONFIG_BOOTM_PLAN9) +static boot_os_fn do_bootm_plan9; +#endif #if defined(CONFIG_CMD_ELF) static boot_os_fn do_bootm_vxworks; static boot_os_fn do_bootm_qnxelf; @@ -154,6 +157,9 @@ static boot_os_fn *boot_os[] = { #if defined(CONFIG_BOOTM_OSE) [IH_OS_OSE] = do_bootm_ose, #endif +#if defined(CONFIG_BOOTM_PLAN9) + [IH_OS_PLAN9] = do_bootm_plan9, +#endif #if defined(CONFIG_CMD_ELF) [IH_OS_VXWORKS] = do_bootm_vxworks, [IH_OS_QNX] = do_bootm_qnxelf, @@ -1628,6 +1634,39 @@ static int do_bootm_ose(int flag, int argc, char * const argv[], } #endif /* CONFIG_BOOTM_OSE */ +#if defined(CONFIG_BOOTM_PLAN9) +static int do_bootm_plan9(int flag, int argc, char * const argv[], + bootm_headers_t *images) +{ + void (*entry_point)(void); + + if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) + return 1; + +#if defined(CONFIG_FIT) + if (!images->legacy_hdr_valid) { + fit_unsupported_reset("Plan 9"); + return 1; + } +#endif + + entry_point = (void (*)(void))images->ep; + + printf("## Transferring control to Plan 9 (at address %08lx) ...\n", + (ulong)entry_point); + + bootstage_mark(BOOTSTAGE_ID_RUN_OS); + + /* + * Plan 9 Parameters: + * None + */ + (*entry_point)(); + + return 1; +} +#endif /* CONFIG_BOOTM_PLAN9 */ + #if defined(CONFIG_CMD_ELF) static int do_bootm_vxworks(int flag, int argc, char * const argv[], bootm_headers_t *images) diff --git a/common/image.c b/common/image.c index 6afbb40..60c2127 100644 --- a/common/image.c +++ b/common/image.c @@ -108,6 +108,7 @@ static const table_entry_t uimage_os[] = { #endif { IH_OS_NETBSD, "netbsd", "NetBSD", }, { IH_OS_OSE, "ose", "Enea OSE", }, + { IH_OS_PLAN9, "plan9", "Plan 9", }, { IH_OS_RTEMS, "rtems", "RTEMS", }, { IH_OS_U_BOOT, "u-boot", "U-Boot", }, #if defined(CONFIG_CMD_ELF) || defined(USE_HOSTCC) diff --git a/include/config_defaults.h b/include/config_defaults.h index d023c63..567b46c 100644 --- a/include/config_defaults.h +++ b/include/config_defaults.h @@ -12,6 +12,7 @@ /* Support bootm-ing different OSes */ #define CONFIG_BOOTM_LINUX 1 #define CONFIG_BOOTM_NETBSD 1 +#define CONFIG_BOOTM_PLAN9 1 #define CONFIG_BOOTM_RTEMS 1 #define CONFIG_GZIP 1 diff --git a/include/image.h b/include/image.h index 8e285f9..4ad0e6b 100644 --- a/include/image.h +++ b/include/image.h @@ -84,6 +84,7 @@ #define IH_OS_UNITY 20 /* Unity OS */ #define IH_OS_INTEGRITY 21 /* INTEGRITY */ #define IH_OS_OSE 22 /* OSE */ +#define IH_OS_PLAN9 23 /* Plan 9 */ /* * CPU Architecture Codes (supported by Linux) -- 1.8.2

2 2

[U-Boot] [PATCH] cmd_ext4: BREAK and correct ext4write parameter order
by Tom Rini 27 Mar '13

27 Mar '13

The ext4write command was taking the in-memory address and filename path in reverse order from the rest of the filesystem read and write commands. This corrects the order to be the same as fatload, etc. Signed-off-by: Tom Rini <trini(a)ti.com> --- common/cmd_ext4.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/cmd_ext4.c b/common/cmd_ext4.c index dcf76a5..706fd54 100644 --- a/common/cmd_ext4.c +++ b/common/cmd_ext4.c @@ -88,10 +88,10 @@ int do_ext4_write(cmd_tbl_t *cmdtp, int flag, int argc, dev = dev_desc->dev; /* get the filename */ - filename = argv[3]; + filename = argv[4]; /* get the address in hexadecimal format (string to int) */ - ram_address = simple_strtoul(argv[4], NULL, 16); + ram_address = simple_strtoul(argv[3], NULL, 16); /* get the filesize in base 10 format */ file_size = simple_strtoul(argv[5], NULL, 10); @@ -122,7 +122,7 @@ fail: U_BOOT_CMD(ext4write, 6, 1, do_ext4_write, "create a file in the root directory", - "<interface> <dev[:part]> [Absolute filename path] [Address] [sizebytes]\n" + "<interface> <dev[:part]> <addr> <absolute filename path> [sizebytes]\n" " - create a file in / directory"); #endif -- 1.7.9.5

1 1

[U-Boot] [PATCH] .checkpatch.conf: ignore udelay->usleep_range warnings
by Matt Porter 27 Mar '13

27 Mar '13

usleep_range() is a Linux facility, ignore it when udelay() is encountered. Signed-off-by: Matt Porter <mporter(a)ti.com> --- .checkpatch.conf | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.checkpatch.conf b/.checkpatch.conf index 38386b3..d88af57 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -15,3 +15,6 @@ # enable more tests --strict + +# Not Linux, so we don't recommend usleep_range() over udelay() +--ignore USLEEP_RANGE -- 1.7.9.5

2 1

[U-Boot] [PATCH] checkpatch.pl: Add 'debug' to the list of logFunctions
by Tom Rini 27 Mar '13

27 Mar '13

While the kernel mainly uses pr_debug(...), etc, for debug messages, we use debug(...). Add this to the list of logFunctions so that they are correctly checked (and not warned against) for long string literals. Signed-off-by: Tom Rini <trini(a)ti.com> --- tools/checkpatch.pl | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/checkpatch.pl b/tools/checkpatch.pl index 051ba0d..9f23901 100755 --- a/tools/checkpatch.pl +++ b/tools/checkpatch.pl @@ -272,6 +272,7 @@ our $logFunctions = qr{(?x: [a-z0-9]+_(?:printk|emerg|alert|crit|err|warning|warn|notice|info|debug|dbg|vdbg|devel|cont|WARN)(?:_ratelimited|_once|)| WARN(?:_RATELIMIT|_ONCE|)| panic| + debug| MODULE_[A-Z_]+ )}; -- 1.7.9.5

1 1

[U-Boot] [PATCH 1/2] env_callback: Mark find_env_callback as static
by Tom Rini 27 Mar '13

27 Mar '13

This is not called outside of env_callback.c so mark static, remove from <env_callback.h> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Signed-off-by: Tom Rini <trini(a)ti.com> --- common/env_callback.c | 2 +- include/env_callback.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/common/env_callback.c b/common/env_callback.c index 78ca367..78aafb4 100644 --- a/common/env_callback.c +++ b/common/env_callback.c @@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR; /* * Look up a callback function pointer by name */ -struct env_clbk_tbl *find_env_callback(const char *name) +static struct env_clbk_tbl *find_env_callback(const char *name) { struct env_clbk_tbl *clbkp; int i; diff --git a/include/env_callback.h b/include/env_callback.h index 62428d1..dfc41ae 100644 --- a/include/env_callback.h +++ b/include/env_callback.h @@ -67,7 +67,6 @@ struct env_clbk_tbl { int flags); }; -struct env_clbk_tbl *find_env_callback(const char *); void env_callback_init(ENTRY *var_entry); /* -- 1.7.9.5

2 5

[U-Boot] [PATCH V2] MAKEALL: allow regex matches for -s option
by Stephen Warren 27 Mar '13

27 Mar '13

From: Stephen Warren <swarren(a)nvidia.com> This allows: MAKEALL -s tegra to replace: MAKEALL -s tegra20 -s tegra30 -s tegra114 The following also works: MAKEALL -s tegra -s omap Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: Modified the commit description marginally to s/tegra*/tegra/ in the first example MAKEALL command; it's a regex match so a substring, so the * isn't needed. Also add the dual tegra/omap example command. MAKEALL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAKEALL b/MAKEALL index c1d8957..91fa495 100755 --- a/MAKEALL +++ b/MAKEALL @@ -104,9 +104,9 @@ while true ; do -s|--soc) # echo "Option SoC: argument \`$2'" if [ "$opt_s" ] ; then - opt_s="${opt_s%)} || \$6 == \"$2\")" + opt_s="${opt_s%)} || \$6 == \"$2\" || \$6 ~ /$2/)" else - opt_s="(\$6 == \"$2\")" + opt_s="(\$6 == \"$2\" || \$6 ~ /$2/)" fi SELECTED='y' shift 2 ;; -- 1.7.10.4

2 1

[U-Boot] [PATCH] apx4devkit: change maintainer
by Veli-Pekka Peltola 27 Mar '13

27 Mar '13

As I am no longer working for Bluegiga I will pass apx4devkit maintenance to Lauri. Signed-off-by: Veli-Pekka Peltola <veli-pekka.peltola(a)iki.fi> --- MAINTAINERS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d031c3a..bb55650 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -688,6 +688,10 @@ Stefan Herbrechtsmeier <stefan(a)code.herbrechtsmeier.net> dns325 ARM926EJS (Kirkwood SoC) +Lauri Hintsala <lauri.hintsala(a)bluegiga.com> + + apx4devkit i.MX28 + Vaibhav Hiremath <hvaibhav(a)ti.com> am3517_evm ARM ARMV7 (AM35x SoC) @@ -806,10 +810,6 @@ Linus Walleij <linus.walleij(a)linaro.org> integratorap various integratorcp various -Veli-Pekka Peltola <veli-pekka.peltola(a)bluegiga.com> - - apx4devkit i.MX28 - Luka Perkov <luka(a)openwrt.org> ib62x0 ARM926EJS -- 1.7.10.4

3 2

[U-Boot] [PATCH] mx6: Fix get_board_rev() for the mx6 solo case
by Fabio Estevam 27 Mar '13

27 Mar '13

When booting a Freescale kernel 3.0.35 on a Wandboard solo, the get_board_rev() returns 0x62xxx, which is not a value understood by the VPU (Video Processing Unit) library in the kernel and causes the video playback to fail. The expected values for get_board_rev are: 0x63xxx: For mx6quad/dual 0x61xxx: For mx6dual-lite/solo So adjust get_board_rev() accordingly and make it as weak function, so that we do not need to define it in every mx6 board file. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- arch/arm/cpu/armv7/mx6/soc.c | 12 ++++++++++++ board/boundary/nitrogen6x/nitrogen6x.c | 5 ----- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 5 ----- board/freescale/mx6qsabresd/mx6qsabresd.c | 5 ----- board/wandboard/wandboard.c | 5 ----- 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index 193ba12..4f3cd14 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -61,6 +61,18 @@ u32 get_cpu_rev(void) return (type << 12) | (reg + 0x10); } +#ifdef CONFIG_REVISION_TAG +u32 __weak get_board_rev(void) +{ + u32 cpurev = get_cpu_rev(); + u32 type = ((cpurev >> 12) & 0xff); + if (type == MXC_CPU_MX6SOLO) + cpurev = (MXC_CPU_MX6DL) << 12 | (get_cpu_rev() & 0xFFF); + + return cpurev; +} +#endif + void init_aips(void) { struct aipstz_regs *aips1, *aips2; diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index 229c237..1b1bedf 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -328,11 +328,6 @@ int board_mmc_init(bd_t *bis) } #endif -u32 get_board_rev(void) -{ - return 0x63000; -} - #ifdef CONFIG_MXC_SPI iomux_v3_cfg_t const ecspi1_pads[] = { /* SS1 */ diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c index 5b69a6d..782e5ba 100644 --- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c +++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c @@ -298,11 +298,6 @@ int board_mmc_init(bd_t *bis) } #endif -u32 get_board_rev(void) -{ - return 0x63000 ; -} - #ifdef CONFIG_MXC_SPI iomux_v3_cfg_t const ecspi1_pads[] = { /* SS1 */ diff --git a/board/freescale/mx6qsabresd/mx6qsabresd.c b/board/freescale/mx6qsabresd/mx6qsabresd.c index 2b3926a..806769f 100644 --- a/board/freescale/mx6qsabresd/mx6qsabresd.c +++ b/board/freescale/mx6qsabresd/mx6qsabresd.c @@ -239,11 +239,6 @@ int board_eth_init(bd_t *bis) return 0; } -u32 get_board_rev(void) -{ - return 0x63000; -} - int board_early_init_f(void) { setup_iomux_uart(); diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c index d95189f..1e379fb 100644 --- a/board/wandboard/wandboard.c +++ b/board/wandboard/wandboard.c @@ -168,11 +168,6 @@ int board_init(void) return 0; } -u32 get_board_rev(void) -{ - return get_cpu_rev(); -} - int checkboard(void) { puts("Board: Wandboard\n"); -- 1.7.9.5

2 1