April 2017 - U-Boot

[U-Boot] [PATCH] Set ramdisk_addr_r to a higher address location on meson-gxbb.
by Vagrant Cascadian 16 Apr '17

16 Apr '17

Set ramdisk_addr_r to 0x20000000, otherwise it may conflict with kernel_addr_r location (0x01080000) with a moderately large kernel. Signed-off-by: Vagrant Cascadian <vagrant(a)debian.org> --- include/configs/meson-gxbb-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index cc2b5b61d4..32602cb7c2 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -48,7 +48,7 @@ "scriptaddr=0x1f000000\0" \ "kernel_addr_r=0x01080000\0" \ "pxefile_addr_r=0x01080000\0" \ - "ramdisk_addr_r=0x10000000\0" \ + "ramdisk_addr_r=0x20000000\0" \ MESON_FDTFILE_SETTING \ BOOTENV -- 2.11.0

3 5

[U-Boot] [PATCH v1] i2c: sunxi: add device-model support for i2c
by Philipp Tomsich 16 Apr '17

16 Apr '17

The I2C block in sunxi (Allwinner SoCs) is based on Designware and uses the same driver as the Marvell Orion 5x and Kirkwood families. This change adds a compatible id matching the binding for sunxi devices, supports configuring the clocks and to release the module reset on sunxi platforms as directed by the device tree. As we enable DT control of this driver, we need to make sure the common config header (sunxi-common.h) does try to turn on support for the legacy I2C support. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- drivers/i2c/mvtwsi.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/configs/sunxi-common.h | 9 ++++++--- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 648a96e..475131b 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -16,6 +16,12 @@ #ifdef CONFIG_DM_I2C #include <dm.h> #endif +#if defined(CONFIG_CLK) +#include <clk.h> +#endif +#if defined(CONFIG_DM_RESET) +#include <reset.h> +#endif DECLARE_GLOBAL_DATA_PTR; @@ -36,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR; #endif #endif /* CONFIG_DM_I2C */ +/* On SUNXI, we get CONFIG_SYS_TCLK from this include, so we want to + always have it. */ +#if defined(CONFIG_DM_I2C) && defined(CONFIG_ARCH_SUNXI) +#include <asm/arch/i2c.h> +#endif + /* * TWSI register structure */ @@ -81,6 +93,14 @@ struct mvtwsi_i2c_dev { uint speed; /* The current length of a clock period (depending on speed) */ uint tick; +#if defined(CONFIG_DM_RESET) + bool reset_valid; + struct reset_ctl reset; +#endif +#if defined(CONFIG_CLK) + bool clk_gate_valid; + struct clk clk_gate; +#endif }; #endif /* CONFIG_DM_I2C */ @@ -781,6 +801,14 @@ static int mvtwsi_i2c_ofdata_to_platdata(struct udevice *bus) "u-boot,i2c-slave-addr", 0x0); dev->speed = fdtdec_get_int(gd->fdt_blob, dev_of_offset(bus), "clock-frequency", 100000); +#if defined(CONFIG_DM_RESET) + if (reset_get_by_index(bus, 0, &dev->reset) == 0) + dev->reset_valid = true; +#endif +#if defined(CONFIG_CLK) + if (clk_get_by_index(bus, 0, &dev->clk_gate) == 0) + dev->clk_gate_valid = true; +#endif return 0; } @@ -789,6 +817,17 @@ static int mvtwsi_i2c_probe(struct udevice *bus) struct mvtwsi_i2c_dev *dev = dev_get_priv(bus); uint actual_speed; +#if defined(CONFIG_DM_RESET) + /* Enable the controller */ + if (dev->reset_valid) + reset_deassert(&dev->reset); +#endif +#if defined(CONFIG_CLK) + /* Open the clock-gate */ + if (dev->clk_gate_valid) + clk_enable(&dev->clk_gate); +#endif + __twsi_i2c_init(dev->base, dev->speed, dev->slaveadd, &actual_speed); dev->speed = actual_speed; dev->tick = calc_tick(dev->speed); @@ -831,6 +870,9 @@ static const struct dm_i2c_ops mvtwsi_i2c_ops = { static const struct udevice_id mvtwsi_i2c_ids[] = { { .compatible = "marvell,mv64xxx-i2c", }, { .compatible = "marvell,mv78230-i2c", }, +#if defined(CONFIG_ARCH_SUNXI) + { .compatible = "allwinner,sun6i-a31-i2c", }, +#endif { /* sentinel */ } }; diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 4f566fa..aaab809 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -262,11 +262,14 @@ defined CONFIG_SY8106A_POWER #endif -#if defined CONFIG_I2C0_ENABLE || defined CONFIG_I2C1_ENABLE || \ - defined CONFIG_I2C2_ENABLE || defined CONFIG_I2C3_ENABLE || \ - defined CONFIG_I2C4_ENABLE || defined CONFIG_R_I2C_ENABLE +#if !defined(CONFIG_DM_I2C) && \ + (defined CONFIG_I2C0_ENABLE || defined CONFIG_I2C1_ENABLE || \ + defined CONFIG_I2C2_ENABLE || defined CONFIG_I2C3_ENABLE || \ + defined CONFIG_I2C4_ENABLE || defined CONFIG_R_I2C_ENABLE) #define CONFIG_SYS_I2C +#if !defined(CONFIG_SYS_I2C_MVTWSI) #define CONFIG_SYS_I2C_MVTWSI +#endif #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SLAVE 0x7f #endif -- 1.9.1

