May 2017 - U-Boot

[U-Boot] [PATCH] davinci: omapl138_lcdk: drop custom prompt string
by Sekhar Nori 16 May '17

16 May '17

Drop custom command prompt string in favor of default used by U-Boot. This helps in easier automation setup across boards. Signed-off-by: Sekhar Nori <nsekhar(a)ti.com> --- configs/omapl138_lcdk_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/configs/omapl138_lcdk_defconfig b/configs/omapl138_lcdk_defconfig index 7a5a78f4944b..8a0e618d2a14 100644 --- a/configs/omapl138_lcdk_defconfig +++ b/configs/omapl138_lcdk_defconfig @@ -14,7 +14,6 @@ CONFIG_BOARD_EARLY_INIT_F=y CONFIG_SPL=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0xb5 CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="U-Boot > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y -- 2.9.0

2 1

[U-Boot] [PATCH v4] spl: add support to booting with ATF
by Kever Yang 16 May '17

16 May '17

ATF(ARM Trusted Firmware) is used by ARM arch64 SoCs, find more infomation about ATF at: https://github.com/ARM-software/arm-trusted-firmware SPL is considered as BL2 in ATF terminology, it needs to load other parts of ATF binary like BL31, BL32, SCP-BL30, and BL33(U-Boot). And needs to prepare the parameter for BL31 which including entry and image information for all other images. Then the SPL handle PC to BL31 with the parameter, the BL31 will do the rest of work and at last get into U-Boot(BL33). This patch needs work with patches from Andre for SPL support multi binary in FIT. The entry point of bl31 and bl33 are still using hard code because we still can not get them from the FIT image information. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- Changes in v4: - fix description in Kconfig - add debug log before get into ATF BL31 - remove '_t' postfix for structure define Changes in v3: - remove no neccessary Macro definition in header file. - rename some Macro with 'ATF_' prefix. Changes in v2: - Kconfig comment update with Simon's suggestion - including file ordering, - update function comment format, - use 'if' instead of '#ifdef' for bl31_entry - add ATF Kconfig option depend on ARM64 Changes in v1: - license update - split out as separate patch common/spl/Kconfig | 14 ++++ common/spl/Makefile | 1 + common/spl/spl.c | 5 ++ common/spl/spl_atf.c | 97 +++++++++++++++++++++++++++ include/atf_common.h | 183 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/spl.h | 1 + 6 files changed, 301 insertions(+) create mode 100644 common/spl/spl_atf.c create mode 100644 include/atf_common.h diff --git a/common/spl/Kconfig b/common/spl/Kconfig index ea6fbb6..90c3c38 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -688,6 +688,20 @@ config SPL_YMODEM_SUPPORT means of transmitting U-Boot over a serial line for using in SPL, with a checksum to ensure correctness. +config SPL_ATF_SUPPORT + bool "Support ARM Trusted Firmware" + depends on SPL && ARM64 + help + ATF(ARM Trusted Firmware) is a component for ARM arch64 which which + is loaded by SPL(which is considered as BL2 in ATF terminology). + More detail at: https://github.com/ARM-software/arm-trusted-firmware + +config SPL_ATF_TEXT_BASE + depends on SPL_ATF_SUPPORT + hex "ATF BL31 base address" + help + This is the base address in memory for ATF BL31 text and entry point. + config TPL_ENV_SUPPORT bool "Support an environment" depends on TPL diff --git a/common/spl/Makefile b/common/spl/Makefile index 1933cbd..b3b34d6 100644 --- a/common/spl/Makefile +++ b/common/spl/Makefile @@ -20,6 +20,7 @@ endif obj-$(CONFIG_SPL_UBI) += spl_ubi.o obj-$(CONFIG_SPL_NET_SUPPORT) += spl_net.o obj-$(CONFIG_SPL_MMC_SUPPORT) += spl_mmc.o +obj-$(CONFIG_SPL_ATF_SUPPORT) += spl_atf.o obj-$(CONFIG_SPL_USB_SUPPORT) += spl_usb.o obj-$(CONFIG_SPL_FAT_SUPPORT) += spl_fat.o obj-$(CONFIG_SPL_EXT_SUPPORT) += spl_ext.o diff --git a/common/spl/spl.c b/common/spl/spl.c index a3e73b8..97f1163 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -372,6 +372,11 @@ void board_init_r(gd_t *dummy1, ulong dummy2) gd->malloc_ptr / 1024); #endif + if (IS_ENABLED(CONFIG_SPL_ATF_SUPPORT)) { + debug("loaded - jumping to U-Boot via ATF BL31.\n"); + bl31_entry(); + } + debug("loaded - jumping to U-Boot...\n"); spl_board_prepare_for_boot(); jump_to_image_no_args(&spl_image); diff --git a/common/spl/spl_atf.c b/common/spl/spl_atf.c new file mode 100644 index 0000000..6e8f928 --- /dev/null +++ b/common/spl/spl_atf.c @@ -0,0 +1,97 @@ +/* + * Reference to the ARM TF Project, + * plat/arm/common/arm_bl2_setup.c + * Portions copyright (c) 2013-2016, ARM Limited and Contributors. All rights + * reserved. + * Copyright (C) 2016 Rockchip Electronic Co.,Ltd + * Written by Kever Yang <kever.yang(a)rock-chips.com> + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#include <common.h> +#include <atf_common.h> +#include <errno.h> +#include <spl.h> + +static struct bl2_to_bl31_params_mem bl31_params_mem; +static struct bl31_params *bl2_to_bl31_params; + +/** + * bl2_plat_get_bl31_params() - prepare params for bl31. + * + * This function assigns a pointer to the memory that the platform has kept + * aside to pass platform specific and trusted firmware related information + * to BL31. This memory is allocated by allocating memory to + * bl2_to_bl31_params_mem structure which is a superset of all the + * structure whose information is passed to BL31 + * NOTE: This function should be called only once and should be done + * before generating params to BL31 + * + * @return bl31 params structure pointer + */ +struct bl31_params *bl2_plat_get_bl31_params(void) +{ + struct entry_point_info *bl33_ep_info; + + /* + * Initialise the memory for all the arguments that needs to + * be passed to BL31 + */ + memset(&bl31_params_mem, 0, sizeof(struct bl2_to_bl31_params_mem)); + + /* Assign memory for TF related information */ + bl2_to_bl31_params = &bl31_params_mem.bl31_params; + SET_PARAM_HEAD(bl2_to_bl31_params, ATF_PARAM_BL31, ATF_VERSION_1, 0); + + /* Fill BL31 related information */ + SET_PARAM_HEAD(bl2_to_bl31_params->bl31_image_info, + ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0); + + /* Fill BL32 related information if it exists */ +#ifdef BL32_BASE + bl2_to_bl31_params->bl32_ep_info = &bl31_params_mem.bl32_ep_info; + SET_PARAM_HEAD(bl2_to_bl31_params->bl32_ep_info, ATF_PARAM_EP, + ATF_VERSION_1, 0); + bl2_to_bl31_params->bl32_image_info = &bl31_params_mem.bl32_image_info; + SET_PARAM_HEAD(bl2_to_bl31_params->bl32_image_info, + ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0); +#endif /* BL32_BASE */ + + /* Fill BL33 related information */ + bl2_to_bl31_params->bl33_ep_info = &bl31_params_mem.bl33_ep_info; + bl33_ep_info = &bl31_params_mem.bl33_ep_info; + SET_PARAM_HEAD(bl33_ep_info, ATF_PARAM_EP, ATF_VERSION_1, + ATF_EP_NON_SECURE); + + /* BL33 expects to receive the primary CPU MPID (through x0) */ + bl33_ep_info->args.arg0 = 0xffff & read_mpidr(); + bl33_ep_info->pc = CONFIG_SYS_TEXT_BASE; + bl33_ep_info->spsr = SPSR_64(MODE_EL2, MODE_SP_ELX, + DISABLE_ALL_EXECPTIONS); + + bl2_to_bl31_params->bl33_image_info = &bl31_params_mem.bl33_image_info; + SET_PARAM_HEAD(bl2_to_bl31_params->bl33_image_info, + ATF_PARAM_IMAGE_BINARY, ATF_VERSION_1, 0); + + return bl2_to_bl31_params; +} + +void raw_write_daif(unsigned int daif) +{ + __asm__ __volatile__("msr DAIF, %0\n\t" : : "r" (daif) : "memory"); +} + +void bl31_entry(void) +{ + struct bl31_params *bl31_params; + void (*entry)(struct bl31_params *params, void *plat_params) = NULL; + + bl31_params = bl2_plat_get_bl31_params(); + entry = (void *)CONFIG_SPL_ATF_TEXT_BASE; + + raw_write_daif(SPSR_EXCEPTION_MASK); + dcache_disable(); + + entry(bl31_params, NULL); +} diff --git a/include/atf_common.h b/include/atf_common.h new file mode 100644 index 0000000..8c513e7 --- /dev/null +++ b/include/atf_common.h @@ -0,0 +1,183 @@ +/* + * This is from the ARM TF Project, + * Repository: https://github.com/ARM-software/arm-trusted-firmware.git + * File: include/common/bl_common.h + * Portions copyright (c) 2013-2016, ARM Limited and Contributors. All rights + * reserved. + * Copyright (C) 2016-2017 Rockchip Electronic Co.,Ltd + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +#ifndef __BL_COMMON_H__ +#define __BL_COMMON_H__ + +#define ATF_PARAM_EP 0x01 +#define ATF_PARAM_IMAGE_BINARY 0x02 +#define ATF_PARAM_BL31 0x03 + +#define ATF_VERSION_1 0x01 + +#define ATF_EP_SECURE 0x0 +#define ATF_EP_NON_SECURE 0x1 + +#define SET_PARAM_HEAD(_p, _type, _ver, _attr) do { \ + (_p)->h.type = (uint8_t)(_type); \ + (_p)->h.version = (uint8_t)(_ver); \ + (_p)->h.size = (uint16_t)sizeof(*_p); \ + (_p)->h.attr = (uint32_t)(_attr) ; \ + } while (0) + +#define MODE_RW_SHIFT 0x4 +#define MODE_RW_MASK 0x1 +#define MODE_RW_64 0x0 +#define MODE_RW_32 0x1 + +#define MODE_EL_SHIFT 0x2 +#define MODE_EL_MASK 0x3 +#define MODE_EL3 0x3 +#define MODE_EL2 0x2 +#define MODE_EL1 0x1 +#define MODE_EL0 0x0 + +#define MODE_SP_SHIFT 0x0 +#define MODE_SP_MASK 0x1 +#define MODE_SP_EL0 0x0 +#define MODE_SP_ELX 0x1 + +#define SPSR_DAIF_SHIFT 6 +#define SPSR_DAIF_MASK 0x0f + +#define SPSR_64(el, sp, daif) \ + (MODE_RW_64 << MODE_RW_SHIFT | \ + ((el) & MODE_EL_MASK) << MODE_EL_SHIFT | \ + ((sp) & MODE_SP_MASK) << MODE_SP_SHIFT | \ + ((daif) & SPSR_DAIF_MASK) << SPSR_DAIF_SHIFT) + +#define SPSR_FIQ (1 << 6) +#define SPSR_IRQ (1 << 7) +#define SPSR_SERROR (1 << 8) +#define SPSR_DEBUG (1 << 9) +#define SPSR_EXCEPTION_MASK (SPSR_FIQ | SPSR_IRQ | SPSR_SERROR | SPSR_DEBUG) + +#define DAIF_FIQ_BIT (1<<0) +#define DAIF_IRQ_BIT (1<<1) +#define DAIF_ABT_BIT (1<<2) +#define DAIF_DBG_BIT (1<<3) +#define DISABLE_ALL_EXECPTIONS \ + (DAIF_FIQ_BIT | DAIF_IRQ_BIT | DAIF_ABT_BIT | DAIF_DBG_BIT) + +#ifndef __ASSEMBLY__ + +/******************************************************************************* + * Structure used for telling the next BL how much of a particular type of + * memory is available for its use and how much is already used. + ******************************************************************************/ +struct aapcs64_params { + unsigned long arg0; + unsigned long arg1; + unsigned long arg2; + unsigned long arg3; + unsigned long arg4; + unsigned long arg5; + unsigned long arg6; + unsigned long arg7; +}; + +/*************************************************************************** + * This structure provides version information and the size of the + * structure, attributes for the structure it represents + ***************************************************************************/ +struct param_header { + uint8_t type; /* type of the structure */ + uint8_t version; /* version of this structure */ + uint16_t size; /* size of this structure in bytes */ + uint32_t attr; /* attributes: unused bits SBZ */ +}; + +/***************************************************************************** + * This structure represents the superset of information needed while + * switching exception levels. The only two mechanisms to do so are + * ERET & SMC. Security state is indicated using bit zero of header + * attribute + * NOTE: BL1 expects entrypoint followed by spsr at an offset from the start + * of this structure defined by the macro `ENTRY_POINT_INFO_PC_OFFSET` while + * processing SMC to jump to BL31. + *****************************************************************************/ +struct entry_point_info { + struct param_header h; + uintptr_t pc; + uint32_t spsr; + struct aapcs64_params args; +}; + +/***************************************************************************** + * Image info binary provides information from the image loader that + * can be used by the firmware to manage available trusted RAM. + * More advanced firmware image formats can provide additional + * information that enables optimization or greater flexibility in the + * common firmware code + *****************************************************************************/ +struct atf_image_info { + struct param_header h; + uintptr_t image_base; /* physical address of base of image */ + uint32_t image_size; /* bytes read from image file */ +}; + +/***************************************************************************** + * The image descriptor struct definition. + *****************************************************************************/ +struct image_desc { + /* Contains unique image id for the image. */ + unsigned int image_id; + /* + * This member contains Image state information. + * Refer IMAGE_STATE_XXX defined above. + */ + unsigned int state; + uint32_t copied_size; /* image size copied in blocks */ + struct atf_image_info atf_image_info; + struct entry_point_info ep_info; +}; + +/******************************************************************************* + * This structure represents the superset of information that can be passed to + * BL31 e.g. while passing control to it from BL2. The BL32 parameters will be + * populated only if BL2 detects its presence. A pointer to a structure of this + * type should be passed in X0 to BL31's cold boot entrypoint. + * + * Use of this structure and the X0 parameter is not mandatory: the BL31 + * platform code can use other mechanisms to provide the necessary information + * about BL32 and BL33 to the common and SPD code. + * + * BL31 image information is mandatory if this structure is used. If either of + * the optional BL32 and BL33 image information is not provided, this is + * indicated by the respective image_info pointers being zero. + ******************************************************************************/ +struct bl31_params { + struct param_header h; + struct atf_image_info *bl31_image_info; + struct entry_point_info *bl32_ep_info; + struct atf_image_info *bl32_image_info; + struct entry_point_info *bl33_ep_info; + struct atf_image_info *bl33_image_info; +}; + +/******************************************************************************* + * This structure represents the superset of information that is passed to + * BL31, e.g. while passing control to it from BL2, bl31_params + * and other platform specific params + ******************************************************************************/ +struct bl2_to_bl31_params_mem { + struct bl31_params bl31_params; + struct atf_image_info bl31_image_info; + struct atf_image_info bl32_image_info; + struct atf_image_info bl33_image_info; + struct entry_point_info bl33_ep_info; + struct entry_point_info bl32_ep_info; + struct entry_point_info bl31_ep_info; +}; + +#endif /*__ASSEMBLY__*/ + +#endif /* __BL_COMMON_H__ */ diff --git a/include/spl.h b/include/spl.h index 2e5b885..387054d 100644 --- a/include/spl.h +++ b/include/spl.h @@ -268,4 +268,5 @@ int spl_dfu_cmd(int usbctrl, char *dfu_alt_info, char *interface, char *devstr); int spl_mmc_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev); +void bl31_entry(void); #endif -- 1.9.1

