November 2015 - U-Boot

[U-Boot] [PATCH] Fix sandbox build on Ubuntu 10.04
by Stephen Warren 18 Nov '15

18 Nov '15

gcc 4.4.3 (which is the default native compiler on x86-64 Ubuntu 10.04) doesn't seem to like initializers for sub-fields of anonymous unions. Solve this by replacing the initialization with an assignment. This fixes: lib/lz4_wrapper.c: In function ‘ulz4fn’: lib/lz4_wrapper.c:97: error: unknown field ‘raw’ specified in initializer Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- lib/lz4_wrapper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/lz4_wrapper.c b/lib/lz4_wrapper.c index 0739663fca55..6dc8b764b3f5 100644 --- a/lib/lz4_wrapper.c +++ b/lib/lz4_wrapper.c @@ -94,7 +94,9 @@ int ulz4fn(const void *src, size_t srcn, void *dst, size_t *dstn) } while (1) { - struct lz4_block_header b = { .raw = le32_to_cpu(*(u32 *)in) }; + struct lz4_block_header b; + + b.raw = le32_to_cpu(*(u32 *)in); in += sizeof(struct lz4_block_header); if (in - src + b.size > srcn) { -- 1.9.1

3 5

[U-Boot] [PATCH 0/4] Keymile common changes
by Valentin Longchamp 18 Nov '15

18 Nov '15

