October 2018 - U-Boot

[U-Boot] [PATCH] ARM: rmobile: Drop PRR syscon driver
by Marek Vasut 18 Oct '18

18 Oct '18

The PRR syscon driver is available too late for Multi DTB build of U-Boot. Replace it with simple check whether a platform is Gen3 or not and produce an address of the PRR. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> --- arch/arm/mach-rmobile/cpu_info-rcar.c | 61 ++++----------------------- 1 file changed, 8 insertions(+), 53 deletions(-) diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c index ccb7a32ac4..ce9312f9d8 100644 --- a/arch/arm/mach-rmobile/cpu_info-rcar.c +++ b/arch/arm/mach-rmobile/cpu_info-rcar.c @@ -11,7 +11,14 @@ #define R8A7796_REV_1_0 0x5200 #define R8A7796_REV_1_1 0x5210 -static u32 rmobile_get_prr(void); +static u32 rmobile_get_prr(void) +{ +#ifdef CONFIG_RCAR_GEN3 + return readl(0xFFF00044); +#else + return readl(0xFF000044); +#endif +} u32 rmobile_get_cpu_type(void) { @@ -37,55 +44,3 @@ u32 rmobile_get_cpu_rev_fraction(void) else return prr & 0x0000000F; } - -#if !CONFIG_IS_ENABLED(DM) || !CONFIG_IS_ENABLED(SYSCON) -static u32 rmobile_get_prr(void) -{ - /* - * On RCar/RMobile Gen2 and older systems, the PRR is always - * located at the address below. On newer systems, the PRR - * may be located at different address, but that information - * is obtained from DT. This code will be removed when all - * of the older systems get converted to DM and OF control. - */ - return readl(0xFF000044); -} -#else - -#include <dm.h> -#include <syscon.h> -#include <regmap.h> - -struct renesas_prr_priv { - fdt_addr_t regs; -}; - -enum { - PRR_RCAR, -}; - -static u32 rmobile_get_prr(void) -{ - struct regmap *map; - - map = syscon_get_regmap_by_driver_data(PRR_RCAR); - if (!map) { - printf("PRR regmap failed!\n"); - hang(); - } - - return readl(map->ranges[0].start); -} - -static const struct udevice_id renesas_prr_ids[] = { - { .compatible = "renesas,prr", .data = PRR_RCAR }, - { } -}; - -U_BOOT_DRIVER(renesas_prr) = { - .name = "renesas_prr", - .id = UCLASS_SYSCON, - .of_match = renesas_prr_ids, - .flags = DM_FLAG_PRE_RELOC, -}; -#endif -- 2.18.0

1 0

[U-Boot] [BUG] H2+/H3 : SPI driver : error: ‘AHB_GATE_OFFSET_SPI0’ undeclared (first use in this function)
by Arjan van Vught 18 Oct '18

18 Oct '18

Version: u-boot-2018.09 Configuration : orangepi_zero_defconfig In file included from include/wait_bit.h:15:0, from drivers/spi/sun4i_spi.c:26: drivers/spi/sun4i_spi.c: In function 'sun4i_spi_enable_clock': LD drivers/usb/musb-new/built-in.o drivers/spi/sun4i_spi.c:246:38: error: 'AHB_GATE_OFFSET_SPI0' undeclared (first use in this function); did you mean 'AHB_GATE_OFFSET_MMC0'? setbits_le32(&ccm->ahb_gate0, (1 << AHB_GATE_OFFSET_SPI0)); AHB_GATE_OFFSET_SPI0 can be found in: ./arch/arm/include/asm/arch-sunxi/clock_sun4i.h:#define AHB_GATE_OFFSET_SPI0 20 ./arch/arm/include/asm/arch-sunxi/clock_sun8i_a83t.h:#define AHB_GATE_OFFSET_SPI0 20 ~/uboot/u-boot-2018.09$ grep -a CONFIG_MACH_SUN8I .config # CONFIG_MACH_SUN8I_A23 is not set # CONFIG_MACH_SUN8I_A33 is not set # CONFIG_MACH_SUN8I_A83T is not set CONFIG_MACH_SUN8I_H3=y # CONFIG_MACH_SUN8I_R40 is not set # CONFIG_MACH_SUN8I_V3S is not set CONFIG_MACH_SUN8I=y With arch/arm/include/asm/arch/clock.h #if defined(CONFIG_MACH_SUN8I_A83T) #include <asm/arch/clock_sun8i_a83t.h> #elif defined(CONFIG_MACH_SUN50I_H6) #include <asm/arch/clock_sun50i_h6.h> #elif defined(CONFIG_MACH_SUN6I) || defined(CONFIG_MACH_SUN8I) || \ defined(CONFIG_MACH_SUN50I) #include <asm/arch/clock_sun6i.h> #elif defined(CONFIG_MACH_SUN9I) #include <asm/arch/clock_sun9i.h> #else #include <asm/arch/clock_sun4i.h> #endif The AHB_GATE_OFFSET_SPI0 should be defined in asm/arch/clock_sun6i.h - Arjan

1 0

[U-Boot] [PATCH v2 00/19] DM_I2C_COMPAT removal for all ti platforms
by Jean-Jacques Hiblot 18 Oct '18

18 Oct '18

This series remove the usage of the DM_I2C_COMPAT option for all the ti platforms. It also takes this opportunity to not disable DM_I2C in the SPL. There are a couples of issues to fix: - CMD_EEPROM does not support the DM API. Fixed by removing this option when DM_I2C is used without DM_I2C_COMPAT - i2c_get_chip_for_busnum() does not work when OF_CONTROL is not used (as is the case with am33xx SPL). - The I2C driver do not support DM_I2C without OF_CONTROL. - Most of the PMIC drivers do not support the I2C DM API. - Board detection is done prior DM initialization. Fixed by moving it after DM is initialized. That move breaks the DRA7 platforms (The fixes for that are at the last 5 patches this series) When all this is taken care of DM_I2C_COMPAT can be removed and DM_I2C enabled in the SPL. This has been tested with the following boards: - am437x SK - am335x SK - am335x beaglebone (both DM and non-DM config) - dra76 evm - am572 evm - k2g evm The following targets may be impacted by the changes related to SPL_OF_CONTROL and SPL_OF_PLATDATA: - am3517_evm_defconfig - omap3_logic_defconfig - chromebit_mickey_defconfig - chromebook_jerry_defconfig - chromebook_minnie_defconfig - evb-rk3399_defconfig - rock_defconfig It would be nice it some of you could try to boot them. Changes in v2: - Add missing commit log to the commit disabling CMD_EEPROM when non-DM API is not available - don't use the DT to find the req_seq number if SPL_OF_PLATDATA is used. Instead do it as if SPL_OF_CONTROL is not defined. - Also add DM_I2C support to the twl6030 driver - remove the remaining non-DM I2C API call for pdu001 board. - Fixed warning in power_init_board() for the am43xx ti boards. Andreas Dannenberg (1): ti: common: board_detect: Allow DM I2C without CONFIG_DM_I2C_COMPAT Jean-Jacques Hiblot (17): cmd: Kconfig: Do not include EEPROM if DM_I2C is used without DM_I2C_COMPAT dm: i2c: Add dm_i2c_probe_device() to test the presence of a chip dm: device: Allow using uclass_find_device_by_seq() without OF_CONTROL configs: am335x: am57x: dra7x: Enable CONFIG_SPL_DM_SEQ_ALIAS i2c: omap24xx_i2c: Use platdata to probe the device am335x: Register the I2C controllers if DM_I2C is used. dts: am43x: omap5: Add node for I2C in SPL omap: detect the board after DM is available power: make most tps drivers and the twl4030 driver compatible with DM_I2C configs: am335x_pdu001: remove CONFIG_DM_I2C_COMPAT ti: remove usage of DM_I2C_COMPAT and don't disable DM_I2C in SPL am57xx: remove non-DM I2C code configs: dra7xx-evm: increase the size of the malloc's pool before relocation lib: fdtdec: Add function re-setup the fdt more effeciently drivers: core: Add the option SPL_DM_DEVICE_REMOVE to the Kconfig drivers: core: nullify gd->dm_root after dm_uninit() dra7: Allow selecting a new dtb after board detection. Vignesh R (1): i2c: omap24xx_i2c: Move away from SoC specific headers for reg offset arch/arm/dts/am437x-gp-evm-u-boot.dtsi | 4 + arch/arm/dts/omap5-u-boot.dtsi | 4 + arch/arm/include/asm/arch-am33xx/i2c.h | 47 +-- arch/arm/include/asm/arch-omap3/i2c.h | 47 --- arch/arm/include/asm/arch-omap4/i2c.h | 45 --- arch/arm/include/asm/arch-omap5/i2c.h | 45 --- arch/arm/include/asm/omap_i2c.h | 24 ++ arch/arm/mach-keystone/ddr3_spd.c | 7 + arch/arm/mach-omap2/am33xx/board.c | 24 +- arch/arm/mach-omap2/am33xx/clk_synthesizer.c | 56 +++- arch/arm/mach-omap2/clocks-common.c | 2 + arch/arm/mach-omap2/hwinit-common.c | 23 +- board/eets/pdu001/board.c | 1 - board/ti/am335x/board.c | 17 +- board/ti/am335x/mux.c | 14 + board/ti/am43xx/board.c | 46 ++- board/ti/am57xx/board.c | 25 +- board/ti/common/board_detect.c | 110 +++---- board/ti/ks2_evm/board_k2g.c | 11 + cmd/Kconfig | 1 + configs/am335x_pdu001_defconfig | 1 + configs/am57xx_evm_defconfig | 1 + configs/am57xx_hs_evm_defconfig | 1 + configs/dra7xx_evm_defconfig | 4 +- configs/dra7xx_hs_evm_defconfig | 1 + configs/omap3_logic_defconfig | 1 + drivers/core/Kconfig | 12 +- drivers/core/device.c | 10 +- drivers/core/root.c | 1 + drivers/core/uclass.c | 24 ++ drivers/i2c/i2c-uclass.c | 8 + drivers/i2c/omap24xx_i2c.c | 467 ++++++++++++++++++--------- drivers/power/palmas.c | 39 +++ drivers/power/pmic/pmic_tps62362.c | 27 ++ drivers/power/pmic/pmic_tps65217.c | 47 ++- drivers/power/pmic/pmic_tps65218.c | 88 +++++ drivers/power/pmic/pmic_tps65910.c | 60 +++- drivers/power/twl4030.c | 39 +++ drivers/power/twl6030.c | 39 +++ include/asm-generic/global_data.h | 4 + include/configs/am43xx_evm.h | 2 + include/configs/pdu001.h | 6 - include/configs/ti_armv7_common.h | 18 +- include/dm/uclass-internal.h | 13 + include/fdtdec.h | 17 + include/i2c.h | 13 + include/palmas.h | 5 + include/power/tps65217.h | 2 + include/power/tps65910.h | 1 + include/twl4030.h | 6 +- include/twl6030.h | 5 + lib/fdtdec.c | 38 ++- 52 files changed, 1081 insertions(+), 472 deletions(-) create mode 100644 arch/arm/include/asm/omap_i2c.h -- 2.7.4