2 1

[U-Boot] [PATCH] rockchip: rk3399: defconfig: add CONFIG_OF_EMBED support
by Kever Yang 16 Apr '17

16 Apr '17

Need to enablt CONFIG_OF_EMBED if we use separate uboot and dtb in FIT image for SPL loading. Run make savedefconfig to make the options order correct. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- configs/evb-rk3399_defconfig | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index 195a421..961fe8b 100644 --- a/configs/evb-rk3399_defconfig +++ b/configs/evb-rk3399_defconfig @@ -1,30 +1,37 @@ CONFIG_ARM=y CONFIG_ARCH_ROCKCHIP=y +CONFIG_SPL_LIBCOMMON_SUPPORT=y +CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_SYS_MALLOC_F_LEN=0x4000 CONFIG_ROCKCHIP_RK3399=y +CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3399-evb" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_OF_LIBFDT=y -CONFIG_SPL_ATF_SUPPORT=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 -CONFIG_SPL_ATF_TEXT_BASE=0x00010000 # CONFIG_DISPLAY_CPUINFO is not set CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x4000 -CONFIG_SPL_LIBCOMMON_SUPPORT=y -CONFIG_SPL_LIBGENERIC_SUPPORT=y -CONFIG_SYS_MALLOC_F_LEN=0x4000 +CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR=0x200 +CONFIG_SPL_ATF_SUPPORT=y +CONFIG_SPL_ATF_TEXT_BASE=0x00010000 +CONFIG_FASTBOOT=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_CMD_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x00800800 +CONFIG_FASTBOOT_BUF_SIZE=0x08000000 +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_GPT=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y CONFIG_CMD_USB=y +CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y -CONFIG_CMD_PXE=y CONFIG_SPL_OF_CONTROL=y +CONFIG_OF_EMBED=y CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_SPL_OF_PLATDATA=y CONFIG_REGMAP=y @@ -57,23 +64,13 @@ CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_GENERIC=y -CONFIG_USB_STORAGE=y -CONFIG_USE_TINY_PRINTF=y -CONFIG_ERRNO_STR=y -CONFIG_USB_GADGET=y -CONFIG_USB_GADGET_DUALSPEED=y -CONFIG_USB_GADGET_VBUS_DRAW=0 CONFIG_USB_DWC3=y CONFIG_USB_DWC3_GADGET=y +CONFIG_USB_STORAGE=y +CONFIG_USB_GADGET=y CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_G_DNL_MANUFACTURER="Rockchip" CONFIG_G_DNL_VENDOR_NUM=0x2207 CONFIG_G_DNL_PRODUCT_NUM=0x330a -CONFIG_FASTBOOT=y -CONFIG_CMD_FASTBOOT=y -CONFIG_USB_FUNCTION_FASTBOOT=y -CONFIG_FASTBOOT_FLASH=y -CONFIG_FASTBOOT_FLASH_MMC_DEV=1 -CONFIG_FASTBOOT_BUF_ADDR=0x00800800 -CONFIG_FASTBOOT_BUF_SIZE=0x08000000 -CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_USE_TINY_PRINTF=y +CONFIG_ERRNO_STR=y -- 1.9.1