This is the last part of the changes for the Keymile boards. This series contains all the changes that are common to all boards and architectures (that's why they are sent as an independant series) and mostly target our environment scripts. Holger Brunck (2): km/common: stop u-boot only if someone press <SPACE> km/scripts: load fdt_bid_kwkey.dtb when working with tftp Tobias Müller (1): km/scripts: search for kernel/DTBs at serverip:/PRODUCTNAME via TFTP in develop mode Valentin Longchamp (1): km: update the boot script to check for a DTB board/keymile/scripts/develop-common.txt | 6 +++--- include/configs/km/keymile-common.h | 9 +++++++-- include/configs/km/km-powerpc.h | 1 + include/configs/km/km_arm.h | 6 ++++++ include/configs/km/kmp204x-common.h | 1 + 5 files changed, 18 insertions(+), 5 deletions(-) -- 1.8.3.1

3 12

[U-Boot] [PATCH 0/4] km_kirkwood: various bugfixes
by Valentin Longchamp 18 Nov '15

18 Nov '15

A few bugfixes have been done for the km_kirkwood bards in the last months and this series collects them all to be sumbitted to mainline. Patch 1/4 was already submitted to mainline in [1] and even marked as accepted but the kirkwood maintainer but it was unfortunately never pushed to mainline, so it is here sent again. [1] http://patchwork.ozlabs.org/patch/399411/ Holger Brunck (1): arm/mgcoge3un: check dip_switch at startup Tobias Müller (1): arm/km: Fix LED configuration for 88E1118R PHY (PIGGY3) Valentin Longchamp (2): arm/km_kirkwood: remove KM_ENV_BUS and use CONFIG_I2C_ENV_EEPROM_BUS arm/km_kirkwood: fix the #ifdef for KM_COGE5UN dip switch board/keymile/km_arm/km_arm.c | 66 ++++++++++++++++++++++++++++++++++++++++--- include/configs/km/km_arm.h | 2 +- include/configs/km_kirkwood.h | 4 --- 3 files changed, 63 insertions(+), 9 deletions(-) -- 1.8.3.1

2 8

[U-Boot] [PATCH v3] board_init: Change the logic to setup malloc_base
by Fabio Estevam 18 Nov '15

18 Nov '15

Prior to commit 5ba534d247d418 ("arm: Switch 32-bit ARM to using generic global_data setup") we used to have assembly code that configured the malloc_base address. Since this commit we use the board_init_f_mem() function in C to setup malloc_base address. In board_init_f_mem() there was a deliberate choice to support only early malloc() or full malloc() in SPL, but not both. Adapt this logic to allow both to be used, one after the other, in SPL. This issue has been observed in a Congatec board, where we need to retrieve the manufacturing information from the SPI NOR (the SPI API calls malloc) prior to configuring the DRAM. In this case as malloc_base was not configured we always see malloc to fail. With this change we are able to use malloc in SPL prior to DRAM gets initialized. Also update the CONFIG_SYS_SPL_MALLOC_START entry in the README file. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Changes since v2: - Combine two patches into one (Albert) README | 3 +++ common/init/board_init.c | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README b/README index ef8d437..92d36e6 100644 --- a/README +++ b/README @@ -3568,6 +3568,9 @@ FIT uImage format: CONFIG_SYS_SPL_MALLOC_START Starting address of the malloc pool used in SPL. + When this option is set the full malloc is used in SPL and + it is set up by spl_init() and before that, the simple malloc() + can be used if CONFIG_SYS_MALLOC_F is defined. CONFIG_SYS_SPL_MALLOC_SIZE The size of the malloc pool used in SPL. diff --git a/common/init/board_init.c b/common/init/board_init.c index e74b63b..1c6126d 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -50,8 +50,7 @@ ulong board_init_f_mem(ulong top) #endif arch_setup_gd(gd_ptr); -#if defined(CONFIG_SYS_MALLOC_F) && \ - (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) +#if defined(CONFIG_SYS_MALLOC_F) top -= CONFIG_SYS_MALLOC_F_LEN; gd->malloc_base = top; #endif -- 1.9.1

3 3

[U-Boot] [PATCH] board/ti/am335x: add support for BeagleBone Green
by Robert Nelson 18 Nov '15

18 Nov '15

SeeedStudio BeagleBone Green (BBG) is clone of the BeagleBone Black (BBB) minus the HDMI port and addition of two Grove connectors (i2c2 and usart2). This board can be identified by the 1A value after A335BNLT (BBB) in the at24 eeprom: 1A: [aa 55 33 ee 41 33 33 35 42 4e 4c 54 1a 00 00 00 |.U3.A335BNLT....|] http://beagleboard.org/green http://www.seeedstudio.com/wiki/Beaglebone_green In Mainline Kernel as of: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=… Patch tested on BeagleBone Black (rev C) and BeagleBone Green (production model) Signed-off-by: Robert Nelson <robertcnelson(a)gmail.com> CC: Tom Rini <trini(a)konsulko.com> CC: Jason Kridner <jkridner(a)gmail.com> --- board/ti/am335x/board.c | 12 +++++++++--- include/configs/am335x_evm.h | 7 ++++++- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index f0cb1e2..f56d17e 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -507,9 +507,15 @@ int board_late_init(void) safe_string[sizeof(header.name)] = 0; setenv("board_name", safe_string); - strncpy(safe_string, (char *)header.version, sizeof(header.version)); - safe_string[sizeof(header.version)] = 0; - setenv("board_rev", safe_string); + /* BeagleBone Green eeprom, board_rev: 0x1a 0x00 0x00 0x00 */ + if ( (header.version[0] == 0x1a) && (header.version[1] == 0x00) && + (header.version[2] == 0x00) && (header.version[3] == 0x00) ) { + setenv("board_rev", "BBG1"); + } else { + strncpy(safe_string, (char *)header.version, sizeof(header.version)); + safe_string[sizeof(header.version)] = 0; + setenv("board_rev", safe_string); + } #endif return 0; diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index d58816d..ed3fd34 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -186,7 +186,12 @@ "if test $board_name = A335BONE; then " \ "setenv fdtfile am335x-bone.dtb; fi; " \ "if test $board_name = A335BNLT; then " \ - "setenv fdtfile am335x-boneblack.dtb; fi; " \ + "if test $board_rev = BBG1; then " \ + "setenv fdtfile am335x-bonegreen.dtb; " \ + "else " \ + "setenv fdtfile am335x-boneblack.dtb; " \ + "fi; " \ + "fi; " \ "if test $board_name = A33515BB; then " \ "setenv fdtfile am335x-evm.dtb; fi; " \ "if test $board_name = A335X_SK; then " \ -- 2.6.2

2 2

[U-Boot] [PATCH] common: add CMD_GPIO to Kconfig
by Thomas Chou 18 Nov '15

18 Nov '15

Add CMD_GPIO to Kconfig. Signed-off-by: Thomas Chou <thomas(a)wytron.com.tw> --- common/Kconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/Kconfig b/common/Kconfig index 2c42b8e..f2034c2 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -344,6 +344,11 @@ config CMD_FPGA help FPGA support. +config CMD_GPIO + bool "gpio" + help + GPIO support. + endmenu -- 2.1.4

4 8

[U-Boot] [PATCH] git-mailrc: Add Bin as a maintainer of x86
by Bin Meng 18 Nov '15

18 Nov '15

This updates git-mailrc to add me as a maintainer of x86. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- doc/git-mailrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index 6fe78a1..5b0af80 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -17,6 +17,7 @@ alias afleming Andy Fleming <afleming(a)gmail.com> alias ag Anatolij Gustschin <agust(a)denx.de> alias alisonwang Alison Wang <alison.wang(a)freescale.com> alias angelo_ts Angelo Dureghello <angelo(a)sysam.it> +alias bmeng Bin Meng <bmeng.cn(a)gmail.com> alias danielschwierzeck Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> alias galak Kumar Gala <galak(a)kernel.crashing.org> alias gruss Graeme Russ <graeme.russ(a)gmail.com> @@ -111,7 +112,7 @@ alias sparc uboot, Daniel Hellstrom <daniel(a)gaisler.com> alias superh uboot, iwamatsu alias sh superh -alias x86 uboot, sjg, gruss +alias x86 uboot, sjg, gruss, bmeng # Subsystem aliases alias dm uboot, sjg -- 1.8.2.1

3 2

[U-Boot] [PATCH] omap3: cm-t3517: add board specific get_board_rev()
by Dmitry Lifshitz 18 Nov '15

18 Nov '15

CM-T3517 has several HW revisions. Add board specific get_board_rev() callback to retrieve revision number. Signed-off-by: Dmitry Lifshitz <lifshitz(a)compulab.co.il> --- board/compulab/cm_t3517/cm_t3517.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/board/compulab/cm_t3517/cm_t3517.c b/board/compulab/cm_t3517/cm_t3517.c index 03b2bad..bf7dec2 100644 --- a/board/compulab/cm_t3517/cm_t3517.c +++ b/board/compulab/cm_t3517/cm_t3517.c @@ -98,6 +98,15 @@ int board_init(void) return 0; } +/* + * Routine: get_board_rev + * Description: read system revision + */ +u32 get_board_rev(void) +{ + return cl_eeprom_get_board_rev(); +}; + int misc_init_r(void) { cl_print_pcb_info(); -- 1.7.5.4

3 4

[U-Boot] [PATCH] Allow fw env tools to be available as library
by Stefano Babic 18 Nov '15

18 Nov '15

Sometimes it can be useful to link the fw_ tools instead of having the fw_setenv/fw_printenv installed. Patch exports the tool as library and allowes to link it with own programs. Signed-off-by: Stefano Babic <sbabic(a)denx.de> CC: Tom Rini <trini(a)konsulko.com> --- tools/env/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/env/Makefile b/tools/env/Makefile index 40164f7..38ad118 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -23,10 +23,12 @@ endif always := fw_printenv hostprogs-y := fw_printenv -fw_printenv-objs := fw_env.o fw_env_main.o \ +lib-y += fw_env.o \ crc32.o ctype.o linux_string.o \ env_attr.o env_flags.o aes.o +fw_printenv-objs := fw_env_main.o $(lib-y) + quiet_cmd_crosstools_strip = STRIP $^ cmd_crosstools_strip = $(STRIP) $^; touch $@ -- 1.9.1

2 2

[U-Boot] [PATCH v1] board: ti: beagle_x15: Reused to support am57xx_evm
by Steve Kipisz 18 Nov '15

18 Nov '15

Rename the beagle_x15 directory to am57xx to support TI EVMs that use the AM57xx processor. By doing this we have common code reuse. There will be multiple TI EVMs that use the same code base. This will cause changes in build procedures for existing beagleboard-x15 users. This is in perparation for follow on patches that will introduce support for follow on TI EVMs. Information about the TI AM57xx EVM can be found here http://www.ti.com/tool/tmdxevm5728 For now, we did turn off CONFIG_DM and CONFIG_DEFAULT_DEVICE_TREE as we are expecting to add additional boards shortly. Signed-off-by: Steve Kipisz <s-kipisz2(a)ti.com> Signed-off-by: Schuyler Patton <spatton(a)ti.com> --- arch/arm/cpu/armv7/omap5/Kconfig | 6 +++--- board/ti/{beagle_x15 => am57xx}/Kconfig | 6 +++--- board/ti/am57xx/MAINTAINERS | 6 ++++++ board/ti/{beagle_x15 => am57xx}/Makefile | 0 board/ti/{beagle_x15 => am57xx}/board.c | 0 board/ti/{beagle_x15 => am57xx}/mux_data.h | 0 board/ti/beagle_x15/MAINTAINERS | 6 ------ configs/am57xx_evm_defconfig | 13 +------------ configs/beagle_x15_defconfig | 8 -------- include/configs/{beagle_x15.h => am57xx_evm.h} | 6 +++--- 10 files changed, 16 insertions(+), 35 deletions(-) rename board/ti/{beagle_x15 => am57xx}/Kconfig (55%) create mode 100644 board/ti/am57xx/MAINTAINERS rename board/ti/{beagle_x15 => am57xx}/Makefile (100%) rename board/ti/{beagle_x15 => am57xx}/board.c (100%) rename board/ti/{beagle_x15 => am57xx}/mux_data.h (100%) delete mode 100644 board/ti/beagle_x15/MAINTAINERS delete mode 100644 configs/beagle_x15_defconfig rename include/configs/{beagle_x15.h => am57xx_evm.h} (96%) diff --git a/arch/arm/cpu/armv7/omap5/Kconfig b/arch/arm/cpu/armv7/omap5/Kconfig index 20c3bd9..7734c50 100644 --- a/arch/arm/cpu/armv7/omap5/Kconfig +++ b/arch/arm/cpu/armv7/omap5/Kconfig @@ -13,8 +13,8 @@ config TARGET_OMAP5_UEVM config TARGET_DRA7XX_EVM bool "TI DRA7XX" -config TARGET_BEAGLE_X15 - bool "BeagleBoard X15" +config TARGET_AM57XX_EVM + bool "TI AM57XX EVM board" endchoice @@ -24,6 +24,6 @@ config SYS_SOC source "board/compulab/cm_t54/Kconfig" source "board/ti/omap5_uevm/Kconfig" source "board/ti/dra7xx/Kconfig" -source "board/ti/beagle_x15/Kconfig" +source "board/ti/am57xx/Kconfig" endif diff --git a/board/ti/beagle_x15/Kconfig b/board/ti/am57xx/Kconfig similarity index 55% rename from board/ti/beagle_x15/Kconfig rename to board/ti/am57xx/Kconfig index a305ff1..0302dad 100644 --- a/board/ti/beagle_x15/Kconfig +++ b/board/ti/am57xx/Kconfig @@ -1,12 +1,12 @@ -if TARGET_BEAGLE_X15 +if TARGET_AM57XX_EVM config SYS_BOARD - default "beagle_x15" + default "am57xx" config SYS_VENDOR default "ti" config SYS_CONFIG_NAME - default "beagle_x15" + default "am57xx_evm" endif diff --git a/board/ti/am57xx/MAINTAINERS b/board/ti/am57xx/MAINTAINERS new file mode 100644 index 0000000..d0bb67a --- /dev/null +++ b/board/ti/am57xx/MAINTAINERS @@ -0,0 +1,6 @@ +AM57XX EVM +M: Felipe Balbi <balbi(a)ti.com> +S: Maintained +F: board/ti/iam57xx_evm/ +F: include/configs/am57xx_evm.h +F: configs/am57xx_evm_defconfig diff --git a/board/ti/beagle_x15/Makefile b/board/ti/am57xx/Makefile similarity index 100% rename from board/ti/beagle_x15/Makefile rename to board/ti/am57xx/Makefile diff --git a/board/ti/beagle_x15/board.c b/board/ti/am57xx/board.c similarity index 100% rename from board/ti/beagle_x15/board.c rename to board/ti/am57xx/board.c diff --git a/board/ti/beagle_x15/mux_data.h b/board/ti/am57xx/mux_data.h similarity index 100% rename from board/ti/beagle_x15/mux_data.h rename to board/ti/am57xx/mux_data.h diff --git a/board/ti/beagle_x15/MAINTAINERS b/board/ti/beagle_x15/MAINTAINERS deleted file mode 100644 index 3f84def..0000000 --- a/board/ti/beagle_x15/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -BEAGLE X15 -M: Felipe Balbi <balbi(a)ti.com> -S: Maintained -F: board/ti/beagle_x15/ -F: include/configs/beagle_x15.h -F: configs/beagle_x15_defconfig diff --git a/configs/am57xx_evm_defconfig b/configs/am57xx_evm_defconfig index f6566bf..7573246 100644 --- a/configs/am57xx_evm_defconfig +++ b/configs/am57xx_evm_defconfig @@ -1,19 +1,8 @@ CONFIG_ARM=y CONFIG_OMAP54XX=y -CONFIG_TARGET_BEAGLE_X15=y -CONFIG_DEFAULT_DEVICE_TREE="am57xx-beagle-x15" +CONFIG_TARGET_AM57XX_EVM=y CONFIG_SPL=y -CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set # CONFIG_CMD_SETEXPR is not set -# CONFIG_CMD_NFS is not set -CONFIG_OF_CONTROL=y -CONFIG_DM=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_BAR=y -CONFIG_DM_GPIO=y -CONFIG_DM_SERIAL=y -CONFIG_DM_MMC=y diff --git a/configs/beagle_x15_defconfig b/configs/beagle_x15_defconfig deleted file mode 100644 index 3b3c027..0000000 --- a/configs/beagle_x15_defconfig +++ /dev/null @@ -1,8 +0,0 @@ -CONFIG_ARM=y -CONFIG_OMAP54XX=y -CONFIG_TARGET_BEAGLE_X15=y -CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="CONS_INDEX=3" -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_FLASH is not set -# CONFIG_CMD_SETEXPR is not set diff --git a/include/configs/beagle_x15.h b/include/configs/am57xx_evm.h similarity index 96% rename from include/configs/beagle_x15.h rename to include/configs/am57xx_evm.h index d38b7b5..6308cab 100644 --- a/include/configs/beagle_x15.h +++ b/include/configs/am57xx_evm.h @@ -9,8 +9,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __CONFIG_BEAGLE_X15_H -#define __CONFIG_BEAGLE_X15_H +#ifndef __CONFIG_AM57XX_EVM_H +#define __CONFIG_AM57XX_EVM_H #define CONFIG_AM57XX @@ -88,4 +88,4 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#endif /* __CONFIG_BEAGLE_X5_H */ +#endif /* __CONFIG_AM57XX_EVM_H */ -- 1.9.1

4 6