November 2018 - U-Boot

[U-Boot] [PATCH v2 1/4] arm: baltos: move the board to CONFIG_BLK
by yegorslists＠googlemail.com 03 Dec '18

03 Dec '18

From: Yegor Yefremov <yegorslists(a)googlemail.com> Use DM for both MMC and USB subsystems and use dedicated DTS for U-Boot configuration. Disable SPL support for GPIO and remove EVMSK leftover for DDR power control via GPIO. Signed-off-by: Yegor Yefremov <yegorslists(a)googlemail.com> --- Changes v1 -> v2: - remove GPIO7 pinmux too arch/arm/dts/am335x-baltos.dts | 439 ++++++++++++++++++++++++++++++++ board/vscom/baltos/board.c | 6 +- board/vscom/baltos/mux.c | 7 - configs/am335x_baltos_defconfig | 10 +- 4 files changed, 447 insertions(+), 15 deletions(-) create mode 100644 arch/arm/dts/am335x-baltos.dts diff --git a/arch/arm/dts/am335x-baltos.dts b/arch/arm/dts/am335x-baltos.dts new file mode 100644 index 0000000000..f939cf6406 --- /dev/null +++ b/arch/arm/dts/am335x-baltos.dts @@ -0,0 +1,439 @@ +/* + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +/* + * VScom OnRISC + * http://www.vscom.de + */ + +/dts-v1/; + +#include "am33xx.dtsi" +#include <dt-bindings/pwm/pwm.h> + +/ { + model = "OnRISC Baltos"; + compatible = "vscom,onrisc", "ti,am33xx"; + + chosen { + stdout-path = &uart0; + }; + + cpus { + cpu@0 { + cpu0-supply = <&vdd1_reg>; + }; + }; + + vbat: fixedregulator@0 { + compatible = "regulator-fixed"; + regulator-name = "vbat"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + regulator-boot-on; + }; +}; + +&am33xx_pinmux { + mmc1_pins: pinmux_mmc1_pins { + pinctrl-single,pins = < + 0xf0 (MUX_MODE0 | INPUT_EN | PULL_UP) /* mmc0_dat3.mmc0_dat3 */ + 0xf4 (MUX_MODE0 | INPUT_EN | PULL_UP) /* mmc0_dat2.mmc0_dat2 */ + 0xf8 (MUX_MODE0 | INPUT_EN | PULL_UP) /* mmc0_dat1.mmc0_dat1 */ + 0xfc (MUX_MODE0 | INPUT_EN | PULL_UP) /* mmc0_dat0.mmc0_dat0 */ + 0x100 (MUX_MODE0 | INPUT_EN | PULL_UP) /* mmc0_clk.mmc0_clk */ + 0x104 (MUX_MODE0 | INPUT_EN | PULL_UP) /* mmc0_cmd.mmc0_cmd */ + >; + }; + + i2c1_pins: pinmux_i2c1_pins { + pinctrl-single,pins = < + 0x158 0x2a /* spi0_d1.i2c1_sda_mux3, INPUT | MODE2 */ + 0x15c 0x2a /* spi0_cs0.i2c1_scl_mux3, INPUT | MODE2 */ + >; + }; + + tps65910_pins: pinmux_tps65910_pins { + pinctrl-single,pins = < + 0x078 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_ben1.gpio1[28] */ + >; + + }; + tca6416_pins: pinmux_tca6416_pins { + pinctrl-single,pins = < + AM33XX_IOPAD(0x9b4, PIN_INPUT_PULLUP | MUX_MODE7) /* xdma_event_intr1.gpio0[20] tca6416 stuff */ + >; + }; + + uart0_pins: pinmux_uart0_pins { + pinctrl-single,pins = < + 0x170 (PIN_INPUT_PULLUP | MUX_MODE0) /* uart0_rxd.uart0_rxd */ + 0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */ + >; + }; + + cpsw_default: cpsw_default { + pinctrl-single,pins = < + /* Slave 1 */ + 0x10c (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_crs.rmii1_crs_dv */ + 0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* mii1_tx_en.rmii1_txen */ + 0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* mii1_txd1.rmii1_txd1 */ + 0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE1) /* mii1_txd0.rmii1_txd0 */ + 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_rxd1.rmii1_rxd1 */ + 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE1) /* mii1_rxd0.rmii1_rxd0 */ + 0x144 (PIN_INPUT_PULLDOWN | MUX_MODE0) /* rmii1_ref_clk.rmii1_refclk */ + + + /* Slave 2 */ + 0x40 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a0.rgmii2_tctl */ + 0x44 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a1.rgmii2_rctl */ + 0x48 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a2.rgmii2_td3 */ + 0x4c (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a3.rgmii2_td2 */ + 0x50 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a4.rgmii2_td1 */ + 0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a5.rgmii2_td0 */ + 0x58 (PIN_OUTPUT_PULLDOWN | MUX_MODE2) /* gpmc_a6.rgmii2_tclk */ + 0x5c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a7.rgmii2_rclk */ + 0x60 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a8.rgmii2_rd3 */ + 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a9.rgmii2_rd2 */ + 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a10.rgmii2_rd1 */ + 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE2) /* gpmc_a11.rgmii2_rd0 */ + >; + }; + + cpsw_sleep: cpsw_sleep { + pinctrl-single,pins = < + /* Slave 1 reset value */ + 0x10c (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x144 (PIN_INPUT_PULLDOWN | MUX_MODE7) + + /* Slave 2 reset value*/ + 0x40 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x44 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x48 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x4c (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x50 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x54 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x58 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x5c (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x60 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x64 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x68 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x6c (PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + davinci_mdio_default: davinci_mdio_default { + pinctrl-single,pins = < + /* MDIO */ + 0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0) /* mdio_data.mdio_data */ + 0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0) /* mdio_clk.mdio_clk */ + >; + }; + + davinci_mdio_sleep: davinci_mdio_sleep { + pinctrl-single,pins = < + /* MDIO reset value */ + 0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7) + 0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7) + >; + }; + + nandflash_pins_s0: nandflash_pins_s0 { + pinctrl-single,pins = < + 0x0 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad0.gpmc_ad0 */ + 0x4 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad1.gpmc_ad1 */ + 0x8 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad2.gpmc_ad2 */ + 0xc (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad3.gpmc_ad3 */ + 0x10 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad4.gpmc_ad4 */ + 0x14 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad5.gpmc_ad5 */ + 0x18 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad6.gpmc_ad6 */ + 0x1c (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_ad7.gpmc_ad7 */ + 0x70 (PIN_INPUT_PULLUP | MUX_MODE0) /* gpmc_wait0.gpmc_wait0 */ + 0x74 (PIN_INPUT_PULLUP | MUX_MODE7) /* gpmc_wpn.gpio0_30 */ + 0x7c (PIN_OUTPUT | MUX_MODE0) /* gpmc_csn0.gpmc_csn0 */ + 0x90 (PIN_OUTPUT | MUX_MODE0) /* gpmc_advn_ale.gpmc_advn_ale */ + 0x94 (PIN_OUTPUT | MUX_MODE0) /* gpmc_oen_ren.gpmc_oen_ren */ + 0x98 (PIN_OUTPUT | MUX_MODE0) /* gpmc_wen.gpmc_wen */ + 0x9c (PIN_OUTPUT | MUX_MODE0) /* gpmc_be0n_cle.gpmc_be0n_cle */ + >; + }; +}; + +&elm { + status = "okay"; +}; + +&gpmc { + pinctrl-names = "default"; + pinctrl-0 = <&nandflash_pins_s0>; + ranges = <0 0 0x08000000 0x10000000>; /* CS0: NAND */ + status = "okay"; + + nand@0,0 { + reg = <0 0 0>; /* CS0, offset 0 */ + nand-bus-width = <8>; + ti,nand-ecc-opt = "bch8"; + ti,nand-xfer-type = "polled"; + + gpmc,device-nand = "true"; + gpmc,device-width = <1>; + gpmc,sync-clk-ps = <0>; + gpmc,cs-on-ns = <0>; + gpmc,cs-rd-off-ns = <44>; + gpmc,cs-wr-off-ns = <44>; + gpmc,adv-on-ns = <6>; + gpmc,adv-rd-off-ns = <34>; + gpmc,adv-wr-off-ns = <44>; + gpmc,we-on-ns = <0>; + gpmc,we-off-ns = <40>; + gpmc,oe-on-ns = <0>; + gpmc,oe-off-ns = <54>; + gpmc,access-ns = <64>; + gpmc,rd-cycle-ns = <82>; + gpmc,wr-cycle-ns = <82>; + gpmc,wait-on-read = "true"; + gpmc,wait-on-write = "true"; + gpmc,bus-turnaround-ns = <0>; + gpmc,cycle2cycle-delay-ns = <0>; + gpmc,clk-activation-ns = <0>; + gpmc,wait-monitoring-ns = <0>; + gpmc,wr-access-ns = <40>; + gpmc,wr-data-mux-bus-ns = <0>; + + #address-cells = <1>; + #size-cells = <1>; + elm_id = <&elm>; + + boot@0 { + label = "SPL"; + reg = <0x0 0x20000>; + }; + boot@20000{ + label = "SPL.backup1"; + reg = <0x20000 0x20000>; + }; + boot@40000 { + label = "SPL.backup2"; + reg = <0x40000 0x20000>; + }; + boot@60000 { + label = "SPL.backup3"; + reg = <0x60000 0x20000>; + }; + boot@80000 { + label = "u-boot"; + reg = <0x80000 0x1e0000>; + }; + boot@260000 { + label = "UBI"; + reg = <0x260000 0xfda0000>; + }; + }; +}; + +&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_pins>; + + status = "okay"; +}; + +&i2c1 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_pins>; + + status = "okay"; + clock-frequency = <1000>; + + tps: tps@2d { + reg = <0x2d>; + gpio-controller; + #gpio-cells = <2>; + interrupt-parent = <&gpio1>; + interrupts = <28 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&tps65910_pins>; + }; + + at24@50 { + compatible = "at24,24c02"; + pagesize = <8>; + reg = <0x50>; + }; + + tca6416: gpio@20 { + compatible = "ti,tca6416"; + reg = <0x20>; + gpio-controller; + #gpio-cells = <2>; + interrupt-parent = <&gpio0>; + interrupts = <20 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&tca6416_pins>; + }; +}; + +&usb { + status = "okay"; +}; + +&usb_ctrl_mod { + status = "okay"; +}; + +&usb0_phy { + status = "okay"; +}; + +&usb1_phy { + status = "okay"; +}; + +&usb0 { + status = "okay"; + dr_mode = "host"; +}; + +&usb1 { + status = "okay"; + dr_mode = "host"; +}; + +&cppi41dma { + status = "okay"; +}; + +/include/ "tps65910.dtsi" + +&tps { + vcc1-supply = <&vbat>; + vcc2-supply = <&vbat>; + vcc3-supply = <&vbat>; + vcc4-supply = <&vbat>; + vcc5-supply = <&vbat>; + vcc6-supply = <&vbat>; + vcc7-supply = <&vbat>; + vccio-supply = <&vbat>; + + ti,en-ck32k-xtal = <1>; + + regulators { + vrtc_reg: regulator@0 { + regulator-always-on; + }; + + vio_reg: regulator@1 { + regulator-always-on; + }; + + vdd1_reg: regulator@2 { + /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */ + regulator-name = "vdd_mpu"; + regulator-min-microvolt = <912500>; + regulator-max-microvolt = <1312500>; + regulator-boot-on; + regulator-always-on; + }; + + vdd2_reg: regulator@3 { + /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */ + regulator-name = "vdd_core"; + regulator-min-microvolt = <912500>; + regulator-max-microvolt = <1150000>; + regulator-boot-on; + regulator-always-on; + }; + + vdd3_reg: regulator@4 { + regulator-always-on; + }; + + vdig1_reg: regulator@5 { + regulator-always-on; + }; + + vdig2_reg: regulator@6 { + regulator-always-on; + }; + + vpll_reg: regulator@7 { + regulator-always-on; + }; + + vdac_reg: regulator@8 { + regulator-always-on; + }; + + vaux1_reg: regulator@9 { + regulator-always-on; + }; + + vaux2_reg: regulator@10 { + regulator-always-on; + }; + + vaux33_reg: regulator@11 { + regulator-always-on; + }; + + vmmc_reg: regulator@12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + }; + }; +}; + +&mac { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cpsw_default>; + pinctrl-1 = <&cpsw_sleep>; + dual_emac = <1>; + + status = "okay"; +}; + +&davinci_mdio { + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&davinci_mdio_default>; + pinctrl-1 = <&davinci_mdio_sleep>; + + status = "okay"; +}; + +&cpsw_emac0 { + phy_id = <&davinci_mdio>, <0>; + phy-mode = "rmii"; + dual_emac_res_vlan = <1>; +}; + +&cpsw_emac1 { + phy_id = <&davinci_mdio>, <7>; + phy-mode = "rgmii-txid"; + dual_emac_res_vlan = <2>; +}; + +&phy_sel { + rmii-clock-ext = <1>; +}; + +&mmc1 { + pinctrl-names = "default"; + pinctrl-0 = <&mmc1_pins>; + vmmc-supply = <&vmmc_reg>; + status = "okay"; +}; + +&gpio0 { + ti,no-reset-on-init; +}; diff --git a/board/vscom/baltos/board.c b/board/vscom/baltos/board.c index df0a2d2b7a..60651f501f 100644 --- a/board/vscom/baltos/board.c +++ b/board/vscom/baltos/board.c @@ -35,8 +35,7 @@ DECLARE_GLOBAL_DATA_PTR; -/* GPIO that controls power to DDR on EVM-SK */ -#define GPIO_DDR_VTT_EN 7 +/* GPIO that controls DIP switch and mPCIe slot */ #define DIP_S1 44 #define MPCIE_SW 100 @@ -248,9 +247,6 @@ const struct ctrl_ioregs ioregs_baltos = { void sdram_init(void) { - gpio_request(GPIO_DDR_VTT_EN, "ddr_vtt_en"); - gpio_direction_output(GPIO_DDR_VTT_EN, 1); - config_ddr(400, &ioregs_baltos, &ddr3_baltos_data, &ddr3_baltos_cmd_ctrl_data, diff --git a/board/vscom/baltos/mux.c b/board/vscom/baltos/mux.c index 94410ae35e..9c5542ea02 100644 --- a/board/vscom/baltos/mux.c +++ b/board/vscom/baltos/mux.c @@ -34,7 +34,6 @@ static struct module_pin_mux mmc0_pin_mux[] = { {OFFSET(mmc0_dat0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT0 */ {OFFSET(mmc0_clk), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_CLK */ {OFFSET(mmc0_cmd), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_CMD */ - //{OFFSET(spi0_cs1), (MODE(5) | RXACTIVE | PULLUP_EN)}, /* MMC0_CD */ {-1}, }; @@ -46,11 +45,6 @@ static struct module_pin_mux i2c1_pin_mux[] = { {-1}, }; -static struct module_pin_mux gpio0_7_pin_mux[] = { - {OFFSET(ecap0_in_pwm0_out), (MODE(7) | PULLUDEN)}, /* GPIO0_7 */ - {-1}, -}; - static struct module_pin_mux rmii1_pin_mux[] = { {OFFSET(mii1_crs), MODE(1) | RXACTIVE}, /* RGMII1_TCTL */ {OFFSET(mii1_txen), MODE(1)}, /* RGMII1_TCTL */ @@ -114,7 +108,6 @@ void enable_i2c1_pin_mux(void) void enable_board_pin_mux() { configure_module_pin_mux(i2c1_pin_mux); - configure_module_pin_mux(gpio0_7_pin_mux); configure_module_pin_mux(rgmii2_pin_mux); configure_module_pin_mux(rmii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux); diff --git a/configs/am335x_baltos_defconfig b/configs/am335x_baltos_defconfig index a61b13b6fc..4e68956b7c 100644 --- a/configs/am335x_baltos_defconfig +++ b/configs/am335x_baltos_defconfig @@ -1,6 +1,5 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_AM33XX=y @@ -39,17 +38,22 @@ CONFIG_CMD_MTDPARTS=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:128k(SPL),128k(SPL.backup1),128k(SPL.backup2),128k(SPL.backup3),1920k(u-boot),-(UBI)" CONFIG_CMD_UBI=y +CONFIG_OF_CONTROL=y +CONFIG_DEFAULT_DEVICE_TREE="am335x-baltos" CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_SYS_OMAP24_I2C_SPEED=1000 +CONFIG_DM_MMC=y CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_OMAP_HS_ADMA=y CONFIG_NAND=y CONFIG_PHY_ADDR_ENABLE=y -CONFIG_DRIVER_TI_CPSW=y CONFIG_MII=y +CONFIG_DRIVER_TI_CPSW=y CONFIG_SPI=y CONFIG_OMAP3_SPI=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_DSPS=y @@ -59,7 +63,7 @@ CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0403 CONFIG_USB_GADGET_PRODUCT_NUM=0xbd00 CONFIG_USB_GADGET_DOWNLOAD=y +CONFIG_USB_FUNCTION_MASS_STORAGE=y CONFIG_USB_ETHER=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" CONFIG_FAT_WRITE=y -CONFIG_OF_LIBFDT=y -- 2.17.0