4 4

[U-Boot] [PATCH] armv8: minor fix to comment for enabling SMPEN bit
by Dinh Nguyen 16 May '17

16 May '17

The SMPEN bit is located in the cpuectlr_el1 register and not the cpuactlr_el1 register. Adjust the comment accordingly and also fix a spelling error. Signed-off-by: Dinh Nguyen <dinguyen(a)kernel.org> CC: Mingkai Hu <mingkai.hu(a)nxp.com> CC: Gong Qianyu <Qianyu.Gong(a)nxp.com> CC: Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> CC: Hou Zhiqiang <Zhiqiang.Hou(a)nxp.com> CC: York Sun <york.sun(a)nxp.com> CC: Albert Aribaud <albert.u.boot(a)aribaud.net> CC: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/cpu/armv8/start.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index 62d97f7..354468b 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -86,12 +86,12 @@ save_boot_params_ret: 0: /* - * Enalbe SMPEN bit for coherency. + * Enable SMPEN bit for coherency. * This register is not architectural but at the moment * this bit should be set for A53/A57/A72. */ #ifdef CONFIG_ARMV8_SET_SMPEN - mrs x0, S3_1_c15_c2_1 /* cpuactlr_el1 */ + mrs x0, S3_1_c15_c2_1 /* cpuectlr_el1 */ orr x0, x0, #0x40 msr S3_1_c15_c2_1, x0 #endif -- 2.7.4

