August 2017 - U-Boot

[U-Boot] [PATCH] rk3288: Add Vyasa initial board support
by Jagan Teki 28 Aug '17

28 Aug '17

From: Jagan Teki <jagan(a)amarulasolutions.com> This patch adds support for Vyasa RK3288 initial board from Amarula. Boot from SDMMC: --------------- U-Boot SPL 2017.09-rc1-00111-g3656991-dirty (Aug 10 2017 - 11:40:45) Trying to boot from MMC1 U-Boot 2017.09-rc1-00111-g3656991-dirty (Aug 10 2017 - 11:40:45 +0530) Model: Amarula Vyasa-RK3288 DRAM: 2 GiB MMC: dwmmc@ff0c0000: 1 *** Warning - bad CRC, using default environment In: serial@ff690000 Out: serial@ff690000 Err: serial@ff690000 Model: Amarula Vyasa-RK3288 Net: Net Initialization Skipped No ethernet found. Hit any key to stop autoboot: 0 => Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- Changes for v2: - Fix commit message - Move CONFIG_ENV_IS_IN_MMC to configs arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3288-vyasa.dts | 327 ++++++++++++++++++++++++++++++ arch/arm/mach-rockchip/rk3288/Kconfig | 11 + board/amarula/vyasa-rk3288/Kconfig | 12 ++ board/amarula/vyasa-rk3288/MAINTAINERS | 6 + board/amarula/vyasa-rk3288/Makefile | 7 + board/amarula/vyasa-rk3288/vyasa-rk3288.c | 7 + configs/vyasa-rk3288_defconfig | 63 ++++++ include/configs/vyasa-rk3288.h | 23 +++ 9 files changed, 457 insertions(+) create mode 100644 arch/arm/dts/rk3288-vyasa.dts create mode 100644 board/amarula/vyasa-rk3288/Kconfig create mode 100644 board/amarula/vyasa-rk3288/MAINTAINERS create mode 100644 board/amarula/vyasa-rk3288/Makefile create mode 100644 board/amarula/vyasa-rk3288/vyasa-rk3288.c create mode 100644 configs/vyasa-rk3288_defconfig create mode 100644 include/configs/vyasa-rk3288.h diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index d07715f..371511b 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -41,6 +41,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-veyron-jerry.dtb \ rk3288-veyron-mickey.dtb \ rk3288-veyron-minnie.dtb \ + rk3288-vyasa.dtb \ rk3328-evb.dtb \ rk3368-lion.dtb \ rk3368-sheep.dtb \ diff --git a/arch/arm/dts/rk3288-vyasa.dts b/arch/arm/dts/rk3288-vyasa.dts new file mode 100644 index 0000000..93a9c5e --- /dev/null +++ b/arch/arm/dts/rk3288-vyasa.dts @@ -0,0 +1,327 @@ +/* + * Copyright (C) 2017 Jagan Teki <jagan(a)amarulasolutions.com> + * + * This file is dual-licensed: you can use it either under the terms + * of the GPL or the X11 license, at your option. Note that this dual + * licensing only applies to this file, and not this project as a + * whole. + * + * a) This file is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This file is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * Or, alternatively, + * + * b) Permission is hereby granted, free of charge, to any person + * obtaining a copy of this software and associated documentation + * files (the "Software"), to deal in the Software without + * restriction, including without limitation the rights to use, + * copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following + * conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES + * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + */ + +/dts-v1/; +#include "rk3288.dtsi" + +/ { + model = "Amarula Vyasa-RK3288"; + compatible = "amarula,vyasa-rk3288", "rockchip,rk3288"; + + chosen { + stdout-path = &uart2; + }; + + memory { + device_type = "memory"; + reg = <0 0x80000000>; + }; + + vcc_sd: sdmmc-regulator { + compatible = "regulator-fixed"; + gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_pwr>; + regulator-name = "vcc_sd"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + startup-delay-us = <100000>; + vin-supply = <&vcc_io>; + }; + + vcc_sys: vsys-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc_sys"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-always-on; + regulator-boot-on; + }; +}; + +&dmc { + rockchip,pctl-timing = <0x29a 0xc8 0x1f8 0x42 0x4e 0x4 0xea 0xa + 0x5 0x0 0xa 0x7 0x19 0x24 0xa 0x7 + 0x5 0xa 0x5 0x200 0x5 0x10 0x40 0x0 + 0x1 0x7 0x7 0x4 0xc 0x43 0x100 0x0 + 0x5 0x0>; + rockchip,phy-timing = <0x48f9aab4 0xea0910 0x1002c200 + 0xa60 0x40 0x10 0x0>; + /* Add a dummy value to cause of-platdata think this is bytes */ + rockchip,sdram-params = <0x30B25564 0x627 3 666000000 3 9 1>; +}; + +&cpu0 { + cpu0-supply = <&vdd_cpu>; +}; + +&i2c0 { + clock-frequency = <400000>; + status = "okay"; + + rk808: pmic@1b { + compatible = "rockchip,rk808"; + reg = <0x1b>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PA4 IRQ_TYPE_LEVEL_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&pmic_int &global_pwroff>; + wakeup-source; + rockchip,system-power-controller; + #clock-cells = <1>; + clock-output-names = "xin32k", "rk808-clkout2"; + + vcc1-supply = <&vcc_sys>; + vcc2-supply = <&vcc_sys>; + vcc3-supply = <&vcc_sys>; + vcc4-supply = <&vcc_sys>; + vcc6-supply = <&vcc_sys>; + vcc7-supply = <&vcc_sys>; + vcc8-supply = <&vcc_io>; + vcc9-supply = <&vcc_sys>; + vcc10-supply = <&vcc_sys>; + vcc11-supply = <&vcc_sys>; + vcc12-supply = <&vcc_io>; + + regulators { + vdd_cpu: vdd_log: DCDC_REG1 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <1350000>; + regulator-name = "vdd_log"; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_gpu: DCDC_REG2 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1250000>; + regulator-name = "vdd_gpu"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1000000>; + }; + }; + + vcc_ddr: DCDC_REG3 { + regulator-always-on; + regulator-boot-on; + regulator-name = "vcc_ddr"; + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc_io: DCDC_REG4 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc_io"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + + vcca_tp: LDO_REG1 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc_tp"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + + vcc_codec: LDO_REG2 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc_codec"; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; + + vdd_10: LDO_REG3 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-name = "vdd_10"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1000000>; + }; + }; + + vcc_gps: LDO_REG4 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc_gps"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vccio_sd: LDO_REG5 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vccio_sd"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <3300000>; + }; + }; + + vcc10_lcd: LDO_REG6 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + regulator-name = "vcc10_lcd"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcc_18: LDO_REG7 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc_18"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcc18_lcd: LDO_REG8 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-name = "vcc18_lcd"; + regulator-state-mem { + regulator-on-in-suspend; + regulator-suspend-microvolt = <1800000>; + }; + }; + + vcc33_sd: SWITCH_REG1 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc33_sd"; + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + + vcc_lan: SWITCH_REG2 { + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-name = "vcc_lan"; + regulator-state-mem { + regulator-on-in-suspend; + }; + }; + }; + }; +}; + +&sdmmc { + u-boot,dm-pre-reloc; + status = "okay"; + + bus-width = <4>; + cap-mmc-highspeed; + cap-sd-highspeed; + card-detect-delay = <200>; + disable-wp; + pinctrl-names = "default"; + pinctrl-0 = <&sdmmc_clk>, <&sdmmc_cmd>, <&sdmmc_cd>, <&sdmmc_bus4>; + vmmc-supply = <&vcc_sd>; + vqmmc-supply = <&vccio_sd>; +}; + +&uart2 { + u-boot,dm-pre-reloc; + status = "okay"; +}; + +&wdt { + status = "okay"; +}; + +&pinctrl { + u-boot,dm-pre-reloc; + pmic { + pmic_int: pmic-int { + rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>; + }; + }; + + sdmmc { + sdmmc_pwr: sdmmc-pwr { + rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; +}; diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig index 53cc9a0..4ad2940 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -84,6 +84,15 @@ config TARGET_POPMETAL_RK3288 2GB DDR3. Expansion connectors provide access to I2C, SPI, UART, GPIOs and display interface. +config TARGET_VYASA_RK3288 + bool "Vyasa-RK3288" + select BOARD_LATE_INIT + help + Vyasa is a RK3288-based development board with 2 USB ports, + HDMI, VGA, micro-SD card, audio, WiFi and Gigabit Ethernet, It + also includes on-board eMMC and 2GB of SDRAM. Expansion connectors + provide access to display pins, I2C, SPI, UART and GPIOs. + config TARGET_ROCK2 bool "Radxa Rock 2" select BOARD_LATE_INIT @@ -129,6 +138,8 @@ config SPL_LIBGENERIC_SUPPORT config SPL_SERIAL_SUPPORT default y +source "board/amarula/vyasa-rk3288/Kconfig" + source "board/chipspark/popmetal_rk3288/Kconfig" source "board/firefly/firefly-rk3288/Kconfig" diff --git a/board/amarula/vyasa-rk3288/Kconfig b/board/amarula/vyasa-rk3288/Kconfig new file mode 100644 index 0000000..8b8c308 --- /dev/null +++ b/board/amarula/vyasa-rk3288/Kconfig @@ -0,0 +1,12 @@ +if TARGET_VYASA_RK3288 + +config SYS_BOARD + default "vyasa-rk3288" + +config SYS_VENDOR + default "amarula" + +config SYS_CONFIG_NAME + default "vyasa-rk3288" + +endif diff --git a/board/amarula/vyasa-rk3288/MAINTAINERS b/board/amarula/vyasa-rk3288/MAINTAINERS new file mode 100644 index 0000000..a75c1bf --- /dev/null +++ b/board/amarula/vyasa-rk3288/MAINTAINERS @@ -0,0 +1,6 @@ +RICO +M: Jagan Teki <jagan(a)amarulasolutions.com> +S: Maintained +F: board/amarula/vyasa-rk3288 +F: include/configs/vyasa-rk3288.h +F: configs/vyasa-rk3288_defconfig diff --git a/board/amarula/vyasa-rk3288/Makefile b/board/amarula/vyasa-rk3288/Makefile new file mode 100644 index 0000000..7c0d5c0 --- /dev/null +++ b/board/amarula/vyasa-rk3288/Makefile @@ -0,0 +1,7 @@ +# +# Copyright (C) 2017 Amarula Solutions +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-y += vyasa-rk3288.o diff --git a/board/amarula/vyasa-rk3288/vyasa-rk3288.c b/board/amarula/vyasa-rk3288/vyasa-rk3288.c new file mode 100644 index 0000000..ceee42c --- /dev/null +++ b/board/amarula/vyasa-rk3288/vyasa-rk3288.c @@ -0,0 +1,7 @@ +/* + * Copyright (C) 2017 Amarula Solutions + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include <common.h> diff --git a/configs/vyasa-rk3288_defconfig b/configs/vyasa-rk3288_defconfig new file mode 100644 index 0000000..7db7b0b --- /dev/null +++ b/configs/vyasa-rk3288_defconfig @@ -0,0 +1,63 @@ +CONFIG_ARM=y +CONFIG_ARCH_ROCKCHIP=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_ROCKCHIP_RK3288=y +CONFIG_TARGET_VYASA_RK3288=y +CONFIG_SPL_STACK_R_ADDR=0x80000 +CONFIG_DEFAULT_DEVICE_TREE="rk3288-vyasa" +CONFIG_DEBUG_UART=y +CONFIG_ENV_IS_IN_MMC=y +CONFIG_SILENT_CONSOLE=y +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_SPL_STACK_R=y +CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 +# CONFIG_CMD_IMLS is not set +CONFIG_CMD_GPT=y +CONFIG_CMD_MMC=y +CONFIG_CMD_I2C=y +CONFIG_CMD_GPIO=y +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_PMIC=y +CONFIG_CMD_REGULATOR=y +# CONFIG_SPL_DOS_PARTITION is not set +# CONFIG_SPL_ISO_PARTITION is not set +# CONFIG_SPL_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y +CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" +CONFIG_REGMAP=y +CONFIG_SPL_REGMAP=y +CONFIG_SYSCON=y +CONFIG_SPL_SYSCON=y +# CONFIG_SPL_SIMPLE_BUS is not set +CONFIG_CLK=y +CONFIG_SPL_CLK=y +CONFIG_ROCKCHIP_GPIO=y +CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_ROCKCHIP=y +CONFIG_PINCTRL=y +CONFIG_SPL_PINCTRL=y +# CONFIG_SPL_PINCTRL_FULL is not set +CONFIG_PINCTRL_ROCKCHIP_RK3288=y +CONFIG_DM_PMIC=y +# CONFIG_SPL_PMIC_CHILDREN is not set +CONFIG_PMIC_RK8XX=y +CONFIG_REGULATOR_RK8XX=y +CONFIG_DM_REGULATOR_FIXED=y +CONFIG_PWM_ROCKCHIP=y +CONFIG_RAM=y +CONFIG_SPL_RAM=y +CONFIG_DEBUG_UART_BASE=0xff690000 +CONFIG_DEBUG_UART_CLOCK=24000000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_SYS_NS16550=y +CONFIG_SYSRESET=y +CONFIG_CONSOLE_SCROLL_LINES=10 +CONFIG_USE_TINY_PRINTF=y +CONFIG_CMD_DHRYSTONE=y +CONFIG_ERRNO_STR=y diff --git a/include/configs/vyasa-rk3288.h b/include/configs/vyasa-rk3288.h new file mode 100644 index 0000000..93ab7e7 --- /dev/null +++ b/include/configs/vyasa-rk3288.h @@ -0,0 +1,23 @@ +/* + * Copyright (C) 2017 Amarula Solutions + * + * Configuration settings for Amarula Vyasa RK3288. + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#define ROCKCHIP_DEVICE_SETTINGS +#include <configs/rk3288_common.h> + +#undef BOOT_TARGET_DEVICES + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 1) \ + +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 1 + +#endif -- 2.7.4