3 11

[U-Boot] [PATCH] rpi: Enable command bmp
by Adam Heinrich 03 Dec '18

03 Dec '18

This patch enables the bmp command (with gzip support enabled) on all Raspberry Pi boards. The value of CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (required by CONFIG_VIDEO_BMP_GZIP) is set to match resolution of the "official" 7 inch LCD. Signed-off-by: Adam Heinrich <adam(a)adamh.cz> Cc: Alexander Graf <agraf(a)suse.de> --- configs/rpi_0_w_defconfig | 1 + configs/rpi_2_defconfig | 1 + configs/rpi_3_32b_defconfig | 1 + configs/rpi_3_defconfig | 1 + configs/rpi_defconfig | 1 + include/configs/rpi.h | 7 +++++++ 6 files changed, 12 insertions(+) diff --git a/configs/rpi_0_w_defconfig b/configs/rpi_0_w_defconfig index d5bf01b76e..c809b12279 100644 --- a/configs/rpi_0_w_defconfig +++ b/configs/rpi_0_w_defconfig @@ -9,6 +9,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_BMP=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index a50a815759..1afc3470c4 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -9,6 +9,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_BMP=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig index ec395d29ed..380fb81977 100644 --- a/configs/rpi_3_32b_defconfig +++ b/configs/rpi_3_32b_defconfig @@ -10,6 +10,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_BMP=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_3_defconfig b/configs/rpi_3_defconfig index ac99f2000a..b3e7c20b76 100644 --- a/configs/rpi_3_defconfig +++ b/configs/rpi_3_defconfig @@ -10,6 +10,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_BMP=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig index db42ffd135..8eb8fda029 100644 --- a/configs/rpi_defconfig +++ b/configs/rpi_defconfig @@ -9,6 +9,7 @@ CONFIG_MISC_INIT_R=y # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set CONFIG_SYS_PROMPT="U-Boot> " +CONFIG_CMD_BMP=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 37be6dbeeb..58defc0c2a 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -63,6 +63,13 @@ #define CONFIG_LCD_DT_SIMPLEFB #define CONFIG_VIDEO_BCM2835 +#ifdef CONFIG_DM_VIDEO +#define CONFIG_BMP_24BPP +#define CONFIG_BMP_32BPP +#define CONFIG_VIDEO_BMP_GZIP +#define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((800 * 480 * 4) + 54) +#endif + #ifdef CONFIG_CMD_USB #define CONFIG_TFTP_TSIZE #endif -- 2.17.1