4 34

[U-Boot] [RFC PATCH v2 0/3] python tools to inspect configs
by Jean-Jacques Hiblot 18 Oct '18

18 Oct '18

This series introduce 2 new python tools that helps getting an overview of the configuration options. First one is fairly simple and is used to locate deconfigs based on several criteria: 'arch', 'soc', 'cpu', 'vendor', 'board', 'defconfig name', 'maintainer' and 'status'. All the parameters use regexp. ex: Show all defconfigs of platforms built around imx25 or imx27 or imxs $ tools/find_defconfigs.py --soc 'mx(25|27|s)' The 2nd tool is used to produce a CSV file that summarizes the usage of config options by a set of defconfigs. Useful to check what platforms might need modifications when working on a particular option. ex: Get the TI platforms that enable CONFIG_DM_I2C_COMPAT either in u-boot or the SPL $ tools/configs2csv.py -X CONFIG_DM_I2C_COMPAT --spl --u-boot --vendor ti \ --discard-empty limitations: - must be executed at the root of the source tree - the source tree must be clean (make mrproper) - only supports CSV format. visualization in terminal sould be added. But LibreOffice calc is better suited with all its ordering/ filtering capabilities. Changes in v2: - basically rewrote the whole thing - use tools/moveconfig.py to generate the database of configs - use tools/find_defconfigs.py to get the list of defconfigs off interest - removed diff with .config. tools/moveconfig.py does a better job Jean-Jacques Hiblot (3): tools: moveconfig: Add an option to build a fuller database of options tools: Add a tool to get a list of defconfigs based on filters tools: Add a tool to get an overview of the usage of CONFIG options tools/configs2csv.py | 387 +++++++++++++++++++++++++++++++++++++++++++++++ tools/find_defconfigs.py | 167 ++++++++++++++++++++ tools/moveconfig.py | 56 ++++++- 3 files changed, 603 insertions(+), 7 deletions(-) create mode 100755 tools/configs2csv.py create mode 100755 tools/find_defconfigs.py -- 2.7.4

2 9

[U-Boot] [PATCH 00/41] imx: add i.MX8QXP support
by Peng Fan 18 Oct '18

18 Oct '18

