May 2018 - U-Boot

[U-Boot] [PATCH 1/2] board: move ppa header address in board specific kconfig
by Vinitha V Pillai 07 May '18

07 May '18

Since, ppa firmware address is moved to board specific Kconfig, moving their respective headers also to the same Kconfig files. Signed-off-by: Vinitha V Pillai <vinitha.pillai(a)nxp.com> This patch depends on the following patches: https://patchwork.ozlabs.org/patch/908676/ https://patchwork.ozlabs.org/patch/908089/ --- arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 17 ------------- board/freescale/ls1012ardb/Kconfig | 6 +++++ board/freescale/ls1043aqds/Kconfig | 18 +++++++++++++ board/freescale/ls1043ardb/Kconfig | 21 ++++++++++++++++ board/freescale/ls1046aqds/Kconfig | 18 +++++++++++++ board/freescale/ls1046ardb/Kconfig | 21 ++++++++++++++++ board/freescale/ls1088a/Kconfig | 24 ++++++++++++++++++ board/freescale/ls2080aqds/Kconfig | 18 +++++++++++++ board/freescale/ls2080ardb/Kconfig | 42 +++++++++++++++++++++++++++++++ 9 files changed, 168 insertions(+), 17 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig index 66d6465..2743d87 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/Kconfig +++ b/arch/arm/cpu/armv8/fsl-layerscape/Kconfig @@ -237,23 +237,6 @@ config SYS_LS_PPA_FW_IN_NAND endchoice -config SYS_LS_PPA_ESBC_ADDR - hex "hdr address of PPA firmware loading from" - depends on FSL_LS_PPA && CHAIN_OF_TRUST - default 0x60680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1043A - default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1046A - default 0x40680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1012A - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT && ARCH_LS2080A - default 0x580680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS2080A - default 0x20680000 if SYS_LS_PPA_FW_IN_XIP && ARCH_LS1088A - default 0x680000 if SYS_LS_PPA_FW_IN_MMC - default 0x680000 if SYS_LS_PPA_FW_IN_NAND - help - If the PPA header firmware locate at XIP flash, such as NOR or - QSPI flash, this address is a directly memory-mapped. - If it is in a serial accessed flash, such as NAND and SD - card, it is a byte offset. - config LS_PPA_ESBC_HDR_SIZE hex "Length of PPA ESBC header" depends on FSL_LS_PPA && CHAIN_OF_TRUST && !SYS_LS_PPA_FW_IN_XIP diff --git a/board/freescale/ls1012ardb/Kconfig b/board/freescale/ls1012ardb/Kconfig index 0b873dd..4cd66bd 100644 --- a/board/freescale/ls1012ardb/Kconfig +++ b/board/freescale/ls1012ardb/Kconfig @@ -16,6 +16,12 @@ config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif + if FSL_PFE config BOARD_SPECIFIC_OPTIONS # dummy diff --git a/board/freescale/ls1043aqds/Kconfig b/board/freescale/ls1043aqds/Kconfig index 3c571aa..c3b660f 100644 --- a/board/freescale/ls1043aqds/Kconfig +++ b/board/freescale/ls1043aqds/Kconfig @@ -17,6 +17,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x60400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x60680000 +endif endif if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -24,6 +30,12 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif endif if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -31,6 +43,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1043ardb/Kconfig b/board/freescale/ls1043ardb/Kconfig index 26272c9..60dc9ff 100644 --- a/board/freescale/ls1043ardb/Kconfig +++ b/board/freescale/ls1043ardb/Kconfig @@ -27,6 +27,13 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x60400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x60680000 +endif + endif if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -34,6 +41,13 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif + endif if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -41,6 +55,13 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif + endif source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1046aqds/Kconfig b/board/freescale/ls1046aqds/Kconfig index d75960f..bf93ab9 100644 --- a/board/freescale/ls1046aqds/Kconfig +++ b/board/freescale/ls1046aqds/Kconfig @@ -17,6 +17,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x60400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x60680000 +endif endif if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -24,6 +30,12 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif endif if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -31,6 +43,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1046ardb/Kconfig b/board/freescale/ls1046ardb/Kconfig index cd05cbf..34b7ac2 100644 --- a/board/freescale/ls1046ardb/Kconfig +++ b/board/freescale/ls1046ardb/Kconfig @@ -18,6 +18,13 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x60400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x60680000 +endif + endif if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -25,6 +32,13 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x40400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x40680000 +endif + endif if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -32,6 +46,13 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif + endif source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls1088a/Kconfig b/board/freescale/ls1088a/Kconfig index 235e5d1..931367d 100644 --- a/board/freescale/ls1088a/Kconfig +++ b/board/freescale/ls1088a/Kconfig @@ -17,6 +17,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif endif if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -24,6 +30,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif source "board/freescale/common/Kconfig" @@ -48,6 +60,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif endif if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -55,6 +73,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls2080aqds/Kconfig b/board/freescale/ls2080aqds/Kconfig index 5f23304..8db2dcb 100644 --- a/board/freescale/ls2080aqds/Kconfig +++ b/board/freescale/ls2080aqds/Kconfig @@ -18,6 +18,12 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x580400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x580680000 +endif endif if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -25,6 +31,12 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif endif if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -32,6 +44,12 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif endif source "board/freescale/common/Kconfig" diff --git a/board/freescale/ls2080ardb/Kconfig b/board/freescale/ls2080ardb/Kconfig index 787f8f4..0e66d66 100644 --- a/board/freescale/ls2080ardb/Kconfig +++ b/board/freescale/ls2080ardb/Kconfig @@ -18,6 +18,13 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x580400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x580680000 +endif + endif if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -25,6 +32,13 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif + endif if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -32,6 +46,13 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif + endif source "board/freescale/common/Kconfig" @@ -57,6 +78,13 @@ if SYS_LS_PPA_FW_IN_XIP config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x580400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x580680000 +endif + endif if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) @@ -64,6 +92,13 @@ if (SYS_LS_PPA_FW_IN_XIP && QSPI_BOOT) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x20400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x20680000 +endif + endif if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) @@ -71,6 +106,13 @@ if (SYS_LS_PPA_FW_IN_MMC || SYS_LS_PPA_FW_IN_NAND) config SYS_LS_PPA_FW_ADDR hex "PPA Firmware Addr" default 0x400000 + +if CHAIN_OF_TRUST +config SYS_LS_PPA_ESBC_ADDR + hex "PPA Firmware HDR Addr" + default 0x680000 +endif + endif source "board/freescale/common/Kconfig" -- 2.7.4