2 5

[U-Boot] [RESEND PATCH] rockchip: reserve memory for rk3399 ATF data
by Kever Yang 16 Apr '17

16 Apr '17

There are 3 region used by rk3399 ATF: - bl31 code, locate at 0x10000; - cortex-m0 code and data, locate at 0xff8c0000; - bl31 data, locate at 0xff8c1000 ~ 0xff8c4000; SPL_TEXT_BASE starts from 0xff8c2000, we need to reserve memory for ATF data, or else there will have memory corrupt after SPL load ATF image. More detail about cortex-M0 code in ATF: https://github.com/ARM-software/arm-trusted-firmware/commit/ 8382e17c4c6bffd15119dfce1ee4372e3c1a7890 Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/include/asm/arch-rockchip/boot0.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/boot0.h b/arch/arm/include/asm/arch-rockchip/boot0.h index 8d7bc9a..caca763 100644 --- a/arch/arm/include/asm/arch-rockchip/boot0.h +++ b/arch/arm/include/asm/arch-rockchip/boot0.h @@ -16,3 +16,7 @@ .space 0x4 /* space for the 'RK33' */ #endif b reset + +#if defined(CONFIG_ROCKCHIP_RK3399) && defined(CONFIG_SPL_BUILD) + .space 0x4000 /* space for the ATF data */ +#endif -- 1.9.1

2 1

[U-Boot] rockchip: rk3288: grf: FIX the correct gmac tx_delay shift
by David Wu 16 Apr '17

16 Apr '17

If the tx_delay is not enabled, the RGMII/1000M can't work. Signed-off-by: David Wu <david.wu(a)rock-chips.com> --- arch/arm/include/asm/arch-rockchip/grf_rk3288.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h index 1a7c819..6e5a947 100644 --- a/arch/arm/include/asm/arch-rockchip/grf_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/grf_rk3288.h @@ -813,7 +813,7 @@ enum { (1 << RK3288_TXCLK_DLY_ENA_GMAC_SHIFT), RK3288_TXCLK_DLY_ENA_GMAC_DISABLE = 0, RK3288_TXCLK_DLY_ENA_GMAC_ENABLE = - (1 << RK3288_RXCLK_DLY_ENA_GMAC_SHIFT), + (1 << RK3288_TXCLK_DLY_ENA_GMAC_SHIFT), RK3288_CLK_RX_DL_CFG_GMAC_SHIFT = 0x7, RK3288_CLK_RX_DL_CFG_GMAC_MASK = -- 1.9.1

4 3

[U-Boot] [PATCH v3 0/3] board: at91sam9263ek: Convert to support DM and DT
by Wenyou Yang 16 Apr '17

16 Apr '17

The purpose of the patch set is to convert the board to support the driver model and the device Tree. The patch set is based on the patch set: 1./ PATCH v2 0/6] ARM: dts: at91: Add dts files for AT91 SoCs' boards https://lists.denx.de/pipermail/u-boot/2017-April/287222.html 2./ [PATCH v6] mmc: gen_atmel_mci: add driver model support for mci https://lists.denx.de/pipermail/u-boot/2017-April/287071.html Changes in v3: - Rebase on the master branch (22e10be45) of u-boot-dm git tree. - Update the cover-letter Changes in v2: - Add converting UART to support DM_SERIAL and used in the board_init_f stage. - Remove unused LED feature. - Improve the commit log. - Add [PATCH]: board: at91sam9263ek: Enable early debug UART. - Move out [PATCH] ARM: dts: at91: add dts files for at91sam9263ek. Wenyou Yang (3): configs: at91sam9263ek: Update for DT and DM support board: at91sam9263ek: Clean up code board: at91sam9263ek: Enable early debug UART board/atmel/at91sam9263ek/Makefile | 2 +- board/atmel/at91sam9263ek/at91sam9263ek.c | 64 ++++----------------------- configs/at91sam9263ek_dataflash_cs0_defconfig | 24 +++++++++- configs/at91sam9263ek_dataflash_defconfig | 24 +++++++++- configs/at91sam9263ek_nandflash_defconfig | 24 +++++++++- configs/at91sam9263ek_norflash_boot_defconfig | 24 +++++++++- configs/at91sam9263ek_norflash_defconfig | 24 +++++++++- include/configs/at91sam9263ek.h | 24 +--------- 8 files changed, 126 insertions(+), 84 deletions(-) -- 2.11.0