This patchset is to upstream i.MX8QXP and mek board support, with some drivers update to support i.MX8QXP. The information about the processor could be found https://www.nxp.com/products/processors-and-microcontrollers/applications-p… The architecture of i.MX8QXP is different from i.MX6/7/8M, inside i.MX8QXP, there is a dedicated processor(SCU) used for power/clock/pin/ pad/resource management/thermal and etc. The ACore need to communicate with SCU using SCFW API. The SCFW API is exported by SCFW, so we directly import it into U-Boot source code. Gao Pan (1): imx: lpi2c: fix clock issue when NACK detected Peng Fan (32): imx: import SCFW API imx: add Kconfig entry for i.MX8 arm: build mach-imx for i.MX8 imx8: add IPC communication support between ACore and SCU arm: global_data: introduce ipc_channel_handle imx: boot_mode: Add FLEXSPI boot entry imx8: add imx-regs header file imx8: pins: include i.MX8QXP pin header when CONFIG_IMX8QXP defined imx: add i.MX8 cpu type imx8: add basic cpu support imx8: add boot device detection imx8: implement mmc_get_env_dev imx8: implement imx_get_mac_from_fuse imx8: implement get_board_serial imx8: add mmu and dram related functiions imx8: add bootaux support imx8: add arch_cpu_init imx8: add clock driver imx8: add iomux configuration code serial_lpuart: Update lpuart driver to support i.MX8 net: fec: do not access reserved register for i.MX8 gpio: mxc_gpio: add support for i.MX8 pinctrl: Add pinctrl driver for i.MX8 power: Add power domain driver for i.MX8 power: Add PD device lookup interface to power domain uclass power-domain: add dummy functions when CONFIG_POWER_DOMAIN not defined dm: core: device: enable power domain in probe drivers: regulator: fixed: add off-on-delay-us log: include command header file i2c-mux: pca954x: support pca9646 i2c switch dts: imx8qxp: Add DTS and binding header files imx: 8qxp_mek: Add i.MX8QXP MEK board support Ye Li (8): fsl_esdhc: Update usdhc driver to support i.MX8 serial: lpuart: Enable RX and TX FIFO imx_lpi2c: Update lpi2c driver to support imx8 lpi2c: Fix bus stop problem in xfer lpi2c: Add bus busy error handling net: fec_mxc: Add the init_clk_fec function sata: Add i.MX8 SATA support mmc: fsl_esdhc: fix sd/mmc ddr mode clock setting issue arch/arm/Kconfig | 8 + arch/arm/Makefile | 2 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/fsl-imx8qxp-mek.dts | 416 +++++ arch/arm/dts/fsl-imx8qxp.dtsi | 1593 ++++++++++++++++++++ arch/arm/include/asm/arch-imx/cpu.h | 5 + arch/arm/include/asm/arch-imx8/clock.h | 36 + arch/arm/include/asm/arch-imx8/cpu.h | 26 + arch/arm/include/asm/arch-imx8/fsl_mu_hal.h | 54 + arch/arm/include/asm/arch-imx8/gpio.h | 22 + arch/arm/include/asm/arch-imx8/i2c.h | 34 + arch/arm/include/asm/arch-imx8/imx-regs.h | 119 ++ arch/arm/include/asm/arch-imx8/imx8-pins.h | 15 + arch/arm/include/asm/arch-imx8/imx8qm_pads.h | 295 ++++ arch/arm/include/asm/arch-imx8/imx8qxp_pads.h | 200 +++ arch/arm/include/asm/arch-imx8/iomux.h | 40 + arch/arm/include/asm/arch-imx8/power-domain.h | 15 + arch/arm/include/asm/arch-imx8/sci/ipc.h | 67 + arch/arm/include/asm/arch-imx8/sci/rpc.h | 131 ++ arch/arm/include/asm/arch-imx8/sci/sci.h | 39 + arch/arm/include/asm/arch-imx8/sci/svc/irq/api.h | 160 ++ arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h | 523 +++++++ arch/arm/include/asm/arch-imx8/sci/svc/pad/api.h | 568 +++++++ arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h | 686 +++++++++ arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h | 759 ++++++++++ arch/arm/include/asm/arch-imx8/sci/svc/timer/api.h | 306 ++++ arch/arm/include/asm/arch-imx8/sci/types.h | 862 +++++++++++ arch/arm/include/asm/arch-imx8/sys_proto.h | 19 + arch/arm/include/asm/global_data.h | 4 + arch/arm/include/asm/mach-imx/boot_mode.h | 1 + arch/arm/include/asm/mach-imx/sys_proto.h | 3 + arch/arm/mach-imx/Makefile | 1 + arch/arm/mach-imx/imx8/Kconfig | 26 + arch/arm/mach-imx/imx8/Makefile | 13 + arch/arm/mach-imx/imx8/clock.c | 361 +++++ arch/arm/mach-imx/imx8/cpu.c | 783 ++++++++++ arch/arm/mach-imx/imx8/fsl_mu_hal.c | 28 + arch/arm/mach-imx/imx8/iomux.c | 47 + arch/arm/mach-imx/imx8/sci/ipc.c | 100 ++ arch/arm/mach-imx/imx8/sci/svc/irq/rpc.h | 54 + arch/arm/mach-imx/imx8/sci/svc/irq/rpc_clnt.c | 76 + arch/arm/mach-imx/imx8/sci/svc/misc/rpc.h | 76 + arch/arm/mach-imx/imx8/sci/svc/misc/rpc_clnt.c | 515 +++++++ arch/arm/mach-imx/imx8/sci/svc/pad/rpc.h | 68 + arch/arm/mach-imx/imx8/sci/svc/pad/rpc_clnt.c | 475 ++++++ arch/arm/mach-imx/imx8/sci/svc/pm/rpc.h | 73 + arch/arm/mach-imx/imx8/sci/svc/pm/rpc_clnt.c | 460 ++++++ arch/arm/mach-imx/imx8/sci/svc/rm/rpc.h | 83 + arch/arm/mach-imx/imx8/sci/svc/rm/rpc_clnt.c | 645 ++++++++ arch/arm/mach-imx/imx8/sci/svc/timer/rpc.h | 67 + arch/arm/mach-imx/imx8/sci/svc/timer/rpc_clnt.c | 365 +++++ board/freescale/imx8qxp_mek/Kconfig | 14 + board/freescale/imx8qxp_mek/MAINTAINERS | 6 + board/freescale/imx8qxp_mek/Makefile | 7 + board/freescale/imx8qxp_mek/imx8qxp_mek.c | 159 ++ configs/imx8qxp_mek_defconfig | 47 + drivers/ata/Kconfig | 6 + drivers/ata/Makefile | 1 + drivers/ata/ahci.c | 25 + drivers/ata/sata_imx.c | 64 + drivers/core/device.c | 7 + drivers/gpio/mxc_gpio.c | 30 +- drivers/i2c/imx_lpi2c.c | 82 +- drivers/i2c/muxes/pca954x.c | 9 +- drivers/mmc/fsl_esdhc.c | 32 +- drivers/net/fec_mxc.c | 9 +- drivers/pinctrl/nxp/Kconfig | 18 + drivers/pinctrl/nxp/Makefile | 2 + drivers/pinctrl/nxp/pinctrl-imx.c | 209 +-- drivers/pinctrl/nxp/pinctrl-imx.h | 16 + drivers/pinctrl/nxp/pinctrl-imx8.c | 42 + drivers/pinctrl/nxp/pinctrl-scu.c | 72 + drivers/power/domain/Kconfig | 6 + drivers/power/domain/Makefile | 1 + drivers/power/domain/imx8-power-domain.c | 315 ++++ drivers/power/domain/power-domain-uclass.c | 42 + drivers/power/regulator/fixed.c | 6 + drivers/serial/serial_lpuart.c | 48 +- include/configs/imx8qxp_mek.h | 157 ++ include/dt-bindings/clock/imx8qxp-clock.h | 533 +++++++ include/dt-bindings/pinctrl/pads-imx8qm.h | 975 ++++++++++++ include/dt-bindings/pinctrl/pads-imx8qxp.h | 770 ++++++++++ include/dt-bindings/soc/imx8_pd.h | 197 +++ include/dt-bindings/soc/imx_rsrc.h | 560 +++++++ include/fsl_lpuart.h | 2 +- .../asm/arch-mx7ulp => include}/imx_lpi2c.h | 0 include/log.h | 1 + include/power-domain.h | 52 + 88 files changed, 15691 insertions(+), 157 deletions(-) create mode 100644 arch/arm/dts/fsl-imx8qxp-mek.dts create mode 100644 arch/arm/dts/fsl-imx8qxp.dtsi create mode 100644 arch/arm/include/asm/arch-imx8/clock.h create mode 100644 arch/arm/include/asm/arch-imx8/cpu.h create mode 100644 arch/arm/include/asm/arch-imx8/fsl_mu_hal.h create mode 100644 arch/arm/include/asm/arch-imx8/gpio.h create mode 100644 arch/arm/include/asm/arch-imx8/i2c.h create mode 100644 arch/arm/include/asm/arch-imx8/imx-regs.h create mode 100644 arch/arm/include/asm/arch-imx8/imx8-pins.h create mode 100644 arch/arm/include/asm/arch-imx8/imx8qm_pads.h create mode 100644 arch/arm/include/asm/arch-imx8/imx8qxp_pads.h create mode 100644 arch/arm/include/asm/arch-imx8/iomux.h create mode 100644 arch/arm/include/asm/arch-imx8/power-domain.h create mode 100755 arch/arm/include/asm/arch-imx8/sci/ipc.h create mode 100755 arch/arm/include/asm/arch-imx8/sci/rpc.h create mode 100644 arch/arm/include/asm/arch-imx8/sci/sci.h create mode 100755 arch/arm/include/asm/arch-imx8/sci/svc/irq/api.h create mode 100755 arch/arm/include/asm/arch-imx8/sci/svc/misc/api.h create mode 100755 arch/arm/include/asm/arch-imx8/sci/svc/pad/api.h create mode 100755 arch/arm/include/asm/arch-imx8/sci/svc/pm/api.h create mode 100755 arch/arm/include/asm/arch-imx8/sci/svc/rm/api.h create mode 100755 arch/arm/include/asm/arch-imx8/sci/svc/timer/api.h create mode 100755 arch/arm/include/asm/arch-imx8/sci/types.h create mode 100644 arch/arm/include/asm/arch-imx8/sys_proto.h create mode 100644 arch/arm/mach-imx/imx8/Kconfig create mode 100644 arch/arm/mach-imx/imx8/Makefile create mode 100644 arch/arm/mach-imx/imx8/clock.c create mode 100644 arch/arm/mach-imx/imx8/cpu.c create mode 100644 arch/arm/mach-imx/imx8/fsl_mu_hal.c create mode 100644 arch/arm/mach-imx/imx8/iomux.c create mode 100644 arch/arm/mach-imx/imx8/sci/ipc.c create mode 100644 arch/arm/mach-imx/imx8/sci/svc/irq/rpc.h create mode 100644 arch/arm/mach-imx/imx8/sci/svc/irq/rpc_clnt.c create mode 100644 arch/arm/mach-imx/imx8/sci/svc/misc/rpc.h create mode 100644 arch/arm/mach-imx/imx8/sci/svc/misc/rpc_clnt.c create mode 100644 arch/arm/mach-imx/imx8/sci/svc/pad/rpc.h create mode 100644 arch/arm/mach-imx/imx8/sci/svc/pad/rpc_clnt.c create mode 100644 arch/arm/mach-imx/imx8/sci/svc/pm/rpc.h create mode 100644 arch/arm/mach-imx/imx8/sci/svc/pm/rpc_clnt.c create mode 100644 arch/arm/mach-imx/imx8/sci/svc/rm/rpc.h create mode 100644 arch/arm/mach-imx/imx8/sci/svc/rm/rpc_clnt.c create mode 100644 arch/arm/mach-imx/imx8/sci/svc/timer/rpc.h create mode 100644 arch/arm/mach-imx/imx8/sci/svc/timer/rpc_clnt.c create mode 100644 board/freescale/imx8qxp_mek/Kconfig create mode 100644 board/freescale/imx8qxp_mek/MAINTAINERS create mode 100644 board/freescale/imx8qxp_mek/Makefile create mode 100644 board/freescale/imx8qxp_mek/imx8qxp_mek.c create mode 100644 configs/imx8qxp_mek_defconfig create mode 100644 drivers/ata/sata_imx.c create mode 100644 drivers/pinctrl/nxp/pinctrl-imx8.c create mode 100644 drivers/pinctrl/nxp/pinctrl-scu.c create mode 100644 drivers/power/domain/imx8-power-domain.c create mode 100644 include/configs/imx8qxp_mek.h create mode 100644 include/dt-bindings/clock/imx8qxp-clock.h create mode 100644 include/dt-bindings/pinctrl/pads-imx8qm.h create mode 100644 include/dt-bindings/pinctrl/pads-imx8qxp.h create mode 100644 include/dt-bindings/soc/imx8_pd.h create mode 100644 include/dt-bindings/soc/imx_rsrc.h rename {arch/arm/include/asm/arch-mx7ulp => include}/imx_lpi2c.h (100%) -- 2.14.1

