February 2017 - U-Boot

[U-Boot] [PATCH v3 0/8] board: sama5d4: convert boards to support DM/DT
by Wenyou Yang 12 Feb '17

12 Feb '17

The purpose of patch set is to convert the board to support Device Tree and Driver Model. It is based on the patch set: [PATCH v5 0/2] pinctrl: at91: Add pinctrl driver http://lists.denx.de/pipermail/u-boot/2017-February/280463.html Changes in v3: - add the Reviewed-by tags. - rebase on the patch: [PATCH v2] ARM: dts: at91: add device tree files for at91sam9x5ek http://lists.denx.de/pipermail/u-boot/2017-February/280504.html Changes in v2: - Restore the wrong removal #define CONFIG_USB_ETHER. - Update the commit log. - Restore the wrong removal of USB related code. - Update the commit log. - Restore wrong removal of #define CONFIG_USB_ETHER. - Update the commit log. - Restore the wrong removal USB related code. - Update the commit log. Wenyou Yang (8): configs: at91-sama5_common: fix for CONFIG_AT91_GPIO board: sama5d4_xplained: move config options to defconfig board: sama5d4_xplained: clean up code board: sama5d4_xplained: enable early debug UART board: sama5d4ek: move config options to defconfig board: sama5d4ek: clean up code board: sama5d4ek: enable early debug UART configs: sama5d4: move CONFIG_SYS_NO_FLASH to *defconfig board/atmel/sama5d4_xplained/sama5d4_xplained.c | 100 ++++------------------- board/atmel/sama5d4ek/sama5d4ek.c | 101 ++++-------------------- configs/sama5d4_xplained_mmc_defconfig | 31 +++++++- configs/sama5d4_xplained_nandflash_defconfig | 33 +++++++- configs/sama5d4_xplained_spiflash_defconfig | 31 +++++++- configs/sama5d4ek_mmc_defconfig | 30 +++++++ configs/sama5d4ek_nandflash_defconfig | 30 +++++++ configs/sama5d4ek_spiflash_defconfig | 30 +++++++ include/configs/at91-sama5_common.h | 2 + include/configs/sama5d4_xplained.h | 33 -------- include/configs/sama5d4ek.h | 33 -------- 11 files changed, 214 insertions(+), 240 deletions(-) -- 2.11.0

2 9

[U-Boot] [PATCH 0/3] Move CONFIG_SYS_NO_FLASH and rename it to CONFIG_MTD_NOR_FLASH
by Masahiro Yamada 12 Feb '17

12 Feb '17

2 7

[U-Boot] [PATCH v2 00/10] stm32f7: add clock and pin control drivers
by Vikas Manocha 12 Feb '17

12 Feb '17

This patchset: - adds support for stm32f7 clock driver. - adds support for stm32f7 pin control driver. - adds device tree nodes for stm32f7 serial & clock. - adds stm32f7 pin control device tree sub nodes : - serial usart1 - ethernet - qspi flash Changed in v2: - added removed blank lines in code. - removed not used functions. - changed fixed length array read from device node to relaxed length read. Vikas Manocha (10): serial: stm32f7: add device tree support clk: stm32f7: add clock driver for stm32f7 family stm32f7: serial: use clock driver to enable clock ARM: DT: stm32f7: add usart1 & clock device tree nodes stm32f7: clk: remove usart1 clock enable from board init PINCTRL: stm32f7: add pin control driver ARM: DT: stm32f7: add pin control device node ARM: DT: stm32f7: add pin control node for serial port pins ARM: DT: stm32f7: add ethernet pin contol node ARM: DT: stm32f7: add qspi pin contol node arch/arm/dts/stm32f746-disco.dts | 13 ++ arch/arm/dts/stm32f746.dtsi | 72 +++++++++++ arch/arm/mach-stm32/stm32f7/Makefile | 2 +- arch/arm/mach-stm32/stm32f7/soc.c | 2 - board/st/stm32f746-disco/stm32f746-disco.c | 111 +---------------- configs/stm32f746-disco_defconfig | 4 + doc/device-tree-bindings/clock/st,stm32-rcc.txt | 95 +++++++++++++++ .../pinctrl/st,stm32-pinctrl.txt | 133 +++++++++++++++++++++ drivers/clk/Makefile | 2 +- .../stm32f7/clock.c => drivers/clk/clk_stm32f7.c | 64 +++++++++- drivers/pinctrl/Kconfig | 9 ++ drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl_stm32.c | 121 +++++++++++++++++++ drivers/serial/serial_stm32x7.c | 42 +++++++ 14 files changed, 552 insertions(+), 119 deletions(-) create mode 100644 doc/device-tree-bindings/clock/st,stm32-rcc.txt create mode 100644 doc/device-tree-bindings/pinctrl/st,stm32-pinctrl.txt rename arch/arm/mach-stm32/stm32f7/clock.c => drivers/clk/clk_stm32f7.c (85%) create mode 100644 drivers/pinctrl/pinctrl_stm32.c -- 1.9.1