1 0

[U-Boot] [PATCH V2 01/12] scripts: spl: fix typo
by Peng Fan 28 Aug '17

28 Aug '17

Typo fix: CONIFG->CONFIG Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Tom Rini <trini(a)konsulko.com> --- V2: none scripts/Makefile.uncmd_spl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl index 15d0836..b399411 100644 --- a/scripts/Makefile.uncmd_spl +++ b/scripts/Makefile.uncmd_spl @@ -9,7 +9,7 @@ ifdef CONFIG_SPL_BUILD ifndef CONFIG_SPL_DM CONFIG_DM_SERIAL= CONFIG_DM_GPIO= -CONIFG_DM_I2C= +CONFIG_DM_I2C= CONFIG_DM_SPI= CONFIG_DM_SPI_FLASH= endif -- 2.6.2

5 22

[U-Boot] [PATCH v2 0/4] usb: net: Migrate USB Ethernet to Kconfig
by Chris Packham 28 Aug '17

28 Aug '17

3 8

[U-Boot] [PATCH] lib: don't build regex support into SPL when not using environment
by Anatolij Gustschin 28 Aug '17

28 Aug '17

regex code is not used in SPL when environment support is disabled, so do not include this code to reduce SPL size. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- lib/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Makefile b/lib/Makefile index 1ffa455..b0850a1 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_RBTREE) += rbtree.o obj-$(CONFIG_BITREVERSE) += bitrev.o obj-y += list_sort.o obj-y += hashtable.o +obj-$(CONFIG_REGEX) += slre.o endif obj-$(CONFIG_RSA) += rsa/ @@ -78,7 +79,9 @@ obj-y += hang.o obj-y += linux_compat.o obj-y += linux_string.o obj-y += membuff.o +ifdef CONFIG_SPL_ENV_SUPPORT obj-$(CONFIG_REGEX) += slre.o +endif obj-y += string.o obj-y += tables_csum.o obj-y += time.o -- 2.7.4