1 1

[U-Boot] [PATCH] rockchip: update emmc/sd index for distro boot order
by Kever Yang 07 May '18

07 May '18

According to the emmc/sdcard index in dts alias, emmc is 0 and sdcard is 1, let's update to using correct mmc number for distro boot order in common header. series-version: 2 series-changes: 2 - update the commit message Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- include/configs/rockchip-common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 4062480..d658854 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -16,11 +16,11 @@ #ifndef CONFIG_SPL_BUILD -/* First try to boot from SD (index 0), then eMMC (index 1) */ +/* First try to boot from SD (index 1), then eMMC (index 0) */ #if CONFIG_IS_ENABLED(CMD_MMC) #define BOOT_TARGET_MMC(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) #else #define BOOT_TARGET_MMC(func) #endif -- 1.9.1

1 0

[U-Boot] [PATCH] rockchip: update emmc/sd index
by Kever Yang 07 May '18

07 May '18

We define emmc/sdcard index in dts alias, emmc is 0 and sdcard is 1. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- include/configs/rockchip-common.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 4062480..d658854 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -16,11 +16,11 @@ #ifndef CONFIG_SPL_BUILD -/* First try to boot from SD (index 0), then eMMC (index 1) */ +/* First try to boot from SD (index 1), then eMMC (index 0) */ #if CONFIG_IS_ENABLED(CMD_MMC) #define BOOT_TARGET_MMC(func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) + func(MMC, mmc, 1) \ + func(MMC, mmc, 0) #else #define BOOT_TARGET_MMC(func) #endif -- 1.9.1

2 2

[U-Boot] [PATCH] arm: mach-omap2: cache: Explicitly enable I cache
by Lokesh Vutla 06 May '18

06 May '18

