April 2017 - U-Boot

[U-Boot] [PATCH v1 0/2]
by Eric Gao 18 Apr '17

18 Apr '17

Add bmp logo display support for evb-rk3399 Changes in v1: -Add bmp logo display support. -Enable logo display for evb-rk3399 Eric Gao (2): board: rockchip: common: Add bmp logo support rockchip: include: Enable logo display for evb-rk3399 board/rockchip/common/Makefile | 9 + board/rockchip/common/common.c | 20 + board/rockchip/common/misc.c | 85 + include/configs/evb_rk3399.h | 7 + include/rockchip/misc.h | 9 + include/rockchip/rockchip_logo.h | 9613 ++++++++++++++++++++++++++++++++++++++ tools/logos/rockchip_24bit.bmp | Bin 0 -> 115322 bytes 7 files changed, 9743 insertions(+) create mode 100644 board/rockchip/common/Makefile create mode 100644 board/rockchip/common/common.c create mode 100644 board/rockchip/common/misc.c create mode 100644 include/rockchip/misc.h create mode 100644 include/rockchip/rockchip_logo.h create mode 100644 tools/logos/rockchip_24bit.bmp -- 1.9.1

1 0

[U-Boot] [PATCH] rockchip: reserve memory for rk3399 ATF data
by Kever Yang 18 Apr '17

18 Apr '17

There are 3 region used by rk3399 ATF: - bl31 code, locate at 0x10000; - cortex-m0 code and data, locate at 0xff8c0000; - bl31 data, locate at 0xff8c1000 ~ 0xff8c4000; SPL_TEXT_BASE starts from 0xff8c2000, we need to reserve memory for ATF data, or else there will have memory corrupt after SPL load ATF image. More detail about cortex-M0 code in ATF: https://github.com/ARM-software/arm-trusted-firmware/commit/ 8382e17c4c6bffd15119dfce1ee4372e3c1a7890 Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/include/asm/arch-rockchip/boot0.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/boot0.h b/arch/arm/include/asm/arch-rockchip/boot0.h index 8d7bc9a..f85a4db 100644 --- a/arch/arm/include/asm/arch-rockchip/boot0.h +++ b/arch/arm/include/asm/arch-rockchip/boot0.h @@ -16,3 +16,7 @@ .space 0x4 /* space for the 'RK33' */ #endif b reset + +#ifdef defined(CONFIG_ROCKCHIP_RK3399) && defined(CONFIG_SPL_BUILD) + .space 0x4000 /* space for the ATF data */ +#endif -- 1.9.1

3 4

[U-Boot] [PATCH 00/16] RFC: Board init using driver model
by Simon Glass 18 Apr '17

18 Apr '17