1 0

[U-Boot] [PATCH v2 00/10] uboot overlays, FIT image & unittest
by Pantelis Antoniou 28 Aug '17

28 Aug '17

This patchset allows uboot to handle overlays in a manner that uses a base DT blob and an arbitrary number of DT overlays blobs. While it is intended to be used with FIT images since handling a multitude of device tree blobs manually is a chore, manual fdt overlay application is supported and described. The first 2 patches have already been accepted in DTC mainline. We can apply them now, or expect the updated drop from mainline. The next patch contains the FIT FDT blob generation logic as well as documentation about how it works. Path #4 spits out an informative message in case of an overlay failure that may be attribute to mis-compilation (which is a common problem). Patches 5 & 6 are documentation entries. Patch #7 makes sure unit tests using overlays can be used on non-sandbox boards. Patch #8 adds overlay unit tests as part of sandbox's defconfig. Patch #9 fixes a problem with unit tests using an already present symbol. Finally, #10 adds a unit test using a stacked overlay. The patchset is available at https://github.com/pantoniou/u-boot/tree/uboot-overlays and is against mainline u-boot as pulled today, 11/8/2017. Franklin S Cooper Jr (1): doc: overlays: Tweak documentation regarding overlays Pantelis Antoniou (9): Introduce fdt_setprop_placeholder() method fdt: Allow stacked overlays phandle references fit: Introduce methods for applying overlays on fit-load fdt-overlay: Spit out a descriptive failure warning doc: Document how to apply fdt overlays dtbo: make dtbos special config: sandbox: Add unit tests ut: fix fdt_getprop_u32() change test: overlay: Add unit test for stacked overlay cmd/fdt.c | 8 + common/image-fdt.c | 7 +- common/image-fit.c | 226 ++++++++++++++++++++++++-- configs/sandbox_defconfig | 2 + doc/README.fdt-overlays | 114 ++++++++++++++ doc/uImage.FIT/command_syntax_extensions.txt | 12 +- doc/uImage.FIT/overlay-fdt-boot.txt | 225 ++++++++++++++++++++++++++ doc/uImage.FIT/source_file_format.txt | 6 +- include/image.h | 10 ++ lib/libfdt/fdt_overlay.c | 228 ++++++++++++++++++++++++--- lib/libfdt/fdt_rw.c | 20 ++- lib/libfdt/libfdt.h | 31 ++++ scripts/Makefile.lib | 17 ++ test/overlay/Makefile | 1 + test/overlay/cmd_ut_overlay.c | 50 ++++-- test/overlay/test-fdt-overlay-stacked.dts | 21 +++ 16 files changed, 926 insertions(+), 52 deletions(-) create mode 100644 doc/README.fdt-overlays create mode 100644 doc/uImage.FIT/overlay-fdt-boot.txt create mode 100644 test/overlay/test-fdt-overlay-stacked.dts -- 2.1.4

