November 2016 - U-Boot

[U-Boot] Rockchip RK3288 u-boot with mainline kernel
by Rick Bronson 29 Nov '16

29 Nov '16

Hi All, I've got unsupported RK3288 hardware running the latest git u-boot to SPL as explained in http://git.denx.de/?p=u-boot.git;a=blob;f=doc/README.rockchip. My goal is to run the mainline (ie. not Android) Linux kernel on this hardware and wondered: - Do I need to get the latest git u-boot to run before I can run the mainline kernel? Or can I use github.com/linux-rockchip/u-boot-rockchip.git, which I have running u-boot fully. - The device tree seems to be in two places, once via: resource_tool --image=resource2.img --pack linux/logo.bmp ${DTS}.dtb that gets put into the resource file and then again at the end of the kernel via CONFIG_ARM_APPENDED_DTB. Do I need both? When I do both I get things like: .... Unknow param: MACHINE_MODEL:rk30sdk! Unknow param: MACHINE_ID:007! .... Thanks much for any help. Rick Bronson

3 2

[U-Boot] [PATCH v2 0/8] SF: Cadence QSPI driver fixes and clean up
by Phil Edworthy 29 Nov '16

29 Nov '16

This series has fixes, patches to clean the code up, and add support for specifying the sampling edge. Changed in v2: spi: cadence_qspi: Fix baud rate calculation spi: cadence_qspi: Fix CS timings (was "Fix CQSPI_CAL_DELAY calculation") spi: cadence_qspi: Support specifying the sample edge used Added in v2: spi: cadence_qspi: Better debug information on the SPI clock rate Phil Edworthy (8): spi: cadence_qspi: Fix clearing of pol/pha bits spi: cadence_qspi: Fix baud rate calculation spi: cadence_qspi: Better debug information on the SPI clock rate spi: cadence_qspi: Use #define for bits instead of bit shifts spi: cadence_qspi: Clean up the #define names spi: cadence_qspi: Remove returns from end of void functions spi: cadence_qspi: Fix CS timings spi: cadence_qspi: Support specifying the sample edge used doc/device-tree-bindings/spi/spi-cadence.txt | 2 + drivers/spi/cadence_qspi.c | 13 +- drivers/spi/cadence_qspi.h | 3 +- drivers/spi/cadence_qspi_apb.c | 191 +++++++++++++-------------- 4 files changed, 104 insertions(+), 105 deletions(-) -- 2.7.4

4 32

Re: [U-Boot] [RESEND][PATCH 00/24] sh: add generic board support and fixes
by Vladimir Zapolskiy 29 Nov '16

29 Nov '16