3 2

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 16 May '17

16 May '17

Hello Tom, please pull from u-boot-i2c.git master The following changes since commit 22f3368e71321db1e0e15dfbf54b052367890ec7: Merge branch 'master' of git://git.denx.de/u-boot-mips (2017-05-13 16:45:35 -0400) are available in the git repository at: git://git.denx.de/u-boot-i2c.git master for you to fetch changes up to ce3b5d69112b1adc878e06586c1bc819414309be: Drop use of CONFIG_I2C_SOFT (2017-05-15 06:19:10 +0200) ---------------------------------------------------------------- Simon Glass (12): i2c: Drop use of CONFIG_I2C_HARD i2c: powerpc: Remove use of CONFIG_HARD_I2C i2c: cm5200: Drop use of CONFIG_I2C_HARD i2c: pdm360ng: Drop use of CONFIG_I2C_HARD i2c: keymile: Drop use of CONFIG_I2C_HARD i2c: mxc_i2c: Drop use of CONFIG_I2C_HARD i2c: omap: Modify code to work without CONFIG_I2C_HARD i2c: Finish dropping use of CONFIG_I2C_HARD i2c: README: Drop CONFIG_SYS_I2C_INIT_MPC5XXX i2c: Drop CONFIG_SYS_I2C_BOARD_LATE_INIT Drop CONFIG_I2CFAST Drop use of CONFIG_I2C_SOFT README | 64 +----------- arch/arm/include/asm/arch-armada100/config.h | 12 --- arch/powerpc/cpu/mpc512x/Makefile | 1 - arch/powerpc/cpu/mpc512x/i2c.c | 386 ----------------------------------------------------------------------- arch/powerpc/cpu/mpc5xxx/Makefile | 1 - arch/powerpc/cpu/mpc5xxx/i2c.c | 456 ------------------------------------------------------------------------------------ arch/powerpc/cpu/mpc8260/Makefile | 2 +- arch/powerpc/cpu/mpc8260/commproc.c | 4 - arch/powerpc/cpu/mpc8260/i2c.c | 741 ----------------------------------------------------------------------------------------------------------------------------------------- arch/powerpc/cpu/mpc8xx/Makefile | 1 - arch/powerpc/cpu/mpc8xx/i2c.c | 672 ---------------------------------------------------------------------------------------------------------------------------- board/alphaproject/ap_sh4a_4a/ap_sh4a_4a.c | 12 +-- board/cm5200/cm5200.c | 36 ++----- board/cm5200/cmd_cm5200.c | 32 +----- board/davedenx/aria/aria.c | 3 - board/esd/mecp5123/mecp5123.c | 12 +-- board/freescale/m52277evb/README | 1 - board/freescale/m53017evb/README | 1 - board/freescale/m5373evb/README | 1 - board/freescale/m54455evb/README | 1 - board/freescale/m547xevb/README | 1 - board/freescale/mpc5121ads/mpc5121ads.c | 21 ---- board/ifm/ac14xx/ac14xx.c | 53 +--------- board/keymile/km82xx/km82xx.c | 5 - board/keymile/km_arm/km_arm.c | 4 - board/pdm360ng/pdm360ng.c | 30 ------ board/renesas/r0p7734/r0p7734.c | 12 +-- board/ti/am335x/board.c | 3 +- board/ti/am43xx/board.c | 3 +- board/tqc/tqm5200/tqm5200.c | 18 +--- cmd/eeprom.c | 2 - common/board_f.c | 4 +- common/board_r.c | 17 ---- common/stdio.c | 5 +- configs/MiniFAP_defconfig | 2 - configs/O2D300_defconfig | 1 - configs/O2DNT2_RAMBOOT_defconfig | 1 - configs/O2DNT2_defconfig | 1 - configs/O2D_defconfig | 1 - configs/O2I_defconfig | 1 - configs/O2MNT_O2M110_defconfig | 1 - configs/O2MNT_O2M112_defconfig | 1 - configs/O2MNT_O2M113_defconfig | 1 - configs/O2MNT_defconfig | 1 - configs/O3DNT_defconfig | 1 - configs/TQM5200S_HIGHBOOT_defconfig | 2 - configs/TQM5200S_defconfig | 2 - configs/TQM5200_B_HIGHBOOT_defconfig | 2 - configs/TQM5200_B_defconfig | 2 - configs/TQM5200_STK100_defconfig | 2 - configs/TQM5200_defconfig | 2 - configs/a4m072_defconfig | 1 - configs/ac14xx_defconfig | 1 - configs/ap_sh4a_4a_defconfig | 1 - configs/apx4devkit_defconfig | 2 - configs/aria_defconfig | 1 - configs/aspenite_defconfig | 1 - configs/cam5200_defconfig | 2 - configs/cam5200_niosflash_defconfig | 2 - configs/charon_defconfig | 1 - configs/cm5200_defconfig | 1 - configs/digsy_mtc_RAMBOOT_defconfig | 2 - configs/digsy_mtc_defconfig | 2 - configs/digsy_mtc_rev5_RAMBOOT_defconfig | 2 - configs/digsy_mtc_rev5_defconfig | 2 - configs/fo300_defconfig | 2 - configs/gplugd_defconfig | 1 - configs/ipek01_defconfig | 2 - configs/m28evk_defconfig | 1 - configs/mecp5123_defconfig | 2 - configs/motionpro_defconfig | 2 - configs/mpc5121ads_defconfig | 2 - configs/mpc5121ads_rev2_defconfig | 2 - configs/pcm030_LOWBOOT_defconfig | 2 - configs/pcm030_defconfig | 2 - configs/pdm360ng_defconfig | 2 - configs/r0p7734_defconfig | 1 - configs/v38b_defconfig | 2 - drivers/i2c/fsl_i2c.c | 9 -- drivers/i2c/fti2c010.c | 9 -- drivers/i2c/mxc_i2c.c | 4 - include/common.h | 10 ++ include/configs/M54418TWR.h | 1 - include/configs/TQM5200.h | 64 +----------- include/configs/a4m072.h | 20 ---- include/configs/ac14xx.h | 18 ---- include/configs/ap_sh4a_4a.h | 14 --- include/configs/apx4devkit.h | 6 -- include/configs/aria.h | 21 ---- include/configs/axs10x.h | 2 +- include/configs/cm5200.h | 12 +-- include/configs/digsy_mtc.h | 31 ------ include/configs/ids8313.h | 1 - include/configs/ipek01.h | 23 ----- include/configs/jupiter.h | 19 ---- include/configs/m28evk.h | 6 -- include/configs/manroland/mpc5200-common.h | 176 +++++++++++++++++++++++++++++++++ include/configs/mecp5123.h | 18 +--- include/configs/motionpro.h | 22 ----- include/configs/mpc5121ads.h | 18 ---- include/configs/mxs.h | 10 -- include/configs/o2dnt-common.h | 22 ----- include/configs/pcm030.h | 31 +----- include/configs/pdm360ng.h | 30 ------ include/configs/r0p7734.h | 14 --- include/configs/s32v234evb.h | 10 -- include/configs/v38b.h | 21 ---- include/i2c.h | 3 - scripts/config_whitelist.txt | 3 - 109 files changed, 220 insertions(+), 3113 deletions(-) delete mode 100644 arch/powerpc/cpu/mpc512x/i2c.c delete mode 100644 arch/powerpc/cpu/mpc5xxx/i2c.c delete mode 100644 arch/powerpc/cpu/mpc8260/i2c.c delete mode 100644 arch/powerpc/cpu/mpc8xx/i2c.c create mode 100644 include/configs/manroland/mpc5200-common.h bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