2 2

[U-Boot] [PATCH v2 1/3] Enable FEC driver to retrieve PHY address from device tree
by Martyn Welch 03 Dec '18

03 Dec '18

Currently if we have more than one phy on the MDIO bus, we do not have a good mechanism for determining which should be used at runtime. Enable the FEC driver to determine the address for the PHY from the device tree. Signed-off-by: Martyn Welch <martyn.welch(a)collabora.com> --- Changes in v2: - New in v2 drivers/net/fec_mxc.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 99c5c649a0..425f6197cb 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1264,11 +1264,32 @@ static const struct eth_ops fecmxc_ops = { .read_rom_hwaddr = fecmxc_read_rom_hwaddr, }; +static int device_get_phy_addr(struct udevice *dev) +{ + struct ofnode_phandle_args phandle_args; + int reg; + + if (dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0, + &phandle_args)) { + debug("Failed to find phy-handle"); + return -ENODEV; + } + + reg = ofnode_read_u32_default(phandle_args.node, "reg", 0); + + return reg; +} + static int fec_phy_init(struct fec_priv *priv, struct udevice *dev) { struct phy_device *phydev; + int addr; int mask = 0xffffffff; + addr = device_get_phy_addr(dev); + if (addr >= 0) + mask = 1 << addr; + #ifdef CONFIG_FEC_MXC_PHYADDR mask = 1 << CONFIG_FEC_MXC_PHYADDR; #endif -- 2.19.1

7 14

[U-Boot] [PATCH] ddrmc: vybrid: We shall perform bitwise AND, not logical one
by Lukasz Majewski 03 Dec '18

03 Dec '18

With logical AND - we exit the memory setup procedure on any interrupt - also on errors. Signed-off-by: Lukasz Majewski <lukma(a)denx.de> --- arch/arm/mach-imx/ddrmc-vf610.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-imx/ddrmc-vf610.c b/arch/arm/mach-imx/ddrmc-vf610.c index 3d7da1c25e..ea6a49e0fa 100644 --- a/arch/arm/mach-imx/ddrmc-vf610.c +++ b/arch/arm/mach-imx/ddrmc-vf610.c @@ -231,6 +231,6 @@ void ddrmc_ctrl_init_ddr3(struct ddr3_jedec_timings const *timings, /* all inits done, start the DDR controller */ writel(DDRMC_CR00_DRAM_CLASS_DDR3 | DDRMC_CR00_START, &ddrmr->cr[0]); - while (!(readl(&ddrmr->cr[80]) && 0x100)) + while (!(readl(&ddrmr->cr[80]) & 0x100)) udelay(10); } -- 2.11.0

3 2

[U-Boot] [PATCH 1/2] net: zynq_gem: Added 64-bit addressing support
by Siva Durga Prasad Paladugu 03 Dec '18

03 Dec '18

From: Vipul Kumar <vipul.kumar(a)xilinx.com> This patch adds 64-bit addressing support for zynq gem. This means it can perform send and receive operations on 64-bit address buffers. Signed-off-by: Vipul Kumar <vipul.kumar(a)xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/net/zynq_gem.c | 63 ++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 54 insertions(+), 9 deletions(-) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index bc33126..ee528db 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -86,10 +86,17 @@ DECLARE_GLOBAL_DATA_PTR; /* Set with binary 00011000 to use 1536 byte(1*max length frame/buffer) */ #define ZYNQ_GEM_DMACR_RXBUF 0x00180000 +#if defined(CONFIG_PHYS_64BIT) +# define ZYNQ_GEM_DMA_BUS_WIDTH BIT(30) /* 64 bit bus */ +#else +# define ZYNQ_GEM_DMA_BUS_WIDTH (0 << 30) /* 32 bit bus */ +#endif + #define ZYNQ_GEM_DMACR_INIT (ZYNQ_GEM_DMACR_BLENGTH | \ ZYNQ_GEM_DMACR_RXSIZE | \ ZYNQ_GEM_DMACR_TXSIZE | \ - ZYNQ_GEM_DMACR_RXBUF) + ZYNQ_GEM_DMACR_RXBUF | \ + ZYNQ_GEM_DMA_BUS_WIDTH) #define ZYNQ_GEM_TSR_DONE 0x00000020 /* Tx done mask */ @@ -147,12 +154,20 @@ struct zynq_gem_regs { u32 transmit_q1_ptr; /* 0x440 - Transmit priority queue 1 */ u32 reserved8[15]; u32 receive_q1_ptr; /* 0x480 - Receive priority queue 1 */ + u32 reserved10[17]; + u32 upper_txqbase; /* 0x4C8 - Upper tx_q base addr */ + u32 reserved11[2]; + u32 upper_rxqbase; /* 0x4D4 - Upper rx_q base addr */ }; /* BD descriptors */ struct emac_bd { u32 addr; /* Next descriptor pointer */ u32 status; +#if defined(CONFIG_PHYS_64BIT) + u32 addr_hi; + u32 reserved; +#endif }; #define RX_BUF 32 @@ -390,13 +405,21 @@ static int zynq_gem_init(struct udevice *dev) for (i = 0; i < RX_BUF; i++) { priv->rx_bd[i].status = 0xF0000000; priv->rx_bd[i].addr = - ((ulong)(priv->rxbuffers) + - (i * PKTSIZE_ALIGN)); - } + (lower_32_bits((ulong)(priv->rxbuffers) + + (i * PKTSIZE_ALIGN))); +#if defined(CONFIG_PHYS_64BIT) + priv->rx_bd[i].addr_hi = + (upper_32_bits((ulong)(priv->rxbuffers) + + (i * PKTSIZE_ALIGN))); +#endif + } /* WRAP bit to last BD */ priv->rx_bd[--i].addr |= ZYNQ_GEM_RXBUF_WRAP_MASK; /* Write RxBDs to IP */ - writel((ulong)priv->rx_bd, &regs->rxqbase); + writel(lower_32_bits((ulong)priv->rx_bd), &regs->rxqbase); +#if defined(CONFIG_PHYS_64BIT) + writel(upper_32_bits((ulong)priv->rx_bd), &regs->upper_rxqbase); +#endif /* Setup for DMA Configuration register */ writel(ZYNQ_GEM_DMACR_INIT, &regs->dmacr); @@ -406,12 +429,18 @@ static int zynq_gem_init(struct udevice *dev) /* Disable the second priority queue */ dummy_tx_bd->addr = 0; +#if defined(CONFIG_PHYS_64BIT) + dummy_tx_bd->addr_hi = 0; +#endif dummy_tx_bd->status = ZYNQ_GEM_TXBUF_WRAP_MASK | ZYNQ_GEM_TXBUF_LAST_MASK| ZYNQ_GEM_TXBUF_USED_MASK; dummy_rx_bd->addr = ZYNQ_GEM_RXBUF_WRAP_MASK | ZYNQ_GEM_RXBUF_NEW_MASK; +#if defined(CONFIG_PHYS_64BIT) + dummy_rx_bd->addr_hi = 0; +#endif dummy_rx_bd->status = 0; writel((ulong)dummy_tx_bd, &regs->transmit_q1_ptr); @@ -485,7 +514,8 @@ static int zynq_gem_init(struct udevice *dev) static int zynq_gem_send(struct udevice *dev, void *ptr, int len) { - u32 addr, size; + dma_addr_t addr; + u32 size; struct zynq_gem_priv *priv = dev_get_priv(dev); struct zynq_gem_regs *regs = priv->iobase; struct emac_bd *current_bd = &priv->tx_bd[1]; @@ -493,17 +523,26 @@ static int zynq_gem_send(struct udevice *dev, void *ptr, int len) /* Setup Tx BD */ memset(priv->tx_bd, 0, sizeof(struct emac_bd)); - priv->tx_bd->addr = (ulong)ptr; + priv->tx_bd->addr = lower_32_bits((ulong)ptr); +#if defined(CONFIG_PHYS_64BIT) + priv->tx_bd->addr_hi = upper_32_bits((ulong)ptr); +#endif priv->tx_bd->status = (len & ZYNQ_GEM_TXBUF_FRMLEN_MASK) | ZYNQ_GEM_TXBUF_LAST_MASK; /* Dummy descriptor to mark it as the last in descriptor chain */ current_bd->addr = 0x0; +#if defined(CONFIG_PHYS_64BIT) + current_bd->addr_hi = 0x0; +#endif current_bd->status = ZYNQ_GEM_TXBUF_WRAP_MASK | ZYNQ_GEM_TXBUF_LAST_MASK| ZYNQ_GEM_TXBUF_USED_MASK; /* setup BD */ - writel((ulong)priv->tx_bd, &regs->txqbase); + writel(lower_32_bits((ulong)priv->tx_bd), &regs->txqbase); +#if defined(CONFIG_PHYS_64BIT) + writel(upper_32_bits((ulong)priv->tx_bd), &regs->upper_txqbase); +#endif addr = (ulong) ptr; addr &= ~(ARCH_DMA_MINALIGN - 1); @@ -531,7 +570,7 @@ static int zynq_gem_send(struct udevice *dev, void *ptr, int len) static int zynq_gem_recv(struct udevice *dev, int flags, uchar **packetp) { int frame_len; - u32 addr; + dma_addr_t addr; struct zynq_gem_priv *priv = dev_get_priv(dev); struct emac_bd *current_bd = &priv->rx_bd[priv->rxbd_current]; @@ -550,8 +589,14 @@ static int zynq_gem_recv(struct udevice *dev, int flags, uchar **packetp) return -1; } +#if defined(CONFIG_PHYS_64BIT) + addr = (dma_addr_t)((current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK) + | ((dma_addr_t)current_bd->addr_hi << 32)); +#else addr = current_bd->addr & ZYNQ_GEM_RXBUF_ADD_MASK; +#endif addr &= ~(ARCH_DMA_MINALIGN - 1); + *packetp = (uchar *)(uintptr_t)addr; return frame_len; -- 2.7.4

2 2

[U-Boot] Please pull u-boot-dm
by Simon Glass 03 Dec '18

03 Dec '18

Hi Tom, Here is my attempt at a signed pull request. I've brought in most of the outstanding dm patches. Please let me know if it looks OK. Do you have my public key? The following changes since commit 0a60a81ba3860946551cb79aa6486aa076e357f3: Kconfig: sandbox: enable cmd_avb and dependencies (2018-10-07 13:34:19 -0400) are available in the Git repository at: git://git.denx.de/u-boot-dm.git tags/dm-9oct18 for you to fetch changes up to 41b781ddf1869f5349e05ace888979f3673fe8c6: dtoc: Fix the value of SetInt() (2018-10-09 04:40:27 -0600) ---------------------------------------------------------------- Test improvements to tidy up output and drop duplicate tests Sandbox SPL/TPL support Various dm-related improvements ---------------------------------------------------------------- Marek Vasut (2): ofnode: Replace of_n_addr_cells with of_n_size_cells ofnode: Add missing address translation into ofnode_get_addr_size() Simon Glass (74): sandbox: Unprotect DATA regions in bus tests patman: Handle unicode in _ProjectConfigParser tests test/py: Fix unicode handling for log filtering buildman: Make the toolchain test more forgiving Makefile: Add a 'check' target for make test: Simplify the PATH setup test: Print the name of each test before running it test: Tidy up comments and variable name binman: Add a default path to libfdt.py binman: Fix up removal of temporary directories binman: Separate out testSplBssPad() buildman: dtoc: Suppress unwanted output from test tools: Set an initial value for indir patman: Don't clear progress in tout unless it was used test: Reduce the number of tests run with sandbox_flattree binman: Run tests concurrently log: Correct definition of log_msg_ret() log: Add helpers for common log levels sandbox: Support file truncation with os_open() sandbox: Add a way to write data to the host filesystem sandbox: spi: Drop command-line SPI option sandbox: Support booting from TPL to SPL sandbox: Add a flag to set the default log level sandbox: Remove the old memory file later sandbox: spi: Add more logging sandbox: video: Speed up video output sandbox: Add a debug UART serial: sandbox: Allow serial output without device tree sandbox: tpm: Tidy up enums and return values sandbox: tpm: Enhance to support the latest Chromium OS dm: spi: Clean up detection of sandbox SPI emulator sandbox: Restore blocking I/O on exit dm: core: Alloc uclass-private data to be cache-aligned dm: core: Update some functions to use const dm: core: Add a function to find the first inactive child dm: core: Update ofnode to read binman-style flash entry sf: Avoid allocating memory on every read operation spl: input: Allow input in SPL and TPL Makefile: Add a warning if SPL/TPL cannot be built blk: Support block drivers in TPL Kconfig: Convert CONFIG_RTC_MC146818 to Kconfig rtc: Allow use of RTC in SPL and TPL fdt: Document the fact that dtc is now built doc: Update docs for device tree in SPL, TPL fdt: Allow indicating a node is for U-Boot proper only tpm: Add support for SPL and TPL serial: Allow serial to be absent in TPL fdt: Allow libfdt in TPL cros: Update cros_ec code to use struct udevice cros: Adjust board_get_cros_ec_dev() to return a udevice dm: spi: Add logging of some return values fdt: Remove fdtdec_decode_region() function video: Adjust video_clear() to return an error tpm: Use livetree and allow children tpm: Tidy up logging in tpm-common.c tpm: Add a few new commands for v1 binman: Move to three-digit test-file numbers log: Add comments to the rest of the log categories Add a header file for strings Rename GPT_HEADER_SIGNATURE to avoid conflict cros: Update ec_commands to latest version x86: Update mtrr functions to allow leaving cache alone cros_ec: Update cros_ec_read_hash() to specify the image cros_ec: Add support for v3 messages on LPC test: panel: Add a test for the panel uclass panel: Expand the backlight support ctags: Minor changes to fix ctags output fdt: Allow C++ comments in link scripts and DT files pci: Add a little more debugging to pci_rom sysreset: Tidy up a few comments and logging sysreset: Add a way to find the last reset video: at91: Adjust vidconsole_position_cursor() to use char pos video: Tidy up a few comments in video.o dtoc: Fix the value of SetInt() .travis.yml | 1 + Makefile | 8 +- arch/sandbox/cpu/os.c | 85 +- arch/sandbox/cpu/start.c | 19 +- arch/sandbox/cpu/state.c | 6 +- arch/sandbox/dts/sandbox.dts | 20 +- arch/sandbox/dts/sandbox64.dts | 20 +- arch/sandbox/dts/sandbox_pmic.dtsi | 2 +- arch/sandbox/dts/test.dts | 49 +- arch/sandbox/include/asm/state.h | 2 +- arch/sandbox/include/asm/test.h | 15 + arch/x86/cpu/coreboot/coreboot.c | 4 +- arch/x86/cpu/mtrr.c | 31 +- arch/x86/include/asm/mtrr.h | 6 +- board/atmel/common/video_display.c | 5 +- cmd/cros_ec.c | 31 +- cmd/tpm_test.c | 15 - cmd/x86/mtrr.c | 8 +- common/cros_ec.c | 4 +- common/log.c | 3 +- configs/chromebook_link64_defconfig | 1 + configs/edison_defconfig | 1 + configs/malta64_defconfig | 1 + configs/malta64el_defconfig | 1 + configs/malta_defconfig | 1 + configs/maltael_defconfig | 1 + configs/sandbox_defconfig | 2 + configs/sandbox_flattree_defconfig | 1 + disk/part_efi.c | 6 +- doc/README.fdt-control | 16 +- doc/driver-model/README.txt | 7 +- drivers/block/Kconfig | 12 + drivers/block/Makefile | 2 +- drivers/core/device.c | 45 +- drivers/core/of_extra.c | 27 +- drivers/core/ofnode.c | 10 +- drivers/input/Kconfig | 48 + drivers/input/Makefile | 11 +- drivers/input/input.c | 5 +- drivers/misc/cros_ec.c | 178 +- drivers/misc/cros_ec_lpc.c | 33 + drivers/misc/cros_ec_sandbox.c | 8 +- drivers/mtd/spi/sandbox.c | 194 +- drivers/mtd/spi/sf-uclass.c | 6 +- drivers/mtd/spi/sf_probe.c | 2 +- drivers/mtd/spi/spi_flash.c | 17 +- drivers/pci/pci_rom.c | 4 +- drivers/pwm/sandbox_pwm.c | 25 + drivers/rtc/Kconfig | 26 + drivers/rtc/Makefile | 2 +- drivers/serial/Kconfig | 21 + drivers/serial/sandbox.c | 24 +- drivers/serial/serial-uclass.c | 4 + drivers/spi/sandbox_spi.c | 38 +- drivers/spi/spi-uclass.c | 6 +- drivers/sysreset/sysreset-uclass.c | 34 +- drivers/sysreset/sysreset_sandbox.c | 15 + drivers/tpm/Makefile | 2 +- drivers/tpm/tpm-uclass.c | 9 +- drivers/tpm/tpm_tis_lpc.c | 2 +- drivers/tpm/tpm_tis_sandbox.c | 115 +- drivers/video/backlight-uclass.c | 10 + drivers/video/panel-uclass.c | 18 + drivers/video/pwm_backlight.c | 187 +- drivers/video/simple_panel.c | 20 +- drivers/video/tegra124/sor.c | 3 +- drivers/video/vidconsole-uclass.c | 14 +- drivers/video/video-uclass.c | 10 +- drivers/video/video_bmp.c | 2 +- include/backlight.h | 25 + include/configs/edison.h | 1 - include/configs/malta.h | 1 - include/cros_ec.h | 72 +- include/dm/device.h | 39 +- include/dm/of_extra.h | 3 +- include/dm/uclass.h | 3 + include/ec_commands.h | 4324 +++++++++++++++++++++++++++------ include/fdtdec.h | 45 - include/linux/compiler-gcc.h | 6 +- include/log.h | 29 +- include/os.h | 36 +- include/panel.h | 22 +- include/part_efi.h | 2 +- include/string.h | 1 + include/sysreset.h | 34 +- include/tpm-v1.h | 76 + include/tpm-v2.h | 1 + include/video.h | 11 +- lib/Kconfig | 32 + lib/Makefile | 10 +- lib/fdtdec.c | 83 - lib/hang.c | 5 +- lib/tpm-common.c | 10 +- lib/tpm-v1.c | 68 +- scripts/Makefile.spl | 9 +- scripts/config_whitelist.txt | 1 - test/dm/Makefile | 1 + test/dm/bus.c | 12 + test/dm/core.c | 31 + test/dm/ofnode.c | 16 + test/dm/panel.c | 79 + test/dm/sysreset.c | 21 +- test/dm/video.c | 2 +- test/log/log_test.c | 13 + test/py/README.md | 1 + test/py/multiplexed_log.py | 7 +- test/py/tests/test_log.py | 6 + test/run | 57 +- tools/binman/binman.py | 28 +- tools/binman/cmdline.py | 2 + tools/binman/elf_test.py | 5 + tools/binman/entry_test.py | 17 +- tools/binman/fdt_test.py | 8 +- tools/binman/ftest.py | 268 +- tools/binman/test/{01_invalid.dts => 001_invalid.dts} | 0 tools/binman/test/{02_missing_node.dts => 002_missing_node.dts} | 0 tools/binman/test/{03_empty.dts => 003_empty.dts} | 0 tools/binman/test/{04_invalid_entry.dts => 004_invalid_entry.dts} | 0 tools/binman/test/{05_simple.dts => 005_simple.dts} | 0 tools/binman/test/{06_dual_image.dts => 006_dual_image.dts} | 0 tools/binman/test/{07_bad_align.dts => 007_bad_align.dts} | 0 tools/binman/test/{08_pack.dts => 008_pack.dts} | 0 tools/binman/test/{09_pack_extra.dts => 009_pack_extra.dts} | 0 tools/binman/test/{10_pack_align_power2.dts => 010_pack_align_power2.dts} | 0 .../{11_pack_align_size_power2.dts => 011_pack_align_size_power2.dts} | 0 tools/binman/test/{12_pack_inv_align.dts => 012_pack_inv_align.dts} | 0 .../test/{13_pack_inv_size_align.dts => 013_pack_inv_size_align.dts} | 0 tools/binman/test/{14_pack_overlap.dts => 014_pack_overlap.dts} | 0 tools/binman/test/{15_pack_overflow.dts => 015_pack_overflow.dts} | 0 .../test/{16_pack_image_overflow.dts => 016_pack_image_overflow.dts} | 0 tools/binman/test/{17_pack_image_size.dts => 017_pack_image_size.dts} | 0 tools/binman/test/{18_pack_image_align.dts => 018_pack_image_align.dts} | 0 .../test/{19_pack_inv_image_align.dts => 019_pack_inv_image_align.dts} | 0 ...ack_inv_image_align_power2.dts => 020_pack_inv_image_align_power2.dts} | 0 tools/binman/test/{21_image_pad.dts => 021_image_pad.dts} | 0 tools/binman/test/{22_image_name.dts => 022_image_name.dts} | 0 tools/binman/test/{23_blob.dts => 023_blob.dts} | 0 tools/binman/test/{24_sorted.dts => 024_sorted.dts} | 0 tools/binman/test/{25_pack_zero_size.dts => 025_pack_zero_size.dts} | 0 tools/binman/test/{26_pack_u_boot_dtb.dts => 026_pack_u_boot_dtb.dts} | 0 tools/binman/test/{27_pack_4gb_no_size.dts => 027_pack_4gb_no_size.dts} | 0 tools/binman/test/{28_pack_4gb_outside.dts => 028_pack_4gb_outside.dts} | 0 tools/binman/test/{29_x86-rom.dts => 029_x86-rom.dts} | 0 .../binman/test/{30_x86-rom-me-no-desc.dts => 030_x86-rom-me-no-desc.dts} | 0 tools/binman/test/{31_x86-rom-me.dts => 031_x86-rom-me.dts} | 0 tools/binman/test/{32_intel-vga.dts => 032_intel-vga.dts} | 0 tools/binman/test/{33_x86-start16.dts => 033_x86-start16.dts} | 0 tools/binman/test/{34_x86_ucode.dts => 034_x86_ucode.dts} | 0 tools/binman/test/{35_x86_single_ucode.dts => 035_x86_single_ucode.dts} | 0 tools/binman/test/{36_u_boot_img.dts => 036_u_boot_img.dts} | 0 tools/binman/test/{37_x86_no_ucode.dts => 037_x86_no_ucode.dts} | 0 .../{38_x86_ucode_missing_node.dts => 038_x86_ucode_missing_node.dts} | 0 .../{39_x86_ucode_missing_node2.dts => 039_x86_ucode_missing_node2.dts} | 0 .../{40_x86_ucode_not_in_image.dts => 040_x86_ucode_not_in_image.dts} | 0 tools/binman/test/{41_unknown_pos_size.dts => 041_unknown_pos_size.dts} | 0 tools/binman/test/{42_intel-fsp.dts => 042_intel-fsp.dts} | 0 tools/binman/test/{43_intel-cmc.dts => 043_intel-cmc.dts} | 0 .../binman/test/{44_x86_optional_ucode.dts => 044_x86_optional_ucode.dts} | 0 tools/binman/test/{45_prop_test.dts => 045_prop_test.dts} | 0 tools/binman/test/{46_intel-vbt.dts => 046_intel-vbt.dts} | 0 tools/binman/test/{47_spl_bss_pad.dts => 047_spl_bss_pad.dts} | 0 tools/binman/test/{48_x86-start16-spl.dts => 048_x86-start16-spl.dts} | 0 tools/binman/test/{49_x86_ucode_spl.dts => 049_x86_ucode_spl.dts} | 0 tools/binman/test/{50_intel_mrc.dts => 050_intel_mrc.dts} | 0 tools/binman/test/{51_u_boot_spl_dtb.dts => 051_u_boot_spl_dtb.dts} | 0 tools/binman/test/{52_u_boot_spl_nodtb.dts => 052_u_boot_spl_nodtb.dts} | 0 tools/binman/test/{53_symbols.dts => 053_symbols.dts} | 0 tools/binman/test/{54_unit_address.dts => 054_unit_address.dts} | 0 tools/binman/test/{55_sections.dts => 055_sections.dts} | 0 tools/binman/test/{56_name_prefix.dts => 056_name_prefix.dts} | 0 tools/binman/test/{57_unknown_contents.dts => 057_unknown_contents.dts} | 0 ...58_x86_ucode_spl_needs_retry.dts => 058_x86_ucode_spl_needs_retry.dts} | 0 tools/binman/test/{59_change_size.dts => 059_change_size.dts} | 0 tools/binman/test/{60_fdt_update.dts => 060_fdt_update.dts} | 0 tools/binman/test/{61_fdt_update_bad.dts => 061_fdt_update_bad.dts} | 0 tools/binman/test/{62_entry_args.dts => 062_entry_args.dts} | 0 .../binman/test/{63_entry_args_missing.dts => 063_entry_args_missing.dts} | 0 .../test/{64_entry_args_required.dts => 064_entry_args_required.dts} | 0 ...ntry_args_unknown_datatype.dts => 065_entry_args_unknown_datatype.dts} | 0 tools/binman/test/{66_text.dts => 066_text.dts} | 0 tools/binman/test/{67_fmap.dts => 067_fmap.dts} | 0 tools/binman/test/{68_blob_named_by_arg.dts => 068_blob_named_by_arg.dts} | 0 tools/binman/test/{69_fill.dts => 069_fill.dts} | 0 tools/binman/test/{70_fill_no_size.dts => 070_fill_no_size.dts} | 0 tools/binman/test/{71_gbb.dts => 071_gbb.dts} | 0 tools/binman/test/{72_gbb_too_small.dts => 072_gbb_too_small.dts} | 0 tools/binman/test/{73_gbb_no_size.dts => 073_gbb_no_size.dts} | 0 tools/binman/test/{74_vblock.dts => 074_vblock.dts} | 0 tools/binman/test/{75_vblock_no_content.dts => 075_vblock_no_content.dts} | 0 .../binman/test/{76_vblock_bad_phandle.dts => 076_vblock_bad_phandle.dts} | 0 tools/binman/test/{77_vblock_bad_entry.dts => 077_vblock_bad_entry.dts} | 0 tools/binman/test/{78_u_boot_tpl.dts => 078_u_boot_tpl.dts} | 0 tools/binman/test/{79_uses_pos.dts => 079_uses_pos.dts} | 0 tools/binman/test/{80_fill_empty.dts => 080_fill_empty.dts} | 0 tools/binman/test/{81_x86-start16-tpl.dts => 081_x86-start16-tpl.dts} | 0 tools/binman/test/{82_fdt_update_all.dts => 082_fdt_update_all.dts} | 0 tools/binman/test/{83_compress.dts => 083_compress.dts} | 0 tools/binman/test/{84_files.dts => 084_files.dts} | 0 tools/binman/test/{85_files_compress.dts => 085_files_compress.dts} | 0 tools/binman/test/{86_files_none.dts => 086_files_none.dts} | 0 tools/binman/test/{87_files_no_pattern.dts => 087_files_no_pattern.dts} | 0 tools/binman/test/{88_expand_size.dts => 088_expand_size.dts} | 0 tools/binman/test/{89_expand_size_bad.dts => 089_expand_size_bad.dts} | 0 tools/binman/test/{90_hash.dts => 090_hash.dts} | 0 tools/binman/test/{91_hash_no_algo.dts => 091_hash_no_algo.dts} | 0 tools/binman/test/{92_hash_bad_algo.dts => 092_hash_bad_algo.dts} | 0 tools/binman/test/{93_x86_tpl_ucode.dts => 093_x86_tpl_ucode.dts} | 0 tools/binman/test/{94_fmap_x86.dts => 094_fmap_x86.dts} | 0 tools/binman/test/{95_fmap_x86_section.dts => 095_fmap_x86_section.dts} | 0 tools/binman/test/{96_elf.dts => 096_elf.dts} | 0 tools/binman/test/{97_elf_strip.dts => 097_elf_strip.dts} | 0 tools/binman/test/{99_hash_section.dts => 099_hash_section.dts} | 0 tools/buildman/test.py | 8 +- tools/concurrencytest/.gitignore | 1 + tools/concurrencytest/README.md | 74 + tools/concurrencytest/concurrencytest.py | 144 ++ tools/dtoc/dtoc.py | 7 + tools/dtoc/fdt.py | 2 +- tools/dtoc/test_dtoc.py | 6 +- tools/dtoc/test_fdt.py | 12 +- tools/patman/settings.py | 27 +- tools/patman/test_util.py | 2 +- tools/patman/tools.py | 3 + tools/patman/tout.py | 8 +- 224 files changed, 5757 insertions(+), 1621 deletions(-) create mode 100644 include/string.h create mode 100644 test/dm/panel.c rename tools/binman/test/{01_invalid.dts => 001_invalid.dts} (100%) rename tools/binman/test/{02_missing_node.dts => 002_missing_node.dts} (100%) rename tools/binman/test/{03_empty.dts => 003_empty.dts} (100%) rename tools/binman/test/{04_invalid_entry.dts => 004_invalid_entry.dts} (100%) rename tools/binman/test/{05_simple.dts => 005_simple.dts} (100%) rename tools/binman/test/{06_dual_image.dts => 006_dual_image.dts} (100%) rename tools/binman/test/{07_bad_align.dts => 007_bad_align.dts} (100%) rename tools/binman/test/{08_pack.dts => 008_pack.dts} (100%) rename tools/binman/test/{09_pack_extra.dts => 009_pack_extra.dts} (100%) rename tools/binman/test/{10_pack_align_power2.dts => 010_pack_align_power2.dts} (100%) rename tools/binman/test/{11_pack_align_size_power2.dts => 011_pack_align_size_power2.dts} (100%) rename tools/binman/test/{12_pack_inv_align.dts => 012_pack_inv_align.dts} (100%) rename tools/binman/test/{13_pack_inv_size_align.dts => 013_pack_inv_size_align.dts} (100%) rename tools/binman/test/{14_pack_overlap.dts => 014_pack_overlap.dts} (100%) rename tools/binman/test/{15_pack_overflow.dts => 015_pack_overflow.dts} (100%) rename tools/binman/test/{16_pack_image_overflow.dts => 016_pack_image_overflow.dts} (100%) rename tools/binman/test/{17_pack_image_size.dts => 017_pack_image_size.dts} (100%) rename tools/binman/test/{18_pack_image_align.dts => 018_pack_image_align.dts} (100%) rename tools/binman/test/{19_pack_inv_image_align.dts => 019_pack_inv_image_align.dts} (100%) rename tools/binman/test/{20_pack_inv_image_align_power2.dts => 020_pack_inv_image_align_power2.dts} (100%) rename tools/binman/test/{21_image_pad.dts => 021_image_pad.dts} (100%) rename tools/binman/test/{22_image_name.dts => 022_image_name.dts} (100%) rename tools/binman/test/{23_blob.dts => 023_blob.dts} (100%) rename tools/binman/test/{24_sorted.dts => 024_sorted.dts} (100%) rename tools/binman/test/{25_pack_zero_size.dts => 025_pack_zero_size.dts} (100%) rename tools/binman/test/{26_pack_u_boot_dtb.dts => 026_pack_u_boot_dtb.dts} (100%) rename tools/binman/test/{27_pack_4gb_no_size.dts => 027_pack_4gb_no_size.dts} (100%) rename tools/binman/test/{28_pack_4gb_outside.dts => 028_pack_4gb_outside.dts} (100%) rename tools/binman/test/{29_x86-rom.dts => 029_x86-rom.dts} (100%) rename tools/binman/test/{30_x86-rom-me-no-desc.dts => 030_x86-rom-me-no-desc.dts} (100%) rename tools/binman/test/{31_x86-rom-me.dts => 031_x86-rom-me.dts} (100%) rename tools/binman/test/{32_intel-vga.dts => 032_intel-vga.dts} (100%) rename tools/binman/test/{33_x86-start16.dts => 033_x86-start16.dts} (100%) rename tools/binman/test/{34_x86_ucode.dts => 034_x86_ucode.dts} (100%) rename tools/binman/test/{35_x86_single_ucode.dts => 035_x86_single_ucode.dts} (100%) rename tools/binman/test/{36_u_boot_img.dts => 036_u_boot_img.dts} (100%) rename tools/binman/test/{37_x86_no_ucode.dts => 037_x86_no_ucode.dts} (100%) rename tools/binman/test/{38_x86_ucode_missing_node.dts => 038_x86_ucode_missing_node.dts} (100%) rename tools/binman/test/{39_x86_ucode_missing_node2.dts => 039_x86_ucode_missing_node2.dts} (100%) rename tools/binman/test/{40_x86_ucode_not_in_image.dts => 040_x86_ucode_not_in_image.dts} (100%) rename tools/binman/test/{41_unknown_pos_size.dts => 041_unknown_pos_size.dts} (100%) rename tools/binman/test/{42_intel-fsp.dts => 042_intel-fsp.dts} (100%) rename tools/binman/test/{43_intel-cmc.dts => 043_intel-cmc.dts} (100%) rename tools/binman/test/{44_x86_optional_ucode.dts => 044_x86_optional_ucode.dts} (100%) rename tools/binman/test/{45_prop_test.dts => 045_prop_test.dts} (100%) rename tools/binman/test/{46_intel-vbt.dts => 046_intel-vbt.dts} (100%) rename tools/binman/test/{47_spl_bss_pad.dts => 047_spl_bss_pad.dts} (100%) rename tools/binman/test/{48_x86-start16-spl.dts => 048_x86-start16-spl.dts} (100%) rename tools/binman/test/{49_x86_ucode_spl.dts => 049_x86_ucode_spl.dts} (100%) rename tools/binman/test/{50_intel_mrc.dts => 050_intel_mrc.dts} (100%) rename tools/binman/test/{51_u_boot_spl_dtb.dts => 051_u_boot_spl_dtb.dts} (100%) rename tools/binman/test/{52_u_boot_spl_nodtb.dts => 052_u_boot_spl_nodtb.dts} (100%) rename tools/binman/test/{53_symbols.dts => 053_symbols.dts} (100%) rename tools/binman/test/{54_unit_address.dts => 054_unit_address.dts} (100%) rename tools/binman/test/{55_sections.dts => 055_sections.dts} (100%) rename tools/binman/test/{56_name_prefix.dts => 056_name_prefix.dts} (100%) rename tools/binman/test/{57_unknown_contents.dts => 057_unknown_contents.dts} (100%) rename tools/binman/test/{58_x86_ucode_spl_needs_retry.dts => 058_x86_ucode_spl_needs_retry.dts} (100%) rename tools/binman/test/{59_change_size.dts => 059_change_size.dts} (100%) rename tools/binman/test/{60_fdt_update.dts => 060_fdt_update.dts} (100%) rename tools/binman/test/{61_fdt_update_bad.dts => 061_fdt_update_bad.dts} (100%) rename tools/binman/test/{62_entry_args.dts => 062_entry_args.dts} (100%) rename tools/binman/test/{63_entry_args_missing.dts => 063_entry_args_missing.dts} (100%) rename tools/binman/test/{64_entry_args_required.dts => 064_entry_args_required.dts} (100%) rename tools/binman/test/{65_entry_args_unknown_datatype.dts => 065_entry_args_unknown_datatype.dts} (100%) rename tools/binman/test/{66_text.dts => 066_text.dts} (100%) rename tools/binman/test/{67_fmap.dts => 067_fmap.dts} (100%) rename tools/binman/test/{68_blob_named_by_arg.dts => 068_blob_named_by_arg.dts} (100%) rename tools/binman/test/{69_fill.dts => 069_fill.dts} (100%) rename tools/binman/test/{70_fill_no_size.dts => 070_fill_no_size.dts} (100%) rename tools/binman/test/{71_gbb.dts => 071_gbb.dts} (100%) rename tools/binman/test/{72_gbb_too_small.dts => 072_gbb_too_small.dts} (100%) rename tools/binman/test/{73_gbb_no_size.dts => 073_gbb_no_size.dts} (100%) rename tools/binman/test/{74_vblock.dts => 074_vblock.dts} (100%) rename tools/binman/test/{75_vblock_no_content.dts => 075_vblock_no_content.dts} (100%) rename tools/binman/test/{76_vblock_bad_phandle.dts => 076_vblock_bad_phandle.dts} (100%) rename tools/binman/test/{77_vblock_bad_entry.dts => 077_vblock_bad_entry.dts} (100%) rename tools/binman/test/{78_u_boot_tpl.dts => 078_u_boot_tpl.dts} (100%) rename tools/binman/test/{79_uses_pos.dts => 079_uses_pos.dts} (100%) rename tools/binman/test/{80_fill_empty.dts => 080_fill_empty.dts} (100%) rename tools/binman/test/{81_x86-start16-tpl.dts => 081_x86-start16-tpl.dts} (100%) rename tools/binman/test/{82_fdt_update_all.dts => 082_fdt_update_all.dts} (100%) rename tools/binman/test/{83_compress.dts => 083_compress.dts} (100%) rename tools/binman/test/{84_files.dts => 084_files.dts} (100%) rename tools/binman/test/{85_files_compress.dts => 085_files_compress.dts} (100%) rename tools/binman/test/{86_files_none.dts => 086_files_none.dts} (100%) rename tools/binman/test/{87_files_no_pattern.dts => 087_files_no_pattern.dts} (100%) rename tools/binman/test/{88_expand_size.dts => 088_expand_size.dts} (100%) rename tools/binman/test/{89_expand_size_bad.dts => 089_expand_size_bad.dts} (100%) rename tools/binman/test/{90_hash.dts => 090_hash.dts} (100%) rename tools/binman/test/{91_hash_no_algo.dts => 091_hash_no_algo.dts} (100%) rename tools/binman/test/{92_hash_bad_algo.dts => 092_hash_bad_algo.dts} (100%) rename tools/binman/test/{93_x86_tpl_ucode.dts => 093_x86_tpl_ucode.dts} (100%) rename tools/binman/test/{94_fmap_x86.dts => 094_fmap_x86.dts} (100%) rename tools/binman/test/{95_fmap_x86_section.dts => 095_fmap_x86_section.dts} (100%) rename tools/binman/test/{96_elf.dts => 096_elf.dts} (100%) rename tools/binman/test/{97_elf_strip.dts => 097_elf_strip.dts} (100%) rename tools/binman/test/{99_hash_section.dts => 099_hash_section.dts} (100%) create mode 100644 tools/concurrencytest/.gitignore create mode 100644 tools/concurrencytest/README.md create mode 100644 tools/concurrencytest/concurrencytest.py Regards, Simon