Hi Tom, On 11/28/2016 05:43 PM, Tom Rini wrote: > On Mon, Nov 28, 2016 at 12:15:12AM +0200, Vladimir Zapolskiy wrote: > >> This is a combined series of the fixes to SH2/SH3/SH4/SH4A architecture port >> of U-boot on top of the master branch, there is no functional difference >> between this series and 3 my series sent in August 2016 for 2016.09, however >> due to many positive generalization updates to U-boot sources the old >> unreviewed series can not be cleanly applied anymore: >> >> * [PATCH 0/6] sh4: fix and simplify cache manipulation >> * [PATCH 0/5] sh4: fixes to SH7751 PCI host controller >> * [PATCH] common: sh: add necessary define bits to board_f >> * [PATCH 00/12] sh: change arch and boards code to generic board >> >> I have to resend the changes, because apparently Nobuhiro Iwamatsu is >> too busy to maintain SH port and I ask Tom/Simon/Marek and other active >> U-boot developers to review and apply the changes, it is highly desirable >> to have a possibility to run modern U-boot on boards powered by SH cores. > > First, would you be interested in taking up the SH maintainership? clearly Renesas abandoned SH architecture as a legacy one (and probably as a competing with R-Car one), but until J4 core as a replacement for Renesas SH4 is released by j-core.org project it is desirable to keep U-Boot running on SH platforms. I'm interested in maintainership of SH and thereafter J-Core cores, but practically I have only one SH4 powered board on hand, unfortunately begging for hardware donations was not so successful. At the moment U-Boot contains SH2A/SH3/SH4/SH4A arch support and boards, I have to figure out where to get more boards to cover more SoC flavours, and getting legacy hardware is always a problem, because it is not on a store's shelf. To start from I would recommend to decouple u-boot-sh.git fork into independent SH and ARM R-Car repositories, the latter one will be maintained by Renesas associates. > Second, I know before you told me how to get QEMU to run, but with this > series and: > qemu-system-sh4 -M r2d -kernel r2dplus/current/r2dplus/u-boot.bin > -nographic -serial null -serial vc > > I get: > QEMU 2.5.91 monitor - type 'help' for more information > (qemu) long write to SH7750_WCR1_A7 (0x000000001f800008) ignored > long write to SH7750_WCR2_A7 (0x000000001f80000c) ignored > long write to SH7750_WCR3_A7 (0x000000001f800010) ignored > long write to SH7750_MCR_A7 (0x000000001f800014) ignored > word write to SH7750_RTCNT_A7 (0x000000001f800020) ignored > word write to SH7750_RTCOR_A7 (0x000000001f800024) ignored > Write access to refresh count register > word write to SH7750_RTCSR_A7 (0x000000001f80001c) ignored > Read access to refresh count register, incrementing > long write to SH7750_MCR_A7 (0x000000001f800014) ignored > long read to SH7750_WCR1_A7 (0x000000001f800008) ignored > long read to SH7750_WCR2_A7 (0x000000001f80000c) ignored > long read to SH7750_WCR3_A7 (0x000000001f800010) ignored > long read to SH7750_MCR_A7 (0x000000001f800014) ignored > > and the qemu monitor/debug prompt. The displayed qemu output is expected and can be ignored, currently SH port in qemu is in "odd fixes" maintainership stage, hopefully I'll find time to send a patch to silence this. > Without -serial args I just get the > hang. Any ideas? I ask since I'm keen to add r2dplus to test.py and > travis-ci once it's working, thanks! > I use this list of components to build and test U-Boot on r2dplus qemu target and SH7751 powered board I have on hand (it is quite similar to r2dplus devkit): * SH4 toolchain from buildroot distro with musl (libc flavour most probably is unrelated to U-boot or kernel): - gcc-5.3.0 - musl-1.1.12 - linux-4.4 headers * qemu-system-sh4 is from standard Debian qemu-system-misc package: - qemu-system-misc-1:2.6+dfsg-3 - qemu-2.6.50 vanilla build also works for me fine * U-Boot compilation: % make ARCH=sh CROSS_COMPILE=sh4-buildroot-linux-musl- CC='sh4-buildroot-linux-musl-gcc -Wall' r2dplus_defconfig % make ARCH=sh CROSS_COMPILE=sh4-buildroot-linux-musl- CC='sh4-buildroot-linux-musl-gcc -Wall' u-boot.bin Command to run qemu with output directly to a console is similar to the command you mentioned above (press Ctrl-C to terminate): % qemu-system-sh4 -M r2d -kernel u-boot.bin -monitor null -serial null -serial stdio -nographic This is an example of testing on my end (omitting "long write .. ignored" messages): U-Boot 2016.11-00195-ge01f392eab43 (Nov 29 2016 - 02:55:25 +0200) CPU: SH4 BOARD: Renesas Solutions R2D Plus DRAM: 64 MiB Flash: ERROR: too many flash sectors 8 MiB *** Warning - bad CRC, using default environment PCI: SH7751 PCI host bridge found. long read to SH7750_WCR1_A7 (0x000000001f800008) ignored long read to SH7750_WCR2_A7 (0x000000001f80000c) ignored long read to SH7750_WCR3_A7 (0x000000001f800010) ignored long read to SH7750_MCR_A7 (0x000000001f800014) ignored PCI: Bus Dev VenId DevId Class Int PCI: 00:00.0 - 1054:350e - Bridge device 00:02.0 - 10ec:8139 - Network controller In: serial Out: serial Err: serial Net: RTL8139#0 Error: RTL8139#0 address not set. IDE: Bus 0: not available => bdinfo mem start = 0x8C000000 mem size = 0x04000000 flash start = 0xA0000000 flash size = 0x00800000 flash offset = 0xFFE5D444 ethaddr = (not set) IP addr = <NULL> baudrate = 115200 bps => pci Scanning PCI devices on bus 0 BusDevFun VendorId DeviceId Device Class Sub-Class _____________________________________________________________ 00.00.00 0x1054 0x350e Bridge device 0x00 00.02.00 0x10ec 0x8139 Network controller 0x00 -- With best wishes, Vladimir