At present we have a lot of ad-hoc init functions related to boards, for example board_early_init_f(), board_misc_init_f() and dram_init(). There are used in different ways by different boards as useful hooks to do the required init and sequence it correctly. Some functions are always enabled but have a __weak default. Some are controlled by the existence of a CONFIG. There are two main init sequences: board_init_f() (f for running from read-only flash) which runs before relocation and board_init_r() (r for relocated) which runs afterwards. One problem with the current sequence is that it has a lot of arch-specific #ifdefs around various functions. There are also #ifdefs for various features. There has been quite a bit of discussion about how to tidy this up and at least one RFC series[1]. Now that we have driver model we can use this to deal with the init sequences. This approach has several advantages: - We have a path to remove the #ifdefs - It is easy for multiple parts of the code to implement the same hook - We can track what is called and what is not - We don't need weak functions - We can eventually adjust the sequence to improve naming or to add new init phases - It provides a model for how we might deal with ft_board_setup() and friends This series starts the process of replacing the pre-relocation init sequence with a driver-model solution. It defines a uclass, adds tests and converts sandbox and a few x86 boards over to use this new setup. This series is not ready for use yet as the rest of the init sequence hooks need to be converted. But there is enough here to show the idea. Comments welcome. [1] https://lists.denx.de/pipermail/u-boot/2011-August/098718.html Simon Glass (16): x86: Drop leading spaces in cpu_x86_get_desc() x86: Display the SPL banner only once x86: config: Enable dhrystone command for link dm: board: Add a uclass for init functions dm: board: Add a command to view phase info dm: board: Adjust pre-relocation init hooks dm: board: Support printing CPU info using the uclass dm: sandbox: Convert to using driver-model baord init dm: board: Add tests for the board uclass dm: board: Add documentation dm: x86: board: Enable CONFIG_BOARD dm: x86: board: Add a BOARD_F_RESERVE_ARCH driver dm: x86: board: ivybridge: Add support for CONFIG_BOARD dm: x86: board: ivybridge: Switch to use CONFIG_BOARD dm: x86: board: ivybridge: Remove old board init code dm: board: Add information about the new board init to the README README | 3 + arch/Kconfig | 5 + arch/sandbox/dts/test.dts | 12 ++ arch/sandbox/include/asm/state.h | 3 + arch/sandbox/include/asm/test.h | 9 ++ arch/x86/cpu/coreboot/coreboot.c | 2 + arch/x86/cpu/cpu.c | 41 ++++- arch/x86/cpu/cpu_x86.c | 6 +- arch/x86/cpu/ivybridge/cpu.c | 57 +++++-- arch/x86/cpu/ivybridge/sdram.c | 6 +- arch/x86/cpu/ivybridge/sdram_nop.c | 36 ++++- arch/x86/cpu/x86_64/cpu.c | 2 + arch/x86/include/asm/arch-ivybridge/sandybridge.h | 7 + arch/x86/lib/spl.c | 11 +- board/google/chromebook_link/link.c | 5 - board/google/chromebox_panther/panther.c | 5 - board/sandbox/sandbox.c | 44 +++++- cmd/Kconfig | 8 + cmd/Makefile | 1 + cmd/board.c | 58 +++++++ common/Kconfig | 31 ++++ common/board_f.c | 58 ++++++- common/init/Makefile | 1 + common/init/board-uclass.c | 108 +++++++++++++ configs/chromebook_link64_defconfig | 2 + configs/chromebook_link_defconfig | 2 + configs/chromebox_panther_defconfig | 1 + doc/driver-model/board-info.txt | 181 ++++++++++++++++++++++ drivers/cpu/cpu-uclass.c | 19 +++ drivers/misc/Makefile | 1 + drivers/misc/board_sandbox.c | 44 ++++++ include/asm-generic/global_data.h | 5 + include/board.h | 170 ++++++++++++++++++++ include/cpu.h | 5 + include/dm/uclass-id.h | 1 + test/dm/Makefile | 1 + test/dm/board.c | 74 +++++++++ 37 files changed, 980 insertions(+), 45 deletions(-) create mode 100644 cmd/board.c create mode 100644 common/init/board-uclass.c create mode 100644 doc/driver-model/board-info.txt create mode 100644 drivers/misc/board_sandbox.c create mode 100644 include/board.h create mode 100644 test/dm/board.c -- 2.12.0.367.g23dc2f6d3c-goog

5 38

[U-Boot] [PATCH 1/2][v4] armv8: ls2080a: Reorganise NAND_BOOT code in config flag
by Santan Kumar 18 Apr '17

18 Apr '17

