November 2016 - U-Boot

[U-Boot] [PATCH 00/12] Fix GCC 6.2 compiler warnings
by Andre Przywara 05 Dec '16

05 Dec '16

More or less by accident I ran buildman the other day on a box with GCC 6.2.0 cross-compilers. By default it seems that the 6.x series enables more (and new) warnings, so the results were non-clean builds for about two thirds of the armv8 defconfigs. Some of the warnings are cosmectic, but some are genuine bugs (mostly in error handling cases, but still). This is a first bunch of fixes, shamelessly picking the low hanging fruits here. I fixed even the cases where the code itself was correct, to avoid warnings and also not to confuse any readers of the code. Also getting used to ignore warnings leads to eventually missing that one genuine one in the future (been there ...) In a few cases I made a guess on the fix, please feel free to correct me in the (likely) case I got it wrong. Applies on top of v2016.11 release. Cheers, Andre. P.S. Almost every Freescale board build still complains along the lines of [1]. I spent some time in that file (drivers/ddr/fsl/options.c) and narrowly escaped before I lost the remaining bits of my sanity to the daemons of #ifdef hell. If someone more familiar with that code could take a look and decide whether those definitions either belong into some #ifdef clauses or they should be attributed with __maybe_unused. [1] http://pastebin.com/TrLSssqU Andre Przywara (12): ls2080aqds: eth: add missing braces mtd: cfi_flash: fix indentation net: e1000: fix indentation net: ldpaa_eth: add missing braces net: rtl8169: remove unneeded definition marvell: comphy_a3700: fix bitmask usb: eth: r8152_fw: fix indentation davinci: da8xxevm: fix indentation phy: micrel: add missing braces cmd: tpm_test: fix indentation Xilinx ZynqMP: fix minimum SDHCI frequency usb: gadget: remove unused shortname variable board/davinci/da8xxevm/da850evm.c | 4 ++-- board/freescale/ls2080aqds/eth.c | 3 ++- cmd/tpm_test.c | 4 ++-- drivers/mtd/cfi_flash.c | 4 ++-- drivers/net/e1000.c | 5 ++--- drivers/net/ldpaa_eth/ldpaa_eth.c | 3 ++- drivers/net/phy/micrel.c | 3 ++- drivers/net/rtl8169.c | 3 --- drivers/phy/marvell/comphy_a3700.h | 4 ++-- drivers/usb/eth/r8152_fw.c | 8 ++++---- drivers/usb/gadget/ether.c | 1 - include/configs/xilinx_zynqmp_ep.h | 2 +- 12 files changed, 21 insertions(+), 23 deletions(-) -- 2.8.2

11 38

[U-Boot] [PATCH 1/1] rpi: set serial port clock to 48 MHz
by Mirza Krak 04 Dec '16

04 Dec '16