2 6

[U-Boot] [PATCH v3 0/3] board: at91sam9rlek: Convert to support DM and DT
by Wenyou Yang 16 Apr '17

16 Apr '17

The purpose of the patch set is to convert the board to support the driver model and the device tree. The patch set is based on the patch set: 1./ PATCH v2 0/6] ARM: dts: at91: Add dts files for AT91 SoCs' boards https://lists.denx.de/pipermail/u-boot/2017-April/287222.html 2./ [PATCH v6] mmc: gen_atmel_mci: add driver model support for mci https://lists.denx.de/pipermail/u-boot/2017-April/287071.html Changes in v3: - Rebase on the master branch (22e10be45) of u-boot-dm git tree. - Update the cover-letter. Changes in v2: - Add converting UART to support DM_SERIAL and used in the board_init_f stage. - Remove unused LED feature. - Improve the commit log. - Add [PATCH]: board: at91sam9rlek: Enable early debug UART. - Move out [PATCH]: ARM: dts: at91: add dts files for at91sam9rlek. Wenyou Yang (3): configs: at91sam9rlek: Update for DT and DM support board: at91sam9rlek: Clean up code board: at91sam9rlek: Enable early debug UART board/atmel/at91sam9rlek/Makefile | 2 +- board/atmel/at91sam9rlek/at91sam9rlek.c | 24 +++++++++--------------- configs/at91sam9rlek_dataflash_defconfig | 22 +++++++++++++++++++++- configs/at91sam9rlek_mmc_defconfig | 22 +++++++++++++++++++++- configs/at91sam9rlek_nandflash_defconfig | 22 +++++++++++++++++++++- include/configs/at91sam9rlek.h | 22 +--------------------- 6 files changed, 74 insertions(+), 40 deletions(-) -- 2.11.0

2 6

[U-Boot] [PATCH v4 0/3] board: at91sam9260ek/9g20ek: Convert to support DM and DT
by Wenyou Yang 16 Apr '17

16 Apr '17

The purpose of the patch set is to convert the boards to support the driver model and the device tree. The patch set is based on the patch set: 1./ PATCH v2 0/6] ARM: dts: at91: Add dts files for AT91 SoCs' boards https://lists.denx.de/pipermail/u-boot/2017-April/287222.html 2./ [PATCH v6] mmc: gen_atmel_mci: add driver model support for mci https://lists.denx.de/pipermail/u-boot/2017-April/287071.html Changes in v4: - Rebase on the master branch (22e10be45) of u-boot-dm git tree. - Update the cover-letter. Changes in v3: - Add the support of Atmel uart device be used in the board_init_f stage. - Remove unused LED feature. - Improve the commit log. - Move out [PATCH 1/3] ARM: dts: at91: add dts file for at91sam9g20/at91sam9260. - Add [PATCH]: board: at91sam9260ek/9g20ek: Enable early debug UART. Changes in v2: - Add missing conversion default config files for at91sam9xeek. - Improve the commit log. Wenyou Yang (3): configs: at91sam9260ek/9g20ek: Update for DT and DM board: at91sam9260ek: Clean up code board: at91sam9260ek/9g20ek: Enable early debug UART board/atmel/at91sam9260ek/Makefile | 2 +- board/atmel/at91sam9260ek/at91sam9260ek.c | 79 +++----------------------- configs/at91sam9260ek_dataflash_cs0_defconfig | 21 ++++++- configs/at91sam9260ek_dataflash_cs1_defconfig | 21 ++++++- configs/at91sam9260ek_nandflash_defconfig | 21 ++++++- configs/at91sam9g20ek_2mmc_defconfig | 24 +++++++- configs/at91sam9g20ek_2mmc_nandflash_defconfig | 24 +++++++- configs/at91sam9g20ek_dataflash_cs0_defconfig | 21 ++++++- configs/at91sam9g20ek_dataflash_cs1_defconfig | 21 ++++++- configs/at91sam9g20ek_nandflash_defconfig | 21 ++++++- configs/at91sam9xeek_dataflash_cs0_defconfig | 21 ++++++- configs/at91sam9xeek_dataflash_cs1_defconfig | 21 ++++++- configs/at91sam9xeek_nandflash_defconfig | 21 ++++++- include/configs/at91sam9260ek.h | 29 +--------- 14 files changed, 238 insertions(+), 109 deletions(-) -- 2.11.0

