May 2015 - U-Boot

[U-Boot] [PATCH] fsl/sata: Replace sprintf() with snprintf()
by Yuantian.Tang＠freescale.com 29 May '15

29 May '15

From: Tang Yuantian <Yuantian.Tang(a)freescale.com> Function 'sprintf' does not check buffer boundaries but outputs to the buffer of fixed size which could potentially cause buffer overflow. Use a safer function to replace it. Signed-off-by: Tang Yuantian <Yuantian.Tang(a)freescale.com> --- drivers/block/fsl_sata.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/fsl_sata.c b/drivers/block/fsl_sata.c index 71d7cec..735708a 100644 --- a/drivers/block/fsl_sata.c +++ b/drivers/block/fsl_sata.c @@ -113,7 +113,7 @@ int init_sata(int dev) /* Save the private struct to block device struct */ sata_dev_desc[dev].priv = (void *)sata; - sprintf(sata->name, "SATA%d", dev); + snprintf(sata->name, 12, "SATA%d", dev); /* Set the controller register base address to device struct */ reg = (fsl_sata_reg_t *)(fsl_sata_info[dev].sata_reg_base); -- 2.1.0.27.g96db324

3 2

[U-Boot] [PATCH V2] ARM: bcm2835: use phys_to_bus() for mbox
by Stephen Warren 29 May '15

29 May '15

When we communicate with the VideoCore to perform property mailbox transactions, that is a DMA operation as far as the property buffer is concerned. Use phys_to_bus() on that buffer. Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- v2: Rebase on top of bcm283x mbox header move. While this isn't USB-related, it does depend on patches that went into the USB topic/dwc2 tree. Either this can be merged there, or we'll have to wait until that branch is merged into u-boot/master and then merge this. As best I can tell, this is the last place we need to do this. SDHCI has potential but CONFIG_MMC_SDMA isn't set so I don't believe the code does any DMA. LCD has potential, but the VideoCore allocates the display surface, programs the display engine, and passes the surface's CPU pointer back to the CPU in a firmware message, of U-Boot isn't involved in setting up the DMA HW. --- arch/arm/mach-bcm283x/mbox.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-bcm283x/mbox.c b/arch/arm/mach-bcm283x/mbox.c index 3b17a31eacfd..1af9be78c68a 100644 --- a/arch/arm/mach-bcm283x/mbox.c +++ b/arch/arm/mach-bcm283x/mbox.c @@ -7,6 +7,7 @@ #include <common.h> #include <asm/io.h> #include <asm/arch/mbox.h> +#include <phys2bus.h> #define TIMEOUT 1000 /* ms */ @@ -110,10 +111,10 @@ int bcm2835_mbox_call_prop(u32 chan, struct bcm2835_mbox_hdr *buffer) dump_buf(buffer); #endif - ret = bcm2835_mbox_call_raw(chan, (u32)buffer, &rbuffer); + ret = bcm2835_mbox_call_raw(chan, phys_to_bus((u32)buffer), &rbuffer); if (ret) return ret; - if (rbuffer != (u32)buffer) { + if (rbuffer != phys_to_bus((u32)buffer)) { printf("mbox: Response buffer mismatch\n"); return -1; } -- 1.9.1

3 4

[U-Boot] Building u-boot.rom for Minnowboard
by Saket Sinha 28 May '15

28 May '15