4 8

[U-Boot] [PATCH v3 0/1] efi_loader: improve boot sequence in distro_bootcmd
by AKASHI Takahiro 03 Dec '18

03 Dec '18

Actually, this patch is a RESEND of my v2[1], without patch #2 and #3 as I don't want to dive into details of dtb discussions[2]. I think that the patch #1 alone is useful. If fdt_addr_r is not defined, "load ... ${fdt_addr_r} ${prefix}${efi_fdtfile}" will fail quietly. So it should be OK. Think about applying my "removable device" patch[3] alongside this patch. [1] https://lists.denx.de/pipermail/u-boot/2018-October/345029.html [2] https://lists.denx.de/pipermail/u-boot/2018-October/344375.html [3] https://lists.denx.de/pipermail/u-boot/2018-November/347491.html Changes in v3 (Nov 27, 2018): * remove v2's patch #2 and #3 Changes in v2 (Oct 22, 2018): * rewrite my previous changes after Alex's comments, including - boot bootmgr only once before searching for boot binary - dtb must be loaded from the same device with boot binary's * add patch#2 as part of this patch set, in particular adding CONFIG_SYS Thanks, -Takahio Akashi AKASHI Takahiro (1): efi_loader: rework fdt handling in distro boot script include/config_distro_bootcmd.h | 38 +++++++++++++++++---------------- 1 file changed, 20 insertions(+), 18 deletions(-) -- 2.19.1