2 21

[U-Boot] [PATCH] ARM: rmobile: Add missing IPSR18 bits to R8A7795 PFC
by Marek Vasut 28 Aug '17

28 Aug '17

The IPSR18 register bits were missing from the R8A7795 ES2.0+ PFC tables, which triggered a BUG() in sh_pfc driver. This is because of an out-of-bounds access to the pinmux_gpios[] array in the PFC tables, which was too short due to the missing IPSR18 bits. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- arch/arm/mach-rmobile/pfc-r8a7795.c | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/arch/arm/mach-rmobile/pfc-r8a7795.c b/arch/arm/mach-rmobile/pfc-r8a7795.c index 4446093973..93aaf31ed9 100644 --- a/arch/arm/mach-rmobile/pfc-r8a7795.c +++ b/arch/arm/mach-rmobile/pfc-r8a7795.c @@ -2185,6 +2185,27 @@ enum { FSO_TOEx_MARK, TPU0TO1_MARK, + /* IPSR18 */ + USB3_PWEN_IMARK, + AUDIO_CLKOUT2_B_MARK, + SSI_SCK9_B_MARK, + TS_SDEN0_E_MARK, + STP_ISEN_0_E_MARK, + RIF2_D0_B_MARK, + TPU0TO2_MARK, + FMCLK_C_MARK, + FMCLK_D_MARK, + + USB3_OVC_IMARK, + AUDIO_CLKOUT3_B_MARK, + SSI_WS9_B_MARK, + TS_SPSYNC0_E_MARK, + STP_ISSYNC_0_E_MARK, + RIF2_D1_B_MARK, + TPU0TO3_MARK, + FMIN_C_MARK, + FMIN_D_MARK, + PINMUX_MARK_END, }; @@ -3288,6 +3309,27 @@ static struct pinmux_gpio pinmux_gpios[] = { GPIO_FN(RIF3_D1_B), GPIO_FN(FSO_TOEx), GPIO_FN(TPU0TO1), + + /* IPSR18 */ + GPIO_IFN(USB3_PWEN), + GPIO_FN(AUDIO_CLKOUT2_B), + GPIO_FN(SSI_SCK9_B), + GPIO_FN(TS_SDEN0_E), + GPIO_FN(STP_ISEN_0_E), + GPIO_FN(RIF2_D0_B), + GPIO_FN(TPU0TO2), + GPIO_FN(FMCLK_C), + GPIO_FN(FMCLK_D), + + GPIO_IFN(USB3_OVC), + GPIO_FN(AUDIO_CLKOUT3_B), + GPIO_FN(SSI_WS9_B), + GPIO_FN(TS_SPSYNC0_E), + GPIO_FN(STP_ISSYNC_0_E), + GPIO_FN(RIF2_D1_B), + GPIO_FN(TPU0TO3), + GPIO_FN(FMIN_C), + GPIO_FN(FMIN_D), }; static struct pinmux_cfg_reg pinmux_config_regs[] = { -- 2.11.0

1 0

[U-Boot] [PATCH] ARM: rmobile: Drop board_mmc_init
by Marek Vasut 28 Aug '17

28 Aug '17

The board_mmc_init() is no longer invoked when DM is used, so move all the pinmux config into board_init() instead. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- board/renesas/salvator-x/salvator-x.c | 9 ++------- board/renesas/ulcb/ulcb.c | 9 ++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index d8a0d7a8a2..2695de5dbf 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -158,12 +158,7 @@ int board_init(void) udelay(1); #endif - return 0; -} - -#ifdef CONFIG_SH_SDHI -int board_mmc_init(bd_t *bis) -{ +#ifdef CONFIG_MMC /* SDHI0 */ gpio_request(GPIO_GFN_SD0_DAT0, NULL); gpio_request(GPIO_GFN_SD0_DAT1, NULL); @@ -227,10 +222,10 @@ int board_mmc_init(bd_t *bis) gpio_request(GPIO_GP_3_14, NULL); gpio_direction_output(GPIO_GP_3_15, 1); /* power on */ gpio_direction_output(GPIO_GP_3_14, 1); /* 1: 3.3V, 0: 1.8V */ +#endif return 0; } -#endif int dram_init(void) { diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 695cce9465..2b6cc612c8 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -137,12 +137,7 @@ int board_init(void) udelay(1); #endif - return 0; -} - -#ifdef CONFIG_SH_SDHI -int board_mmc_init(bd_t *bis) -{ +#ifdef CONFIG_MMC /* SDHI0 */ gpio_request(GPIO_GFN_SD0_DAT0, NULL); gpio_request(GPIO_GFN_SD0_DAT1, NULL); @@ -179,10 +174,10 @@ int board_mmc_init(bd_t *bis) gpio_request(GPIO_GP_5_9, NULL); gpio_direction_output(GPIO_GP_5_3, 0); /* 1: 3.3V, 0: 1.8V */ gpio_direction_output(GPIO_GP_5_9, 0); /* 1: 3.3V, 0: 1.8V */ +#endif return 0; } -#endif int dram_init(void) { -- 2.11.0

1 0

[U-Boot] [PATCH] ARM: rmobile: Replace CONFIG_RAVB with CONFIG_RENESAS_RAVB in boards
by Marek Vasut 28 Aug '17

28 Aug '17

The configuration option name is the later, so replace usage of CONFIG_RAVB in board files with CONFIG_RENESAS_RAVB , otherwise the RAVB pinmux is not set and ethernet does not work. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- board/renesas/salvator-x/salvator-x.c | 2 +- board/renesas/ulcb/ulcb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/renesas/salvator-x/salvator-x.c b/board/renesas/salvator-x/salvator-x.c index a09cd56d66..d8a0d7a8a2 100644 --- a/board/renesas/salvator-x/salvator-x.c +++ b/board/renesas/salvator-x/salvator-x.c @@ -116,7 +116,7 @@ int board_init(void) /* USB1 pull-up */ setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); -#ifdef CONFIG_RAVB +#ifdef CONFIG_RENESAS_RAVB /* EtherAVB Enable */ /* GPSR2 */ gpio_request(GPIO_GFN_AVB_AVTP_CAPTURE_A, NULL); diff --git a/board/renesas/ulcb/ulcb.c b/board/renesas/ulcb/ulcb.c index 068cbdea03..695cce9465 100644 --- a/board/renesas/ulcb/ulcb.c +++ b/board/renesas/ulcb/ulcb.c @@ -105,7 +105,7 @@ int board_init(void) /* USB1 pull-up */ setbits_le32(PFC_PUEN6, PUEN_USB1_OVC | PUEN_USB1_PWEN); -#ifdef CONFIG_RAVB +#ifdef CONFIG_RENESAS_RAVB /* EtherAVB Enable */ /* GPSR2 */ gpio_request(GPIO_GFN_AVB_AVTP_CAPTURE_A, NULL); -- 2.11.0