8 68

[U-Boot] [PATCH v5 1/1] efi_loader: PSCI reset and shutdown
by Heinrich Schuchardt 18 Oct '18

18 Oct '18

When an operating system started via bootefi tries to reset or power off this is done by calling the EFI runtime ResetSystem(). On most ARMv8 system the actual reset relies on PSCI. Depending on whether the PSCI firmware resides the hypervisor (EL2) or in the secure monitor (EL3) either an HVC or an SMC command has to be issued. The current implementation always uses SMC. This results in crashes on systems where the PSCI firmware is implemented in the hypervisor, e.g. qemu-arm64_defconfig. The logic to decide which call is needed based on the device tree is already implemented in the PSCI firmware driver. During the EFI runtime the device driver model is not available. But we can minimize code duplication by merging the EFI runtime reset and poweroff code with the PSCI firmware driver. As the same HVC/SMC problem is also evident for the ARMv8 do_poweroff and reset_misc routines let's move them into the same code module. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Reviewed-by: Sumit Garg <sumit.garg(a)linaro.org> Tested-by: Sumit Garg <sumit.garg(a)linaro.org> --- Travis reporteded no errors in https://travis-ci.org/xypron2/u-boot/builds/442613876 v5: depend on CONFIG_PSCI_reset for EFI runtime support v4: fix reset_misc() too avoid switch statement v3: update commit message v2: Use PSCI firmware driver to detect call method. Thanks to Sumit for pointing me at dtb parsing as part of "psci_probe() --- arch/arm/cpu/armv7/smccc-call.S | 2 + arch/arm/cpu/armv8/Kconfig | 1 + arch/arm/cpu/armv8/fwcall.c | 52 ++--------------- arch/arm/cpu/armv8/smccc-call.S | 2 + drivers/firmware/psci.c | 100 +++++++++++++++++++++++++++----- include/linux/psci.h | 6 +- 6 files changed, 96 insertions(+), 67 deletions(-) diff --git a/arch/arm/cpu/armv7/smccc-call.S b/arch/arm/cpu/armv7/smccc-call.S index 0d8b59eb6b..eae69e36c3 100644 --- a/arch/arm/cpu/armv7/smccc-call.S +++ b/arch/arm/cpu/armv7/smccc-call.S @@ -7,6 +7,8 @@ #include <asm/opcodes-sec.h> #include <asm/opcodes-virt.h> + .section .text.efi_runtime + #define UNWIND(x...) /* * Wrap c macros in asm macros to delay expansion until after the diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index c8bebabdf6..d643981b73 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -96,6 +96,7 @@ endmenu config PSCI_RESET bool "Use PSCI for reset and shutdown" default y + select ARM_SMCCC if OF_CONTROL depends on !ARCH_EXYNOS7 && !ARCH_BCM283X && \ !TARGET_LS2080A_SIMU && !TARGET_LS2080AQDS && \ !TARGET_LS2080ARDB && !TARGET_LS2080A_EMU && \ diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c index 0ba3dad8cc..9957c2974b 100644 --- a/arch/arm/cpu/armv8/fwcall.c +++ b/arch/arm/cpu/armv8/fwcall.c @@ -7,7 +7,6 @@ #include <asm-offsets.h> #include <config.h> -#include <efi_loader.h> #include <version.h> #include <asm/macro.h> #include <asm/psci.h> @@ -19,7 +18,7 @@ * x0~x7: input arguments * x0~x3: output arguments */ -static void __efi_runtime hvc_call(struct pt_regs *args) +static void hvc_call(struct pt_regs *args) { asm volatile( "ldr x0, %0\n" @@ -53,7 +52,7 @@ static void __efi_runtime hvc_call(struct pt_regs *args) * x0~x3: output arguments */ -void __efi_runtime smc_call(struct pt_regs *args) +void smc_call(struct pt_regs *args) { asm volatile( "ldr x0, %0\n" @@ -83,9 +82,9 @@ void __efi_runtime smc_call(struct pt_regs *args) * use PSCI on U-Boot running below a hypervisor, please detect * this and set the flag accordingly. */ -static const __efi_runtime_data bool use_smc_for_psci = true; +static const bool use_smc_for_psci = true; -void __noreturn __efi_runtime psci_system_reset(void) +void __noreturn psci_system_reset(void) { struct pt_regs regs; @@ -100,7 +99,7 @@ void __noreturn __efi_runtime psci_system_reset(void) ; } -void __noreturn __efi_runtime psci_system_off(void) +void __noreturn psci_system_off(void) { struct pt_regs regs; @@ -114,44 +113,3 @@ void __noreturn __efi_runtime psci_system_off(void) while (1) ; } - -#ifdef CONFIG_CMD_POWEROFF -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - puts("poweroff ...\n"); - - udelay(50000); /* wait 50 ms */ - - disable_interrupts(); - - psci_system_off(); - - /*NOTREACHED*/ - return 0; -} -#endif - -#ifdef CONFIG_PSCI_RESET -void reset_misc(void) -{ - psci_system_reset(); -} - -#ifdef CONFIG_EFI_LOADER -void __efi_runtime EFIAPI efi_reset_system( - enum efi_reset_type reset_type, - efi_status_t reset_status, - unsigned long data_size, void *reset_data) -{ - if (reset_type == EFI_RESET_COLD || - reset_type == EFI_RESET_WARM || - reset_type == EFI_RESET_PLATFORM_SPECIFIC) { - psci_system_reset(); - } else if (reset_type == EFI_RESET_SHUTDOWN) { - psci_system_off(); - } - - while (1) { } -} -#endif /* CONFIG_EFI_LOADER */ -#endif /* CONFIG_PSCI_RESET */ diff --git a/arch/arm/cpu/armv8/smccc-call.S b/arch/arm/cpu/armv8/smccc-call.S index 16c9e298b4..86de4b4089 100644 --- a/arch/arm/cpu/armv8/smccc-call.S +++ b/arch/arm/cpu/armv8/smccc-call.S @@ -6,6 +6,8 @@ #include <linux/arm-smccc.h> #include <generated/asm-offsets.h> + .section .text.efi_runtime + .macro SMCCC instr .cfi_startproc \instr #0 diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 2cb35f356f..7ec5eb094b 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -9,31 +9,38 @@ #include <common.h> #include <dm.h> #include <dm/lists.h> +#include <efi_loader.h> #include <linux/libfdt.h> #include <linux/arm-smccc.h> #include <linux/errno.h> #include <linux/printk.h> #include <linux/psci.h> -psci_fn *invoke_psci_fn; +#define DRIVER_NAME "psci" -static unsigned long __invoke_psci_fn_hvc(unsigned long function_id, - unsigned long arg0, unsigned long arg1, - unsigned long arg2) -{ - struct arm_smccc_res res; +#define PSCI_METHOD_HVC 1 +#define PSCI_METHOD_SMC 2 - arm_smccc_hvc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res); - return res.a0; -} +int __efi_runtime_data psci_method; -static unsigned long __invoke_psci_fn_smc(unsigned long function_id, - unsigned long arg0, unsigned long arg1, - unsigned long arg2) +unsigned long __efi_runtime invoke_psci_fn + (unsigned long function_id, unsigned long arg0, + unsigned long arg1, unsigned long arg2) { struct arm_smccc_res res; - arm_smccc_smc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res); + /* + * In the __efi_runtime we need to avoid the switch statement. In some + * cases the compiler creates lookup tables to implement switch. These + * tables are not correctly relocated when SetVirtualAddressMap is + * called. + */ + if (psci_method == PSCI_METHOD_SMC) + arm_smccc_smc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res); + else if (psci_method == PSCI_METHOD_HVC) + arm_smccc_hvc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res); + else + res.a0 = PSCI_RET_DISABLED; return res.a0; } @@ -67,9 +74,9 @@ static int psci_probe(struct udevice *dev) } if (!strcmp("hvc", method)) { - invoke_psci_fn = __invoke_psci_fn_hvc; + psci_method = PSCI_METHOD_HVC; } else if (!strcmp("smc", method)) { - invoke_psci_fn = __invoke_psci_fn_smc; + psci_method = PSCI_METHOD_SMC; } else { pr_warn("invalid \"method\" property: %s\n", method); return -EINVAL; @@ -78,6 +85,67 @@ static int psci_probe(struct udevice *dev) return 0; } +/** + * void do_psci_probe() - probe PSCI firmware driver + * + * Ensure that psci_method is initialized. + */ +static void __maybe_unused do_psci_probe(void) +{ + struct udevice *dev; + + uclass_get_device_by_name(UCLASS_FIRMWARE, DRIVER_NAME, &dev); +} + +#if IS_ENABLED(CONFIG_EFI_LOADER) && IS_ENABLED(CONFIG_PSCI_RESET) +efi_status_t efi_reset_system_init(void) +{ + do_psci_probe(); + return EFI_SUCCESS; +} + +void __efi_runtime EFIAPI efi_reset_system(enum efi_reset_type reset_type, + efi_status_t reset_status, + unsigned long data_size, + void *reset_data) +{ + if (reset_type == EFI_RESET_COLD || + reset_type == EFI_RESET_WARM || + reset_type == EFI_RESET_PLATFORM_SPECIFIC) { + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); + } else if (reset_type == EFI_RESET_SHUTDOWN) { + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); + } + while (1) + ; +} +#endif /* IS_ENABLED(CONFIG_EFI_LOADER) && IS_ENABLED(CONFIG_PSCI_RESET) */ + +#ifdef CONFIG_PSCI_RESET +void reset_misc(void) +{ + do_psci_probe(); + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); +} +#endif /* CONFIG_PSCI_RESET */ + +#ifdef CONFIG_CMD_POWEROFF +int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + do_psci_probe(); + + puts("poweroff ...\n"); + udelay(50000); /* wait 50 ms */ + + disable_interrupts(); + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); + enable_interrupts(); + + log_err("Power off not supported on this platform\n"); + return CMD_RET_FAILURE; +} +#endif + static const struct udevice_id psci_of_match[] = { { .compatible = "arm,psci" }, { .compatible = "arm,psci-0.2" }, @@ -86,7 +154,7 @@ static const struct udevice_id psci_of_match[] = { }; U_BOOT_DRIVER(psci) = { - .name = "psci", + .name = DRIVER_NAME, .id = UCLASS_FIRMWARE, .of_match = psci_of_match, .bind = psci_bind, diff --git a/include/linux/psci.h b/include/linux/psci.h index 8d13bd2702..9433df836b 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -88,10 +88,8 @@ #define PSCI_RET_DISABLED -8 #ifdef CONFIG_ARM_PSCI_FW -typedef unsigned long (psci_fn)(unsigned long, unsigned long, - unsigned long, unsigned long); - -extern psci_fn *invoke_psci_fn; +unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3); #else unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3) -- 2.19.1