2 4

[U-Boot] [PATCH] cmd: bmp: manage centered display
by Patrick Delaunay 03 Dec '18

03 Dec '18

Allow to display BMP at the middle of the screen. 'm' means "middle" as it is done for the splashscreen variable: splashpos=m,m Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- Example for command load mmc 0:4 ${splashimage} splash.bmp bmp display ${splashimage} m m or function can be used directly bmp_display(0xC0000000, BMP_ALIGN_CENTER, BMP_ALIGN_CENTER) cmd/bmp.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/cmd/bmp.c b/cmd/bmp.c index 02bdf48..1ace8a8 100644 --- a/cmd/bmp.c +++ b/cmd/bmp.c @@ -108,6 +108,7 @@ static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[ return (bmp_info(addr)); } +#define BMP_ALIGN_CENTER 0x7FFF static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) { ulong addr; @@ -124,8 +125,14 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar break; case 4: addr = simple_strtoul(argv[1], NULL, 16); - x = simple_strtoul(argv[2], NULL, 10); - y = simple_strtoul(argv[3], NULL, 10); + if (!strcmp(argv[2], "m")) + x = BMP_ALIGN_CENTER; + else + x = simple_strtoul(argv[2], NULL, 10); + if (!strcmp(argv[3], "m")) + y = BMP_ALIGN_CENTER; + else + y = simple_strtoul(argv[3], NULL, 10); break; default: return CMD_RET_USAGE; @@ -249,9 +256,11 @@ int bmp_display(ulong addr, int x, int y) if (!ret) { bool align = false; -# ifdef CONFIG_SPLASH_SCREEN_ALIGN - align = true; -# endif /* CONFIG_SPLASH_SCREEN_ALIGN */ + if (CONFIG_IS_ENABLED(SPLASH_SCREEN_ALIGN) || + x == BMP_ALIGN_CENTER || + y == BMP_ALIGN_CENTER) + align = true; + ret = video_bmp_display(dev, addr, x, y, align); } #elif defined(CONFIG_LCD) -- 2.7.4

