January 2016 - U-Boot

[U-Boot] [PATCH] net: zynq: Change MDC setup for arm64
by Michal Simek 14 Jan '16

14 Jan '16

MDC setting depends on pclk input clocks which varies across SoC. This driver is used by xilinx zynq and zynqmp SOC. Input clock frequence on silicon is 125MHz where divider 64 put frequency below 2.5MHz requires by spec (125/64=1.95). Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/net/zynq_gem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 7059c8432a34..a9cebccfbb5d 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -56,7 +56,11 @@ DECLARE_GLOBAL_DATA_PTR; #define ZYNQ_GEM_NWCFG_SPEED1000 0x000000400 /* 1Gbps operation */ #define ZYNQ_GEM_NWCFG_FDEN 0x000000002 /* Full Duplex mode */ #define ZYNQ_GEM_NWCFG_FSREM 0x000020000 /* FCS removal */ +#ifdef CONFIG_ARM64 +#define ZYNQ_GEM_NWCFG_MDCCLKDIV 0x000100000 /* Div pclk by 64, max 160MHz */ +#else #define ZYNQ_GEM_NWCFG_MDCCLKDIV 0x0000c0000 /* Div pclk by 48, max 120MHz */ +#endif #ifdef CONFIG_ARM64 # define ZYNQ_GEM_DBUS_WIDTH (1 << 21) /* 64 bit bus */ -- 1.9.1

1 0

[U-Boot] [PATCH 1/3] fpga: xilinx: Check for substring in device ID validation
by Michal Simek 14 Jan '16