2 1

[U-Boot] [PATCH v4 0/3] spl: USB Gadget cleanup
by Stefan Agner 29 Nov '16

29 Nov '16

From: Stefan Agner <stefan.agner(a)toradex.com> This patchset cleans up the SPL USB Gadget Kconfig and Makfile. The first two patches are actual fixes and we might consider to add these two for the v2016.11 release. The third one adds a new config option for cleaner structure. I plan to add another USB function with SPL support which is the reason I looked into this... Build tested using buildman for all boards on powerpc mips and arm. No new errors or warnings: Building 4 commits for 1072 boards (8 threads, 1 job per thread) 4044 0 244 /4288 P1022DS_NAND This patchset is probably most interesting for am335x_evm_usbspl_defconfig (CONFIG_SPL_USBETH_SUPPORT) And the board with which SPL DFU support has been introduced dra7xx_evm_defconfig (CONFIG_SPL_DFU_SUPPORT, not set by default) A follow-up patchset which moves RAM boot support into a separate file is in preparation. -- Stefan Changes in v4: - Use correct config CONFIG_SPL_RAM_DEVICE to descide whether to add BOOT_DEVICE_RAM to linker list. Changes in v3: - Fix depends on SPL_USB_GADGET_SUPPORT and use if statement Changes in v2: - Use CONFIG_SPL_RAM_SUPPORT to descide whether to compile the function in first place. - Leave DWC3 config in top level SPL Makefile (as U-Boot does) Stefan Agner (3): spl: add RAM boot device only if it is actually defined spl: dfu: move DFU Kconfig to SPL Kconfig spl: add USB Gadget config option Kconfig | 27 ------------------ common/spl/Kconfig | 57 ++++++++++++++++++++++++++++++------- common/spl/spl.c | 2 ++ configs/am335x_evm_usbspl_defconfig | 1 + drivers/Makefile | 4 ++- drivers/usb/gadget/Makefile | 9 ++++-- include/configs/dra7xx_evm.h | 1 - scripts/Makefile.spl | 5 +--- 8 files changed, 60 insertions(+), 46 deletions(-) -- 2.10.2

3 7

[U-Boot] [PATCH] README: fix typo FAT_ENV_DEV_AND_PART
by Nicolae Rosia 29 Nov '16

29 Nov '16

From: Nicolae Rosia <Nicolae_Rosia(a)Mentor.com> The actual define symbol is FAT_ENV_DEVICE_AND_PART Signed-off-by: Nicolae Rosia <Nicolae_Rosia(a)Mentor.com> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 00830d7..d6b430a 100644 --- a/README +++ b/README @@ -4115,7 +4115,7 @@ but it can not erase, write this NOR flash by SRIO or PCIE interface. Define this to a string that is the name of the block device. - - FAT_ENV_DEV_AND_PART: + - FAT_ENV_DEVICE_AND_PART: Define this to a string to specify the partition of the device. It can be as following: -- 2.5.5

2 1