1 0

[U-Boot] [PATCH] Kconfig: Convert CONFIG_IMX_WATCHDOG to Kconfig
by Xiaoliang Yang 18 Oct '18

18 Oct '18

Move this option to Kconfig and tidy up the config file of eight boards which use it. Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1(a)nxp.com> --- configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/dh_imx6_defconfig | 1 + configs/display5_defconfig | 1 + configs/display5_factory_defconfig | 1 + configs/ge_bx50v3_defconfig | 1 + configs/kp_imx6q_tpc_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/tqma6s_wru4_mmc_defconfig | 1 + configs/warp_defconfig | 1 + drivers/watchdog/Kconfig | 7 +++++++ include/configs/aristainetos-common.h | 3 --- include/configs/dh_imx6.h | 2 -- include/configs/display5.h | 2 -- include/configs/ge_bx50v3.h | 2 -- include/configs/kp_imx6q_tpc.h | 2 -- include/configs/mx53ppd.h | 2 -- include/configs/tqma6_wru4.h | 2 -- include/configs/warp.h | 2 -- scripts/config_whitelist.txt | 1 - 21 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index 5044a59..c55e39c 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -50,4 +50,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig index 6641382..95c3063 100644 --- a/configs/aristainetos2b_defconfig +++ b/configs/aristainetos2b_defconfig @@ -50,4 +50,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index 6a31ee6..4082b12 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -49,4 +49,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 2cb7164..92b2377 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -59,4 +59,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/configs/display5_defconfig b/configs/display5_defconfig index 697138e..ab5ec59 100644 --- a/configs/display5_defconfig +++ b/configs/display5_defconfig @@ -75,3 +75,4 @@ CONFIG_MII=y CONFIG_MXC_UART=y CONFIG_SPI=y CONFIG_MXC_SPI=y +CONFIG_IMX_WATCHDOG=y diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig index 5962b64..5d1c746 100644 --- a/configs/display5_factory_defconfig +++ b/configs/display5_factory_defconfig @@ -82,4 +82,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x1b67 CONFIG_USB_GADGET_PRODUCT_NUM=0x4000 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index 729377d..c907779 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -41,5 +41,6 @@ CONFIG_CMD_E1000=y CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/configs/kp_imx6q_tpc_defconfig b/configs/kp_imx6q_tpc_defconfig index 84ca1ce..5ebbe1d 100644 --- a/configs/kp_imx6q_tpc_defconfig +++ b/configs/kp_imx6q_tpc_defconfig @@ -40,4 +40,5 @@ CONFIG_MII=y CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_STORAGE=y +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 7be5c04..34328fd 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -37,4 +37,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_VIDEO=y # CONFIG_VIDEO_SW_CURSOR is not set +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/configs/tqma6s_wru4_mmc_defconfig b/configs/tqma6s_wru4_mmc_defconfig index df4c87e..c1be704 100644 --- a/configs/tqma6s_wru4_mmc_defconfig +++ b/configs/tqma6s_wru4_mmc_defconfig @@ -65,4 +65,5 @@ CONFIG_USB=y CONFIG_USB_STORAGE=y CONFIG_USB_HOST_ETHER=y CONFIG_USB_ETHER_SMSC95XX=y +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/configs/warp_defconfig b/configs/warp_defconfig index 6a9c91e..63eee27 100644 --- a/configs/warp_defconfig +++ b/configs/warp_defconfig @@ -37,4 +37,5 @@ CONFIG_USB_GADGET_VENDOR_NUM=0x0525 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 CONFIG_CI_UDC=y CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_IMX_WATCHDOG=y CONFIG_OF_LIBFDT=y diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index d545b3e..02f4e1e 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -111,4 +111,11 @@ config XILINX_TB_WATCHDOG Select this to enable Xilinx Axi watchdog timer, which can be found on some Xilinx Microblaze Platforms. +config IMX_WATCHDOG + bool "Enable Watchdog Timer support for IMX and LSCH2 of NXP" + select HW_WATCHDOG + help + Select this to enable the IMX and LSCH2 of Layerscape watchdog + driver. + endmenu diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index baddd1c..ca974c0 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -192,9 +192,6 @@ /* UBI support */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG - /* Framebuffer */ #define CONFIG_VIDEO_IPUV3 /* check this console not needed, after test remove it */ diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index 6c833e7..9231bd8 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -109,8 +109,6 @@ #endif /* Watchdog */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 /* allow to overwrite serial and ethaddr */ diff --git a/include/configs/display5.h b/include/configs/display5.h index 6d00699..1fb7469 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -368,8 +368,6 @@ /* Commands */ /* Watchdog */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000 /* ENV config */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index fad840b..e0e1f71 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -31,8 +31,6 @@ #define CONFIG_REVISION_TAG #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 6000 #define CONFIG_MXC_UART diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index 7043830..b6b27ee 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -67,8 +67,6 @@ #endif /* Watchdog */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 /* allow to overwrite serial and ethaddr */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index bbd4cd7..d2a8e65 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -22,8 +22,6 @@ /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 8000 #define CONFIG_BOARD_LATE_INIT diff --git a/include/configs/tqma6_wru4.h b/include/configs/tqma6_wru4.h index a945272..34f000f 100644 --- a/include/configs/tqma6_wru4.h +++ b/include/configs/tqma6_wru4.h @@ -17,8 +17,6 @@ #define CONSOLE_DEV "ttymxc3" /* Watchdog */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 60000 /* Config on-board RTC */ diff --git a/include/configs/warp.h b/include/configs/warp.h index f9c095d..9aa8a48 100644 --- a/include/configs/warp.h +++ b/include/configs/warp.h @@ -26,8 +26,6 @@ #define CONFIG_SUPPORT_EMMC_BOOT /* Watchdog */ -#define CONFIG_HW_WATCHDOG -#define CONFIG_IMX_WATCHDOG #define CONFIG_WATCHDOG_TIMEOUT_MSECS 30000 /* 30s */ #define CONFIG_SYS_MEMTEST_START 0x80000000 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b85c35b..59108b9 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -964,7 +964,6 @@ CONFIG_IMX_HDMI CONFIG_IMX_NAND CONFIG_IMX_OTP CONFIG_IMX_VIDEO_SKIP -CONFIG_IMX_WATCHDOG CONFIG_INETSPACE_V2 CONFIG_INITRD_TAG CONFIG_INIT_CRITICAL -- 1.7.1

1 0

[U-Boot] [PATCH 1/1] efi_loader: fix typos in efi_device_path.c
by Heinrich Schuchardt 18 Oct '18

18 Oct '18

