August 2015 - U-Boot

[U-Boot] [PATCH v2] omap-common: SYS_BOOT fallback logic correction and support for more devices
by Paul Kocialkowski 28 Aug '15

28 Aug '15

The SYS_BOOT-based fallback shouldn't only check for one of the conditions of use and then let the switch/case handle each boot device without enforcing the conditions for each type of boot device again. For instance, this behaviour would trigger the fallback for UART when BOOT_DEVICE_UART is defined, CONFIG_SPL_YMODEM_SUPPORT is enabled (which should be a show-stopper) and e.g. BOOT_DEVICE_USB is enabled and not CONFIG_SPL_USB_SUPPORT. Separating the logic for USB and UART solves this. In addition, this adds support for more peripheral devices (USBETH and CPGMAC) to the fallback mechanism. Note that the USBETH boot device should always be different from the USB boot device (each should match a different bootrom handoff case). Signed-off-by: Paul Kocialkowski <contact(a)paulk.fr> --- arch/arm/cpu/armv7/omap-common/boot-common.c | 32 +++++++++++++++++++--------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/arch/arm/cpu/armv7/omap-common/boot-common.c b/arch/arm/cpu/armv7/omap-common/boot-common.c index 5ec46fa..8e5d5c9 100644 --- a/arch/arm/cpu/armv7/omap-common/boot-common.c +++ b/arch/arm/cpu/armv7/omap-common/boot-common.c @@ -30,6 +30,7 @@ void save_omap_boot_params(void) { u32 boot_params = *((u32 *)OMAP_SRAM_SCRATCH_BOOT_PARAMS); struct omap_boot_parameters *omap_boot_params; + int sys_boot_device = 0; u32 boot_device; u32 boot_mode; @@ -64,31 +65,42 @@ void save_omap_boot_params(void) if (boot_device == BOOT_DEVICE_QSPI_4) boot_device = BOOT_DEVICE_SPI; #endif -#if (defined(BOOT_DEVICE_UART) && !defined(CONFIG_SPL_YMODEM_SUPPORT)) || \ - (defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_SUPPORT)) || \ - (defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USBETH_SUPPORT)) /* * When booting from peripheral booting, the boot device is not usable * as-is (unless there is support for it), so the boot device is instead * figured out using the SYS_BOOT pins. */ switch (boot_device) { -#ifdef BOOT_DEVICE_UART - case BOOT_DEVICE_UART: +#if defined(BOOT_DEVICE_UART) && !defined(CONFIG_SPL_YMODEM_SUPPORT) + case BOOT_DEVICE_UART: + sys_boot_device = 1; + break; +#endif +#if defined(BOOT_DEVICE_USB) && !defined(CONFIG_SPL_USB_SUPPORT) + case BOOT_DEVICE_USB: + sys_boot_device = 1; + break; #endif -#ifdef BOOT_DEVICE_USB - case BOOT_DEVICE_USB: +#if defined(BOOT_DEVICE_USBETH) && !defined(CONFIG_SPL_USBETH_SUPPORT) + case BOOT_DEVICE_USBETH: + sys_boot_device = 1; + break; +#endif +#if defined(BOOT_DEVICE_CPGMAC) && !defined(CONFIG_SPL_ETH_SUPPORT) + case BOOT_DEVICE_CPGMAC: + sys_boot_device = 1; + break; #endif + } + + if (sys_boot_device) { boot_device = omap_sys_boot_device(); /* MMC raw mode will fallback to FS mode. */ if ((boot_device >= MMC_BOOT_DEVICES_START) && (boot_device <= MMC_BOOT_DEVICES_END)) boot_mode = MMCSD_MODE_RAW; - - break; } -#endif gd->arch.omap_boot_device = boot_device; -- 1.9.1

3 2

[U-Boot] [RESEND PATCH v6] mtd/nand/ubi: assortment of alignment fixes
by Marcel Ziswiler 28 Aug '15

28 Aug '15