14 Jan '16

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Check for substrings in deviceID validation check so that it can support xa bitstreams also. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/fpga/xilinx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/fpga/xilinx.c b/drivers/fpga/xilinx.c index c765a74a25e0..d459a2f7a572 100644 --- a/drivers/fpga/xilinx.c +++ b/drivers/fpga/xilinx.c @@ -75,8 +75,8 @@ int fpga_loadbitstream(int devnum, char *fpgadata, size_t size, buffer[i] = *dataptr++; if (xdesc->name) { - i = strncmp(buffer, xdesc->name, strlen(xdesc->name)); - if (i) { + i = (ulong)strstr(buffer, xdesc->name); + if (!i) { printf("%s: Wrong bitstream ID for this device\n", __func__); printf("%s: Bitstream ID %s, current device ID %d/%s\n", -- 1.9.1

1 2

[U-Boot] [PATCH v2 resend 0/1] cmd_boot: Add a poweroff command
by Hans de Goede 14 Jan '16

14 Jan '16

Hi Tom, This patch is a prereq of the board poweroff patches I've pending for sunxi, since it is a core patch I would prefer for you to merge it directly, rather then "sneak it in" in a sunxi pull-req. This is a resend of v2 of the patch which contains the changes you requested. Regards, Hans

2 2

[U-Boot] [PATCH] common: env_flags: fix loop condition when using env_flags_varaccess_mask
by Peng Fan 14 Jan '16

14 Jan '16

From: Peng Fan <peng.fan(a)nxp.com> We should use ARRAY_SIZE, but not sizeof. The size of env_flags_varaccess_mask is 16bytes, but we only need 4 loops. If using 16 as the end condition, we may access memory that not belong to array env_flags_varaccess_mask. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: York Sun <yorksun(a)freescale.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- common/env_flags.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/env_flags.c b/common/env_flags.c index 7719355..9c3aed1 100644 --- a/common/env_flags.c +++ b/common/env_flags.c @@ -152,7 +152,7 @@ enum env_flags_varaccess env_flags_parse_varaccess_from_binflags(int binflags) { int i; - for (i = 0; i < sizeof(env_flags_varaccess_mask); i++) + for (i = 0; i < ARRAY_SIZE(env_flags_varaccess_mask); i++) if (env_flags_varaccess_mask[i] == (binflags & ENV_FLAGS_VARACCESS_BIN_MASK)) return (enum env_flags_varaccess)i; -- 2.6.2

4 3

[U-Boot] [PATCH V2] common: cli_simple: use strlcpy instead of strcpy
by Peng Fan 14 Jan '16

14 Jan '16

Report Coverity log: Destination buffer too small (STRING_OVERFLOW) string_overflow: You might overrun the 1024 byte destination string lastcommand by writing 1025 bytes from console_buffer Signed-off-by: Peng Fan <van.freenix(a)gmail.com> Cc: Heiko Schocher <hs(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> Cc: Tom Rini <trini(a)konsulko.com> --- Changes V2: Use strlcpy instead of strncpy. common/cli_simple.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/cli_simple.c b/common/cli_simple.c index 9c3d073..bb96aae 100644 --- a/common/cli_simple.c +++ b/common/cli_simple.c @@ -276,7 +276,8 @@ void cli_simple_loop(void) flag = 0; /* assume no special flags for now */ if (len > 0) - strcpy(lastcommand, console_buffer); + strlcpy(lastcommand, console_buffer, + CONFIG_SYS_CBSIZE + 1); else if (len == 0) flag |= CMD_FLAG_REPEAT; #ifdef CONFIG_BOOT_RETRY_TIME -- 2.6.2

3 2

[U-Boot] [PATCH] net: lpc32xx: fix ignored MDIO busy wait status on read
by Vladimir Zapolskiy 14 Jan '16

14 Jan '16

The change fixes PHY write operation, which incorrectly waits for released busy state before issuing a write operation, this breaks sequential write/read operation logic, because read operation starts immediately on request and it completes, when busy state is gone. Instead of adding the second preceding busy state check to read function, do busy state release check after issuing a write operation, this method of operation is also recommended by the LPC32xx User's Manual, see MII Mgmt Indicators Register notes: For PHY Write if scan is not used: 1. Write 0 to MCMD 2. Write PHY address and register address to MADR 3. Write data to MWTD 4. Wait for busy bit to be cleared in MIND Reported-by: Alexandre Messier <amessier(a)tycoint.com> Signed-off-by: Vladimir Zapolskiy <vz(a)mleia.com> Tested-by: Alexandre Messier <amessier(a)tycoint.com> --- The change replaces: https://patchwork.ozlabs.org/patch/557713/ drivers/net/lpc32xx_eth.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/lpc32xx_eth.c b/drivers/net/lpc32xx_eth.c index e76e9bc..3ba5b4b 100644 --- a/drivers/net/lpc32xx_eth.c +++ b/drivers/net/lpc32xx_eth.c @@ -304,6 +304,13 @@ static int mii_reg_write(const char *devname, u8 phy_adr, u8 reg_ofs, u16 data) return -EFAULT; } + /* write the phy and reg addressse into the MII address reg */ + writel((phy_adr << MADR_PHY_OFFSET) | (reg_ofs << MADR_REG_OFFSET), + &regs->madr); + + /* write data to the MII write register */ + writel(data, &regs->mwtd); + /* wait till the MII is not busy */ timeout = MII_TIMEOUT; do { @@ -319,13 +326,6 @@ static int mii_reg_write(const char *devname, u8 phy_adr, u8 reg_ofs, u16 data) return -EFAULT; } - /* write the phy and reg addressse into the MII address reg */ - writel((phy_adr << MADR_PHY_OFFSET) | (reg_ofs << MADR_REG_OFFSET), - &regs->madr); - - /* write data to the MII write register */ - writel(data, &regs->mwtd); - /*debug("%s:(adr %d, off %d) <= %04x\n", __func__, phy_adr, reg_ofs, data);*/ -- 2.1.4

2 1

[U-Boot] [PATCH 1/2] sniper: Various boot-related env settings, devicetree support
by Paul Kocialkowski 14 Jan '16

14 Jan '16

This adds various env settings for more flexible boot possibilities, including devicetree support and distro defaults config. Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- include/configs/sniper.h | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 08046b5..a995415 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -126,21 +126,9 @@ */ #define CONFIG_PARTITION_UUIDS -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION - #define CONFIG_CMD_PART /* - * Filesystems - */ - -#define CONFIG_CMD_FS_GENERIC -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EXT4 -#define CONFIG_CMD_FAT - -/* * SPL */ @@ -257,16 +245,24 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x82000000\0" \ + "loadaddr=0x82000000\0" \ + "fdt_addr_r=0x88000000\0" \ + "fdtaddr=0x88000000\0" \ + "ramdisk_addr_r=0x88080000\0" \ + "pxefile_addr_r=0x80100000\0" \ + "scriptaddr=0x80000000\0" \ + "bootm_size=0x10000000\0" \ "boot_mmc_dev=0\0" \ "kernel_mmc_part=3\0" \ "recovery_mmc_part=4\0" \ + "fdtfile=omap3-sniper.dtb\0" \ + "bootfile=/boot/extlinux/extlinux.conf\0" \ "bootargs=console=ttyO2 vram=5M,0x9FA00000 omapfb.vram=0:5M\0" /* - * ATAGs / Device Tree + * ATAGs */ -#define CONFIG_OF_LIBFDT #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG #define CONFIG_INITRD_TAG @@ -278,7 +274,6 @@ */ #define CONFIG_SYS_LOAD_ADDR 0x82000000 -#define CONFIG_BOOTDELAY 1 #define CONFIG_ANDROID_BOOT_IMAGE @@ -299,5 +294,6 @@ */ #include <config_defaults.h> +#include <config_distro_defaults.h> #endif -- 1.9.1

2 3

[U-Boot] [PATCH] lpc32xx: devkit3250: update board configuration file
by Vladimir Zapolskiy 14 Jan '16

14 Jan '16

The change updates DevKit3250 board powerd by NXP LPC3250 SoC: * due to increased resulting U-boot image size give more space to store loaded and relocated versions, * add DMA support, which is used by NAND SLC driver, * add NXP OHCI and PHY drivers to the image, * add USB, JFFS and FAT commands. Signed-off-by: Vladimir Zapolskiy <vz(a)mleia.com> --- include/configs/devkit3250.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index d89e661..99d9148 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -33,7 +33,7 @@ #define CONFIG_SYS_MALLOC_LEN SZ_1M #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE #define CONFIG_SYS_SDRAM_SIZE SZ_64M -#define CONFIG_SYS_TEXT_BASE 0x83FA0000 +#define CONFIG_SYS_TEXT_BASE 0x83F00000 #define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE + SZ_32K) #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_TEXT_BASE - SZ_1M) @@ -49,6 +49,13 @@ #define CONFIG_BAUDRATE 115200 /* + * DMA + */ +#if !defined(CONFIG_SPL_BUILD) +#define CONFIG_DMA_LPC32XX +#endif + +/* * I2C */ #define CONFIG_SYS_I2C @@ -114,9 +121,19 @@ #define CONFIG_SYS_NAND_PAGE_SIZE NAND_LARGE_BLOCK_PAGE_SIZE #define CONFIG_SYS_NAND_USE_FLASH_BBT +#define CONFIG_CMD_JFFS2 #define CONFIG_CMD_NAND /* + * USB + */ +#define CONFIG_USB_OHCI_LPC32XX +#define CONFIG_USB_ISP1301_I2C_ADDR 0x2d +#define CONFIG_USB_STORAGE +#define CONFIG_CMD_FAT +#define CONFIG_CMD_USB + +/* * U-Boot General Configurations */ #define CONFIG_SYS_LONGHELP -- 2.1.4

2 1

[U-Boot] [PATCH v2 0/3] arm: lpc32xx: use driver model serial console drivers
by Vladimir Zapolskiy 14 Jan '16

14 Jan '16

The changeset switches 14-clock UART driver to DM and enables DM versions of NXP LPC32xx standard (NS16550) and 14-clock UART drivers for both ordinary and SPL U-boot images. The change increases sizes of SPL images from about 10KB to 15KB. Changes from v1 to v2: * included 14-clock UART driver change to DM to the series (v1 1/3), * moved dm/platform_data/lpc32xx_hsuart.h include down in v2 2/3 change * removed ambiguity from a commit message in v2 3/3 change * added CONFIG_SPL_SYS_MALLOC_SIMPLE to defconfigs Vladimir Zapolskiy (3): serial: lpc32xx hsuart: port driver to driver model arm: lpc32xx: switch serial console to driver model arm: lpc32xx: switch SPL builds to driver model arch/arm/cpu/arm926ejs/lpc32xx/devices.c | 37 ++++++++++- arch/arm/include/asm/arch-lpc32xx/config.h | 32 +++------ configs/devkit3250_defconfig | 3 + configs/work_92105_defconfig | 3 + drivers/serial/lpc32xx_hsuart.c | 103 ++++++++++++++++++----------- include/dm/platform_data/lpc32xx_hsuart.h | 18 +++++ 6 files changed, 132 insertions(+), 64 deletions(-) create mode 100644 include/dm/platform_data/lpc32xx_hsuart.h -- 2.1.4

3 7

[U-Boot] [PATCH] test/fs: error case fixes/enhancements
by Stephen Warren 14 Jan '16

14 Jan '16

From: Stephen Warren <swarren(a)nvidia.com> - Use "mkdir -p" to avoid errors when intermediate directories are missing. - Fall back to "dd" when "fallocate" fails. For example, fallocate isn't supported on ext4. - Add error checking for test image generation. Without this, the test simply plows on spewing all kinds of errors which are hard to immediately root-cause. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/fs/fs-test.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/fs/fs-test.sh b/test/fs/fs-test.sh index fc41c04c15e6..043e5d0c0e49 100755 --- a/test/fs/fs-test.sh +++ b/test/fs/fs-test.sh @@ -100,7 +100,7 @@ function compile_sandbox() { # We save time by not deleting and recreating the file system images function prepare_env() { rm -f ${MD5_FILE}.* ${OUT}.* - mkdir ${OUT_DIR} + mkdir -p ${OUT_DIR} } # 1st parameter is the name of the image file to be created @@ -115,11 +115,23 @@ function create_image() { fi if [ ! -f "$1" ]; then fallocate -l 3G "$1" &> /dev/null + if [ $? -ne 0 ]; then + echo fallocate failed - using dd instead + dd if=/dev/zero of=$1 bs=1024 count=$((3 * 1024 * 1024)) + if [ $? -ne 0 ]; then + echo Could not create empty disk image + exit $? + fi + fi mkfs -t "$2" $MKFS_OPTION "$1" &> /dev/null if [ $? -ne 0 -a "$2" = "fat" ]; then # If we fail and we did fat, try vfat. mkfs -t vfat $MKFS_OPTION "$1" &> /dev/null fi + if [ $? -ne 0 ]; then + echo Could not create filesystem + exit $? + fi fi } -- 2.6.4

2 2