3 3

[U-Boot] [PATCH] distro: add more efi dtb prefixes
by Guillaume GARDET 03 Dec '18

03 Dec '18

As used on some distro, such as openSUSE. Signed-off-by: Guillaume GARDET <guillaume.gardet(a)free.fr> Cc: Tom Rini <trini(a)konsulko.com> --- include/config_distro_bootcmd.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h index d672e8ebe6..ad4c7a78f1 100644 --- a/include/config_distro_bootcmd.h +++ b/include/config_distro_bootcmd.h @@ -141,7 +141,8 @@ "load ${devtype} ${devnum}:${distro_bootpart} " \ "${fdt_addr_r} ${prefix}${efi_fdtfile}\0" \ \ - "efi_dtb_prefixes=/ /dtb/ /dtb/current/\0" \ + "efi_dtb_prefixes=/ /dtb/ /dtb/current/ " \ + "/boot/ /boot/dtb/ /boot/dtb/current/\0" \ "scan_dev_for_efi=" \ "setenv efi_fdtfile ${fdtfile}; " \ BOOTENV_EFI_SET_FDTFILE_FALLBACK \ -- 2.17.1

4 5

[U-Boot] [PATCH 0/1] ARM: mvebu: Armada-38x DDR training update
by Chris Packham 03 Dec '18