2 1

Re: [U-Boot] Bug in emmc subsystem
by Arno Steffens 15 May '17

15 May '17

Some news here. With help of Diego I found, that GP partition can be addressed: This works with Zynq> mmc dev 0 4 MMC: block number 0x1 exceeds max(0x0) switch to partitions #4, OK mmc0(part 4) is current device (0 is the user data area, 1 and 2 the first and second boot partitions, 3 the RPMB partition and 4, 5, 6 and 7 the up to four general purpose partitions). Still a potential problem is the message "MMC: block number 0x1 exceeds max(0x0)" After that I can see the capacity: Zynq> mmc info Device: sdhci@e0100000 Manufacturer ID: 13 OEM: 14e Name: Q1J54 Tran Speed: 52000000 Rd Block Len: 512 MMC version 5.0 High Capacity: Yes Capacity: 1.8 GiB Bus Width: 4-bit Erase Group Size: 512 KiB HC WP Group Size: 8 MiB User Capacity: 0 Bytes WRREL Boot Capacity: 2 MiB ENH RPMB Capacity: 512 KiB ENH GP1 Capacity: 1.8 GiB ENH WRREL But even after activating the GP partition a load fails, neither load mmc 0:1 80000000 /bin/busy nor load mmc 0:4 80000000 /bin/busy nor load mmc 0:0 80000000 /bin/busy give anything else back than ** Bad device size - mmc 0 ** And: "mmc info", shows that this command switches back to user mode, as capacity is zero again. Even this seems not ok to me: Zynq> mmc dev 0 4 MMC: block number 0x1 exceeds max(0x0) switch to partitions #4, OK mmc0(part 4) is current device Zynq> mmc dev MMC: block number 0x1 exceeds max(0x0) switch to partitions #0, OK mmc0(part 0) is current device It should just sow the partition, not set it again (without parameter) Best regards Arno > Gesendet: Freitag, 07. April 2017 um 04:07 Uhr > Von: "Jaehoon Chung" <jh80.chung(a)samsung.com> > An: "Arno Steffens" <star(a)gmx.li> > Betreff: Re: [U-Boot] Bug in emmc subsystem > > Hi Arno, > > On 04/07/2017 04:36 AM, Arno Steffens wrote: > > Dear Jeahoon Chung, > > > > I am in office earliest on Monday. > > > > From what I remember there is not much additional debug information to be expected (from the code I have in mind). But I will check this to give you as much support as I can. > > Which files do you want me to enable debug and what command shall I send to create useful information for you? > > If enabled CONFIG_DEBUG, maybe all debug message will be printed. > I want to see the mmc command's debug message. > > Which u-boot version do you use? Well, i can't check in more detail on today. :) > But i think this is not bug..because my all boards are working fine with SD-card and eMMC4.41/4.5/5.0. > > If it's bug in subsystem, maybe i might see the similar thing...but it's just assumption.. > So i need to check whether it's really mmc subsystem bug or not. > > > > > This board is a custom board - most eval boards have SDcard instead of fixed emmc. > > Do you use SD-card? Not eMMC? > > > Is there any trick to get access to the GP partition? > > I couldn't found something about this. > > > > So before converting to GP / pseudoSingleLevelCell-mode (to extend reliablility) I accessed it with > > “if ext4load mmc 0:1 ${addr_ld} /{file_name} … ”, but this doesn’t work anymore - it returns with: ** Bad device size - mmc 0 ** > > > > But maybe I just have to use other command for accessing GP? > > > > Best regards > > Arno > > > > > > Am 06.04.2017 um 14:08 schrieb Jaehoon Chung: > >> Hi, > >> > >> On 04/06/2017 03:55 AM, Arno Steffens wrote: > >>> There seems to be a problem handling emmc with configured GP partition. > >>> > >>> Below the "mmc info". The problem might be that user capacity is calculated/shown as "0". > >>> At least it shows the GP1 partition with correct size - which is not the case for "mmc hwpartition" - it denies its existence ;) > >>> > >>> Can someone help me to fix this? > >> > >> Which board do you use? It seems that the initializing mmc might be failed. > >> After enabling debug option, share the log about mmc. > >> > >> Best Regards, > >> Jaehoon Chung > >> > >>> > >>> Thanks a lot. > >>> - Arno > >>> > >>> > >>>> mmc info > >>> Device: sdhci at e0100000 > >>> Manufacturer ID: 13 > >>> OEM: 14e > >>> Name: Q1J54 > >>> Tran Speed: 52000000 > >>> Rd Block Len: 512 > >>> MMC version 5.0 > >>> High Capacity: Yes > >>> Capacity: 0 Bytes > >>> Bus Width: 4-bit > >>> Erase Group Size: 512 KiB > >>> HC WP Group Size: 8 MiB > >>> User Capacity: 0 Bytes WRREL > >>> Boot Capacity: 2 MiB ENH > >>> RPMB Capacity: 512 KiB ENH > >>> GP1 Capacity: 1.8 GiB ENH WRREL > >>> > >>>> mmc hwpartition > >>> Partition configuration: > >>> No enhanced user data area > >>> No GP1 partition > >>> No GP2 partition > >>> No GP3 partition > >>> No GP4 partition > >>> Card already partitioned > >>> Failed! > >>> > >>>> mmc read 0 0 1 > >>> MMC read: dev # 0, block # 0, count 1 ... MMC: block number 0x1 exceeds > >>> max(0x0) > >>> 0 blocks read: ERROR > >>> > >>>> mmc dev 0 0 > >>> MMC: block number 0x1 exceeds max(0x0) > >>> switch to partitions #0, OK > >>> mmc0(part 0) is current device > >>> > >>> BTW: > >>> The GP partiton was created in Linux by the mmc-utils with > >>> “mmc gp create -y 1908736 1 1 0 /dev/mmcblk0” > >>> > >>> Linux can handle this as you can see in boot message: > >>> [ 1.248426] mmc0: new high speed MMC card at address 0001 > >>> [ 1.264301] mmcblk0: mmc0:0001 Q1J54A 0 B > >>> [ 1.268525] mmcblk0boot0: mmc0:0001 Q1J54A partition 1 2.00 MiB > >>> [ 1.284605] mmcblk0boot1: mmc0:0001 Q1J54A partition 2 2.00 MiB > >>> [ 1.300666] mmcblk0gp0: mmc0:0001 Q1J54A partition 4 1.82 GiB > >>> [ 1.316563] mmcblk0rpmb: mmc0:0001 Q1J54A partition 3 512 KiB > >>> [ 1.325255] mmcblk0gp0: p1 p2 p3 > >>> … > >>> [ 3.083325] EXT4-fs (mmcblk0gp0p1): INFO: recovery required on readonly filesystem > >>> [ 3.090893] EXT4-fs (mmcblk0gp0p1): write access will be enabled during recovery > >>> [ 3.189597] EXT4-fs (mmcblk0gp0p1): recovery complete > >>> [ 3.196310] EXT4-fs (mmcblk0gp0p1): mounted filesystem with ordered data mode. Opts: (null) > >>> _______________________________________________