Add CONFIG_NAND_BOOT config flag to organise NAND_BOOT specific code in config flag like -nand-boot specfic errata errata_rcw_src() -CONFIG_SYS_NAND_U_BOOT_DST,etc Signed-off-by: Santan Kumar <santan.kumar(a)nxp.com> Signed-off-by: Priyanka Jain <priyanka.jain(a)nxp.com> Signed-off-by: Abhimanyu Saini <abhimanyu.saini(a)nxp.com> --- Changes for v4: Rebased to latest codebase Incorporated York's comments to remove CONFIG_SPL and move CONFIG_SPL_NAND_SUPPORT to kconfig arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 +- configs/ls2080aqds_nand_defconfig | 1 + configs/ls2080ardb_nand_defconfig | 1 + include/configs/ls2080a_common.h | 2 ++ include/configs/ls2080aqds.h | 4 +++- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index 9e3cdd7..76e3af0 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -134,7 +134,7 @@ void erratum_a009635(void) static void erratum_rcw_src(void) { -#if defined(CONFIG_SPL) +#if defined(CONFIG_SPL) && defined(CONFIG_NAND_BOOT) u32 __iomem *dcfg_ccsr = (u32 __iomem *)DCFG_BASE; u32 __iomem *dcfg_dcsr = (u32 __iomem *)DCFG_DCSR_BASE; u32 val; diff --git a/configs/ls2080aqds_nand_defconfig b/configs/ls2080aqds_nand_defconfig index 2a649c5..7fe4262 100644 --- a/configs/ls2080aqds_nand_defconfig +++ b/configs/ls2080aqds_nand_defconfig @@ -10,6 +10,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_NAND_BOOT=y CONFIG_SYS_EXTRA_OPTIONS="NAND, LS2080A" CONFIG_BOOTDELAY=10 CONFIG_SPL=y diff --git a/configs/ls2080ardb_nand_defconfig b/configs/ls2080ardb_nand_defconfig index 81987fe..7c45541 100644 --- a/configs/ls2080ardb_nand_defconfig +++ b/configs/ls2080ardb_nand_defconfig @@ -10,6 +10,7 @@ CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_OF_BOARD_SETUP=y CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_NAND_BOOT=y CONFIG_SYS_EXTRA_OPTIONS="NAND, LS2080A" CONFIG_BOOTDELAY=10 CONFIG_SPL=y diff --git a/include/configs/ls2080a_common.h b/include/configs/ls2080a_common.h index 427f623..12078c3 100644 --- a/include/configs/ls2080a_common.h +++ b/include/configs/ls2080a_common.h @@ -222,8 +222,10 @@ unsigned long long get_qixis_addr(void); #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_TEXT_BASE 0x1800a000 +#ifdef CONFIG_NAND_BOOT #define CONFIG_SYS_NAND_U_BOOT_DST 0x80400000 #define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_NAND_U_BOOT_DST +#endif #define CONFIG_SYS_SPL_MALLOC_SIZE 0x00100000 #define CONFIG_SYS_SPL_MALLOC_START 0x80200000 #define CONFIG_SYS_MONITOR_LEN (640 * 1024) diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index beacb99..4c48562 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -197,7 +197,8 @@ unsigned long get_board_ddr_clk(void); FTIM2_GPCM_TWP(0x3E)) #define CONFIG_SYS_CS3_FTIM3 0x0 -#if defined(CONFIG_SPL) && defined(CONFIG_NAND) +#if defined(CONFIG_SPL) +#if defined(CONFIG_NAND_BOOT) #define CONFIG_SYS_CSPR1_EXT CONFIG_SYS_NOR0_CSPR_EXT #define CONFIG_SYS_CSPR1 CONFIG_SYS_NOR0_CSPR_EARLY #define CONFIG_SYS_CSPR1_FINAL CONFIG_SYS_NOR0_CSPR @@ -233,6 +234,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SPL_PAD_TO 0x20000 #define CONFIG_SYS_NAND_U_BOOT_OFFS (256 * 1024) #define CONFIG_SYS_NAND_U_BOOT_SIZE (640 * 1024) +#endif #else #define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NOR0_CSPR_EXT #define CONFIG_SYS_CSPR0 CONFIG_SYS_NOR0_CSPR_EARLY -- 1.9.1

3 8

[U-Boot] [PATCH] sunxi: Add maintainer of the NanoPi NEO Air
by Jelle van der Waa 18 Apr '17

18 Apr '17

Add myself as maintainer of the NanoPi NEO Air board. Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- board/sunxi/MAINTAINERS | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index 2321b8b08f..5ad40ab2a2 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -232,6 +232,11 @@ M: Jelle van der Waa <jelle(a)vdwaa.nl> S: Maintained F: configs/nanopi_neo_defconfig +NANOPI-NEO-AIR BOARD +M: Jelle van der Waa <jelle(a)vdwaa.nl> +S: Maintained +F: configs/nanopi_neo_air_defconfig + NINTENDO NES CLASSIC EDITION BOARD M: FUKAUMI Naoki <naobsd(a)gmail.com> S: Maintained -- 2.12.0

2 1

[U-Boot] [PATCH] cmd: ubi: remove unnecessary logical constraint
by Heinrich Schuchardt 18 Apr '17

18 Apr '17