1 0

[U-Boot] spi flash env and driver model
by Chris Packham 28 Aug '17

28 Aug '17

Hi, I'm looking at a problem on the db-88f6820-amc board (which has it's env on spi flash). Somewhere in the init sequence we get a crash. git bisect leads me to commit 8fee8845e7 ("enf_sf: reuse setup_flash_device instead of open coding it") but I don't think that's actually the problem. The real problem seems to be the way setup_spi_device() relies on the speed to come from the device-tree. Even when I specify a speed for the spi-flash in the device tree it doesn't seem to stick. The only thing that seems to work is restoring the CONFIG_ENV_SPI_MAX_HZ in the DM_SPI_FLASH case. I can submit that as a patch but it seems contrary to the intentions of commit 96907c0fe5 ("dm: spi: Read default speed and mode values from DT"). Does anyone have any thoughts as to where to go with this? Thanks, Chris

3 5

[U-Boot] [PATCH 0/3] add support for GPT partition name manipulation
by alison＠peloton-tech.com 28 Aug '17

28 Aug '17

From: Alison Chaiken <alison(a)she-devel.com> One way for userspace and the bootloader to exchange information about dynamic image selection is via the storage device partition table, as described at https://source.android.com/devices/tech/ota/ab_updates The scheme described there relies on setting partitions' "boot" flag. When no partition on a device is bootable since the kernel and U-Boot are stored elsewhere, the name field in the GPT partition table offers another logical place to store information. These patches allow users to easily modify GPT partition names via bootscripts that can select different images based on a boot-failure counter, or when userspace installs a software update. These patches have been tested on a TI DRA7xx-based SOM with U-Boot 2015.07. The storage device is an eMMC. Alison Chaiken (3): GPT: add accessor function for disk GUID GPT: read partition table from device into a data structure rename GPT partitions to detect boot failure cmd/gpt.c | 339 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- disk/part_efi.c | 31 ++++++ include/part.h | 24 ++++ 3 files changed, 392 insertions(+), 2 deletions(-) -- 2.1.4

11 115