2 1

[U-Boot] [PATCH 0/3] sunxi: video: Add support for TV (composite) output on H3/H5
by Jernej Skrabec 15 May '17

15 May '17

This series implements support for composite output. Driver is implemented using DM video framework and heavily reuse code written for older SoCs. Additionally, driver also implements plug detection. Patch 1 splits out code used for composite output from video driver for older SoCs. Patch 2 adds needed changes in clock driver. Patch 3 adds new driver for composite output. Everything was tested on H3 (OrangePi 2) and H5 (OrangePi PC2) board. Since this series changes video driver for old SoCs, I would kindly ask that someone tests if everything still works as expected. Last but not least - driver should work as-is, but to work reliably, following patch must also be applied: https://patchwork.ozlabs.org/patch/756736/ Best regards, Jernej Jernej Skrabec (3): sunxi: video: Split out TVE code sunxi: Add clock support for TV encoder sunxi: video: Add H3/H5 TV out driver arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 8 +- arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 10 ++ arch/arm/include/asm/arch-sunxi/display.h | 107 ------------------ arch/arm/include/asm/arch-sunxi/display2.h | 17 +++ arch/arm/include/asm/arch-sunxi/tve.h | 144 ++++++++++++++++++++++++ drivers/video/sunxi/Makefile | 4 +- drivers/video/sunxi/sunxi_de2.c | 60 ++++++++-- drivers/video/sunxi/sunxi_display.c | 73 ++---------- drivers/video/sunxi/sunxi_tve.c | 156 ++++++++++++++++++++++++++ drivers/video/sunxi/tve.c | 88 +++++++++++++++ 10 files changed, 484 insertions(+), 183 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/tve.h create mode 100644 drivers/video/sunxi/sunxi_tve.c create mode 100644 drivers/video/sunxi/tve.c -- 2.12.2