3 14

[U-Boot] [PATCH 00/10] stm32f7: add clock and pin control drivers
by Vikas Manocha 12 Feb '17

12 Feb '17

This patchset: - adds support for stm32f7 clock driver. - adds support for stm32f7 pin control driver. - adds device tree nodes for stm32f7 serial & clock. - adds stm32f7 pin control device tree sub nodes : - serial usart1 - ethernet - qspi flash Vikas Manocha (10): serial: stm32f7: add device tree support clk: stm32f7: add clock driver for stm32f7 family stm32f7: serial: use clock driver to enable clock ARM: DT: stm32f7: add usart1 & clock device tree nodes stm32f7: clk: remove usart1 clock enable from board init PINCTRL: stm32f7: add pin control driver ARM: DT: stm32f7: add pin control device node ARM: DT: stm32f7: add pin control node for serial port pins ARM: DT: stm32f7: add ethernet pin contol node ARM: DT: stm32f7: add qspi pin contol node arch/arm/dts/stm32f746-disco.dts | 13 ++ arch/arm/dts/stm32f746.dtsi | 72 +++++++++++ arch/arm/mach-stm32/stm32f7/Makefile | 2 +- arch/arm/mach-stm32/stm32f7/soc.c | 2 - board/st/stm32f746-disco/stm32f746-disco.c | 111 +---------------- configs/stm32f746-disco_defconfig | 4 + doc/device-tree-bindings/clock/st,stm32-rcc.txt | 95 +++++++++++++++ .../pinctrl/st,stm32-pinctrl.txt | 133 +++++++++++++++++++++ drivers/clk/Makefile | 2 +- .../stm32f7/clock.c => drivers/clk/clk_stm32f7.c | 66 +++++++++- drivers/pinctrl/Kconfig | 9 ++ drivers/pinctrl/Makefile | 1 + drivers/pinctrl/pinctrl_stm32.c | 118 ++++++++++++++++++ drivers/serial/serial_stm32x7.c | 40 +++++++ 14 files changed, 549 insertions(+), 119 deletions(-) create mode 100644 doc/device-tree-bindings/clock/st,stm32-rcc.txt create mode 100644 doc/device-tree-bindings/pinctrl/st,stm32-pinctrl.txt rename arch/arm/mach-stm32/stm32f7/clock.c => drivers/clk/clk_stm32f7.c (84%) create mode 100644 drivers/pinctrl/pinctrl_stm32.c -- 1.9.1

4 19

[U-Boot] [PATCH v6 4/6] mvebu: usb: xhci: Add VBUS regulator supply to the host driver
by kostap＠marvell.com 12 Feb '17

12 Feb '17

From: Konstantin Porotchkin <kostap(a)marvell.com> The USB device should linked to VBUS regulator through "vbus-supply" DTS property. This patch adds handling for "vbus-supply" property inside the USB device entry for turning on the VBUS regulator upon the host adapter probe. Signed-off-by: Konstantin Porotchkin <kostap(a)marvell.com> Cc: Stefan Roese <sr(a)denx.de> Cc: Marek Vasut <marex(a)denx.de> Cc: Nadav Haklai <nadavh(a)marvell.com> Cc: Neta Zur Hershkovits <neta(a)marvell.com> Cc: Igal Liberman <igall(a)marvell.com> Cc: Haim Boot <hayim(a)marvell.com> --- Changes for v6: - Corerct the "clocks" definition in document file doc/device-tree-bindings/usb/marvell.xhci-usb.txt | 28 +++++++++++++++++++++++ drivers/usb/host/Kconfig | 1 + drivers/usb/host/xhci-mvebu.c | 13 ++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 doc/device-tree-bindings/usb/marvell.xhci-usb.txt diff --git a/doc/device-tree-bindings/usb/marvell.xhci-usb.txt b/doc/device-tree-bindings/usb/marvell.xhci-usb.txt new file mode 100644 index 0000000..e042d1b --- /dev/null +++ b/doc/device-tree-bindings/usb/marvell.xhci-usb.txt @@ -0,0 +1,28 @@ +Marvell SOC USB controllers + +This controller is integrated in Armada 3700/8K. +It uses the same properties as a generic XHCI host controller + +Required properties : + - compatible: should be one or more of: + - "marvell,armada3700-xhci", "generic-xhci" for Armada 37xx SoCs + - "marvell,armada-8k-xhci", "generic-xhci" for Armada A8K SoCs + - reg: should contain address and length of the standard XHCI + register set for the device. + - interrupts: one XHCI interrupt should be described here. + +Optional properties: + - clocks: phandle to system controller clock driving this unit + - vbus-supply : If present, specifies the fixed regulator to be turned on + for providing power to the USB VBUS rail. + +Example: + cpm_usb3_0: usb3@500000 { + compatible = "marvell,armada-8k-xhci", + "generic-xhci"; + reg = <0x500000 0x4000>; + interrupts = <GIC_SPI 62 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&cpm_syscon0 1 22>; + vbus-supply = <&reg_usb3h0_vbus>; + status = "disabled"; + }; diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 5129a57..0bf8274 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -25,6 +25,7 @@ config USB_XHCI_MVEBU bool "MVEBU USB 3.0 support" default y depends on ARCH_MVEBU + select DM_REGULATOR help Choose this option to add support for USB 3.0 driver on mvebu SoCs, which includes Armada8K, Armada3700 and other Armada diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index 46eb937..d880af1 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c @@ -10,6 +10,7 @@ #include <dm.h> #include <fdtdec.h> #include <usb.h> +#include <power/regulator.h> #include <asm/gpio.h> #include "xhci.h" @@ -44,12 +45,22 @@ static int xhci_usb_probe(struct udevice *dev) struct mvebu_xhci_platdata *plat = dev_get_platdata(dev); struct mvebu_xhci *ctx = dev_get_priv(dev); struct xhci_hcor *hcor; - int len; + int len, ret; + struct udevice *regulator; ctx->hcd = (struct xhci_hccr *)plat->hcd_base; len = HC_LENGTH(xhci_readl(&ctx->hcd->cr_capbase)); hcor = (struct xhci_hcor *)((uintptr_t)ctx->hcd + len); + ret = device_get_supply_regulator(dev, "vbus-supply", &regulator); + if (!ret) { + ret = regulator_set_enable(regulator, true); + if (ret) { + printf("Failed to turn ON the VBUS regulator\n"); + return ret; + } + } + /* Enable USB xHCI (VBUS, reset etc) in board specific code */ board_xhci_enable(); -- 2.7.4

