August 2016 - U-Boot

[U-Boot] [PATCH] imx: mx7dsabresd: consolidate BOOT_FROM
by Peng Fan 28 Aug '16

28 Aug '16

To i.MX7, different boot medias' IVT offset is fixed at 0x400. So consolidate BOOT_FROM to use FLASH_OFFSET_STANDARD. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> --- board/freescale/mx7dsabresd/imximage.cfg | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/board/freescale/mx7dsabresd/imximage.cfg b/board/freescale/mx7dsabresd/imximage.cfg index 76574ff..7314316 100644 --- a/board/freescale/mx7dsabresd/imximage.cfg +++ b/board/freescale/mx7dsabresd/imximage.cfg @@ -16,11 +16,8 @@ IMAGE_VERSION 2 -/* - * Boot Device : sd - */ - -BOOT_FROM sd +/* valid for various boot medias */ +BOOT_FROM FLASH_OFFSET_STANDARD /* * Secure boot support -- 2.6.2

2 4

[U-Boot] [PATCH] ARM: uniphier: support system reset functionality for PSCI
by Masahiro Yamada 28 Aug '16

28 Aug '16

This supports the system reset via PSCI for ARMv7 SoCs. Because the system reset is not supported on PSCI 0.1, let's define CONFIG_ARMV7_PSCI_1_0. (it is supported since PSCI 0.2, but there is no CONFIG to enable it in U-Boot for now.) Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/mach-uniphier/arm32/psci.c | 5 +++++ arch/arm/mach-uniphier/reset.c | 10 +++++++++- include/configs/uniphier.h | 1 + 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-uniphier/arm32/psci.c b/arch/arm/mach-uniphier/arm32/psci.c index 633a3e0..e668265 100644 --- a/arch/arm/mach-uniphier/arm32/psci.c +++ b/arch/arm/mach-uniphier/arm32/psci.c @@ -151,3 +151,8 @@ int __secure psci_cpu_on(u32 function_id, u32 cpuid, u32 entry_point) return PSCI_RET_SUCCESS; } + +void __secure psci_system_reset(u32 function_id) +{ + reset_cpu(0); +} diff --git a/arch/arm/mach-uniphier/reset.c b/arch/arm/mach-uniphier/reset.c index b5825bc..af5ad14 100644 --- a/arch/arm/mach-uniphier/reset.c +++ b/arch/arm/mach-uniphier/reset.c @@ -6,10 +6,18 @@ #include <common.h> #include <linux/io.h> +#include <asm/secure.h> #include "sc-regs.h" -void reset_cpu(unsigned long ignored) +/* If PSCI is enabled, this is used for SYSTEM_RESET function */ +#ifdef CONFIG_ARMV7_PSCI +#define __SECURE __secure +#else +#define __SECURE +#endif + +void __SECURE reset_cpu(unsigned long ignored) { u32 tmp; diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 0f5b20f..184704b 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -12,6 +12,7 @@ #define __CONFIG_UNIPHIER_COMMON_H__ #define CONFIG_ARMV7_PSCI +#define CONFIG_ARMV7_PSCI_1_0 #define CONFIG_ARMV7_PSCI_NR_CPUS 4 #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 -- 1.9.1

1 1

[U-Boot] [PATCH] ARM: uniphier: change UNIPHIER_SERIAL to default y option
by Masahiro Yamada 28 Aug '16

28 Aug '16