Fix some typos in comments. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- lib/efi_loader/efi_device_path.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c index adb9938d45..49bbdb72af 100644 --- a/lib/efi_loader/efi_device_path.c +++ b/lib/efi_loader/efi_device_path.c @@ -82,7 +82,7 @@ struct efi_device_path *efi_dp_next(const struct efi_device_path *dp) /* * Compare two device-paths, stopping when the shorter of the two hits - * an End* node. This is useful to, for example, compare a device-path + * an End* node. This is useful to, for example, compare a device-path * representing a device with one representing a file on the device, or * a device with a parent device. */ @@ -109,16 +109,17 @@ int efi_dp_match(const struct efi_device_path *a, } /* - * See UEFI spec (section 3.1.2, about short-form device-paths.. - * tl;dr: we can have a device-path that starts with a USB WWID - * or USB Class node, and a few other cases which don't encode - * the full device path with bus hierarchy: + * We can have device paths that start with a USB WWID or a USB Class node, + * and a few other cases which don't encode the full device path with bus + * hierarchy: * * - MESSAGING:USB_WWID * - MESSAGING:USB_CLASS * - MEDIA:FILE_PATH * - MEDIA:HARD_DRIVE * - MESSAGING:URI + * + * See UEFI spec (section 3.1.2, about short-form device-paths) */ static struct efi_device_path *shorten_path(struct efi_device_path *dp) { @@ -644,7 +645,7 @@ static unsigned dp_part_size(struct blk_desc *desc, int part) /* * Create a device node for a block device partition. * - * @buf buffer to which the device path is wirtten + * @buf buffer to which the device path is written * @desc block device descriptor * @part partition number, 0 identifies a block device */ @@ -709,7 +710,7 @@ static void *dp_part_node(void *buf, struct blk_desc *desc, int part) /* * Create a device path for a block device or one of its partitions. * - * @buf buffer to which the device path is wirtten + * @buf buffer to which the device path is written * @desc block device descriptor * @part partition number, 0 identifies a block device */ @@ -728,7 +729,7 @@ static void *dp_part_fill(void *buf, struct blk_desc *desc, int part) /* * We *could* make a more accurate path, by looking at if_type * and handling all the different cases like we do for non- - * legacy (ie CONFIG_BLK=y) case. But most important thing + * legacy (i.e. CONFIG_BLK=y) case. But most important thing * is just to have a unique device-path for if_type+devnum. * So map things to a fictitious USB device. */ @@ -752,7 +753,7 @@ static void *dp_part_fill(void *buf, struct blk_desc *desc, int part) return dp_part_node(buf, desc, part); } -/* Construct a device-path from a partition on a blk device: */ +/* Construct a device-path from a partition on a block device: */ struct efi_device_path *efi_dp_from_part(struct blk_desc *desc, int part) { void *buf, *start; @@ -771,7 +772,7 @@ struct efi_device_path *efi_dp_from_part(struct blk_desc *desc, int part) /* * Create a device node for a block device partition. * - * @buf buffer to which the device path is wirtten + * @buf buffer to which the device path is written * @desc block device descriptor * @part partition number, 0 identifies a block device */ @@ -791,7 +792,7 @@ struct efi_device_path *efi_dp_part_node(struct blk_desc *desc, int part) return buf; } -/* convert path to an UEFI style path (ie. DOS style backslashes and utf16) */ +/* convert path to an UEFI style path (i.e. DOS style backslashes and UTF-16) */ static void path_to_uefi(u16 *uefi, const char *path) { while (*path) { -- 2.19.1

2 1

[U-Boot] [PATCH v4 1/1] efi_loader: PSCI reset and shutdown
by Heinrich Schuchardt 18 Oct '18

18 Oct '18

When an operating system started via bootefi tries to reset or power off this is done by calling the EFI runtime ResetSystem(). On most ARMv8 system the actual reset relies on PSCI. Depending on whether the PSCI firmware resides the hypervisor (EL2) or in the secure monitor (EL3) either an HVC or an SMC command has to be issued. The current implementation always uses SMC. This results in crashes on systems where the PSCI firmware is implemented in the hypervisor, e.g. qemu-arm64_defconfig. The logic to decide which call is needed based on the device tree is already implemented in the PSCI firmware driver. During the EFI runtime the device driver model is not available. But we can minimize code duplication by merging the EFI runtime reset and poweroff code with the PSCI firmware driver. As the same HVC/SMC problem is also evident for the ARMv8 do_poweroff and reset_misc routines let's move them into the same code module. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> Reviewed-by: Sumit Garg <sumit.garg(a)linaro.org> Tested-by: Sumit Garg <sumit.garg(a)linaro.org> --- Travis reporteded no errors in https://travis-ci.org/xypron2/u-boot/builds/442613876 v4: fix reset_misc() too avoid switch statement v3: update commit message v2: Use PSCI firmware driver to detect call method. Thanks to Sumit for pointing me at dtb parsing as part of "psci_probe() --- arch/arm/cpu/armv7/smccc-call.S | 2 + arch/arm/cpu/armv8/Kconfig | 1 + arch/arm/cpu/armv8/fwcall.c | 52 ++--------------- arch/arm/cpu/armv8/smccc-call.S | 2 + drivers/firmware/psci.c | 100 +++++++++++++++++++++++++++----- include/linux/psci.h | 6 +- 6 files changed, 96 insertions(+), 67 deletions(-) diff --git a/arch/arm/cpu/armv7/smccc-call.S b/arch/arm/cpu/armv7/smccc-call.S index 0d8b59eb6b..eae69e36c3 100644 --- a/arch/arm/cpu/armv7/smccc-call.S +++ b/arch/arm/cpu/armv7/smccc-call.S @@ -7,6 +7,8 @@ #include <asm/opcodes-sec.h> #include <asm/opcodes-virt.h> + .section .text.efi_runtime + #define UNWIND(x...) /* * Wrap c macros in asm macros to delay expansion until after the diff --git a/arch/arm/cpu/armv8/Kconfig b/arch/arm/cpu/armv8/Kconfig index c8bebabdf6..d643981b73 100644 --- a/arch/arm/cpu/armv8/Kconfig +++ b/arch/arm/cpu/armv8/Kconfig @@ -96,6 +96,7 @@ endmenu config PSCI_RESET bool "Use PSCI for reset and shutdown" default y + select ARM_SMCCC if OF_CONTROL depends on !ARCH_EXYNOS7 && !ARCH_BCM283X && \ !TARGET_LS2080A_SIMU && !TARGET_LS2080AQDS && \ !TARGET_LS2080ARDB && !TARGET_LS2080A_EMU && \ diff --git a/arch/arm/cpu/armv8/fwcall.c b/arch/arm/cpu/armv8/fwcall.c index 0ba3dad8cc..9957c2974b 100644 --- a/arch/arm/cpu/armv8/fwcall.c +++ b/arch/arm/cpu/armv8/fwcall.c @@ -7,7 +7,6 @@ #include <asm-offsets.h> #include <config.h> -#include <efi_loader.h> #include <version.h> #include <asm/macro.h> #include <asm/psci.h> @@ -19,7 +18,7 @@ * x0~x7: input arguments * x0~x3: output arguments */ -static void __efi_runtime hvc_call(struct pt_regs *args) +static void hvc_call(struct pt_regs *args) { asm volatile( "ldr x0, %0\n" @@ -53,7 +52,7 @@ static void __efi_runtime hvc_call(struct pt_regs *args) * x0~x3: output arguments */ -void __efi_runtime smc_call(struct pt_regs *args) +void smc_call(struct pt_regs *args) { asm volatile( "ldr x0, %0\n" @@ -83,9 +82,9 @@ void __efi_runtime smc_call(struct pt_regs *args) * use PSCI on U-Boot running below a hypervisor, please detect * this and set the flag accordingly. */ -static const __efi_runtime_data bool use_smc_for_psci = true; +static const bool use_smc_for_psci = true; -void __noreturn __efi_runtime psci_system_reset(void) +void __noreturn psci_system_reset(void) { struct pt_regs regs; @@ -100,7 +99,7 @@ void __noreturn __efi_runtime psci_system_reset(void) ; } -void __noreturn __efi_runtime psci_system_off(void) +void __noreturn psci_system_off(void) { struct pt_regs regs; @@ -114,44 +113,3 @@ void __noreturn __efi_runtime psci_system_off(void) while (1) ; } - -#ifdef CONFIG_CMD_POWEROFF -int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - puts("poweroff ...\n"); - - udelay(50000); /* wait 50 ms */ - - disable_interrupts(); - - psci_system_off(); - - /*NOTREACHED*/ - return 0; -} -#endif - -#ifdef CONFIG_PSCI_RESET -void reset_misc(void) -{ - psci_system_reset(); -} - -#ifdef CONFIG_EFI_LOADER -void __efi_runtime EFIAPI efi_reset_system( - enum efi_reset_type reset_type, - efi_status_t reset_status, - unsigned long data_size, void *reset_data) -{ - if (reset_type == EFI_RESET_COLD || - reset_type == EFI_RESET_WARM || - reset_type == EFI_RESET_PLATFORM_SPECIFIC) { - psci_system_reset(); - } else if (reset_type == EFI_RESET_SHUTDOWN) { - psci_system_off(); - } - - while (1) { } -} -#endif /* CONFIG_EFI_LOADER */ -#endif /* CONFIG_PSCI_RESET */ diff --git a/arch/arm/cpu/armv8/smccc-call.S b/arch/arm/cpu/armv8/smccc-call.S index 16c9e298b4..86de4b4089 100644 --- a/arch/arm/cpu/armv8/smccc-call.S +++ b/arch/arm/cpu/armv8/smccc-call.S @@ -6,6 +6,8 @@ #include <linux/arm-smccc.h> #include <generated/asm-offsets.h> + .section .text.efi_runtime + .macro SMCCC instr .cfi_startproc \instr #0 diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c index 2cb35f356f..7ec5eb094b 100644 --- a/drivers/firmware/psci.c +++ b/drivers/firmware/psci.c @@ -9,31 +9,38 @@ #include <common.h> #include <dm.h> #include <dm/lists.h> +#include <efi_loader.h> #include <linux/libfdt.h> #include <linux/arm-smccc.h> #include <linux/errno.h> #include <linux/printk.h> #include <linux/psci.h> -psci_fn *invoke_psci_fn; +#define DRIVER_NAME "psci" -static unsigned long __invoke_psci_fn_hvc(unsigned long function_id, - unsigned long arg0, unsigned long arg1, - unsigned long arg2) -{ - struct arm_smccc_res res; +#define PSCI_METHOD_HVC 1 +#define PSCI_METHOD_SMC 2 - arm_smccc_hvc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res); - return res.a0; -} +int __efi_runtime_data psci_method; -static unsigned long __invoke_psci_fn_smc(unsigned long function_id, - unsigned long arg0, unsigned long arg1, - unsigned long arg2) +unsigned long __efi_runtime invoke_psci_fn + (unsigned long function_id, unsigned long arg0, + unsigned long arg1, unsigned long arg2) { struct arm_smccc_res res; - arm_smccc_smc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res); + /* + * In the __efi_runtime we need to avoid the switch statement. In some + * cases the compiler creates lookup tables to implement switch. These + * tables are not correctly relocated when SetVirtualAddressMap is + * called. + */ + if (psci_method == PSCI_METHOD_SMC) + arm_smccc_smc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res); + else if (psci_method == PSCI_METHOD_HVC) + arm_smccc_hvc(function_id, arg0, arg1, arg2, 0, 0, 0, 0, &res); + else + res.a0 = PSCI_RET_DISABLED; return res.a0; } @@ -67,9 +74,9 @@ static int psci_probe(struct udevice *dev) } if (!strcmp("hvc", method)) { - invoke_psci_fn = __invoke_psci_fn_hvc; + psci_method = PSCI_METHOD_HVC; } else if (!strcmp("smc", method)) { - invoke_psci_fn = __invoke_psci_fn_smc; + psci_method = PSCI_METHOD_SMC; } else { pr_warn("invalid \"method\" property: %s\n", method); return -EINVAL; @@ -78,6 +85,67 @@ static int psci_probe(struct udevice *dev) return 0; } +/** + * void do_psci_probe() - probe PSCI firmware driver + * + * Ensure that psci_method is initialized. + */ +static void __maybe_unused do_psci_probe(void) +{ + struct udevice *dev; + + uclass_get_device_by_name(UCLASS_FIRMWARE, DRIVER_NAME, &dev); +} + +#ifdef CONFIG_EFI_LOADER +efi_status_t efi_reset_system_init(void) +{ + do_psci_probe(); + return EFI_SUCCESS; +} + +void __efi_runtime EFIAPI efi_reset_system(enum efi_reset_type reset_type, + efi_status_t reset_status, + unsigned long data_size, + void *reset_data) +{ + if (reset_type == EFI_RESET_COLD || + reset_type == EFI_RESET_WARM || + reset_type == EFI_RESET_PLATFORM_SPECIFIC) { + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); + } else if (reset_type == EFI_RESET_SHUTDOWN) { + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); + } + while (1) + ; +} +#endif /* CONFIG_EFI_LOADER */ + +#ifdef CONFIG_PSCI_RESET +void reset_misc(void) +{ + do_psci_probe(); + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_RESET, 0, 0, 0); +} +#endif /* CONFIG_PSCI_RESET */ + +#ifdef CONFIG_CMD_POWEROFF +int do_poweroff(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + do_psci_probe(); + + puts("poweroff ...\n"); + udelay(50000); /* wait 50 ms */ + + disable_interrupts(); + invoke_psci_fn(PSCI_0_2_FN_SYSTEM_OFF, 0, 0, 0); + enable_interrupts(); + + log_err("Power off not supported on this platform\n"); + return CMD_RET_FAILURE; +} +#endif + static const struct udevice_id psci_of_match[] = { { .compatible = "arm,psci" }, { .compatible = "arm,psci-0.2" }, @@ -86,7 +154,7 @@ static const struct udevice_id psci_of_match[] = { }; U_BOOT_DRIVER(psci) = { - .name = "psci", + .name = DRIVER_NAME, .id = UCLASS_FIRMWARE, .of_match = psci_of_match, .bind = psci_bind, diff --git a/include/linux/psci.h b/include/linux/psci.h index 8d13bd2702..9433df836b 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -88,10 +88,8 @@ #define PSCI_RET_DISABLED -8 #ifdef CONFIG_ARM_PSCI_FW -typedef unsigned long (psci_fn)(unsigned long, unsigned long, - unsigned long, unsigned long); - -extern psci_fn *invoke_psci_fn; +unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3); #else unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3) -- 2.19.1

2 3

[U-Boot] [PATCH] emdk->emsdp: Rename board
by Alexey Brodkin 18 Oct '18

18 Oct '18

Real marketing name of the board was recently updated so to accommodate that change renaming the board and all related to it. Signed-off-by: Alexey Brodkin <abrodkin(a)synopsys.com> --- arch/arc/Kconfig | 6 +++--- arch/arc/dts/Makefile | 2 +- arch/arc/dts/{emdk.dts => emsdp.dts} | 2 +- board/synopsys/{emdk => emsdp}/Kconfig | 6 +++--- board/synopsys/{emdk => emsdp}/MAINTAINERS | 5 +++-- board/synopsys/{emdk => emsdp}/Makefile | 2 +- board/synopsys/{emdk => emsdp}/README | 11 ++++++----- board/synopsys/{emdk/emdk.c => emsdp/emsdp.c} | 18 +++++++++--------- configs/{emdk_defconfig => emsdp_defconfig} | 6 +++--- include/configs/{emdk.h => emsdp.h} | 10 +++++----- 10 files changed, 35 insertions(+), 33 deletions(-) rename arch/arc/dts/{emdk.dts => emsdp.dts} (96%) rename board/synopsys/{emdk => emsdp}/Kconfig (63%) rename board/synopsys/{emdk => emsdp}/MAINTAINERS (50%) rename board/synopsys/{emdk => emsdp}/Makefile (85%) rename board/synopsys/{emdk => emsdp}/README (90%) rename board/synopsys/{emdk/emdk.c => emsdp/emsdp.c} (77%) rename configs/{emdk_defconfig => emsdp_defconfig} (88%) rename include/configs/{emdk.h => emsdp.h} (85%) diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig index b24593e137b3..fa6b3447c961 100644 --- a/arch/arc/Kconfig +++ b/arch/arc/Kconfig @@ -150,8 +150,8 @@ config TARGET_AXS101 config TARGET_AXS103 bool "Support Synopsys Designware SDP board AXS103" -config TARGET_EMDK - bool "Synopsys EM Development kit" +config TARGET_EMSDP + bool "Synopsys EM Software Development Platform" select CPU_ARCEM6 config TARGET_HSDK @@ -166,7 +166,7 @@ endchoice source "board/abilis/tb100/Kconfig" source "board/synopsys/Kconfig" source "board/synopsys/axs10x/Kconfig" -source "board/synopsys/emdk/Kconfig" +source "board/synopsys/emsdp/Kconfig" source "board/synopsys/hsdk/Kconfig" source "board/synopsys/iot_devkit/Kconfig" diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile index 17e1405c0c48..4f1e4637ce95 100644 --- a/arch/arc/dts/Makefile +++ b/arch/arc/dts/Makefile @@ -4,7 +4,7 @@ dtb-$(CONFIG_TARGET_AXS101) += axs101.dtb dtb-$(CONFIG_TARGET_AXS103) += axs103.dtb dtb-$(CONFIG_TARGET_NSIM) += nsim.dtb dtb-$(CONFIG_TARGET_TB100) += abilis_tb100.dtb -dtb-$(CONFIG_TARGET_EMDK) += emdk.dtb +dtb-$(CONFIG_TARGET_EMSDP) += emsdp.dtb dtb-$(CONFIG_TARGET_HSDK) += hsdk.dtb dtb-$(CONFIG_TARGET_IOT_DEVKIT) += iot_devkit.dtb diff --git a/arch/arc/dts/emdk.dts b/arch/arc/dts/emsdp.dts similarity index 96% rename from arch/arc/dts/emdk.dts rename to arch/arc/dts/emsdp.dts index ebe538d06f83..d307b95d8eff 100644 --- a/arch/arc/dts/emdk.dts +++ b/arch/arc/dts/emsdp.dts @@ -7,7 +7,7 @@ #include "skeleton.dtsi" / { - model = "snps,emdk"; + model = "snps,emsdp"; #address-cells = <1>; #size-cells = <1>; diff --git a/board/synopsys/emdk/Kconfig b/board/synopsys/emsdp/Kconfig similarity index 63% rename from board/synopsys/emdk/Kconfig rename to board/synopsys/emsdp/Kconfig index a9b834dbfdd9..8228bb5c7484 100644 --- a/board/synopsys/emdk/Kconfig +++ b/board/synopsys/emsdp/Kconfig @@ -1,12 +1,12 @@ -if TARGET_EMDK +if TARGET_EMSDP config SYS_BOARD - default "emdk" + default "emsdp" config SYS_VENDOR default "synopsys" config SYS_CONFIG_NAME - default "emdk" + default "emsdp" endif diff --git a/board/synopsys/emdk/MAINTAINERS b/board/synopsys/emsdp/MAINTAINERS similarity index 50% rename from board/synopsys/emdk/MAINTAINERS rename to board/synopsys/emsdp/MAINTAINERS index 605e33844570..6404013957c5 100644 --- a/board/synopsys/emdk/MAINTAINERS +++ b/board/synopsys/emsdp/MAINTAINERS @@ -1,5 +1,6 @@ EM DEVELOPMENT KIT BOARD M: Alexey Brodkin <abrodkin(a)synopsys.com> S: Maintained -F: board/synopsys/emdk/ -F: configs/emdk_defconfig +F: arch/arc/dts/emsdp.dts +F: board/synopsys/emsdp/ +F: configs/emsdp_defconfig diff --git a/board/synopsys/emdk/Makefile b/board/synopsys/emsdp/Makefile similarity index 85% rename from board/synopsys/emdk/Makefile rename to board/synopsys/emsdp/Makefile index 4926c4e30730..733a48c46a86 100644 --- a/board/synopsys/emdk/Makefile +++ b/board/synopsys/emsdp/Makefile @@ -4,4 +4,4 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-y += emdk.o +obj-y += emsdp.o diff --git a/board/synopsys/emdk/README b/board/synopsys/emsdp/README similarity index 90% rename from board/synopsys/emdk/README rename to board/synopsys/emsdp/README index 706b547a9ed2..034062e397b3 100644 --- a/board/synopsys/emdk/README +++ b/board/synopsys/emsdp/README @@ -1,11 +1,12 @@ ================================================================================ -Useful notes on bulding and using of U-Boot on ARC EM Development Kit (AKA EMDK) +Useful notes on bulding and using of U-Boot on +ARC EM Software Development Platform (AKA EMSDP) ================================================================================ BOARD OVERVIEW - The DesignWare ARC EM Development Kit is FPGA-bases platform for rapid - software development on the ARC EM family of processors. + The DesignWare ARC EM Software Development Platform is FPGA-bases platform + for rapid software development on the ARC EM family of processors. Since this board is based on FPGA it's possible to load and use different versions of ARC EM CPUs. U-Boot is built to be run on the simplest @@ -50,7 +51,7 @@ Useful notes on bulding and using of U-Boot on ARC EM Development Kit (AKA EMDK) 1. Configure U-Boot: ------------------------->8---------------------- - make emdk_defconfig + make emsdp_defconfig ------------------------->8---------------------- 2. To build Elf file (for example to be used with host debugger via JTAG @@ -69,7 +70,7 @@ Useful notes on bulding and using of U-Boot on ARC EM Development Kit (AKA EMDK) EXECUTING U-BOOT - 1. The EMDK board is supposed to auto-start U-Boot image stored in ROM on + 1. The EMSDP board is supposed to auto-start U-Boot image stored in ROM on power-on. For that make sure VCCIO DIP-switches are all in "off" state. 2. Though it is possible to load U-Boot as a simple Elf file via JTAG right diff --git a/board/synopsys/emdk/emdk.c b/board/synopsys/emsdp/emsdp.c similarity index 77% rename from board/synopsys/emdk/emdk.c rename to board/synopsys/emsdp/emsdp.c index 79cafefb8b8e..b5ec7f17ec1b 100644 --- a/board/synopsys/emdk/emdk.c +++ b/board/synopsys/emsdp/emsdp.c @@ -55,7 +55,7 @@ void reset_cpu(ulong addr) ; /* loop forever till reset */ } -static int do_emdk_rom(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +static int do_emsdp_rom(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { u32 creg_boot = readl((u32 *)(CREG_BASE + CREG_BOOT_OFFSET)); @@ -71,17 +71,17 @@ static int do_emdk_rom(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) return CMD_RET_SUCCESS; } -cmd_tbl_t cmd_emdk[] = { - U_BOOT_CMD_MKENT(rom, 2, 0, do_emdk_rom, "", ""), +cmd_tbl_t cmd_emsdp[] = { + U_BOOT_CMD_MKENT(rom, 2, 0, do_emsdp_rom, "", ""), }; -static int do_emdk(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) +static int do_emsdp(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) { cmd_tbl_t *c; - c = find_cmd_tbl(argv[1], cmd_emdk, ARRAY_SIZE(cmd_emdk)); + c = find_cmd_tbl(argv[1], cmd_emsdp, ARRAY_SIZE(cmd_emsdp)); - /* Strip off leading 'emdk' command */ + /* Strip off leading 'emsdp' command */ argc--; argv++; @@ -92,8 +92,8 @@ static int do_emdk(cmd_tbl_t *cmdtp, int flag, int argc, char *const argv[]) } U_BOOT_CMD( - emdk, CONFIG_SYS_MAXARGS, 0, do_emdk, - "Synopsys EMDK specific commands", + emsdp, CONFIG_SYS_MAXARGS, 0, do_emsdp, + "Synopsys EMSDP specific commands", "rom unlock - Unlock non-volatile memory for writing\n" - "emdk rom lock - Lock non-volatile memory to prevent writing\n" + "emsdp rom lock - Lock non-volatile memory to prevent writing\n" ); diff --git a/configs/emdk_defconfig b/configs/emsdp_defconfig similarity index 88% rename from configs/emdk_defconfig rename to configs/emsdp_defconfig index c839d6f3f63d..273334b05d21 100644 --- a/configs/emdk_defconfig +++ b/configs/emsdp_defconfig @@ -1,13 +1,13 @@ CONFIG_ARC=y CONFIG_ISA_ARCV2=y CONFIG_CPU_ARCEM6=y -CONFIG_TARGET_EMDK=y +CONFIG_TARGET_EMSDP=y CONFIG_SYS_TEXT_BASE=0x00000000 CONFIG_SYS_CLK_FREQ=40000000 # CONFIG_ARCH_FIXUP_FDT_MEMORY is not set CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="emdk# " +CONFIG_SYS_PROMPT="emsdp# " # CONFIG_CMD_BOOTD is not set # CONFIG_CMD_XIMG is not set CONFIG_CMD_MMC=y @@ -15,7 +15,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y CONFIG_OF_EMBED=y -CONFIG_DEFAULT_DEVICE_TREE="emdk" +CONFIG_DEFAULT_DEVICE_TREE="emsdp" CONFIG_ENV_IS_IN_FAT=y CONFIG_ENV_FAT_INTERFACE="mmc" CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" diff --git a/include/configs/emdk.h b/include/configs/emsdp.h similarity index 85% rename from include/configs/emdk.h rename to include/configs/emsdp.h index dca13e2fffbe..385d59e33875 100644 --- a/include/configs/emdk.h +++ b/include/configs/emsdp.h @@ -3,8 +3,8 @@ * Copyright (C) 2018 Synopsys, Inc. All rights reserved. */ -#ifndef _CONFIG_EMDK_H_ -#define _CONFIG_EMDK_H_ +#ifndef _CONFIG_EMSDP_H_ +#define _CONFIG_EMSDP_H_ #include <linux/sizes.h> @@ -30,11 +30,11 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "upgrade_image=u-boot.bin\0" \ - "upgrade=emdk rom unlock && " \ + "upgrade=emsdp rom unlock && " \ "fatload mmc 0 ${loadaddr} ${upgrade_image} && " \ "cp.b ${loadaddr} 0 ${filesize} && " \ "dcache flush && " \ - "emdk rom lock\0" + "emsdp rom lock\0" -#endif /* _CONFIG_EMDK_H_ */ +#endif /* _CONFIG_EMSDP_H_ */ -- 2.17.2

1 0