2 1

[U-Boot] [PATCH 2/6] usb: host: xhci-omap: fix double weak board_usb_init functions
by Uri Mashiach 12 Feb '17

12 Feb '17

A weak version of the function board_usb_init is implemented in: common/usb.c drivers/usb/host/xhci-omap.c To fix the double implementations: * Convert the board_usb_init function in drivers/usb/host/xhci-omap.c normal (not weak). * The function board_usb_init in drivers/usb/host/xhci-omap.c calls to the weak function omap_xhci_board_usb_init. * Rename board version of the function board_usb_init to omap_xhci_board_usb_init. Done only for boards that defines CONFIG_USB_XHCI_OMAP. To achieve the same flexibility with the function board_usb_cleanup: * Add a normal (not weak) implementation of the function board_usb_cleanup in drivers/usb/host/xhci-omap.c * The function board_usb_cleanup in drivers/usb/host/xhci-omap.c calls to the weak function omap_xhci_board_usb_cleanup. * Rename board version of the function board_usb_cleanup to omap_xhci_board_usb_cleanup. Done only for boards that defines CONFIG_USB_XHCI_OMAP. Signed-off-by: Uri Mashiach <uri.mashiach(a)compulab.co.il> --- board/compulab/cl-som-am57x/cl-som-am57x.c | 2 +- board/ti/am43xx/board.c | 4 ++-- board/ti/am57xx/board.c | 4 ++-- board/ti/dra7xx/evm.c | 4 ++-- drivers/usb/host/xhci-omap.c | 23 +++++++++++++++++++++-- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/board/compulab/cl-som-am57x/cl-som-am57x.c b/board/compulab/cl-som-am57x/cl-som-am57x.c index bdd0a2b..fe1468f 100644 --- a/board/compulab/cl-som-am57x/cl-som-am57x.c +++ b/board/compulab/cl-som-am57x/cl-som-am57x.c @@ -54,7 +54,7 @@ int board_mmc_init(bd_t *bis) #endif /* CONFIG_GENERIC_MMC */ #ifdef CONFIG_USB_XHCI_OMAP -int board_usb_init(int index, enum usb_init_type init) +int omap_xhci_board_usb_init(int index, enum usb_init_type init) { setbits_le32((*prcm)->cm_l3init_usb_otg_ss1_clkctrl, OTG_SS_CLKCTRL_MODULEMODE_HW | OPTFCLKEN_REFCLK960M); diff --git a/board/ti/am43xx/board.c b/board/ti/am43xx/board.c index 390cc16..2572029 100644 --- a/board/ti/am43xx/board.c +++ b/board/ti/am43xx/board.c @@ -694,7 +694,7 @@ int usb_gadget_handle_interrupts(int index) #endif /* CONFIG_USB_DWC3 */ #if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) -int board_usb_init(int index, enum usb_init_type init) +int omap_xhci_board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); #ifdef CONFIG_USB_DWC3 @@ -725,7 +725,7 @@ int board_usb_init(int index, enum usb_init_type init) return 0; } -int board_usb_cleanup(int index, enum usb_init_type init) +int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) { #ifdef CONFIG_USB_DWC3 switch (index) { diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 5f2d4df..96fad0f 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -616,7 +616,7 @@ int usb_gadget_handle_interrupts(int index) #endif /* CONFIG_USB_DWC3 */ #if defined(CONFIG_USB_DWC3) || defined(CONFIG_USB_XHCI_OMAP) -int board_usb_init(int index, enum usb_init_type init) +int omap_xhci_board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); switch (index) { @@ -650,7 +650,7 @@ int board_usb_init(int index, enum usb_init_type init) return 0; } -int board_usb_cleanup(int index, enum usb_init_type init) +int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) { #ifdef CONFIG_USB_DWC3 switch (index) { diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index bd1c809..21fa824 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -727,7 +727,7 @@ static struct ti_usb_phy_device usb_phy2_device = { .index = 1, }; -int board_usb_init(int index, enum usb_init_type init) +int omap_xhci_board_usb_init(int index, enum usb_init_type init) { enable_usb_clocks(index); switch (index) { @@ -764,7 +764,7 @@ int board_usb_init(int index, enum usb_init_type init) return 0; } -int board_usb_cleanup(int index, enum usb_init_type init) +int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) { switch (index) { case 0: diff --git a/drivers/usb/host/xhci-omap.c b/drivers/usb/host/xhci-omap.c index b881b19..ceee12a 100644 --- a/drivers/usb/host/xhci-omap.c +++ b/drivers/usb/host/xhci-omap.c @@ -27,12 +27,31 @@ DECLARE_GLOBAL_DATA_PTR; static struct omap_xhci omap; -__weak int __board_usb_init(int index, enum usb_init_type init) +__weak int __omap_xhci_board_usb_init(int index, enum usb_init_type init) { return 0; } + +int omap_xhci_board_usb_init(int index, enum usb_init_type init) + __attribute__((weak, alias("__omap_xhci_board_usb_init"))); + int board_usb_init(int index, enum usb_init_type init) - __attribute__((weak, alias("__board_usb_init"))); +{ + return omap_xhci_board_usb_init(index, init); +} + +__weak int __omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) +{ + return 0; +} + +int omap_xhci_board_usb_cleanup(int index, enum usb_init_type init) + __attribute__((weak, alias("__omap_xhci_board_usb_cleanup"))); + +int board_usb_cleanup(int index, enum usb_init_type init) +{ + return omap_xhci_board_usb_cleanup(index, init); +} static int omap_xhci_core_init(struct omap_xhci *omap) { -- 2.7.4