This is very likely to be necessary for normal use cases. Set its default to 'y' for shorter defconfig files. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- configs/uniphier_ld11_defconfig | 1 - configs/uniphier_ld20_defconfig | 1 - configs/uniphier_ld4_sld8_defconfig | 1 - configs/uniphier_pro4_defconfig | 1 - configs/uniphier_pxs2_ld6b_defconfig | 1 - configs/uniphier_sld3_defconfig | 1 - drivers/serial/Kconfig | 1 + 7 files changed, 1 insertion(+), 6 deletions(-) diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig index 57b9c07..9b32d68 100644 --- a/configs/uniphier_ld11_defconfig +++ b/configs/uniphier_ld11_defconfig @@ -25,7 +25,6 @@ CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_UNIPHIER_SERIAL=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index e6aa525..7623381 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -26,7 +26,6 @@ CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_UNIPHIER_SERIAL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index 47b577a..f51e0da 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -31,7 +31,6 @@ CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_UNIPHIER_SERIAL=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index e156ec5..c47d02f 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -30,7 +30,6 @@ CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_UNIPHIER_SERIAL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index f943516..9eebad1 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -31,7 +31,6 @@ CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y CONFIG_PINCTRL=y CONFIG_SPL_PINCTRL=y -CONFIG_UNIPHIER_SERIAL=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_STORAGE=y diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 598cde2..2f6f476 100644 --- a/configs/uniphier_sld3_defconfig +++ b/configs/uniphier_sld3_defconfig @@ -28,7 +28,6 @@ CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 CONFIG_SPL_NAND_DENALI=y -CONFIG_UNIPHIER_SERIAL=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 9ff7234..ab5df70 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig @@ -344,6 +344,7 @@ config SANDBOX_SERIAL config UNIPHIER_SERIAL bool "Support for UniPhier on-chip UART" depends on ARCH_UNIPHIER + default y help If you have a UniPhier based board and want to use the on-chip serial ports, say Y to this option. If unsure, say N. -- 1.9.1

1 1

[U-Boot] [PATCH 0/3] ARM: uniphier: some more fixes for v2016.09
by Masahiro Yamada 28 Aug '16

28 Aug '16

Masahiro Yamada (3): ARM: uniphier: display revision of Micro Support Card 3.6.x kindly ARM: uniphier: increase CONFIG_SYS_MALLOC_F_LEN for sLD3 ARM: dts: uniphier: add u-boot,dm-pre-reloc to use eMMC boot on sLD3 arch/arm/dts/uniphier-ph1-sld3-ref.dts | 8 ++++++++ arch/arm/dts/uniphier-ph1-sld3.dtsi | 1 + arch/arm/mach-uniphier/micro-support-card.c | 7 ++++++- configs/uniphier_sld3_defconfig | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) -- 1.9.1

1 4

[U-Boot] [PATCH] mmc: uniphier-sd: add static qualifiers to probe and remove callbacks
by Masahiro Yamada 28 Aug '16

28 Aug '16