Hi Simon, I am building u-boot.rom for MinnowboardMax as per the steps mentioned in the README.x86. 1. Downloading BAY_TRAIL_FSP_KIT_GOLD3.tgz a) copying BAYTRAIL_FSP_GOLD_003_16-SEP-2014.fd as board/intel/minnowmax/fsp.bin b) copying Vga.dat as board/intel/minnowmax/vga.bin c) ./tools/ifdtool -x BayleyBay/SPI.bin >From the generted files, copying flashregion_2_intel_me.bin as board/intel/minnowmax/me.bin Though the o/p files are generated, I get the following error after this command - root@saket-HP-PC:# /u-boot-x86/tools/ifdtool -x BayleyBay/SPI.bin Flash Region 0 (Flash Descriptor): 00000000 - 00000fff Flash Region 1 (BIOS): 00500000 - 007fffff Flash Region 2 (Intel ME): 00001000 - 004fffff Flash Region 3 (GbE): 00fff000 - 00000fff (unused) Error while writing: Bad address Flash Region 4 (Platform Data): 00fff000 - 00000fff (unused) Error while writing: Bad address 2. Downloading 2014-WW42.4-MinnowBoardMax.73-64-bit.bin_Release.zip a)./tools/ifdtool -x MNW2MAX1.X64.0073.R02.1409160934.bin >From the generted files, copying flashregion_0_flashdescriptor.bin as board/intel/minnowmax/descriptor.bin Though the o/p files are generated, I get the following error after this command - root@saket-PC:# /u-boot-x86/tools/ifdtool -x MNW2MAX1.X64.0073.R02.1409160934.bin Flash Region 0 (Flash Descriptor): 00000000 - 00000fff Flash Region 1 (BIOS): 00500000 - 007fffff Flash Region 2 (Intel ME): 00001000 - 004fffff Flash Region 3 (GbE): 00000000 - 00000fff Flash Region 4 (Platform Data): 00fff000 - 00000fff (unused) Error while writing: Bad address 3. Building u-boot.rom export BUILD_ROM=y make minnowmax_defconfig make all 4. Flashing u-boot.rom to Minnowmax by desiprog sf100 ./flashrom -p dediprog -w u-boot.rom 5. Now when I am powering Minnowmax and collecting the output on serial - Nothing appears. Kindly let me know, if I am missing something here. Regards, Saket Sinha

1 0

[U-Boot] [PATCH v2 1/4] zynqmp: gem: Set data bus width to 64bit for arm64
by Michal Simek 28 May '15

28 May '15

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Set the data bus width to 64-bit AMBA Databus width in config register. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- Changes in v2: - Select 64bit setup based on CONFIG_ARM64 not on CONFIG_TARGET_XILINX_ZYNQMP - Fix type in the subject drivers/net/zynq_gem.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index c723dbb0a694..df8452acc5be 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -58,7 +58,14 @@ #define ZYNQ_GEM_NWCFG_MDCCLKDIV 0x000080000 /* Div pclk by 32, 80MHz */ #define ZYNQ_GEM_NWCFG_MDCCLKDIV2 0x0000c0000 /* Div pclk by 48, 120MHz */ -#define ZYNQ_GEM_NWCFG_INIT (ZYNQ_GEM_NWCFG_FDEN | \ +#ifdef CONFIG_ARM64 +# define ZYNQ_GEM_DBUS_WIDTH (1 << 21) /* 64 bit bus */ +#else +# define ZYNQ_GEM_DBUS_WIDTH (0 << 21) /* 32 bit bus */ +#endif + +#define ZYNQ_GEM_NWCFG_INIT (ZYNQ_GEM_DBUS_WIDTH | \ + ZYNQ_GEM_NWCFG_FDEN | \ ZYNQ_GEM_NWCFG_FSREM | \ ZYNQ_GEM_NWCFG_MDCCLKDIV) -- 2.3.5

2 4

[U-Boot] [PATCH v2] imx: drop warning: unused variable 'max_freq'
by Stefano Babic 28 May '15

28 May '15