[U-Boot] [PATCH] sata: fix sata command can not being executed bug
by yuantian.tang＠nxp.com 29 Nov '16

29 Nov '16

From: Tang Yuantian <Yuantian.Tang(a)nxp.com> Commit d97dc8a0 separated the non-command code into its own file which caused variable sata_curr_device can not be set to a correct value. Before commit d97dc8a0, variable sata_curr_device can be set correctly in sata_initialize(). After commit d97dc8a0, sata_initialize() is moved out to its own file. Accordingly, variable sata_curr_device is removed from sata_initialize() too. This caused sata_curr_device never gets a chance to be set properly which prevent other commands from being executed. This patch sets variable sata_curr_device properly. Fixes: d97dc8a0 (dm: sata: Separate the non-command code into its own file) Signed-off-by: Tang Yuantian <yuantian.tang(a)nxp.com> --- v3: - refine the commit message v2: - refined this patch and updated the commit title and message cmd/sata.c | 9 ++++++--- common/sata.c | 8 +++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/cmd/sata.c b/cmd/sata.c index d18b523..f56622a 100644 --- a/cmd/sata.c +++ b/cmd/sata.c @@ -32,9 +32,12 @@ static int do_sata(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) } /* If the user has not yet run `sata init`, do it now */ - if (sata_curr_device == -1) - if (sata_initialize()) - return 1; + if (sata_curr_device == -1) { + rc = sata_initialize(); + if (rc == -1) + return rc; + sata_curr_device = rc; + } switch (argc) { case 0: diff --git a/common/sata.c b/common/sata.c index 88f08c9..42ff5c7 100644 --- a/common/sata.c +++ b/common/sata.c @@ -51,7 +51,7 @@ static unsigned long sata_bwrite(struct blk_desc *block_dev, lbaint_t start, int __sata_initialize(void) { - int rc; + int rc, ret = -1; int i; for (i = 0; i < CONFIG_SYS_SATA_MAX_DEVICE; i++) { @@ -71,12 +71,14 @@ int __sata_initialize(void) if (!rc) { rc = scan_sata(i); if (!rc && sata_dev_desc[i].lba > 0 && - sata_dev_desc[i].blksz > 0) + sata_dev_desc[i].blksz > 0) { part_init(&sata_dev_desc[i]); + ret = i; + } } } - return rc; + return ret; } int sata_initialize(void) __attribute__((weak, alias("__sata_initialize"))); -- 2.1.0.27.g96db324

3 2

[U-Boot] [PATCH v2] tools/env: fix environment alignment tests for block devices
by Max Krummenacher 29 Nov '16

29 Nov '16

commit 183923d3e412500bdc597d1745e2fb6f7f679ec7 enforces that the environment must start at an erase block boundary. For block devices the sample fw_env.config does not mandate a erase block size for block devices. A missing setting defaults to the full env size. Depending on the environment location the alignment check now errors out for perfectly legal settings. Fix this by defaulting to the standard blocksize of 0x200 for environments stored in a block device. That keeps the fw_env.config files for block devices working even with that new check. Signed-off-by: Max Krummenacher <max.krummenacher(a)toradex.com> --- Changes in v2: - move default value handling from parse_config(), get_config() to check_device_config(), so that !defined(CONFIG_FILE) is covered also. - use DIV_ROUND_UP instead of doing this manually - move the check after the setting of default values in check_device_config(). - use 0 as the marker for default values to be used. tools/env/fw_env.c | 60 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 3dc0d53..862a0b1 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1291,18 +1291,6 @@ static int check_device_config(int dev) struct stat st; int fd, rc = 0; - if (DEVOFFSET(dev) % DEVESIZE(dev) != 0) { - fprintf(stderr, "Environment does not start on (erase) block boundary\n"); - errno = EINVAL; - return -1; - } - - if (ENVSIZE(dev) > ENVSECTORS(dev) * DEVESIZE(dev)) { - fprintf(stderr, "Environment does not fit into available sectors\n"); - errno = EINVAL; - return -1; - } - fd = open(DEVNAME(dev), O_RDONLY); if (fd < 0) { fprintf(stderr, @@ -1335,9 +1323,15 @@ static int check_device_config(int dev) goto err; } DEVTYPE(dev) = mtdinfo.type; + if (DEVESIZE(dev) == 0) + /* Assume the erase size is the same as the env-size */ + DEVESIZE(dev) = ENVSIZE(dev); } else { uint64_t size; DEVTYPE(dev) = MTD_ABSENT; + if (DEVESIZE(dev) == 0) + /* Assume the erase size to be 512 bytes */ + DEVESIZE(dev) = 0x200; /* * Check for negative offsets, treat it as backwards offset @@ -1359,6 +1353,22 @@ static int check_device_config(int dev) } } + if (ENVSECTORS(dev) == 0) + /* Assume enough sectors to cover the environment */ + ENVSECTORS(dev) = DIV_ROUND_UP(ENVSIZE(dev), DEVESIZE(dev)); + + if (DEVOFFSET(dev) % DEVESIZE(dev) != 0) { + fprintf(stderr, "Environment does not start on (erase) block boundary\n"); + errno = EINVAL; + return -1; + } + + if (ENVSIZE(dev) > ENVSECTORS(dev) * DEVESIZE(dev)) { + fprintf(stderr, "Environment does not fit into available sectors\n"); + errno = EINVAL; + return -1; + } + err: close(fd); return rc; @@ -1382,10 +1392,10 @@ static int parse_config(struct env_opts *opts) DEVNAME (0) = DEVICE1_NAME; DEVOFFSET (0) = DEVICE1_OFFSET; ENVSIZE (0) = ENV1_SIZE; - /* Default values are: erase-size=env-size */ - DEVESIZE (0) = ENVSIZE (0); - /* #sectors=env-size/erase-size (rounded up) */ - ENVSECTORS (0) = (ENVSIZE(0) + DEVESIZE(0) - 1) / DEVESIZE(0); + + /* Set defaults for DEVESIZE, ENVSECTORS later once we + * know DEVTYPE + */ #ifdef DEVICE1_ESIZE DEVESIZE (0) = DEVICE1_ESIZE; #endif @@ -1397,10 +1407,10 @@ static int parse_config(struct env_opts *opts) DEVNAME (1) = DEVICE2_NAME; DEVOFFSET (1) = DEVICE2_OFFSET; ENVSIZE (1) = ENV2_SIZE; - /* Default values are: erase-size=env-size */ - DEVESIZE (1) = ENVSIZE (1); - /* #sectors=env-size/erase-size (rounded up) */ - ENVSECTORS (1) = (ENVSIZE(1) + DEVESIZE(1) - 1) / DEVESIZE(1); + + /* Set defaults for DEVESIZE, ENVSECTORS later once we + * know DEVTYPE + */ #ifdef DEVICE2_ESIZE DEVESIZE (1) = DEVICE2_ESIZE; #endif @@ -1466,13 +1476,9 @@ static int get_config (char *fname) DEVNAME(i) = devname; - if (rc < 4) - /* Assume the erase size is the same as the env-size */ - DEVESIZE(i) = ENVSIZE(i); - - if (rc < 5) - /* Assume enough env sectors to cover the environment */ - ENVSECTORS (i) = (ENVSIZE(i) + DEVESIZE(i) - 1) / DEVESIZE(i); + /* Set defaults for DEVESIZE, ENVSECTORS later once we + * know DEVTYPE + */ i++; } -- 2.5.5

3 4

[U-Boot] [PATCH] tools/Makefile: suppress "which swig" error output
by Andre Przywara 29 Nov '16

29 Nov '16

The Makefile in tools/ tries to find the "swig" utility by calling "which". If nothing is found in the path, some versions of which will print an error message: $ make clean which: no swig in (/usr/local/bin:/usr/bin:/bin) This does not apply to all version of "which", though: $ echo $0 bash $ type which which is aliased to `type -path' $ which foo <== this version is OK $ /usr/bin/which foo <== this one is chatty /usr/bin/which: no foo in (/usr/local/bin:/usr/bin:/bin) $ sh <== make uses /bin/sh sh-4.3$ which foo <== no alias here which: no foo in (/usr/local/bin:/usr/bin:/bin) This error message is rather pointless in our case, since we just have this very check to care for this. So add stderr redirection to suppress the message. Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- tools/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 9edb504..5b81dde 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -112,7 +112,7 @@ fit_check_sign-objs := $(dumpimage-mkimage-objs) fit_check_sign.o # Build a libfdt Python module if swig is available # Use 'sudo apt-get install swig libpython-dev' to enable this hostprogs-$(CONFIG_SPL_OF_PLATDATA) += \ - $(if $(shell which swig),_libfdt.so) + $(if $(shell which swig 2> /dev/null),_libfdt.so) _libfdt.so-sharedobjs += $(LIBFDT_OBJS) libfdt: -- 2.8.2

3 2

[U-Boot] [PATCH v2 1/2] keystone2: Move target selection to Kconfig
by Andrew F. Davis 29 Nov '16

29 Nov '16

The config option TARGET_K2x_EVM is set by the k2x defconfigs to pick a board target, but the header configs also set K2x_EVM. This config is redundant, remove it and use TARGET_K2x_EVM everywhere in its place. Signed-off-by: Andrew F. Davis <afd(a)ti.com> Reviewed-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/mach-keystone/Makefile | 4 ++-- board/ti/ks2_evm/Makefile | 34 +++++++++++++++++----------------- include/configs/k2e_evm.h | 1 - include/configs/k2g_evm.h | 1 - include/configs/k2hk_evm.h | 1 - include/configs/k2l_evm.h | 1 - 6 files changed, 19 insertions(+), 23 deletions(-) rewrite board/ti/ks2_evm/Makefile (66%) diff --git a/arch/arm/mach-keystone/Makefile b/arch/arm/mach-keystone/Makefile index b2ffe5b..8253a3b 100644 --- a/arch/arm/mach-keystone/Makefile +++ b/arch/arm/mach-keystone/Makefile @@ -18,5 +18,5 @@ endif obj-y += msmc.o obj-y += ddr3.o obj-y += keystone.o -obj-$(CONFIG_K2E_EVM) += ddr3_spd.o -obj-$(CONFIG_K2HK_EVM) += ddr3_spd.o +obj-$(CONFIG_TARGET_K2E_EVM) += ddr3_spd.o +obj-$(CONFIG_TARGET_K2HK_EVM) += ddr3_spd.o diff --git a/board/ti/ks2_evm/Makefile b/board/ti/ks2_evm/Makefile dissimilarity index 66% index 7ef2d2b..879f8b5 100644 --- a/board/ti/ks2_evm/Makefile +++ b/board/ti/ks2_evm/Makefile @@ -1,17 +1,17 @@ -# -# KS2-EVM: board Makefile -# (C) Copyright 2012-2015 -# Texas Instruments Incorporated, <www.ti.com> -# SPDX-License-Identifier: GPL-2.0+ -# - -obj-y += board.o -obj-$(CONFIG_K2HK_EVM) += board_k2hk.o -obj-$(CONFIG_K2HK_EVM) += ddr3_k2hk.o -obj-$(CONFIG_K2E_EVM) += board_k2e.o -obj-$(CONFIG_K2E_EVM) += ddr3_k2e.o -obj-$(CONFIG_K2L_EVM) += board_k2l.o -obj-$(CONFIG_K2L_EVM) += ddr3_k2l.o -obj-$(CONFIG_K2L_EVM) += ddr3_cfg.o -obj-$(CONFIG_K2G_EVM) += board_k2g.o -obj-$(CONFIG_K2G_EVM) += ddr3_k2g.o +# +# KS2-EVM: board Makefile +# (C) Copyright 2012-2015 +# Texas Instruments Incorporated, <www.ti.com> +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += board.o +obj-$(CONFIG_TARGET_K2HK_EVM) += board_k2hk.o +obj-$(CONFIG_TARGET_K2HK_EVM) += ddr3_k2hk.o +obj-$(CONFIG_TARGET_K2E_EVM) += board_k2e.o +obj-$(CONFIG_TARGET_K2E_EVM) += ddr3_k2e.o +obj-$(CONFIG_TARGET_K2L_EVM) += board_k2l.o +obj-$(CONFIG_TARGET_K2L_EVM) += ddr3_k2l.o +obj-$(CONFIG_TARGET_K2L_EVM) += ddr3_cfg.o +obj-$(CONFIG_TARGET_K2G_EVM) += board_k2g.o +obj-$(CONFIG_TARGET_K2G_EVM) += ddr3_k2g.o diff --git a/include/configs/k2e_evm.h b/include/configs/k2e_evm.h index 7eaab87..2b359d6 100644 --- a/include/configs/k2e_evm.h +++ b/include/configs/k2e_evm.h @@ -12,7 +12,6 @@ /* Platform type */ #define CONFIG_SOC_K2E -#define CONFIG_K2E_EVM /* U-Boot general configuration */ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 71b0037..6cf4ba4 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -12,7 +12,6 @@ /* Platform type */ #define CONFIG_SOC_K2G -#define CONFIG_K2G_EVM /* U-Boot general configuration */ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ diff --git a/include/configs/k2hk_evm.h b/include/configs/k2hk_evm.h index 0256f0e..59ddb4d 100644 --- a/include/configs/k2hk_evm.h +++ b/include/configs/k2hk_evm.h @@ -12,7 +12,6 @@ /* Platform type */ #define CONFIG_SOC_K2HK -#define CONFIG_K2HK_EVM /* U-Boot general configuration */ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ diff --git a/include/configs/k2l_evm.h b/include/configs/k2l_evm.h index 2322ab2..86a55d7 100644 --- a/include/configs/k2l_evm.h +++ b/include/configs/k2l_evm.h @@ -12,7 +12,6 @@ /* Platform type */ #define CONFIG_SOC_K2L -#define CONFIG_K2L_EVM /* U-Boot general configuration */ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ -- 2.10.1

2 4

[U-Boot] [PATCH] linux/compat.h: Properly implement ndelay fallback
by Mario Six 29 Nov '16

29 Nov '16

Commit c68c62 ("i2c: mvtwsi: Make delay times frequency-dependent") extensively used the ndelay function with a calculated parameter which is dependant on the configured frequency of the I2C bus. If standard speed is employed, the parameter is usually 10000 (10000ns period length for 100kHz frequency). But, since the arm architecture does not implement a proper version of ndelay, the fallback default from include/linux/compat.h is used, which defines every ndelay as udelay(1). This causes problems for slower speeds on arm, since the delay time is now 9us too short for the desired frequency, which leads to random failures of the I2C interface. To remedy this, we implement a proper, parameter-aware ndelay fallback for architectures that don't implement a real ndelay function. Reported-By: Jason Brown <Jason.brown(a)apcon.com> To: Tom Rini <trini(a)konsulko.com> To: Heiko Schocher <hs(a)denx.de> Signed-off-by: Mario Six <mario.six(a)gdsys.cc> --- include/linux/compat.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/compat.h b/include/linux/compat.h index c7fd649..533983f 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -15,7 +15,7 @@ struct p_current{ extern struct p_current *current; -#define ndelay(x) udelay(1) +#define ndelay(x) udelay((x) < 1000 ? 1 : (x)/1000) #define dev_dbg(dev, fmt, args...) \ debug(fmt, ##args) -- 2.9.0

2 1