They are both only referenced in this file. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- drivers/mmc/uniphier-sd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/uniphier-sd.c b/drivers/mmc/uniphier-sd.c index 2a48378..f06e737 100644 --- a/drivers/mmc/uniphier-sd.c +++ b/drivers/mmc/uniphier-sd.c @@ -646,7 +646,7 @@ static const struct mmc_ops uniphier_sd_ops = { .getcd = uniphier_sd_getcd, }; -int uniphier_sd_probe(struct udevice *dev) +static int uniphier_sd_probe(struct udevice *dev) { struct uniphier_sd_priv *priv = dev_get_priv(dev); struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); @@ -731,7 +731,7 @@ int uniphier_sd_probe(struct udevice *dev) return 0; } -int uniphier_sd_remove(struct udevice *dev) +static int uniphier_sd_remove(struct udevice *dev) { struct uniphier_sd_priv *priv = dev_get_priv(dev); -- 1.9.1

1 1

[U-Boot] u-boot - raspberry pi
by dh＠synoia.com 27 Aug '16

27 Aug '16

We have u-boot working on a raspberry pi, but need to append our kernel parms to those built by the firmware. is there a version of u-boot for the pi 3, with this support, and some doc (the variable name for the firmware built kernel parms), a github link would be perfect. We have an order of 400 PIs for a hospital in S America, and want to supply net boot, including kernels. Duncan Hare 714 931 7952

3 5

[U-Boot] [PATCH] rockchip: use dummy byte only enable OF_PLATDATA
by Ziyuan Xu 27 Aug '16

27 Aug '16

Add a condition to determine the rk3288_sdram_channel size. This patch fixes read sdram_channel property failed from DT on rk3288 boards, which not enable OF_PLATDATA. Signed-off-by: Ziyuan Xu <xzy.xu(a)rock-chips.com> --- arch/arm/include/asm/arch-rockchip/sdram.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/sdram.h b/arch/arm/include/asm/arch-rockchip/sdram.h index e08e28f..82c3d07 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram.h +++ b/arch/arm/include/asm/arch-rockchip/sdram.h @@ -24,12 +24,16 @@ struct rk3288_sdram_channel { u8 row_3_4; u8 cs0_row; u8 cs1_row; +#if CONFIG_IS_ENABLED(OF_PLATDATA) /* * For of-platdata, which would otherwise convert this into two * byte-swapped integers. With a size of 9 bytes, this struct will * appear in of-platdata as a byte array. + * + * If OF_PLATDATA enabled, need to add a dummy byte in dts.(i.e 0xff) */ u8 dummy; +#endif }; struct rk3288_sdram_pctl_timing { -- 2.9.2

2 2

[U-Boot] [RESEND PATCH v2 0/5] add pinctrl driver for rk3399
by Kever Yang 27 Aug '16

27 Aug '16

Resend this patch set for some of patches are missing due to my local mail system problem. This patch set add the pinctrl driver for rk3399 and enable pinctrl for pwm module. Module with pinctrl driver support and with interrupt number and default pinctrl in dts node will get pinctrl initialized when driver probe. Module like pwm which without interrupt number need to call the pinctrl API manually. Changes in v2: - move and reg value MACRO in C source, and use MASK/SHIFT Kever Yang (5): rk3399: syscon: add support for pmugrf pinctrl: add driver for rk3399 config: evb-rk3399: enable pinctrl driver rk3399: enable the pwm2/3 pinctrl in board init dts: rk3399: add pinctrl for sdmmc arch/arm/dts/rk3399.dtsi | 37 ++ arch/arm/include/asm/arch-rockchip/clock.h | 1 + arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 321 +++++++++++++++++ arch/arm/mach-rockchip/rk3399/syscon_rk3399.c | 1 + board/rockchip/evb_rk3399/evb-rk3399.c | 31 +- configs/evb-rk3399_defconfig | 2 + drivers/pinctrl/Kconfig | 9 + drivers/pinctrl/rockchip/Makefile | 1 + drivers/pinctrl/rockchip/pinctrl_rk3399.c | 439 ++++++++++++++++++++++++ 9 files changed, 841 insertions(+), 1 deletion(-) create mode 100644 arch/arm/include/asm/arch-rockchip/grf_rk3399.h create mode 100644 drivers/pinctrl/rockchip/pinctrl_rk3399.c -- 1.9.1

2 11

[U-Boot] [PATCH] rockchip: Disable SPL_MMC_SUPPORT if ROCKCHIP_SPL_BACK_TO_BROM is enabled.
by Sandy Patterson 27 Aug '16

27 Aug '16

CONFIG_SPL_MMC_SUPPORT is used pretty much for every board except jerry, so we can refactor the define into rk3288_common.h. Then only define it if we are using using the Bootrom to load the non SPL U-Boot. With this change the SPL binary shrinks from 32k to 23k when ROCKCHIP_SPL_BACK_TO_BROM is enabled. This has been tested on the rock2 board. It should work with any rk3288 though since the bootrom is loading the SPL already it should load the main U-Boot as well. Rock2 has been tested with ROCKCHIP_SPL_BACK_TO_BROM So enabled for rock2. Signed-off-by: Sandy Patterson <apatterson(a)sightlogix.com> --- configs/rock2_defconfig | 1 + include/configs/chromebook_jerry.h | 1 + include/configs/evb_rk3288.h | 2 -- include/configs/fennec_rk3288.h | 2 -- include/configs/firefly-rk3288.h | 2 -- include/configs/miniarm_rk3288.h | 2 -- include/configs/popmetal_rk3288.h | 2 -- include/configs/rk3288_common.h | 4 ++++ include/configs/rock2.h | 2 -- 9 files changed, 6 insertions(+), 12 deletions(-) diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 3b6d7d9..8f730e5 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -67,3 +67,4 @@ CONFIG_USE_PRIVATE_LIBGCC=y CONFIG_USE_TINY_PRINTF=y CONFIG_CMD_DHRYSTONE=y CONFIG_ERRNO_STR=y +CONFIG_ROCKCHIP_SPL_BACK_TO_BROM=y diff --git a/include/configs/chromebook_jerry.h b/include/configs/chromebook_jerry.h index d1f5b46..9800ffb 100644 --- a/include/configs/chromebook_jerry.h +++ b/include/configs/chromebook_jerry.h @@ -22,6 +22,7 @@ #define CONFIG_CMD_SF_TEST +#undef CONFIG_SPL_MMC_SUPPORT #undef CONFIG_SPL_GPIO_SUPPORT #define CONFIG_KEYBOARD diff --git a/include/configs/evb_rk3288.h b/include/configs/evb_rk3288.h index 342557f..390c243 100644 --- a/include/configs/evb_rk3288.h +++ b/include/configs/evb_rk3288.h @@ -10,8 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/fennec_rk3288.h b/include/configs/fennec_rk3288.h index 342557f..390c243 100644 --- a/include/configs/fennec_rk3288.h +++ b/include/configs/fennec_rk3288.h @@ -10,8 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h index a29f557..ee924c3 100644 --- a/include/configs/firefly-rk3288.h +++ b/include/configs/firefly-rk3288.h @@ -14,8 +14,6 @@ #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* SPL @ 32k for ~36k diff --git a/include/configs/miniarm_rk3288.h b/include/configs/miniarm_rk3288.h index 342557f..390c243 100644 --- a/include/configs/miniarm_rk3288.h +++ b/include/configs/miniarm_rk3288.h @@ -10,8 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/popmetal_rk3288.h b/include/configs/popmetal_rk3288.h index 342557f..390c243 100644 --- a/include/configs/popmetal_rk3288.h +++ b/include/configs/popmetal_rk3288.h @@ -10,8 +10,6 @@ #define ROCKCHIP_DEVICE_SETTINGS #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 1 /* SPL @ 32k for ~36k diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index d3d4c68..bc0de3d 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -33,6 +33,10 @@ #define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SPL_BOARD_INIT +#ifndef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM +#define CONFIG_SPL_MMC_SUPPORT +#endif + #ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM /* Bootrom will load u-boot binary to 0x0 once return from SPL */ #define CONFIG_SYS_TEXT_BASE 0x00000000 diff --git a/include/configs/rock2.h b/include/configs/rock2.h index a29f557..ee924c3 100644 --- a/include/configs/rock2.h +++ b/include/configs/rock2.h @@ -14,8 +14,6 @@ #include <configs/rk3288_common.h> -#define CONFIG_SPL_MMC_SUPPORT - #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* SPL @ 32k for ~36k -- 1.9.1

2 4

[U-Boot] [PATCH 2/3 v2] sandbox: Add "host size" hostfs command for fs test
by Stefan Brüns 27 Aug '16

27 Aug '16

This complements the size/fatsize/ext4size commands added in commit cf6598193aed5de8855eaf70c1994f2bc437255a load, save and ls are already implemented for hostfs, now tests can cover the same operations on hostfs and emulated block devices. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Acked-by: Simon Glass <sjg(a)chromium.org> --- cmd/host.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cmd/host.c b/cmd/host.c index 8d84415..b427e54 100644 --- a/cmd/host.c +++ b/cmd/host.c @@ -25,6 +25,12 @@ static int do_host_ls(cmd_tbl_t *cmdtp, int flag, int argc, return do_ls(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX); } +static int do_host_size(cmd_tbl_t *cmdtp, int flag, int argc, + char * const argv[]) +{ + return do_size(cmdtp, flag, argc, argv, FS_TYPE_SANDBOX); +} + static int do_host_save(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { @@ -138,6 +144,7 @@ static cmd_tbl_t cmd_host_sub[] = { U_BOOT_CMD_MKENT(load, 7, 0, do_host_load, "", ""), U_BOOT_CMD_MKENT(ls, 3, 0, do_host_ls, "", ""), U_BOOT_CMD_MKENT(save, 6, 0, do_host_save, "", ""), + U_BOOT_CMD_MKENT(size, 3, 0, do_host_size, "", ""), U_BOOT_CMD_MKENT(bind, 3, 0, do_host_bind, "", ""), U_BOOT_CMD_MKENT(info, 3, 0, do_host_info, "", ""), U_BOOT_CMD_MKENT(dev, 0, 1, do_host_dev, "", ""), @@ -174,6 +181,7 @@ U_BOOT_CMD( "host ls hostfs - <filename> - list files on host\n" "host save hostfs - <addr> <filename> <bytes> [<offset>] - " "save a file to host\n" + "host size hostfs - <filename> - determine size of file on host" "host bind <dev> [<filename>] - bind \"host\" device to file\n" "host info [<dev>] - show device binding & info\n" "host dev [<dev>] - Set or retrieve the current host device\n" -- 2.9.2

2 1