03 Dec '18

Hi All, I had a faulty board to debug at $dayjob. Part of that involved trying the latest DDR training code from Marvell. That didn't fix by problem (I suspect a manufacturing issue with that board). Since I've done the work anyway I figured I'd send this out. Most of the delta is code movement and tidy up. There's very little behavioural change for A38X. This may however be useful if/when someone starts looking at the newer Armada-3700/3900 SoCs. Chris Packham (1): ARM: mvebu: a38x: sync ddr training code with mv_ddr-armada-18.09 board/CZ.NIC/turris_omnia/turris_omnia.c | 4 +- board/Marvell/db-88f6820-amc/db-88f6820-amc.c | 2 +- board/Marvell/db-88f6820-gp/db-88f6820-gp.c | 2 +- board/gdsys/a38x/controlcenterdc.c | 2 +- board/kobol/helios4/helios4.c | 2 +- board/solidrun/clearfog/clearfog.c | 2 +- drivers/ddr/marvell/a38x/ddr3_debug.c | 414 +-------------- drivers/ddr/marvell/a38x/ddr3_init.c | 91 +--- drivers/ddr/marvell/a38x/ddr3_init.h | 43 +- drivers/ddr/marvell/a38x/ddr3_topology_def.h | 78 --- drivers/ddr/marvell/a38x/ddr3_training.c | 484 +++++++++--------- drivers/ddr/marvell/a38x/ddr3_training_bist.c | 1 + .../a38x/ddr3_training_centralization.c | 3 + drivers/ddr/marvell/a38x/ddr3_training_db.c | 172 ++++--- .../ddr/marvell/a38x/ddr3_training_hw_algo.c | 1 + drivers/ddr/marvell/a38x/ddr3_training_ip.h | 38 -- .../ddr/marvell/a38x/ddr3_training_ip_def.h | 31 -- .../marvell/a38x/ddr3_training_ip_engine.c | 2 + .../marvell/a38x/ddr3_training_ip_engine.h | 1 + .../ddr/marvell/a38x/ddr3_training_ip_flow.h | 91 +--- .../marvell/a38x/ddr3_training_ip_prv_if.h | 10 +- .../ddr/marvell/a38x/ddr3_training_leveling.c | 75 +-- .../ddr/marvell/a38x/ddr3_training_leveling.h | 1 - drivers/ddr/marvell/a38x/ddr3_training_pbs.c | 7 +- drivers/ddr/marvell/a38x/ddr_topology_def.h | 107 +++- drivers/ddr/marvell/a38x/ddr_training_ip_db.h | 2 - drivers/ddr/marvell/a38x/dram_if.h | 13 + .../ddr/marvell/a38x/mv_ddr_build_message.c | 2 +- drivers/ddr/marvell/a38x/mv_ddr_common.h | 38 +- drivers/ddr/marvell/a38x/mv_ddr_plat.c | 181 ++++--- drivers/ddr/marvell/a38x/mv_ddr_plat.h | 12 +- drivers/ddr/marvell/a38x/mv_ddr_regs.h | 19 + drivers/ddr/marvell/a38x/mv_ddr_spd.c | 16 +- drivers/ddr/marvell/a38x/mv_ddr_topology.c | 215 ++++++-- drivers/ddr/marvell/a38x/mv_ddr_topology.h | 214 +++++++- drivers/ddr/marvell/a38x/mv_ddr_training_db.h | 40 ++ drivers/ddr/marvell/a38x/xor.c | 8 +- 37 files changed, 1163 insertions(+), 1261 deletions(-) delete mode 100644 drivers/ddr/marvell/a38x/ddr3_topology_def.h create mode 100644 drivers/ddr/marvell/a38x/dram_if.h create mode 100644 drivers/ddr/marvell/a38x/mv_ddr_training_db.h -- 2.19.2

2 3