From: Mirza Krak <mirza.krak(a)gmail.com> Recently the default UART clock rate has been changed to 48 MHz on all pi`s in the firmware files, which broke UART support in u-boot. Align configuration to boot firmware. Signed-off-by: Mirza Krak <mirza.krak(a)gmail.com> --- It was changed here https://github.com/raspberrypi/firmware/commit/d0bc6ce8e2ae7850959fed4edb06…. See also https://github.com/raspberrypi/linux/issues/1732. board/raspberrypi/rpi/rpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 1d3a4e0..a8996d7 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -37,7 +37,7 @@ static const struct pl01x_serial_platdata serial_platdata = { .base = 0x20201000, #endif .type = TYPE_PL011, - .clock = 3000000, + .clock = 48000000, }; U_BOOT_DEVICE(bcm2835_serials) = { -- 2.1.4

2 5

[U-Boot] [PATCH v3 0/7] Add FIT loadable custom processing
by Andrew F. Davis 04 Dec '16

04 Dec '16

Hello all, To see the background on this see here[0]. As Simon suggested we are now using a linker list to keep any and all TEE specific code out of common files as, unlike kernel, dtb, and ramdisk TEE images may not be used by needed by all users. The last 5 patches in this series are an example of how one can now add a handler for an image type for their platform. Thanks, Andrew [0] http://lists.denx.de/pipermail/u-boot/2016-November/272614.html Changes from v2: - Moved generic OP-TEE definitions to common location - Check return value from SMC call - Added patch to add OP-TEE node to kernel fdt, this was missing from the last set to complete the working solution Changes from v1: - Added some additional documentation - Last 4 patches are now the compleate working TEE loading solution for our DRA7xx/AM57xx platforms, not just an example Andrew F. Davis (5): image: Add FIT image loadable section custom processing image: Add Trusted Execution Environment image type arm: omap5: Add OPTEE node to fdt board: ti: dra7xx: add FIT image TEE processing board: ti: am57xx: add FIT image TEE processing Harinarayan Bhatta (2): arm: omap5: Add function to make an SMC call on cpu1 arm: omap5: Add TEE loading support arch/arm/include/asm/omap_common.h | 1 + arch/arm/include/asm/omap_sec_common.h | 6 ++ arch/arm/mach-omap2/omap5/Makefile | 1 + arch/arm/mach-omap2/omap5/fdt.c | 35 +++++++- arch/arm/mach-omap2/omap5/sec-fxns.c | 108 +++++++++++++++++++++++++ arch/arm/mach-omap2/omap5/sec_entry_cpu1.S | 123 +++++++++++++++++++++++++++++ board/ti/am57xx/board.c | 7 ++ board/ti/dra7xx/evm.c | 7 ++ common/image.c | 34 ++++++++ doc/uImage.FIT/source_file_format.txt | 4 +- include/image.h | 31 ++++++++ include/tee/optee.h | 30 +++++++ 12 files changed, 385 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-omap2/omap5/sec_entry_cpu1.S create mode 100644 include/tee/optee.h -- 2.10.2

2 16

[U-Boot] [PATCH v2 0/2] davinci: omapl138_lcdk: load DT when doing EMMC boot
by Fabien Parent 04 Dec '16

04 Dec '16

Load the DT when doing EMMC boot. v1 -> v2: * removed the unecessary PATCH 1, 4 and 5. * no change to PATCH 2 and 3. Fabien Parent (2): davinci: omapl138_lcdk: improve readability of boot command davinci: omapl138_lcdk: add DT support for EMMC boot include/configs/omapl138_lcdk.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) -- 2.10.2

2 4

[U-Boot] [PATCH 1/2] cmd: Convert CMD_BOOTMENU
by Tom Rini 04 Dec '16

04 Dec '16

Also convert MENU while we're in here. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- cmd/Kconfig | 6 ++++++ common/Kconfig | 6 ++++++ configs/nokia_rx51_defconfig | 1 + include/config_distro_defaults.h | 1 - include/config_fallbacks.h | 1 - include/configs/hikey.h | 1 - include/configs/ls1043a_common.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/thunderx_88xx.h | 3 --- include/configs/vexpress_aemv8a.h | 2 -- include/configs/xilinx_zynqmp.h | 1 - scripts/config_whitelist.txt | 1 - 12 files changed, 13 insertions(+), 12 deletions(-) diff --git a/cmd/Kconfig b/cmd/Kconfig index b16c6032aa2d..3e69f9cd5a11 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -203,6 +203,12 @@ config CMD_BOOTEFI_HELLO for testing that EFI is working at a basic level, and for bringing up EFI support on a new architecture. +config CMD_BOOTMENU + bool "bootmenu" + select MENU + help + Add an ANSI terminal boot menu command. + config CMD_ELF bool "bootelf, bootvx" default y diff --git a/common/Kconfig b/common/Kconfig index 913d21a9ec58..a04ee1084fed 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -172,6 +172,12 @@ config BOOTDELAY menu "Console" +config MENU + bool + help + This is the library functionality to provide a text-based menu of + choices for the user to make choices with. + config CONSOLE_RECORD bool "Console recording" help diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index ef60fab6e794..210a9b18f475 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -8,6 +8,7 @@ CONFIG_SYS_CONSOLE_IS_IN_ENV=y CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="Nokia RX-51 # " CONFIG_AUTOBOOT_KEYED=y +CONFIG_CMD_BOOTMENU=y # CONFIG_CMD_IMI is not set # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SAVEENV is not set diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index b5efab5c3f9c..2e24b17b84f2 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -25,7 +25,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP -#define CONFIG_MENU #define CONFIG_DOS_PARTITION #define CONFIG_EFI_PARTITION #define CONFIG_ISO_PARTITION diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h index 2ad54b7bf661..380093218b09 100644 --- a/include/config_fallbacks.h +++ b/include/config_fallbacks.h @@ -96,7 +96,6 @@ #ifndef CONFIG_CMDLINE #undef CONFIG_CMDLINE_EDITING #undef CONFIG_SYS_LONGHELP -#undef CONFIG_MENU #endif #endif /* __CONFIG_FALLBACKS_H */ diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 39faf805806e..7a03d0f30a32 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -80,7 +80,6 @@ #define CONFIG_FS_EXT4 /* Command line configuration */ -#define CONFIG_MENU #define CONFIG_CMD_UNZIP #define CONFIG_CMD_ENV diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 7a407aa70a24..9b20c56d7b37 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -145,7 +145,6 @@ /* Command line configuration */ #define CONFIG_CMD_ENV -#define CONFIG_MENU #define CONFIG_CMD_PXE /* MMC */ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 4d5265f5409a..5187d9367f86 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -364,7 +364,6 @@ int rx51_kp_getc(struct stdio_dev *sdev); "run attachboot;" \ "echo" -#define CONFIG_MENU #define CONFIG_MENU_SHOW /* diff --git a/include/configs/thunderx_88xx.h b/include/configs/thunderx_88xx.h index 4387082b263e..a546db2eb486 100644 --- a/include/configs/thunderx_88xx.h +++ b/include/configs/thunderx_88xx.h @@ -49,9 +49,6 @@ #define CONFIG_BAUDRATE 115200 -/* Command line configuration */ -#define CONFIG_MENU - /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTPATH diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 48834c2faeb2..733f01170e72 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -125,8 +125,6 @@ #define CONFIG_PL011_CLOCK 24000000 #endif -/* Command line configuration */ -#define CONFIG_MENU /*#define CONFIG_MENU_SHOW*/ #define CONFIG_CMD_UNZIP #define CONFIG_CMD_PXE diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index cbdef6eafd0c..80ab4e3cc1f6 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -82,7 +82,6 @@ /* PXE */ #define CONFIG_CMD_PXE -#define CONFIG_MENU #if defined(CONFIG_ZYNQ_SDHCI) # define CONFIG_MMC diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d0b5e7f3e4ae..2691bd6f7314 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -3052,7 +3052,6 @@ CONFIG_MEM_HOLE_16M CONFIG_MEM_INIT_VALUE CONFIG_MEM_REMAP CONFIG_MEM_SIZE -CONFIG_MENU CONFIG_MENUKEY CONFIG_MENUPROMPT CONFIG_MENU_SHOW -- 1.9.1

1 3

[U-Boot] [PATCH 0/6] davinci: omapl138_lcdk: add SPL NAND boot support
by Fabien Parent 04 Dec '16

04 Dec '16

The default AIS image generated contains the SPL, but the latter is not able to load u-boot because the NAND configuration is missing. This series adds SPL NAND boot support and results in the AIS image that is generated able to boot from NAND. Fabien Parent (6): NAND: davinci: add support for NAND chips with 16 bits bus davinci: omapl138_lcdk: use correct define for 16 bit NAND chips davinci: omapl138_lcdk: use correct name for CONFIG_SYS_NAND_MASK_CLE davinci: omapl138_lcdk: use correct name for CONFIG_SYS_NAND_MASK_ALE davinci: omapl138_lck: remove obsolete define davinci: omapl138_lcdk: add NAND SPL boot support board/davinci/da8xxevm/README.omapl138-lcdk | 28 ------------------------ configs/omapl138_lcdk_defconfig | 3 +++ drivers/mtd/nand/davinci_nand.c | 3 +++ include/configs/omapl138_lcdk.h | 34 +++++++++++++++++++++++++---- scripts/config_whitelist.txt | 3 --- 5 files changed, 36 insertions(+), 35 deletions(-) delete mode 100644 board/davinci/da8xxevm/README.omapl138-lcdk -- 2.10.2

2 19

[U-Boot] [PATCH v3 0/6] davinci: omapl138_lcdk: fix a few bugs for SPL boot
by Fabien Parent 04 Dec '16

04 Dec '16

This patchset tries to fix the SPL on omapl138_lcdk. With this patchset, the SPL will be able to boot from EMMC/SPI. The NAND support is still broken so the default u-boot.ais image still has a SPL that is unable to load u-boot. Changes v2 .. v3 * Make CONFIG_SYS_DA850_PLL_INIT & CONFIG_SYS_DA850_DDR_INIT to be new Kconfig options. Changes v1 .. v2: * Don't add an AIS config file but instead configure the PLL and DDR in the SPL. This follow what other boards are doing. * Use new kconfig option to support EMMC boot. Fabien Parent (6): ARM: davinci: Move CONFIG_SYS_DA850_PLL_INIT to Kconfig ARM: davinci: Move CONFIG_SYS_DA850_DDR_INIT to Kconfig davinci: omapl138_lcdk: configure pll0 davinci: omapl138_lcdk: configure ddr2 davinci: da850evm: fix empty boot method list in the SPL davinci: omapl138_lcdk: add u-boot sector for mmc/sd boot arch/arm/mach-davinci/Kconfig | 16 ++++++++++ board/davinci/da8xxevm/u-boot-spl-da850evm.lds | 3 ++ configs/omapl138_lcdk_defconfig | 1 + include/configs/calimain.h | 2 -- include/configs/da850evm.h | 2 -- include/configs/ipam390.h | 2 -- include/configs/legoev3.h | 2 -- include/configs/omapl138_lcdk.h | 41 ++++++++++++++++++++++++++ scripts/config_whitelist.txt | 2 -- 9 files changed, 61 insertions(+), 10 deletions(-) -- 2.10.2

2 16

[U-Boot] [PATCH 0/2] ARM: DRA7/AM57xx: Get rid of CONFIG_AM57XX
by Lokesh Vutla 04 Dec '16

04 Dec '16

CONFIG_AM57XX is redundant as DRA7 and AM57xx uses the same SoC type. This series removes this config. Nishanth Menon (2): usb: xhci: Remove assumption of DWC instance based on DRA7 SoC type ARM: DRA7x/AM57xx: Get rid of CONFIG_AM57XX arch/arm/include/asm/arch-omap5/clock.h | 2 +- arch/arm/include/asm/arch-omap5/hardware.h | 2 +- arch/arm/include/asm/arch-omap5/omap.h | 6 +++--- arch/arm/mach-omap2/omap5/boot.c | 2 +- arch/arm/mach-omap2/omap5/hw_data.c | 4 ++-- drivers/mmc/omap_hsmmc.c | 5 ++--- drivers/power/palmas.c | 2 +- drivers/spi/ti_qspi.c | 2 +- drivers/usb/dwc3/ti_usb_phy.c | 4 ++-- include/configs/am57xx_evm.h | 2 +- include/linux/usb/xhci-omap.h | 4 ++-- scripts/config_whitelist.txt | 1 - 12 files changed, 17 insertions(+), 19 deletions(-) -- 2.10.1

2 6

[U-Boot] [PATCH] ARM: K2G: DDR3: Fix up priv ID for MPU
by Lokesh Vutla 04 Dec '16

04 Dec '16

From: Nishanth Menon <nm(a)ti.com> For ECC enabled DDR, we use EDMA to reset all memory values to 0. For K2E/L/H/K the priv ID of 8 was indicative of ARM, but that is not the case for K2G, where it is 1. Unfortunately, ddr3 code had hard coded the privID and had missed identification previously. Fix the same, else unforeseen behavior can be expected in our reset of DDR contents to 0 for ECC enablement. Signed-off-by: Nishanth Menon <nm(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/mach-keystone/ddr3.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-keystone/ddr3.c b/arch/arm/mach-keystone/ddr3.c index 6b92530..ee8e12e 100644 --- a/arch/arm/mach-keystone/ddr3.c +++ b/arch/arm/mach-keystone/ddr3.c @@ -138,7 +138,10 @@ static void ddr3_reset_data(u32 base, u32 ddr3_size) puts("\nClear entire DDR3 memory to enable ECC\n"); /* save the SES MPAX regs */ - msmc_get_ses_mpax(8, 0, mpax); + if (cpu_is_k2g()) + msmc_get_ses_mpax(K2G_MSMC_SEGMENT_ARM, 0, mpax); + else + msmc_get_ses_mpax(K2HKLE_MSMC_SEGMENT_ARM, 0, mpax); /* setup edma slot 1 configuration */ slot.opt = EDMA3_SLOPT_TRANS_COMP_INT_ENB | @@ -169,8 +172,17 @@ static void ddr3_reset_data(u32 base, u32 ddr3_size) for (seg = 0; seg < seg_num; seg += KS2_MSMC_MAP_SEG_NUM) { /* map 2GB 36-bit DDR address to 32-bit DDR address in EMIF access slave interface so that edma driver can access */ - msmc_map_ses_segment(8, 0, base >> KS2_MSMC_SEG_SIZE_SHIFT, - KS2_MSMC_DST_SEG_BASE + seg, MPAX_SEG_2G); + if (cpu_is_k2g()) { + msmc_map_ses_segment(K2G_MSMC_SEGMENT_ARM, 0, + base >> KS2_MSMC_SEG_SIZE_SHIFT, + KS2_MSMC_DST_SEG_BASE + seg, + MPAX_SEG_2G); + } else { + msmc_map_ses_segment(K2HKLE_MSMC_SEGMENT_ARM, 0, + base >> KS2_MSMC_SEG_SIZE_SHIFT, + KS2_MSMC_DST_SEG_BASE + seg, + MPAX_SEG_2G); + } if ((seg_num - seg) > KS2_MSMC_MAP_SEG_NUM) edma_blks = KS2_MSMC_MAP_SEG_NUM << @@ -197,7 +209,10 @@ static void ddr3_reset_data(u32 base, u32 ddr3_size) qedma3_stop(KS2_EDMA0_BASE, &edma_channel); /* restore the SES MPAX regs */ - msmc_set_ses_mpax(8, 0, mpax); + if (cpu_is_k2g()) + msmc_set_ses_mpax(K2G_MSMC_SEGMENT_ARM, 0, mpax); + else + msmc_set_ses_mpax(K2HKLE_MSMC_SEGMENT_ARM, 0, mpax); } static void ddr3_ecc_init_range(u32 base) -- 2.10.1

2 2

[U-Boot] [PATCH 0/5] ti_armv7_common: env: Add support for loading FIT images
by Lokesh Vutla 04 Dec '16

04 Dec '16

This series adds env support for loading FIT images on TI platforms and making it as default on HS platforms. Lokesh Vutla (5): ti_armv7_common: env: Consolidate support for loading images from mmc ti_armv7_common: env: Add support for loading FIT images ARM: DRA7: Make FIT boot as default boot on HS devices ARM: AM57xx: Make FIT boot as default boot on HS devices ARM: AMx3xx: Make FIT boot as default boot on HS devices board/ti/am335x/board.c | 7 +++++++ board/ti/am43xx/board.c | 7 +++++++ board/ti/am57xx/board.c | 8 ++++++++ board/ti/dra7xx/evm.c | 7 +++++++ include/configs/am335x_evm.h | 29 ++++----------------------- include/configs/am43xx_evm.h | 18 ++++------------- include/configs/ti_armv7_common.h | 41 ++++++++++++++++++++++++++++++++++++++- include/configs/ti_omap4_common.h | 12 ++++-------- include/configs/ti_omap5_common.h | 19 ++++-------------- 9 files changed, 85 insertions(+), 63 deletions(-) -- 2.10.1

2 15