2 6

[U-Boot] [PATCH v3 0/3] board: at91sam9n12ek: Convert to support DM and DT
by Wenyou Yang 16 Apr '17

16 Apr '17

The purpose of the patch set is to convert the board to support the driver model and the device tree. The patch set is based on the patch and patch set: 1./ PATCH v2 0/6] ARM: dts: at91: Add dts files for AT91 SoCs' boards https://lists.denx.de/pipermail/u-boot/2017-April/287222.html 2./ [PATCH v6] mmc: gen_atmel_mci: add driver model support for mci https://lists.denx.de/pipermail/u-boot/2017-April/287071.html Changes in v3: - Rebase on the master branch (22e10be45) of u-boot-dm git tree. - Update the cover-letter. Changes in v2: - Remain the SPI speed macros. - Disable the SPL option for the nand config. - Add support of Atmel uart be used in the board_init_f stage. - Improve the commit log. - Use CONFIG_DEBUG_UART_CLOCK as the input clock for the early debug UART. - Move out [PATCH 1/4] ARM: dts: at91: add dts files for at91sam9n12ek. Wenyou Yang (3): configs: at91sam9n12ek: Update for DT and DM support board: at91sam9n12ek: Clean up code board: at91sam9n12ek: Enable early debug UART board/atmel/at91sam9n12ek/at91sam9n12ek.c | 64 +++++++------------------------ configs/at91sam9n12ek_mmc_defconfig | 25 +++++++++++- configs/at91sam9n12ek_nandflash_defconfig | 31 +++++++++++---- configs/at91sam9n12ek_spiflash_defconfig | 32 ++++++++++++---- include/configs/at91sam9n12ek.h | 19 +-------- 5 files changed, 86 insertions(+), 85 deletions(-) -- 2.11.0

2 6

[U-Boot] [PATCH v3 0/3] board: at91sam9m10g45ek: Convert to support DM and DT
by Wenyou Yang 16 Apr '17

16 Apr '17

The purpose of the patch set is to convert the board to support the driver model and the device tree. The patch set is based on the patch set: 1./ PATCH v2 0/6] ARM: dts: at91: Add dts files for AT91 SoCs' boards https://lists.denx.de/pipermail/u-boot/2017-April/287222.html 2./ [PATCH v6] mmc: gen_atmel_mci: add driver model support for mci https://lists.denx.de/pipermail/u-boot/2017-April/287071.html Changes in v3: - Rebase on the master branch (22e10be45) of u-boot-dm git tree. - Update the cover-letter. Changes in v2: - Add the support of Atmel uart device be used in the board_init_f stage. - Remove unused LED feature. - Disable the SPL options. - Move out [PATCH] ARM: dts: at91: Add dts files for at91sam9m10g45ek. - Add [PATCH] board: at91sam9m10g45ek: Enable early debug UART Wenyou Yang (3): configs: at91sam9m10g45ek: Update to support DM/DT board: at91sam9m10g45ek: Clean up code board: at91sam9m10g45ek: Enable early debug UART board/atmel/at91sam9m10g45ek/Makefile | 2 +- board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c | 107 ++---------------------- configs/at91sam9m10g45ek_mmc_defconfig | 34 ++++++-- configs/at91sam9m10g45ek_nandflash_defconfig | 32 +++++-- include/configs/at91sam9m10g45ek.h | 29 +------ 5 files changed, 61 insertions(+), 143 deletions(-) -- 2.11.0

2 6