A size_t variable can never be negative. The problem was indicated by cppcheck. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cmd/ubi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/ubi.c b/cmd/ubi.c index efc43ffde9..222be5a357 100644 --- a/cmd/ubi.c +++ b/cmd/ubi.c @@ -308,7 +308,7 @@ int ubi_volume_begin_write(char *volume, void *buf, size_t size, return ENODEV; rsvd_bytes = vol->reserved_pebs * (ubi->leb_size - vol->data_pad); - if (size < 0 || size > rsvd_bytes) { + if (size > rsvd_bytes) { printf("size > volume size! Aborting!\n"); return EINVAL; } -- 2.11.0

3 2

[U-Boot] [PATCH 0/8] Add mipi display support for rk3399
by Eric Gao 18 Apr '17

18 Apr '17

Eric Gao (8): rockchip: video: Add mipi dsi driver for rk3399 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 rockchip: video: vop: Fix clk_set_rate() return error arch/arm/dts/rk3399-evb.dts | 84 ++++ arch/arm/dts/rk3399.dtsi | 72 ++++ arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 25 ++ arch/arm/include/asm/arch-rockchip/mipi_rk3399.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 | 11 +- drivers/video/rockchip/Makefile | 1 + drivers/video/rockchip/rk_mipi.c | 484 +++++++++++++++++++++++ drivers/video/rockchip/rk_vop.c | 30 +- 11 files changed, 908 insertions(+), 8 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/mipi_rk3399.h create mode 100644 drivers/video/rockchip/rk_mipi.c -- 1.9.1

2 9

[U-Boot] [PATCH] rockchip: dts: evb-rk3399: correct pwm3 polarity
by Kever Yang 18 Apr '17

18 Apr '17

The pwm3 on evb-rk3399 is used for pwm regulator, need to invert the polarity to make it works correct. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/dts/rk3399-evb.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index d2ded77..b01ce1e 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -20,7 +20,7 @@ vdd_center: vdd-center { compatible = "pwm-regulator"; - pwms = <&pwm3 0 25000 0>; + pwms = <&pwm3 0 25000 1>; regulator-name = "vdd_center"; regulator-min-microvolt = <800000>; regulator-max-microvolt = <1400000>; -- 1.9.1

2 1

[U-Boot] [PATCH v2] rockchip: dts: evb-rk3399: add gmac support
by Kever Yang 18 Apr '17

18 Apr '17

Enable gmac for evb-rk3399. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- Changes in v2: - correct rst pin number arch/arm/dts/rk3399-evb.dts | 24 ++++++++++++++++++++++++ configs/evb-rk3399_defconfig | 4 ++++ 2 files changed, 28 insertions(+) diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index 769d5a0..7d27f40 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -6,6 +6,7 @@ /dts-v1/; #include <dt-bindings/pwm/pwm.h> +#include <dt-bindings/pinctrl/rockchip.h> #include "rk3399.dtsi" #include "rk3399-sdram-lpddr3-4GB-1600.dtsi" @@ -58,6 +59,13 @@ regulator-name = "vcc5v0_host"; gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; }; + + clkin_gmac: external-gmac-clock { + compatible = "fixed-clock"; + clock-frequency = <125000000>; + clock-output-names = "clkin_gmac"; + #clock-cells = <0>; + }; }; &emmc_phy { @@ -163,3 +171,19 @@ }; }; }; + +&gmac { + phy-supply = <&vcc_phy>; + phy-mode = "rgmii"; + clock_in_out = "input"; + snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; + assigned-clocks = <&cru SCLK_RMII_SRC>; + assigned-clock-parents = <&clkin_gmac>; + pinctrl-names = "default"; + pinctrl-0 = <&rgmii_pins>; + tx_delay = <0x10>; + rx_delay = <0x10>; + status = "okay"; +}; diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index c14764d..c5c86d8 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -49,6 +49,10 @@ CONFIG_PMIC_CHILDREN=y CONFIG_SPL_PMIC_CHILDREN=y CONFIG_PMIC_RK808=y CONFIG_REGULATOR_RK808=y +CONFIG_DM_ETH=y +CONFIG_ETH_DESIGNWARE=y +CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_GMAC_ROCKCHIP=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y CONFIG_ROCKCHIP_RK3399_PINCTRL=y -- 1.9.1

2 1

[U-Boot] [PATCH v7 0/4] mmc: meson: add MMC driver for Meson GX (S905)
by Heinrich Schuchardt 18 Apr '17

18 Apr '17

This patch series is a resubmission of the v6 patch series https://lists.denx.de/pipermail/u-boot/2017-February/281941.html by Heiner Kallweit. Patch 1 updates the device tree to a recent Linux version. Patch 2 add a MMC driver for the GXBB SOC Both patches are unchanged relative to version 6 of the patch series. Patch 3 enables the MMC driver in the Odroid C2 default configuration. This patch had to be rearranged to become applicable again. Patch 4 enables MMC as a boot target for the Odroid C2. This patch is new. I have tested the patch series against U-Boot v2017.3 and U-Boot master. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Heiner Kallweit (2): mmc: meson: add MMC driver for Meson GX (S905) arm: dts: update Meson GXBB / Odroid-C2 DT with latest Linux version Heinrich Schuchardt (2): Enable new Meson GX MMC driver in Odroid C2 defconfig. odroid-c2: enable MMC as boot target arch/arm/dts/meson-gxbb-odroidc2.dts | 147 ++++++- arch/arm/dts/meson-gxbb.dtsi | 718 ++++++++++++++++++++++------------- configs/odroid-c2_defconfig | 5 +- drivers/mmc/Kconfig | 6 + drivers/mmc/Makefile | 1 + include/configs/meson-gxbb-common.h | 2 + 6 files changed, 603 insertions(+), 276 deletions(-) -- 2.1.4

5 12