7 19

[U-Boot] [PATCH v3 0/8] rockchip: video: rk3399: enable HDMI output
by Philipp Tomsich 15 May '17

15 May '17

This series provides HDMI enablement for the RK3399 and will support video console on the RK3399 either with VOP-lit or VOP-big: - pinctrl and clk support for the hdmi node - a refactoring of rk_vop.c and rk_hdmi.c to allow for the minor differences between the RK3288 and RK3399 VOP and HDMI blocks With this version, it has been rebased to Simon's next branch and requires the (recently submitted) fix for the RK8xx power manager driver to work reliably. This has been tested using 'bmp display' and 'setenv stdout vidconsole' on the RK3399-Q7 with various HDMI monitors, both for VOP-lit and VOP-big (setting the other one to 'disabled'). Changes in v3: - splits the VOP driver into SOC-specific and common portions - moves the "maximum x" and "maximum y" resolution config into Kconfig (instead of having hard-coded values that may need to be revised each time someone adds a new device or new features) - split into separate drivers for the SOC-specific portion of the driver - rebase to sjg/next - enable both hdmi and vopb (as both VOPs are now disabled by default) - enable RK8XX support instead to RK808 support (rebased to sjg/next) Changes in v2: - renamed to CONFIG_DW_HDMI (from CONFIG_DESIGNWARE_HDMI) for consistency with naming in the MMC and USB subsystems - removed DEBUG from the patch (as was done in our production branches, but missing from the patch-prep branch) - updated SJG's comment (with a TODO for the RK3288) to reflect the new code structure - rebase to master after CMD_BMP was migrated to Kconfig - don't device CONFIG_BMP_24BPP twice in config_whitelist (apparently there had been both the _24BPP and the _24BMP whitelisted before and I didn't even spot it ... thanks go to Simon for catching this) - enable SYS_WHITE_ON_BLACK via defconfig - enable CMD_BMP in the puma-rk3399_defconfig (following a rebase to the upstream master after CMD_BMP was migrate to Kconfig) Philipp Tomsich (8): rockchip: video: introduce CONFIG_DW_HDMI and select for Rockchip HDMI rockchip: video: rk3399: enable HDMI output (from the rk_vop) for the RK3399 rockchip: video: rk3399: add HDMI TX support on the RK3399 rockchip: dts: rk3399: enable HDMI output in the DTS video: bmp: rename CONFIG_BMP_24BMP to CONFIG_BMP_24BPP rockchip: board: puma_rk3399: enable BMP_16BPP, BMP_24BPP and BMP_32BPP rockchip: defconfig: puma-rk3399: enable RK808 support rockchip: defconfig: puma-rk3399: update defconfig with video-support arch/arm/dts/rk3399-puma.dts | 9 ++ arch/arm/dts/rk3399.dtsi | 39 +++++ arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 3 + arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 ++ common/lcd.c | 4 +- configs/puma-rk3399_defconfig | 12 ++ drivers/video/Kconfig | 9 ++ drivers/video/Makefile | 1 + drivers/video/rockchip/Kconfig | 30 +++- drivers/video/rockchip/Makefile | 6 +- drivers/video/rockchip/rk3288_hdmi.c | 116 +++++++++++++++ drivers/video/rockchip/rk3288_vop.c | 95 ++++++++++++ drivers/video/rockchip/rk3399_hdmi.c | 81 +++++++++++ drivers/video/rockchip/rk3399_vop.c | 105 ++++++++++++++ drivers/video/rockchip/rk_hdmi.c | 114 ++++----------- drivers/video/rockchip/rk_hdmi.h | 32 ++++ drivers/video/rockchip/rk_vop.c | 185 ++++++++++++------------ drivers/video/rockchip/rk_vop.h | 32 ++++ drivers/video/video_bmp.c | 4 +- include/configs/brxre1.h | 2 +- include/configs/puma_rk3399.h | 4 +- scripts/config_whitelist.txt | 1 - 22 files changed, 698 insertions(+), 197 deletions(-) create mode 100644 drivers/video/rockchip/rk3288_hdmi.c create mode 100644 drivers/video/rockchip/rk3288_vop.c create mode 100644 drivers/video/rockchip/rk3399_hdmi.c create mode 100644 drivers/video/rockchip/rk3399_vop.c create mode 100644 drivers/video/rockchip/rk_hdmi.h create mode 100644 drivers/video/rockchip/rk_vop.h -- 1.9.1