omap-common cache enabling sequence relies on cpu_init_cp15() (inside start.S) for enabling I-caches. But cpu_init_cp15() can be skipped if CONFIG_SKIP_LOWLEVEL_INIT is defined. So enable I-caches if not enabled already. Debugged-by: Jean-Jacques Hiblot <jjhiblot(a)ti.com> Tested-by: Steve Kipisz <s-kipisz2(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/mach-omap2/omap-cache.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-omap2/omap-cache.c b/arch/arm/mach-omap2/omap-cache.c index b37163a4f3..975ee1b020 100644 --- a/arch/arm/mach-omap2/omap-cache.c +++ b/arch/arm/mach-omap2/omap-cache.c @@ -44,7 +44,11 @@ DECLARE_GLOBAL_DATA_PTR; void enable_caches(void) { - /* Enable D-cache. I-cache is already enabled in start.S */ + + /* Enable I cache if not enabled */ + if (!icache_status()) + icache_enable(); + dcache_enable(); } -- 2.17.0

3 3

[U-Boot] [PATCHv2 1/2] stdio_dev.h: Drop the video section as it is unused
by Tom Rini 06 May '18

06 May '18

With tighter build flags the fact that this header referenced uchar/ushort without including what typedefs it causes an error. Rather than add another include here, drop the section in question as it is unused. Reported-by: Peter Robinson <pbrobinson(a)gmail.com> Tested-by: Peter Robinson <pbrobinson(a)gmail.com> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Changes in v2: - Reword slightly, add Tested-by --- include/stdio_dev.h | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 3164fa2a5579..1ea8bff47bab 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -49,24 +49,6 @@ struct stdio_dev { }; /* - * VIDEO EXTENSIONS - */ -#define VIDEO_FORMAT_RGB_INDEXED 0x0000 -#define VIDEO_FORMAT_RGB_DIRECTCOLOR 0x0001 -#define VIDEO_FORMAT_YUYV_4_4_4 0x0010 -#define VIDEO_FORMAT_YUYV_4_2_2 0x0011 - -typedef struct { - void *address; /* Address of framebuffer */ - ushort width; /* Horizontal resolution */ - ushort height; /* Vertical resolution */ - uchar format; /* Format */ - uchar colors; /* Colors number or color depth */ - void (*setcolreg) (int, int, int, int); - void (*getcolreg) (int, void *); -} video_ext_t; - -/* * VARIABLES */ extern struct stdio_dev *stdio_devices[]; -- 2.7.4

2 5

[U-Boot] [PATCH] Kconfig: Add dependency on HASH to verified boot
by Kelvin Cheung 06 May '18

06 May '18

Building with verified boot support requires hash, add that dependency here. Otherwise the following build error will come out without crc command. LD u-boot lib/built-in.o: In function `hash_calculate': lib/rsa/rsa-checksum.c:29: undefined reference to `hash_progressive_lookup_algo' ... make[1]: *** [u-boot] Error 1 Signed-off-by: Kelvin Cheung <keguang.zhang(a)gmail.com> --- Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/Kconfig b/Kconfig index 37331d2..9fd9de1 100644 --- a/Kconfig +++ b/Kconfig @@ -253,6 +253,7 @@ config FIT_SIGNATURE bool "Enable signature verification of FIT uImages" depends on DM select RSA + select HASH help This option enables signature verification of FIT uImages, using a hash signed and verified using RSA. If -- 1.9.1

3 2

[U-Boot] [PATCH] board: ti: am43: Fix DCDC3 voltage for epos-evm
by Keerthy 06 May '18

06 May '18

A common voltage of 1.35V was being programmed for all am43 board versions. EPOS-EVM Needs 1.20V for LPDDR2. Fixes: fc69d472621b5 (“board: ti: AM43XX: Add ddr voltage rail configuration”) Reported-by: James Doublesin <doublesin(a)ti.com> Signed-off-by: Keerthy <j-keerthy(a)ti.com> --- Tested on am43x-epos-evm board/ti/am43xx/board.c | 10 +++++++--- include/power/tps65218.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index d8a024f..7d412db 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -382,7 +382,7 @@ const struct dpll_params *get_dpll_per_params(void) void scale_vcores_generic(u32 m) { - int mpu_vdd; + int mpu_vdd, ddr_volt; if (i2c_probe(TPS65218_CHIP_PM)) return; @@ -421,9 +421,13 @@ void scale_vcores_generic(u32 m) return; } + if (board_is_eposevm()) + ddr_volt = TPS65218_DCDC3_VOLT_SEL_1200MV; + else + ddr_volt = TPS65218_DCDC3_VOLT_SEL_1350MV; + /* Set DCDC3 (DDR) voltage */ - if (tps65218_voltage_update(TPS65218_DCDC3, - TPS65218_DCDC3_VOLT_SEL_1350MV)) { + if (tps65218_voltage_update(TPS65218_DCDC3, ddr_volt)) { printf("%s failure\n", __func__); return; } diff --git a/include/power/tps65218.h b/include/power/tps65218.h index 43b9c9a..f5218f9 100644 --- a/include/power/tps65218.h +++ b/include/power/tps65218.h @@ -64,6 +64,7 @@ enum { #define TPS65218_DCDC_VOLT_SEL_1260MV 0x29 #define TPS65218_DCDC_VOLT_SEL_1330MV 0x30 #define TPS65218_DCDC3_VOLT_SEL_1350MV 0x12 +#define TPS65218_DCDC3_VOLT_SEL_1200MV 0xC #define TPS65218_CC_STAT (BIT(0) | BIT(1)) #define TPS65218_STATE (BIT(2) | BIT(3)) -- 1.9.1

2 2

[U-Boot] [PATCH] README.sandbox: small typos
by Trevor Woerner 06 May '18

06 May '18

Signed-off-by: Trevor Woerner <twoerner(a)gmail.com> --- board/sandbox/README.sandbox | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/board/sandbox/README.sandbox b/board/sandbox/README.sandbox index 760866f1c3..8250073c38 100644 --- a/board/sandbox/README.sandbox +++ b/board/sandbox/README.sandbox @@ -106,8 +106,8 @@ recreate the binary file. To execute commands directly, use the -c option. You can specify a single command, or multiple commands separated by a semicolon, as is normal in -U-Boot. Be careful with quoting as the shall will normally process and -swallow quotes. When -c is used, U-Boot exists after the command is complete, +U-Boot. Be careful with quoting as the shell will normally process and +swallow quotes. When -c is used, U-Boot exits after the command is complete, but you can force it to go to interactive mode instead with -i. @@ -188,7 +188,7 @@ U-Boot sandbox supports these emulations: - SPI flash - TPM (Trusted Platform Module) -A wide range of commands is implemented. Filesystems which use a block +A wide range of commands are implemented. Filesystems which use a block device are supported. Also sandbox supports driver model (CONFIG_DM) and associated commands. @@ -245,7 +245,7 @@ dhcp set serverip WWW.XXX.YYY.ZZZ tftpboot u-boot.bin -The bridge also support (to a lesser extent) the localhost inderface, 'lo'. +The bridge also supports (to a lesser extent) the localhost interface, 'lo'. The 'lo' interface cannot use the RAW AF_PACKET API because the lo interface doesn't support Ethernet-level traffic. It is a higher-level interface that is -- 2.17.0.rc2.3.gc2a499e6c

2 1

[U-Boot] [PATCH v2 00/17] bmips: convert to use live-dt
by Álvaro Fernández Rojas 06 May '18

06 May '18

Convert bmips drivers to use live device tree instead of flattened device tree. v2: Introduce changes suggested by Daniel Schwierzeck and Simon Glass: - Add generic dev_remap_addr/dev_remap_addr_index functions. - Fix bcm63xx_spi conversion. - Convert remaining bmips drivers (cpu, usbh-phy). Álvaro Fernández Rojas (17): dm: core: add functions to get memory-mapped I/O addreses watchdog: bcm6345: convert to use live dt serial: bcm6345: convert to use live dt clk: bcm6345: convert to use live dt reset: bcm6345: convert to use live dt gpio: bcm6345: convert to use live dt led: bcm6358: convert to use live dt led: bcm6328: convert to use live dt power: domain: bcm6328: convert to use live dt spi: bcm63xx_spi: convert to use live dt spi: bcm63xx_hsspi: convert to use live dt ram: bmips: convert to use live dt cpu: bmips: convert to use live dt phy: bcm6348-usbh: convert to use live dt phy: bcm6358-usbh: convert to use live dt phy: bcm6368-usbh: convert to use live dt phy: bcm6318-usbh: convert to use live dt drivers/clk/clk_bcm6345.c | 8 ++--- drivers/core/fdtaddr.c | 12 +++++++ drivers/core/read.c | 12 +++++++ drivers/cpu/bmips_cpu.c | 12 ++----- drivers/gpio/bcm6345_gpio.c | 18 +++------- drivers/led/led_bcm6328.c | 52 ++++++++++------------------- drivers/led/led_bcm6358.c | 44 +++++++++--------------- drivers/phy/bcm6318-usbh-phy.c | 10 ++---- drivers/phy/bcm6348-usbh-phy.c | 10 ++---- drivers/phy/bcm6358-usbh-phy.c | 10 ++---- drivers/phy/bcm6368-usbh-phy.c | 9 ++--- drivers/power/domain/bcm6328-power-domain.c | 8 ++--- drivers/ram/bmips_ram.c | 7 ++-- drivers/reset/reset-bcm6345.c | 8 ++--- drivers/serial/serial_bcm6345.c | 8 ++--- drivers/spi/bcm63xx_hsspi.c | 12 ++----- drivers/spi/bcm63xx_spi.c | 12 ++----- drivers/watchdog/bcm6345_wdt.c | 8 ++--- include/dm/fdtaddr.h | 22 ++++++++++++ include/dm/read.h | 32 ++++++++++++++++++ 20 files changed, 148 insertions(+), 166 deletions(-) -- 2.11.0

3 40

[U-Boot] [PATCH v3] dm: core: add functions to get memory-mapped I/O addresses
by Daniel Schwierzeck 06 May '18

06 May '18

From: Álvaro Fernández Rojas <noltari(a)gmail.com> Signed-off-by: Álvaro Fernández Rojas <noltari(a)gmail.com> Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Signed-off-by: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> --- This replaces/updates patch 01/17 from patch series https://patchwork.ozlabs.org/cover/889542/. The update fixes some issues with Sandbox and adds unit-tests. The remaining patches from the patch series can be applied as-is when this patch has been committed. Changes in v3: - replace ioremap() with map_physmem() - add unit tests - fix checkpatch.pl warnings Changes in v2: - new patch drivers/core/fdtaddr.c | 15 +++++++++++++++ drivers/core/read.c | 15 +++++++++++++++ include/dm/fdtaddr.h | 22 ++++++++++++++++++++++ include/dm/read.h | 32 ++++++++++++++++++++++++++++++++ test/dm/test-fdt.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+) diff --git a/drivers/core/fdtaddr.c b/drivers/core/fdtaddr.c index 9a3b4c312a..afea47bf7c 100644 --- a/drivers/core/fdtaddr.c +++ b/drivers/core/fdtaddr.c @@ -137,6 +137,21 @@ void *devfdt_get_addr_ptr(struct udevice *dev) return (void *)(uintptr_t)devfdt_get_addr_index(dev, 0); } +void *devfdt_remap_addr_index(struct udevice *dev, int index) +{ + fdt_addr_t addr = devfdt_get_addr(dev); + + if (addr == FDT_ADDR_T_NONE) + return NULL; + + return map_physmem(addr, 0, MAP_NOCACHE); +} + +void *devfdt_remap_addr(struct udevice *dev) +{ + return devfdt_remap_addr_index(dev, 0); +} + void *devfdt_map_physmem(struct udevice *dev, unsigned long size) { fdt_addr_t addr = devfdt_get_addr(dev); diff --git a/drivers/core/read.c b/drivers/core/read.c index 601d1322d6..615551b8f3 100644 --- a/drivers/core/read.c +++ b/drivers/core/read.c @@ -58,6 +58,16 @@ fdt_addr_t dev_read_addr_index(struct udevice *dev, int index) return devfdt_get_addr_index(dev, index); } +void *dev_remap_addr_index(struct udevice *dev, int index) +{ + fdt_addr_t addr = dev_read_addr_index(dev, index); + + if (addr == FDT_ADDR_T_NONE) + return NULL; + + return map_physmem(addr, 0, MAP_NOCACHE); +} + fdt_addr_t dev_read_addr(struct udevice *dev) { return dev_read_addr_index(dev, 0); @@ -70,6 +80,11 @@ void *dev_read_addr_ptr(struct udevice *dev) return (addr == FDT_ADDR_T_NONE) ? NULL : map_sysmem(addr, 0); } +void *dev_remap_addr(struct udevice *dev) +{ + return dev_remap_addr_index(dev, 0); +} + fdt_addr_t dev_read_addr_size(struct udevice *dev, const char *property, fdt_size_t *sizep) { diff --git a/include/dm/fdtaddr.h b/include/dm/fdtaddr.h index c46f0e91d0..82fc5f931d 100644 --- a/include/dm/fdtaddr.h +++ b/include/dm/fdtaddr.h @@ -34,6 +34,28 @@ fdt_addr_t devfdt_get_addr(struct udevice *dev); */ void *devfdt_get_addr_ptr(struct udevice *dev); +/** + * devfdt_remap_addr() - Return pointer to the memory-mapped I/O address + * of the reg property of a device + * + * @dev: Pointer to a device + * + * @return Pointer to addr, or NULL if there is no such property + */ +void *devfdt_remap_addr(struct udevice *dev); + +/** + * devfdt_remap_addr_index() - Return indexed pointer to the memory-mapped + * I/O address of the reg property of a device + * @index: the 'reg' property can hold a list of <addr, size> pairs + * and @index is used to select which one is required + * + * @dev: Pointer to a device + * + * @return Pointer to addr, or NULL if there is no such property + */ +void *devfdt_remap_addr_index(struct udevice *dev, int index); + /** * devfdt_map_physmem() - Read device address from reg property of the * device node and map the address into CPU address diff --git a/include/dm/read.h b/include/dm/read.h index f14c7a7ba8..c826a2235c 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -113,6 +113,18 @@ int dev_read_size(struct udevice *dev, const char *propname); */ fdt_addr_t dev_read_addr_index(struct udevice *dev, int index); +/** + * dev_remap_addr_index() - Get the indexed reg property of a device + * as a memory-mapped I/O pointer + * + * @dev: Device to read from + * @index: the 'reg' property can hold a list of <addr, size> pairs + * and @index is used to select which one is required + * + * @return pointer or NULL if not found + */ +void *dev_remap_addr_index(struct udevice *dev, int index); + /** * dev_read_addr() - Get the reg property of a device * @@ -132,6 +144,16 @@ fdt_addr_t dev_read_addr(struct udevice *dev); */ void *dev_read_addr_ptr(struct udevice *dev); +/** + * dev_remap_addr() - Get the reg property of a device as a + * memory-mapped I/O pointer + * + * @dev: Device to read from + * + * @return pointer or NULL if not found + */ +void *dev_remap_addr(struct udevice *dev); + /** * dev_read_addr_size() - get address and size from a device property * @@ -483,6 +505,16 @@ static inline void *dev_read_addr_ptr(struct udevice *dev) return devfdt_get_addr_ptr(dev); } +static inline void *dev_remap_addr(struct udevice *dev) +{ + return devfdt_remap_addr(dev); +} + +static inline void *dev_remap_addr_index(struct udevice *dev, int index) +{ + return devfdt_remap_addr_index(dev, index); +} + static inline fdt_addr_t dev_read_addr_size(struct udevice *dev, const char *propname, fdt_size_t *sizep) diff --git a/test/dm/test-fdt.c b/test/dm/test-fdt.c index 0d11bfdb2f..b104a6533e 100644 --- a/test/dm/test-fdt.c +++ b/test/dm/test-fdt.c @@ -462,3 +462,45 @@ static int dm_test_fdt_translation(struct unit_test_state *uts) return 0; } DM_TEST(dm_test_fdt_translation, DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT); + +/* Test devfdt_remap_addr_index() */ +static int dm_test_fdt_remap_addr_flat(struct unit_test_state *uts) +{ + struct udevice *dev; + fdt_addr_t addr; + void *paddr; + + ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, true, &dev)); + + addr = devfdt_get_addr(dev); + ut_asserteq(0x8000, addr); + + paddr = map_physmem(addr, 0, MAP_NOCACHE); + ut_assertnonnull(paddr); + ut_asserteq_ptr(paddr, devfdt_remap_addr(dev)); + + return 0; +} +DM_TEST(dm_test_fdt_remap_addr_flat, + DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT | DM_TESTF_FLAT_TREE); + +/* Test dev_remap_addr_index() */ +static int dm_test_fdt_remap_addr_live(struct unit_test_state *uts) +{ + struct udevice *dev; + fdt_addr_t addr; + void *paddr; + + ut_assertok(uclass_find_device_by_seq(UCLASS_TEST_DUMMY, 0, true, &dev)); + + addr = dev_read_addr(dev); + ut_asserteq(0x8000, addr); + + paddr = map_physmem(addr, 0, MAP_NOCACHE); + ut_assertnonnull(paddr); + ut_asserteq_ptr(paddr, dev_remap_addr(dev)); + + return 0; +} +DM_TEST(dm_test_fdt_remap_addr_live, + DM_TESTF_SCAN_PDATA | DM_TESTF_SCAN_FDT | DM_TESTF_LIVE_TREE); -- 2.17.0

2 2