From: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> Various U-Boot adoptions/extensions to MTD/NAND/UBI did not take buffer alignment into account which led to failures of the following form: ERROR: v7_dcache_inval_range - start address is not aligned - 0x1f7f0108 ERROR: v7_dcache_inval_range - stop address is not aligned - 0x1f7f1108 Signed-off-by: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> Acked-by: Scott Wood <scottwood(a)freescale.com> --- Changes in v6: fix assembler build breakage caused by including regular header file like malloc.h by wrapping my wrapper in __ASSEMBLY__ Changes in v5: split up into separate patches to be picked up by the various subsystem maintainers as suggested by Marek Changes in v4: move wrapper to common.h as suggested by Scott Changes in v3: introduce malloc_cache_aligned() as suggested by Scott Changes in v2: run it through checkpatch.pl and fix long lines common/cmd_ubi.c | 2 +- drivers/mtd/nand/nand_util.c | 2 +- fs/ubifs/super.c | 5 +++-- fs/ubifs/ubifs.c | 4 ++-- include/common.h | 9 +++++++++ lib/gzip.c | 2 +- 6 files changed, 17 insertions(+), 7 deletions(-) diff --git a/common/cmd_ubi.c b/common/cmd_ubi.c index cbc10c5..10eea65 100644 --- a/common/cmd_ubi.c +++ b/common/cmd_ubi.c @@ -363,7 +363,7 @@ int ubi_volume_read(char *volume, char *buf, size_t size) tbuf_size = vol->usable_leb_size; if (size < tbuf_size) tbuf_size = ALIGN(size, ubi->min_io_size); - tbuf = malloc(tbuf_size); + tbuf = malloc_cache_aligned(tbuf_size); if (!tbuf) { printf("NO MEM\n"); return ENOMEM; diff --git a/drivers/mtd/nand/nand_util.c b/drivers/mtd/nand/nand_util.c index ee2c24d..21b4a61 100644 --- a/drivers/mtd/nand/nand_util.c +++ b/drivers/mtd/nand/nand_util.c @@ -839,7 +839,7 @@ int nand_torture(nand_info_t *nand, loff_t offset) patt_count = ARRAY_SIZE(patterns); - buf = malloc(nand->erasesize); + buf = malloc_cache_aligned(nand->erasesize); if (buf == NULL) { puts("Out of memory for erase block buffer\n"); return -ENOMEM; diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 10f8fff..0bf52db 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c @@ -57,7 +57,8 @@ struct inode *iget_locked(struct super_block *sb, unsigned long ino) { struct inode *inode; - inode = (struct inode *)malloc(sizeof(struct ubifs_inode)); + inode = (struct inode *)malloc_cache_aligned( + sizeof(struct ubifs_inode)); if (inode) { inode->i_ino = ino; inode->i_sb = sb; @@ -104,7 +105,7 @@ void iput(struct inode *inode) /* * Allocate and use new inode */ - ino = (struct inode *)malloc(sizeof(struct ubifs_inode)); + ino = (struct inode *)malloc_cache_aligned(sizeof(struct ubifs_inode)); memcpy(ino, inode, sizeof(struct ubifs_inode)); /* diff --git a/fs/ubifs/ubifs.c b/fs/ubifs/ubifs.c index 6dd6174..4daa7fa 100644 --- a/fs/ubifs/ubifs.c +++ b/fs/ubifs/ubifs.c @@ -108,7 +108,7 @@ static inline struct crypto_comp *crypto_alloc_comp(const char *alg_name, struct crypto_comp *ptr; int i = 0; - ptr = malloc(sizeof(struct crypto_comp)); + ptr = malloc_cache_aligned(sizeof(struct crypto_comp)); while (i < UBIFS_COMPR_TYPES_CNT) { comp = ubifs_compressors[i]; if (!comp) { @@ -723,7 +723,7 @@ static int do_readpage(struct ubifs_info *c, struct inode *inode, * destination area to a multiple of * UBIFS_BLOCK_SIZE. */ - buff = malloc(UBIFS_BLOCK_SIZE); + buff = malloc_cache_aligned(UBIFS_BLOCK_SIZE); if (!buff) { printf("%s: Error, malloc fails!\n", __func__); diff --git a/include/common.h b/include/common.h index c48e5bc..c12f402 100644 --- a/include/common.h +++ b/include/common.h @@ -1060,6 +1060,15 @@ int cpu_release(int nr, int argc, char * const argv[]); #define DEFINE_CACHE_ALIGN_BUFFER(type, name, size) \ DEFINE_ALIGN_BUFFER(type, name, size, ARCH_DMA_MINALIGN) +#ifndef __ASSEMBLY__ +#include <malloc.h> + +static inline void *malloc_cache_aligned(size_t size) +{ + return memalign(ARCH_DMA_MINALIGN, ALIGN(size, ARCH_DMA_MINALIGN)); +} +#endif + /* * check_member() - Check the offset of a structure member * diff --git a/lib/gzip.c b/lib/gzip.c index ff37d4f..cd8e9fe 100644 --- a/lib/gzip.c +++ b/lib/gzip.c @@ -25,7 +25,7 @@ static void *zalloc(void *x, unsigned items, unsigned size) size *= items; size = (size + ZALLOC_ALIGNMENT - 1) & ~(ZALLOC_ALIGNMENT - 1); - p = malloc (size); + p = malloc_cache_aligned(size); return (p); } -- 2.4.3

4 5

[U-Boot] [PATCH] ARM: k2l: Fix device speeds
by Lokesh Vutla 28 Aug '15

28 Aug '15

ARM supported speeds and init value of core_pll for SDP1200 are programmed wrong as part for the device speed cleanups. Fixing it here. Thanks to "Vitaly Andrianov <vitalya(a)ti.com>" for bisecting this issue Fixes: c37ed9f11b61 ("ARM: keystone2: Fix dev and arm speed detection") Tested-by: Vitaly Andrianov <vitalya(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/mach-keystone/include/mach/clock-k2l.h | 4 ++-- board/ti/ks2_evm/board_k2l.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-keystone/include/mach/clock-k2l.h b/arch/arm/mach-keystone/include/mach/clock-k2l.h index 8772a7d..dec1939 100644 --- a/arch/arm/mach-keystone/include/mach/clock-k2l.h +++ b/arch/arm/mach-keystone/include/mach/clock-k2l.h @@ -40,7 +40,7 @@ /* k2l DEV supports 800, 1000, 1200 MHz */ #define DEV_SUPPORTED_SPEEDS 0x383 -/* k2l ARM supportd 800, 1000, 1200, MHz */ -#define ARM_SUPPORTED_SPEEDS 0x383 +/* k2l ARM supportd 800, 1000, 1200, 1350, 1400 MHz */ +#define ARM_SUPPORTED_SPEEDS 0x3ef #endif diff --git a/board/ti/ks2_evm/board_k2l.c b/board/ti/ks2_evm/board_k2l.c index 70e25f1..f35a64f 100644 --- a/board/ti/ks2_evm/board_k2l.c +++ b/board/ti/ks2_evm/board_k2l.c @@ -25,7 +25,7 @@ unsigned int external_clk[ext_clk_count] = { static struct pll_init_data core_pll_config[NUM_SPDS] = { [SPD800] = CORE_PLL_799, [SPD1000] = CORE_PLL_1000, - [SPD800] = CORE_PLL_1198, + [SPD1200] = CORE_PLL_1198, }; s16 divn_val[16] = { -- 2.1.4

2 1

[U-Boot] [PATCH 0/5] ARM: keystone2: Build images by default
by Lokesh Vutla 28 Aug '15

28 Aug '15

Currently we need to build each image(u-boot.uart, u-boot-nand.gph, u-boot-spi.gph) separately for all keystone2 platforms. This series does the following: - Move SP to end of u-boot section so that u-boot.bin can be used as build target for uart boot. - Renames u-boot-nand.gph to MLO so that the same image can be used for NAND and SD boots. - Includes these images in config.mk so that these images are built automatically upon calling make. Now the updated build targets are as below: Uart: u-boot.bin SPI: u-boot-spi.gph NAND: MLO SD: MLO Testing: k2hk-evm: --------- Uart boot: http://pastebin.ubuntu.com/12106278/ SPI boot: http://pastebin.ubuntu.com/12106315/ NAND boot: http://pastebin.ubuntu.com/12106368/ Lokesh Vutla (4): ARM: keystone2: configs: Move SP to end of u-boot section ARM: keystone2: Rename u-boot-nand.gph to MLO ARM: keystone2: Build MLO by default ARM: keystone2: Update README Nishanth Menon (1): ARM: keystone2: move the custom build rules out to keystone specific makefile Makefile | 16 ---------------- arch/arm/mach-keystone/config.mk | 28 ++++++++++++++++++++++++++++ board/ti/ks2_evm/README | 32 ++++++++++++++++++-------------- include/configs/ti_armv7_keystone2.h | 4 ++-- 4 files changed, 48 insertions(+), 32 deletions(-) create mode 100644 arch/arm/mach-keystone/config.mk -- 2.1.4

4 13

[U-Boot] [PATCH 0/1] env_mmc: Properly prefix mmc errors with '!'
by Hans de Goede 28 Aug '15

28 Aug '15

Hi Tom, Just a small cosmetic patch. I'm not sure whom to send this to, so I'm sending it directly to you. Regards, Hans

2 2

[U-Boot] [PATCH] malloc_simple: Correct the alignment logic in memalign_simple()
by Simon Glass 28 Aug '15

28 Aug '15

This should use the align parameter, not bytes. Natural alignment is one use case but should not be the only one supported by this function. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- common/malloc_simple.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/malloc_simple.c b/common/malloc_simple.c index 9811ab6..134e059 100644 --- a/common/malloc_simple.c +++ b/common/malloc_simple.c @@ -31,7 +31,7 @@ void *memalign_simple(size_t align, size_t bytes) ulong addr, new_ptr; void *ptr; - addr = ALIGN(gd->malloc_base + gd->malloc_ptr, bytes); + addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align); new_ptr = addr + bytes; if (new_ptr > gd->malloc_limit) return NULL; -- 2.5.0.276.gf5e568e

2 2

[U-Boot] [PATCH v2] kconfiglib: update to the latest version
by Ulf Magnusson 28 Aug '15

28 Aug '15

Changes to v1: - Based on a newer Kconfiglib version. Fixes a problem with line numbers and continuation lines. - The patch should hopefully apply now. :P Ulf Magnusson (1): kconfiglib: update to the latest version tools/buildman/kconfiglib.py | 4226 +++++++++++++++++++----------------------- 1 file changed, 1940 insertions(+), 2286 deletions(-) -- 2.1.4

2 3

[U-Boot] [PATCH 0/3] ARM: DRA74x: Add support for ES2.0
by Nishanth Menon 28 Aug '15

28 Aug '15

Hi, This series add detection and basic support for DRA74x/DRA75x support, and adds support for dra74x-evm platform. Nishanth Menon (3): ARM: DRA7: Add detection of ES2.0 ARM: DRA74-evm: Add iodelay values for SR2.0 ARM: DRA74-evm: Use SMA_1 spare register to workaround DP83865 phy on SR2.0 arch/arm/cpu/armv7/omap5/hw_data.c | 2 + arch/arm/cpu/armv7/omap5/hwinit.c | 3 ++ arch/arm/cpu/armv7/omap5/prcm-regs.c | 9 ++++ arch/arm/cpu/armv7/omap5/sdram.c | 4 ++ arch/arm/include/asm/arch-omap5/dra7xx_iodelay.h | 4 ++ arch/arm/include/asm/arch-omap5/omap.h | 3 ++ arch/arm/include/asm/omap_common.h | 2 + board/ti/dra7xx/evm.c | 39 ++++++++++++---- board/ti/dra7xx/mux_data.h | 58 +++++++++++++++++++++++- 9 files changed, 113 insertions(+), 11 deletions(-) -- 2.1.4

2 9

[U-Boot] [PATCH v3 1/2] Makefile: Use correct timezone for U_BOOT_TZ
by Chris Packham 28 Aug '15

28 Aug '15

When building with SOURCE_DATE_EPOCH the timezone is in UTC. When building normally the timezone is taken from the build machine's locale setting. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> Tested-by: Bin Meng <bmeng.cn(a)gmail.com> Tested-by: Paul Kocialkowski <contact(a)paulk.fr> --- Changes in v3: - None Changes in v2: - Collect some tested-by tags - Remove reference to f3f431a71272 in the commit message - Drop Ccs that were erroneously added when submitting v1, remaining Ccs are from the original mailing list thread Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ad51e60..3ff063a 100644 --- a/Makefile +++ b/Makefile @@ -1279,10 +1279,16 @@ define filechk_version.h endef define filechk_timestamp.h - (SOURCE_DATE="$${SOURCE_DATE_EPOCH:+@$$SOURCE_DATE_EPOCH}"; \ - LC_ALL=C date -u -d "$${SOURCE_DATE:-now}" +'#define U_BOOT_DATE "%b %d %C%y"'; \ - LC_ALL=C date -u -d "$${SOURCE_DATE:-now}" +'#define U_BOOT_TIME "%T"'; \ - LC_ALL=C date -u -d "$${SOURCE_DATE:-now}" +'#define U_BOOT_TZ "%z"' ) + (if test -n "$${SOURCE_DATE_EPOCH}"; then \ + SOURCE_DATE="@$${SOURCE_DATE_EPOCH}"; \ + LC_ALL=C date -u -d "$${SOURCE_DATE}" +'#define U_BOOT_DATE "%b %d %C%y"'; \ + LC_ALL=C date -u -d "$${SOURCE_DATE}" +'#define U_BOOT_TIME "%T"'; \ + LC_ALL=C date -u -d "$${SOURCE_DATE}" +'#define U_BOOT_TZ "%z"'; \ + else \ + LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"'; \ + LC_ALL=C date +'#define U_BOOT_TIME "%T"'; \ + LC_ALL=C date +'#define U_BOOT_TZ "%z"'; \ + fi) endef $(version_h): include/config/uboot.release FORCE -- 2.5.0.rc0

5 9

[U-Boot] [PATCH 0/2] NDS32: Generic Board Support and Unsupport
by kunhuahuang 28 Aug '15

28 Aug '15

From: Kun-Hua Huang <kunhua(a)andestech.com> I'm one of the Andestech's uboot maintainers. This patch adds NDS32 core's ag101p platform for generic board support. The ag101 and ag102 platform have been deprecated. We decided to remove ag101 and ag102 platform support. Kun-Hua Huang (2): Add nds32 ag101p mainline support. Remove ag101 and ag102 support arch/Kconfig | 2 + arch/nds32/Kconfig | 8 - arch/nds32/cpu/n1213/Makefile | 1 - arch/nds32/cpu/n1213/ag101/lowlevel_init.S | 16 +- arch/nds32/cpu/n1213/ag102/Makefile | 21 -- arch/nds32/cpu/n1213/ag102/cpu.c | 67 ----- arch/nds32/cpu/n1213/ag102/lowlevel_init.S | 307 ---------------------- arch/nds32/cpu/n1213/ag102/timer.c | 191 -------------- arch/nds32/cpu/n1213/ag102/watchdog.S | 33 --- arch/nds32/cpu/n1213/start.S | 7 +- arch/nds32/include/asm/mach-types.h | 28 -- arch/nds32/include/asm/u-boot.h | 1 + arch/nds32/lib/Makefile | 1 - arch/nds32/lib/board.c | 398 ----------------------------- arch/nds32/lib/interrupts.c | 4 + board/AndesTech/adp-ag101/Kconfig | 18 -- board/AndesTech/adp-ag101/MAINTAINERS | 6 - board/AndesTech/adp-ag101/Makefile | 9 - board/AndesTech/adp-ag101/README | 74 ------ board/AndesTech/adp-ag101/adp-ag101.c | 82 ------ board/AndesTech/adp-ag101p/adp-ag101p.c | 1 - board/AndesTech/adp-ag102/Kconfig | 18 -- board/AndesTech/adp-ag102/MAINTAINERS | 6 - board/AndesTech/adp-ag102/Makefile | 8 - board/AndesTech/adp-ag102/adp-ag102.c | 91 ------- common/board_f.c | 8 +- common/board_r.c | 4 +- common/command.c | 2 +- configs/adp-ag101_defconfig | 4 - configs/adp-ag102_defconfig | 6 - doc/{README.ag102 => README.ag101p} | 16 +- include/configs/adp-ag101.h | 384 ---------------------------- include/configs/adp-ag101p.h | 50 +++- include/configs/adp-ag102.h | 334 ------------------------ 34 files changed, 76 insertions(+), 2130 deletions(-) delete mode 100644 arch/nds32/cpu/n1213/ag102/Makefile delete mode 100644 arch/nds32/cpu/n1213/ag102/cpu.c delete mode 100644 arch/nds32/cpu/n1213/ag102/lowlevel_init.S delete mode 100644 arch/nds32/cpu/n1213/ag102/timer.c delete mode 100644 arch/nds32/cpu/n1213/ag102/watchdog.S delete mode 100644 arch/nds32/lib/board.c delete mode 100644 board/AndesTech/adp-ag101/Kconfig delete mode 100644 board/AndesTech/adp-ag101/MAINTAINERS delete mode 100644 board/AndesTech/adp-ag101/Makefile delete mode 100644 board/AndesTech/adp-ag101/README delete mode 100644 board/AndesTech/adp-ag101/adp-ag101.c delete mode 100644 board/AndesTech/adp-ag102/Kconfig delete mode 100644 board/AndesTech/adp-ag102/MAINTAINERS delete mode 100644 board/AndesTech/adp-ag102/Makefile delete mode 100644 board/AndesTech/adp-ag102/adp-ag102.c delete mode 100644 configs/adp-ag101_defconfig delete mode 100644 configs/adp-ag102_defconfig rename doc/{README.ag102 => README.ag101p} (60%) delete mode 100644 include/configs/adp-ag101.h delete mode 100644 include/configs/adp-ag102.h -- 2.3.5

2 4