4 17

[U-Boot] [PATCH 0/3] video: Fix issues with edid parsing
by Jernej Skrabec 15 May '17

15 May '17

This series fixes some issues with edid parsing, which prevents some board/monitors combinations to work properly. Those issues were mainly found by using sunxi board (OrangePi 2) and DVI screen (Waveshare 10 inch, 1024x600). However, improvements should help other platforms too. Patch 1 initializes and sets flags in timing info. Patch 2 adds support for distinguishing HDMI and DVI monitor based on edid data. Patch 3 use newly added flag in dw_hdmi driver to properly select DVI or HDMI mode. Best regards, Jernej Jernej Skrabec (3): edid: Set timings flags according to edid edid: Add HDMI flag to timing info video: dw_hdmi: Select HDMI mode only if monitor supports it common/edid.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ drivers/video/dw_hdmi.c | 31 ++++++++++++++------------- include/edid.h | 14 +++++++++++++ include/fdtdec.h | 1 + 4 files changed, 87 insertions(+), 15 deletions(-) -- 2.12.2

3 9

[U-Boot] [PATCH v4 00/11] Add mipi dsi display support for rockchip soc.
by Eric Gao 15 May '17

15 May '17

Add mipi dsi display support for rockchip soc. Changes in v4: -Clear irrelevant change -Clear irrelevant change. -Move this patch to an early stage. Changes in v3: -Split GRF changes as a single patch -Split mipi dsi driver file and header as a single patch. -Split Makefile changes to a single patch. -Split Kconfig changes to a single patch. -Improve indentation relationship -Add more description in the commit message -Add ret value in debug message. Changes in v2: -Fix rk_display_init() function report error(err:-19). -Add mipi display mode for vop. -Add compatible items for rk3399 vop. -Change the bitwidth for different display mode. -Extend frame buffer size for mipi display -Add pwm0 pinctrl init for lcd backlight. -Add dts config for mipi display. -Add defconfigs for mipi display, so that it can be enabled by default. Eric Gao (11): rockchip: include: grf: Add GRF register declaration for mipi dsi rockchip: video: Add mipi driver for rockchip soc rockchip: video: Makefile: Add mipi driver addition. rockchip: video: Kconfig: Add mipi driver addition. rockchip: video: vop: Fix rk_display_init() return error rockchip: video: vop: Add mipi display mode for rk3399 rockchip: video: vop: Set different bitwidth for different display mode rockchip: video: vop: Reserve enough space for mipi dispaly rockchip: board: evb_rk3399: initialize pwm0 for dispaly backlight rockchip: dts: Add mipi dsi support for rk3399 rockchip: configs: Enable mipi dsi for rk3399 arch/arm/dts/rk3399-evb.dts | 84 ++++ arch/arm/dts/rk3399.dtsi | 72 +++ arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 23 + .../include/asm/arch-rockchip/rockchip_mipi_dsi.h | 195 ++++++++ arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 1 + board/rockchip/evb_rk3399/evb-rk3399.c | 7 + configs/evb-rk3399_defconfig | 6 + drivers/video/rockchip/Kconfig | 8 +- drivers/video/rockchip/Makefile | 1 + drivers/video/rockchip/rk_mipi.c | 491 +++++++++++++++++++++ drivers/video/rockchip/rk_vop.c | 38 +- 11 files changed, 916 insertions(+), 10 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/rockchip_mipi_dsi.h create mode 100644 drivers/video/rockchip/rk_mipi.c -- 1.9.1