3 5

Re: [U-Boot] [linux-sunxi] Re: [RFC PATCH 4/6] sunxi: Add selective DRAM type and timing
by Icenowy Zheng 12 Feb '17

12 Feb '17

2017年2月12日 00:59于 Jens Kuske <jenskuske(a)gmail.com>写道： > > Hi. > > On 11.02.2017 16:08, Icenowy Zheng wrote: > [..] > > @@ -299,6 +190,13 @@ static void mctl_h3_zq_calibration_quirk(struct dram_para *para) > > { > > struct sunxi_mctl_ctl_reg * const mctl_ctl = > > (struct sunxi_mctl_ctl_reg *)SUNXI_DRAM_CTL0_BASE; > > + int zq_count; > > + > > +#if defined CONFIG_SUNXI_DRAM_DDR3 > > + zq_count = 6; > > This doesn't depend on DRAM type, but on how many ZQ calibration groups > exist. H3 had three: AC, DX0/1 and DX2/3. Devices with only 16bit bus > width most likely only have AC and DX0/1. > > > +#else > > +#error Unsupported DRAM type! > > +#endif > > > > if ((readl(SUNXI_SRAMC_BASE + 0x24) & 0xff) == 0 && > > (readl(SUNXI_SRAMC_BASE + 0xf0) & 0x1) == 0) { > > @@ -327,7 +225,7 @@ static void mctl_h3_zq_calibration_quirk(struct dram_para *para) > > > > writel(0x0a0a0a0a, &mctl_ctl->zqdr[2]); > > > > - for (i = 0; i < 6; i++) { > > + for (i = 0; i < zq_count; i++) { > > I think > for (i = 0; i < (1 + (num_databyte_lanes / 2)) * 2; i++) > would be the cleanest way of handling this, with num_databyte_lanes > being chip-dependent. > > But, as the name of this function already states, this is a quirk for a > bug in H3, which always has 4 databyte lanes. Are you sure other chips > need this quirk too? H5 and A64 for example work well with 'normal' ZQ > calibration. This is for H3 and V3s (1680 and 1681). > > Jens > > > u8 zq = (CONFIG_DRAM_ZQ >> (i * 4)) & 0xf; > > > > writel((zq << 20) | (zq << 16) | (zq << 12) | > > @@ -349,7 +247,9 @@ static void mctl_h3_zq_calibration_quirk(struct dram_para *para) > > > > writel((zq_val[1] << 16) | zq_val[0], &mctl_ctl->zqdr[0]); > > writel((zq_val[3] << 16) | zq_val[2], &mctl_ctl->zqdr[1]); > > +#if defined CONFIG_SUNXI_DRAM_DDR3 > > writel((zq_val[5] << 16) | zq_val[4], &mctl_ctl->zqdr[2]); > > +#endif > > } > > } > > > > @@ -358,7 +258,12 @@ static void mctl_set_cr(struct dram_para *para) > > struct sunxi_mctl_com_reg * const mctl_com = > > (struct sunxi_mctl_com_reg *)SUNXI_DRAM_COM_BASE; > > > > - writel(MCTL_CR_BL8 | MCTL_CR_2T | MCTL_CR_DDR3 | MCTL_CR_INTERLEAVED | > > + writel(MCTL_CR_BL8 | MCTL_CR_2T | MCTL_CR_INTERLEAVED | > > +#if defined CONFIG_SUNXI_DRAM_DDR3 > > + MCTL_CR_DDR3 | > > +#else > > +#error Unsupported DRAM type! > > +#endif > > (para->bank_bits == 3 ? MCTL_CR_EIGHT_BANKS : MCTL_CR_FOUR_BANKS) | > > MCTL_CR_BUS_FULL_WIDTH(para->bus_full_width) | > > (para->dual_rank ? MCTL_CR_DUAL_RANK : MCTL_CR_SINGLE_RANK) | > > -- > You received this message because you are subscribed to the Google Groups "linux-sunxi" group. > To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe(a)googlegroups.com. > For more options, visit https://groups.google.com/d/optout.

1 0

[U-Boot] please pull u-boot-samsung master
by Minkyu Kang 11 Feb '17

11 Feb '17

Dear Tom, The following changes since commit f1cc97764be4383d2aeb56d5ba5415439a1d5c97: Merge branch 'master' of git://git.denx.de/u-boot-video (2017-02-09 14:54:09 -0500) are available in the git repository at: git://git.denx.de/u-boot-samsung.git master for you to fetch changes up to 5d3be0f81ca7668ac04ee0f0b7d82e123c7f59b5: exynos: Drop large alignment for SDRAM parameters (2017-02-10 18:51:51 +0900) ---------------------------------------------------------------- Simon Glass (1): exynos: Drop large alignment for SDRAM parameters board/samsung/common/exynos-uboot-spl.lds | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) -- from. prom. www.promsoft.net

2 1

[U-Boot] Please pull u-boot-rockchip
by Simon Glass 11 Feb '17

11 Feb '17

Hi Tom, This includes a board rename and a few other minor changes. The following changes since commit 21342d4aed6c77a4aa7a5b2579b3c23e21aea31a: Merge git://git.denx.de/u-boot-dm (2017-02-08 16:24:44 -0500) are available in the git repository at: git://git.denx.de/u-boot-rockchip.git for you to fetch changes up to 6f2797645562e85c407aab3e9a757bfd61a027fe: rockchip: rename miniarm to tinker board (2017-02-09 12:10:59 -0700) ---------------------------------------------------------------- Eddie Cai (1): rockchip: rename miniarm to tinker board Jacob Chen (3): rockchip: dts: rk3288: correct sdram setting for miniarm rockchip: configs: move env offset to common header rockchip: firefly: configs: use spl back to brom Romain Perier (1): rockchip: Enable ETH address randomization for the firefly-rk3288 Simon Glass (1): rockchip: Correct MAINTAINER entry for chromebook_minnie arch/arm/dts/Makefile | 2 +- arch/arm/dts/rk3288-miniarm.dts | 58 ---------------------- arch/arm/dts/rk3288-tinker.dts | 58 ++++++++++++++++++++++ .../{rk3288-miniarm.dtsi => rk3288-tinker.dtsi} | 0 arch/arm/mach-rockchip/rk3288-board.c | 2 +- arch/arm/mach-rockchip/rk3288/Kconfig | 10 ++-- board/google/veyron/MAINTAINERS | 4 +- board/rockchip/miniarm_rk3288/MAINTAINERS | 6 --- .../{miniarm_rk3288 => tinker_rk3288}/Kconfig | 6 +-- board/rockchip/tinker_rk3288/MAINTAINERS | 6 +++ .../{miniarm_rk3288 => tinker_rk3288}/Makefile | 2 +- .../tinker-rk3288.c} | 0 configs/firefly-rk3288_defconfig | 3 +- ...rm-rk3288_defconfig => tinker-rk3288_defconfig} | 4 +- doc/README.rockchip | 2 +- include/configs/evb_rk3288.h | 14 ------ include/configs/fennec_rk3288.h | 14 ------ include/configs/firefly-rk3288.h | 5 -- include/configs/kylin_rk3036.h | 14 ------ include/configs/popmetal_rk3288.h | 14 ------ include/configs/rock2.h | 14 ------ include/configs/rockchip-common.h | 14 ++++++ .../configs/{miniarm_rk3288.h => tinker_rk3288.h} | 14 ------ 23 files changed, 96 insertions(+), 170 deletions(-) delete mode 100644 arch/arm/dts/rk3288-miniarm.dts create mode 100644 arch/arm/dts/rk3288-tinker.dts rename arch/arm/dts/{rk3288-miniarm.dtsi => rk3288-tinker.dtsi} (100%) delete mode 100644 board/rockchip/miniarm_rk3288/MAINTAINERS rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Kconfig (64%) create mode 100644 board/rockchip/tinker_rk3288/MAINTAINERS rename board/rockchip/{miniarm_rk3288 => tinker_rk3288}/Makefile (79%) rename board/rockchip/{miniarm_rk3288/miniarm-rk3288.c => tinker_rk3288/tinker-rk3288.c} (100%) rename configs/{miniarm-rk3288_defconfig => tinker-rk3288_defconfig} (95%) rename include/configs/{miniarm_rk3288.h => tinker_rk3288.h} (59%) Regards, Simon

2 1

[U-Boot] [PATCH v2 2/2] test/py: Create tests for ext4 and fat testing on sandbox
by Stefan Brüns 11 Feb '17

11 Feb '17

From: Stefan BrÃ¼ns <stefan.bruens(a)rwth-aachen.de> The following checks are currently implemented: 1. listing a directory 2. verifying size of a file 3. veryfying md5sum for a file region 4. reading the beginning of a file Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- test/py/tests/test_fs.py | 357 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 357 insertions(+) create mode 100644 test/py/tests/test_fs.py diff --git a/test/py/tests/test_fs.py b/test/py/tests/test_fs.py new file mode 100644 index 0000000000..7aaf8debaf --- /dev/null +++ b/test/py/tests/test_fs.py @@ -0,0 +1,357 @@ +# Copyright (c) 2016, Stefan Bruens <stefan.bruens(a)rwth-aachen.de> +# +# SPDX-License-Identifier: GPL-2.0 + +# Test U-Boot's filesystem implementations +# +# The tests are currently covering the ext4 and fat filesystem implementations. +# +# Following functionality is currently checked: +# - Listing a directory and checking for a set of files +# - Verifying the size of a file +# - Reading sparse and non-sparse files +# - File content verification using md5sums + + +from distutils.spawn import find_executable +import hashlib +import pytest +import os +import random +import re +import u_boot_utils as util + +(a)pytest.fixture(scope='session') +def prereq_commands(): + """Detect required commands to run file system tests.""" + for command in ['mkfs', 'mount', 'umount']: + if find_executable(command) is None: + pytest.skip('Filesystem tests, "{0}" not in PATH'.format(command)) + +""" +Scenarios: + hostfs: access image contents through the sandbox hostfs + facility, using the filesytem implementation of + the sandbox host, e.g. Linux kernel + generic: test u-boots native filesystem implementations, + using the 'generic' command names, e.g. 'load' + TODO - + fscommands: test u-boots native filesystem implementations, + using the fs specific commands, e.g. 'ext4load' +""" +(a)pytest.fixture(scope='class', params=['generic', 'hostfs']) +def scenario(request): + request.cls.scenario = request.param + return request.param + + +""" +Dictionary of files to use during filesystem tests. The files +are keyed by the filenames. The value is an array of strides, each tuple +contains the the start offset (inclusive) and end offset (exclusive). +""" +files = { + 'empty.file' : [(0, 0)], + '1MB.file' : [(0, 1e6)], + '1MB.sparse.file' : [(1e6-1, 1e6)], + '32MB.sparse.file' : [(0, 1e6), (4e6, 5e6), (31e6, 32e6)], + # Creating a 2.5 GB file on FAT is exceptionally slow, disable it for now + # '2_5GB.sparse.file' : [(0, 1e6), (1e9, 1e9+1e6), (2.5e9-1e6, 2.5e9)], +} + +"""Options to pass to mkfs.""" +mkfs_opts = { + 'fat' :'-t vfat', + 'ext4' : '-t ext4 -F', +} + +class FsImage: + def __init__(self, fstype, imagepath, mountpath): + """Create a new filesystem image. + + Args: + fstype: filesystem type (string) + imagepath: full path to image file + mountpath: mountpoint directory + """ + self.fstype = fstype + self.imagepath = imagepath + self.mountpath = mountpath + self.md5s = {} + with open(self.imagepath, 'w') as fd: + fd.truncate(0) + fd.seek(3e9) + fd.write(bytes([0])) + + def mkfs(self, log): + mkfsopts = mkfs_opts.get(self.fstype) + util.run_and_log(log, + 'mkfs {0} {1}'.format(mkfsopts, self.imagepath)) + + def create_file(self, log, filename, strides): + """Create a single file in the filesystem. Each file + is defined by one or more strides, which is filled with + random data. For each stride, the md5sum is calculated + and stored. + """ + md5sums = [] + with open(self.mountpath + '/' + filename, 'w') as fd: + for stride in strides: + length = int(stride[1] - stride[0]) + data = bytearray(random.getrandbits(8) for _ in xrange(length)) + md5 = hashlib.md5(data).hexdigest() + md5sums.append(md5) + log.info('{0}: write {1} bytes @ {2} : {3}'.format( + filename, int(stride[1] - stride[0]), + int(stride[0]), md5)) + fd.seek(stride[0]) + fd.write(data); + self.md5s[filename] = md5sums + + def create_files(self, log): + with log.section('Create initial files'): + for filename in files: + self.create_file(log, filename, files[filename]) + log.info('Created test files in "{0}"'.format(self.mountpath)) + util.run_and_log(log, 'ls -la {0}'.format(self.mountpath)) + util.run_and_log(log, 'sync {0}'.format(self.mountpath)) + + def mount(self, log): + if not os.path.exists(self.mountpath): + os.mkdir(self.mountpath) + log.info('Mounting {0} at {1}'.format(self.imagepath, self.mountpath)) + if self.fstype == 'ext4': + cmd = 'sudo -n mount -o loop,rw {0} {1}'.format(self.imagepath, self.mountpath) + else: + cmd = 'sudo -n mount -o loop,rw,umask=000 {0} {1}'.format(self.imagepath, self.mountpath) + util.run_and_log(log, cmd) + if self.fstype == 'ext4': + cmd = 'sudo -n chmod og+rw {0}'.format(self.mountpath) + return util.run_and_log(log, cmd) + + def unmount(self, log): + log.info('Unmounting {0}'.format(self.imagepath)) + cmd = 'sudo -n umount -l {0}'.format(self.mountpath) + util.run_and_log(log, cmd, ignore_errors=True) + + +(a)pytest.fixture(scope='module', params=['fat', 'ext4']) +def fsimage(prereq_commands, u_boot_config, u_boot_log, request): + """Filesystem image instance.""" + datadir = u_boot_config.result_dir + '/' + fstype = request.param + imagepath = datadir + '3GB.' + fstype + '.img' + mountpath = datadir + 'mnt_' + fstype + + with u_boot_log.section('Create image "{0}"'.format(imagepath)): + fsimage = FsImage(fstype, imagepath, mountpath) + fsimage.mkfs(u_boot_log) + + yield fsimage + fsimage.unmount(u_boot_log) + +(a)pytest.fixture(scope='module') +def populated_image(fsimage, u_boot_log): + """Filesystem populated with files required for tests.""" + try: + fsimage.mount(u_boot_log) + except Exception as e: + pytest.skip('{0}: could not mount "{1}"'.format( + fsimage.fstype, fsimage.imagepath)) + yield None + + fsimage.create_files(u_boot_log) + fsimage.unmount(u_boot_log) + yield fsimage + +(a)pytest.fixture(scope='function') +def boundimage(populated_image, u_boot_console, request): + """Filesystem image instance which is accessible from inside + the running U-Boot instance.""" + image = populated_image + request.cls.image = image + if request.cls.scenario == 'hostfs': + image.mount(u_boot_console.log) + image.rootpath = image.mountpath + '/' + yield image + image.unmount(u_boot_console.log) + else: + output = u_boot_console.run_command_list( + ['host bind 0 {0}'.format(image.imagepath)]) + image.rootpath = '/' + yield image + output = u_boot_console.run_command_list(['host bind 0 ']) + + +def test_fs_prepare_image(u_boot_config, fsimage, request): + """Dummy test to create an image file with filesystem. + Useful to isolate fixture setup from actual tests.""" + if not fsimage: + pytest.fail('Failed to create image') + +def test_fs_populate_image(populated_image, request): + """Dummy test to create initial filesystem contents.""" + if not populated_image: + pytest.fail('Failed create initial image content') + +(a)pytest.mark.usefixtures('u_boot_console', 'scenario', 'boundimage') +class TestFilesystems: + ignore_cleanup_errors = True + filesize_regex = re.compile('^filesize=([A-Fa-f0-9]+)') + md5sum_regex = re.compile('^md5 for .* ==> ([A-Fa-f0-9]{32})') + dirlist_regex = re.compile('\s+(\d+)\s+(\S+.file\S*)') + + commands = { + 'fat' : { + 'listcmd' : 'ls', + 'readcmd' : 'load', + 'sizecmd' : 'size', + 'writecmd' : 'size', + }, + 'ext4' : { + 'listcmd' : 'ls', + 'readcmd' : 'load', + 'sizecmd' : 'size', + 'writecmd' : 'size', + }, + } + + cmd_parameters = { + 'hostfs' : { + 'prefix' : 'host ', + 'interface' : 'hostfs -', + }, + 'generic' : { + 'prefix' : '', + 'interface' : 'host 0:0', + }, + } + + def get_filesize(self, filename): + """Get the size of the given file.""" + strides = files[filename] + return int(strides[-1][1]) + + def check_dirlist(self, string, filenames): + """Check if the output string returned by a list command + contains all given filenames.""" + m = self.dirlist_regex.findall(string) + assert(m) + for i, e in enumerate(m): + m[i] = (int(e[0]), e[1].lower()) + for f in filenames: + e = (self.get_filesize(f), f.lower()) + assert(e in m) + + def check_filesize(self, string, size): + """Check if the output string returned by a size command + matches the expected file size.""" + m = self.filesize_regex.match(string) + assert(m) + assert(int(m.group(1), 16) == size) + + def check_md5sum(self, string, md5): + """Check if the output string returned by the md5sum + command matches the expected md5.""" + m = self.md5sum_regex.match(string) + assert(m) + assert(len(m.group(1)) == 32) + assert(m.group(1) == md5) + + def run_listcmd(self, dirname): + """Run the scenario and filesystem specific list command + for the given directory name.""" + cmd = '{0}{1} {2} {3}'.format( + self.fs_params.get('prefix'), + self.fs_commands.get('listcmd'), + self.fs_params.get('interface'), + self.image.rootpath + dirname) + with self.console.log.section('List "{0}"'.format(dirname)): + output = self.console.run_command_list([cmd]) + return output[0] + + def run_readcmd(self, filename, offset, length): + """Run the scenario and filesystem specific read command + for the given file.""" + cmd = '{0}{1} {2} {3} {4} 0x{5:x} 0x{6:x}'.format( + self.fs_params.get('prefix'), + self.fs_commands.get('readcmd'), + self.fs_params.get('interface'), + '0', # address + self.image.rootpath + filename, + length, offset) + with self.console.log.section('Read file "{0}"'.format(filename)): + output = self.console.run_command_list( + [cmd, 'env print filesize', + 'md5sum 0 $filesize', 'env set filesize']) + return output[1:3] + + def run_sizecmd(self, filename): + """Run the scenario and filesystem specific size command + for the given file.""" + cmd = '{0}{1} {2} {3}'.format( + self.fs_params.get('prefix'), + self.fs_commands.get('sizecmd'), + self.fs_params.get('interface'), + self.image.rootpath + filename) + with self.console.log.section('Get size of "{0}"'.format(filename)): + output = self.console.run_command_list( + [cmd, 'env print filesize', 'env set filesize']) + return output[1] + + def setup(self): + self.fs_params = self.cmd_parameters.get(self.scenario) + self.fs_commands = self.commands.get(self.image.fstype) + + @pytest.mark.parametrize('dirname', ['', './']) + def test_fs_ls(self, u_boot_console, dirname): + """Check the contents of the given directory.""" + if self.image.fstype == 'fat' and dirname == './': + pytest.skip("FAT has no '.' entry in the root directory") + self.console = u_boot_console + self.setup() + + output = self.run_listcmd(dirname) + self.check_dirlist(output, files.keys()) + + @pytest.mark.parametrize('filename', files.keys()) + def test_fs_filesize(self, u_boot_console, filename): + """Check the filesize of the given file.""" + self.console = u_boot_console + self.setup() + + filesize = self.get_filesize(filename) + + output = self.run_sizecmd(filename) + self.check_filesize(output, filesize) + + @pytest.mark.parametrize('filename', files.keys()) + def test_fs_read(self, u_boot_console, filename): + """Read all defined strides of the given file and checks + its contents.""" + self.console = u_boot_console + self.setup() + + md5s = self.image.md5s[filename] + + for i, stride in enumerate(files[filename]): + length = int(stride[1]) - int(stride[0]) + offset = int(stride[0]) + output = self.run_readcmd(filename, offset, length) + self.check_filesize(output[0], length) + self.console.log.info('md5: {0}'.format(md5s[i])) + self.check_md5sum(output[1], md5s[i]) + + @pytest.mark.parametrize('filename', files.keys()) + def test_fs_read_head(self, u_boot_console, filename): + """Check reading the head of the given file, up to the first + 4 Megabyte (or less for smaller files). Also reads sparse + regions of a file.""" + self.console = u_boot_console + self.setup() + + filesize = self.get_filesize(filename) + filesize = min(filesize, int(4e6)) + + output = self.run_readcmd(filename, 0, filesize) + self.check_filesize(output[0], filesize) -- 2.11.0

4 5