max_freq in print_cpuinfo is used only with imx6. Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- Changes in v2: - fix breakage of mx6 boards Changes in v1: - broken, please ignore arch/arm/imx-common/cpu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index 275befd..5e56cfe 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -145,7 +145,8 @@ const char *get_imx_type(u32 imxtype) int print_cpuinfo(void) { - u32 cpurev, max_freq; + u32 cpurev; + __maybe_unused u32 max_freq; #if defined(CONFIG_MX6) && defined(CONFIG_IMX6_THERMAL) struct udevice *thermal_dev; -- 1.9.1

1 0

[U-Boot] [PATCH v2] mx6_common: Fix LOADADDR and SYS_TEXT_BASE for MX6SL and MX6SX
by Fabio Estevam 28 May '15

28 May '15

Commit 8183058188cd2d942 ("imx6: centralise common boot options in mx6_common.h") broke boot on mx6sl and mx6sx by assuming that all mx6 SoCs use the same LOADADDR/SYS_TEXT_BASE range, which is not correct. DDR on mx6sx/mx6sl starts at 0x80000000. Adjust LOADADDR/SYS_TEXT_BASE to the proper values for mx6sx/mx6sl, so that these SoCs can boot again. Also, TQMA6 requires a custom CONFIG_SYS_TEXT_BASE value, so move its setting to mx6_common.h. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Build tested only. Changes since v1: - Fix build warnings in tqma6 include/configs/mx6_common.h | 20 +++++++++++++++++++- include/configs/tqma6.h | 7 ------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 233c6d2..e69c0dd 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -53,11 +53,29 @@ #define CONFIG_REVISION_TAG /* Boot options */ + +/* place code in last 4 MiB of RAM on TQMA6 */ +#if defined(CONFIG_TARGET_TQMA6) +#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) +#define CONFIG_SYS_TEXT_BASE 0x2fc00000 +#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) +#define CONFIG_SYS_TEXT_BASE 0x4fc00000 +#endif +#endif + +#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6SL)) +#define CONFIG_LOADADDR 0x82000000 +#ifndef CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_TEXT_BASE 0x87800000 +#endif +#else #define CONFIG_LOADADDR 0x12000000 -#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR #ifndef CONFIG_SYS_TEXT_BASE #define CONFIG_SYS_TEXT_BASE 0x17800000 #endif +#endif +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + #ifndef CONFIG_BOOTDELAY #define CONFIG_BOOTDELAY 3 #endif diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index 4c93c9b..f1bf095 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -118,13 +118,6 @@ #define CONFIG_CMD_ITEST #define CONFIG_CMD_SETEXPR -/* place code in last 4 MiB of RAM */ -#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) -#define CONFIG_SYS_TEXT_BASE 0x2fc00000 -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) -#define CONFIG_SYS_TEXT_BASE 0x4fc00000 -#endif - #define CONFIG_ENV_SIZE (SZ_8K) /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M) -- 1.9.1

2 1

Re: [U-Boot] [PATCH] mx6_common: Fix LOADADDR and SYS_TEXT_BASE for MX6SL and MX6SX
by Fabio Estevam 28 May '15

28 May '15

Hi Andy, On Thu, May 28, 2015 at 8:26 AM, Andy Pont <andy.pont(a)sdcsystems.com> wrote: > Doesn't this also leave an empty, and therefore meaningless #ifndef...#endif > that could be removed completely? Good catch, thanks. I sent a v2 that addresses this problem and also the build warning on tqma6. I am not able to boot test it on real hardware at the moment though. Regards, Fabio Estevam

1 0

[U-Boot] [PATCH] imx6: novena: Reinstate missing CONFIG_FAT_WRITE
by Marek Vasut 28 May '15

28 May '15

Commit a380ce6e9698257c4e8be4c0711b09c90a8febff removed CONFIG_FAT_WRITE from novena.h , so Novena lost ability to write FAT partitions. Add this functionality back. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Peter Robinson <pbrobinson(a)gmail.com> Cc: Stefano Babic <sbabic(a)denx.de> --- include/configs/novena.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/novena.h b/include/configs/novena.h index 1f93269..519c26a 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -24,6 +24,7 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_EEPROM #define CONFIG_CMD_I2C +#define CONFIG_FAT_WRITE #define CONFIG_CMD_FUSE #define CONFIG_CMD_MII #define CONFIG_CMD_NET -- 2.1.4

2 2

[U-Boot] [PATCH] net: Fix a warning added by 76ec988
by Joe Hershberger 28 May '15

28 May '15

arm: + lsxhl w+board/buffalo/lsxl/lsxl.c: In function 'rescue_mode': w+board/buffalo/lsxl/lsxl.c:230:8: warning: unused variable 'enetaddr' [-Wunused-variable] arm: + lschlv2 w+board/buffalo/lsxl/lsxl.c: In function 'rescue_mode': w+board/buffalo/lsxl/lsxl.c:230:8: warning: unused variable 'enetaddr' [-Wunused-variable] Remove the unused variable. Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> --- board/buffalo/lsxl/lsxl.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/board/buffalo/lsxl/lsxl.c b/board/buffalo/lsxl/lsxl.c index 45dd788..0f37345 100644 --- a/board/buffalo/lsxl/lsxl.c +++ b/board/buffalo/lsxl/lsxl.c @@ -227,8 +227,6 @@ static void erase_environment(void) static void rescue_mode(void) { - uchar enetaddr[6]; - printf("Entering rescue mode..\n"); setenv("bootsource", "rescue"); } -- 1.7.11.5

2 1

[U-Boot] [PATCH v3 0/6] Add ARMv7M STM32F1 and STM3210E-EVAL board support
by Matt Porter 28 May '15

28 May '15

This series adds support for the STM32F1 SoC family and the STM3210E-EVAL board on top of the STM32F4 SoC family support [1]. Since this board has no DRAM the first patch fixes the build when CONFIG_NR_DRAM_BANKS is not set. A patch is also required to force the processor to stay in Thumb mode when 'go'ing to an application. As the STM32F1 differs greatly from STM32F4 in flash and clock layout, there's a separate subdirectory for the STM32F1 family. The gpio and serial drivers are shared as these peripherals are mostly similar with only the pinmux bits being significantly different in the gpio driver. The STM3210E-EVAL board is supported with 1MiB Flash and 96KiB of SRAM on the STM32F103ZGT6, USART1 for console, and four user LEDs. [1] http://lists.denx.de/pipermail/u-boot/2015-March/206640.html Matt Porter (6): image: fix build when CONFIG_NR_DRAM_BANKS is disabled on ARM common/cmd_boot: keep ARM v7M in thumb mode during do_go_exec() ARMv7M: add STM32F1 support gpio: stm32: add stm32f1 support serial: stm32: add stm32f1 support board: add stm3210e-eval board support arch/arm/Kconfig | 5 + arch/arm/cpu/armv7m/Makefile | 1 + arch/arm/cpu/armv7m/stm32f1/Makefile | 14 +++ arch/arm/cpu/armv7m/stm32f1/clock.c | 196 ++++++++++++++++++++++++++++++ arch/arm/cpu/armv7m/stm32f1/flash.c | 180 +++++++++++++++++++++++++++ arch/arm/cpu/armv7m/stm32f1/soc.c | 36 ++++++ arch/arm/cpu/armv7m/stm32f1/timer.c | 121 ++++++++++++++++++ arch/arm/include/asm/arch-stm32f1/gpio.h | 118 ++++++++++++++++++ arch/arm/include/asm/arch-stm32f1/stm32.h | 116 ++++++++++++++++++ arch/arm/lib/Makefile | 1 + arch/arm/lib/cmd_boot.c | 44 +++++++ board/st/stm3210e-eval/Kconfig | 19 +++ board/st/stm3210e-eval/MAINTAINERS | 5 + board/st/stm3210e-eval/Makefile | 14 +++ board/st/stm3210e-eval/stm3210e-eval.c | 86 +++++++++++++ common/image.c | 2 +- configs/stm3210e-eval_defconfig | 3 + drivers/gpio/stm32_gpio.c | 110 ++++++++++++++++- drivers/serial/serial_stm32.c | 10 ++ include/configs/stm3210e-eval.h | 118 ++++++++++++++++++ include/flash.h | 1 + 21 files changed, 1198 insertions(+), 2 deletions(-) create mode 100644 arch/arm/cpu/armv7m/stm32f1/Makefile create mode 100644 arch/arm/cpu/armv7m/stm32f1/clock.c create mode 100644 arch/arm/cpu/armv7m/stm32f1/flash.c create mode 100644 arch/arm/cpu/armv7m/stm32f1/soc.c create mode 100644 arch/arm/cpu/armv7m/stm32f1/timer.c create mode 100644 arch/arm/include/asm/arch-stm32f1/gpio.h create mode 100644 arch/arm/include/asm/arch-stm32f1/stm32.h create mode 100644 arch/arm/lib/cmd_boot.c create mode 100644 board/st/stm3210e-eval/Kconfig create mode 100644 board/st/stm3210e-eval/MAINTAINERS create mode 100644 board/st/stm3210e-eval/Makefile create mode 100644 board/st/stm3210e-eval/stm3210e-eval.c create mode 100644 configs/stm3210e-eval_defconfig create mode 100644 include/configs/stm3210e-eval.h -- 2.1.0

2 10