5 26

[U-Boot] [PATCH] mx6cuboxi: Add support for sata
by Peter Robinson 15 May '17

15 May '17

The Cubox-i and Hummingboard series of devices have an option of SATA on board, and depending on how the fuses are blown even the option to boot SPL from SATA. So enable support for it so it can be used to boot the OS from if people desire. Signed-off-by: Peter Robinson <pbrobinson(a)gmail.com> --- board/solidrun/mx6cuboxi/mx6cuboxi.c | 7 +++++++ include/configs/mx6cuboxi.h | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/board/solidrun/mx6cuboxi/mx6cuboxi.c b/board/solidrun/mx6cuboxi/mx6cuboxi.c index 285588d..4d8bc80 100644 --- a/board/solidrun/mx6cuboxi/mx6cuboxi.c +++ b/board/solidrun/mx6cuboxi/mx6cuboxi.c @@ -22,6 +22,7 @@ #include <linux/errno.h> #include <asm/gpio.h> #include <asm/imx-common/iomux-v3.h> +#include <asm/imx-common/sata.h> #include <asm/imx-common/video.h> #include <mmc.h> #include <fsl_esdhc.h> @@ -314,6 +315,12 @@ int board_early_init_f(void) ret = setup_display(); #endif +#ifdef CONFIG_CMD_SATA + /* Only mx6q/mx6q has SATA */ + if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) + setup_sata(); +#endif + #ifdef CONFIG_USB_EHCI_MX6 setup_usb(); #endif diff --git a/include/configs/mx6cuboxi.h b/include/configs/mx6cuboxi.h index 2782911..cec626a 100644 --- a/include/configs/mx6cuboxi.h +++ b/include/configs/mx6cuboxi.h @@ -21,6 +21,17 @@ /* MMC Configs */ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC2_BASE_ADDR +/* SATA Configuration */ +#define CONFIG_CMD_SATA +#ifdef CONFIG_CMD_SATA +#define CONFIG_DWC_AHSATA +#define CONFIG_SYS_SATA_MAX_DEVICE 1 +#define CONFIG_DWC_AHSATA_PORT_ID 0 +#define CONFIG_DWC_AHSATA_BASE_ADDR SATA_ARB_BASE_ADDR +#define CONFIG_LBA48 +#define CONFIG_LIBATA +#endif + /* Ethernet Configuration */ #define CONFIG_FEC_MXC #define CONFIG_MII @@ -119,6 +130,7 @@ #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ + func(SATA, sata, 0) \ func(USB, usb, 0) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) -- 2.9.3

3 4