April 2017 - U-Boot

[U-Boot] [PATCH v2 0/6] ARM: dts: at91: Add dts files for AT91 SoCs' boards
by Wenyou Yang 16 Apr '17

16 Apr '17

The device tree source files of AT91 SoCs's board are copied from the Linux v4.10, and have some changes. Changes in v2: - Rebase on the master branch (22e10be45) of u-boot-dm git tree. Wenyou Yang (6): ARM: dts: at91: Add dts files for at91sam9x5ek ARM: dts: at91: Add dts files for at91sam9n12ek ARM: dts: at91: Add dts files for at91sam9m10g45ek ARM: dts: at91: Add dts files for at91sam9260ek/9g20ek ARM: dts: at91: Add dts files for at91sam9rlek ARM: dts: at91: Add dts files for at91sam9263ek arch/arm/dts/Makefile | 20 + arch/arm/dts/at91sam9260.dtsi | 149 ++-- arch/arm/dts/at91sam9260ek.dts | 215 ++++++ arch/arm/dts/at91sam9263.dtsi | 198 ++--- arch/arm/dts/at91sam9263ek.dts | 229 ++++++ arch/arm/dts/at91sam9g15.dtsi | 29 + arch/arm/dts/at91sam9g15ek.dts | 26 + arch/arm/dts/at91sam9g20.dtsi | 4 +- arch/arm/dts/at91sam9g20ek.dts | 29 + arch/arm/dts/at91sam9g20ek_2mmc.dts | 56 ++ arch/arm/dts/at91sam9g20ek_common.dtsi | 227 ++++++ arch/arm/dts/at91sam9g25.dtsi | 31 + arch/arm/dts/at91sam9g25ek.dts | 69 ++ arch/arm/dts/at91sam9g35.dtsi | 30 + arch/arm/dts/at91sam9g35ek.dts | 31 + arch/arm/dts/at91sam9g45.dtsi | 218 +++--- arch/arm/dts/at91sam9m10g45ek.dts | 359 +++++++++ arch/arm/dts/at91sam9n12.dtsi | 1064 ++++++++++++++++++++++++++ arch/arm/dts/at91sam9n12ek.dts | 265 +++++++ arch/arm/dts/at91sam9rl.dtsi | 1139 ++++++++++++++++++++++++++++ arch/arm/dts/at91sam9rlek.dts | 239 ++++++ arch/arm/dts/at91sam9x25.dtsi | 32 + arch/arm/dts/at91sam9x25ek.dts | 30 + arch/arm/dts/at91sam9x35.dtsi | 31 + arch/arm/dts/at91sam9x35ek.dts | 30 + arch/arm/dts/at91sam9x5.dtsi | 1302 ++++++++++++++++++++++++++++++++ arch/arm/dts/at91sam9x5_can.dtsi | 71 ++ arch/arm/dts/at91sam9x5_isi.dtsi | 72 ++ arch/arm/dts/at91sam9x5_lcd.dtsi | 146 ++++ arch/arm/dts/at91sam9x5_macb0.dtsi | 67 ++ arch/arm/dts/at91sam9x5_macb1.dtsi | 55 ++ arch/arm/dts/at91sam9x5_usart3.dtsi | 69 ++ arch/arm/dts/at91sam9x5cm.dtsi | 100 +++ arch/arm/dts/at91sam9x5dm.dtsi | 66 ++ arch/arm/dts/at91sam9x5ek.dtsi | 167 ++++ 35 files changed, 6603 insertions(+), 262 deletions(-) create mode 100644 arch/arm/dts/at91sam9260ek.dts create mode 100644 arch/arm/dts/at91sam9263ek.dts create mode 100644 arch/arm/dts/at91sam9g15.dtsi create mode 100644 arch/arm/dts/at91sam9g15ek.dts create mode 100644 arch/arm/dts/at91sam9g20ek.dts create mode 100644 arch/arm/dts/at91sam9g20ek_2mmc.dts create mode 100644 arch/arm/dts/at91sam9g20ek_common.dtsi create mode 100644 arch/arm/dts/at91sam9g25.dtsi create mode 100644 arch/arm/dts/at91sam9g25ek.dts create mode 100644 arch/arm/dts/at91sam9g35.dtsi create mode 100644 arch/arm/dts/at91sam9g35ek.dts create mode 100644 arch/arm/dts/at91sam9m10g45ek.dts create mode 100644 arch/arm/dts/at91sam9n12.dtsi create mode 100644 arch/arm/dts/at91sam9n12ek.dts create mode 100644 arch/arm/dts/at91sam9rl.dtsi create mode 100644 arch/arm/dts/at91sam9rlek.dts create mode 100644 arch/arm/dts/at91sam9x25.dtsi create mode 100644 arch/arm/dts/at91sam9x25ek.dts create mode 100644 arch/arm/dts/at91sam9x35.dtsi create mode 100644 arch/arm/dts/at91sam9x35ek.dts create mode 100644 arch/arm/dts/at91sam9x5.dtsi create mode 100644 arch/arm/dts/at91sam9x5_can.dtsi create mode 100644 arch/arm/dts/at91sam9x5_isi.dtsi create mode 100644 arch/arm/dts/at91sam9x5_lcd.dtsi create mode 100644 arch/arm/dts/at91sam9x5_macb0.dtsi create mode 100644 arch/arm/dts/at91sam9x5_macb1.dtsi create mode 100644 arch/arm/dts/at91sam9x5_usart3.dtsi create mode 100644 arch/arm/dts/at91sam9x5cm.dtsi create mode 100644 arch/arm/dts/at91sam9x5dm.dtsi create mode 100644 arch/arm/dts/at91sam9x5ek.dtsi -- 2.11.0

2 12

[U-Boot] [PATCH] rockchip: rk3399: use actual dram size
by Kever Yang 16 Apr '17

16 Apr '17

Since our sdram driver is ready, we can use the actual size instead of hard code. Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> --- arch/arm/mach-rockchip/rk3399/sdram_rk3399.c | 8 ++++---- board/rockchip/evb_rk3399/evb-rk3399.c | 19 ++++++++++++++++++- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c b/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c index 749b52c..536879d 100644 --- a/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/sdram_rk3399.c @@ -1280,6 +1280,8 @@ static int rk3399_dmc_probe(struct udevice *dev) priv->pmugrf = syscon_get_first_range(ROCKCHIP_SYSCON_PMUGRF); debug("%s: pmugrf=%p\n", __func__, priv->pmugrf); + priv->info.base = 0; + priv->info.size = sdram_size_mb(priv) << 20; #endif return 0; } @@ -1288,9 +1290,7 @@ static int rk3399_dmc_get_info(struct udevice *dev, struct ram_info *info) { struct dram_info *priv = dev_get_priv(dev); - info = &priv->info; - priv->info.base = 0; - priv->info.size = sdram_size_mb(priv) << 20; + *info = priv->info; return 0; } @@ -1314,8 +1314,8 @@ U_BOOT_DRIVER(dmc_rk3399) = { .ofdata_to_platdata = rk3399_dmc_ofdata_to_platdata, #endif .probe = rk3399_dmc_probe, -#ifdef CONFIG_SPL_BUILD .priv_auto_alloc_size = sizeof(struct dram_info), +#ifdef CONFIG_SPL_BUILD .platdata_auto_alloc_size = sizeof(struct rockchip_dmc_plat), #endif }; diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index 4b0d83c..6f9a954 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -5,6 +5,7 @@ */ #include <common.h> #include <dm.h> +#include <ram.h> #include <dm/pinctrl.h> #include <dm/uclass-internal.h> #include <asm/arch/periph.h> @@ -65,7 +66,23 @@ out: int dram_init(void) { - gd->ram_size = 0x80000000; + struct ram_info ram; + struct udevice *dev; + int ret; + + ret = uclass_get_device(UCLASS_RAM, 0, &dev); + if (ret) { + debug("DRAM init failed: %d\n", ret); + return ret; + } + ret = ram_get_info(dev, &ram); + if (ret) { + debug("Cannot get DRAM size: %d\n", ret); + return ret; + } + debug("SDRAM base=%lx, size=%x\n", ram.base, ram.size); + gd->ram_size = ram.size; + return 0; } -- 1.9.1

2 1

[U-Boot] [PATCH v2 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. 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 v2 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. 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 v3 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. It is based on the patch set: [PATCH v8 0/2] pinctrl: at91: Add pinctrl driver https://lists.denx.de/pipermail/u-boot/2017-March/284577.html 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 v2 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. It is based on the patch set: [PATCH v8 0/2] pinctrl: at91: Add pinctrl driver https://lists.denx.de/pipermail/u-boot/2017-March/284577.html 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 v2 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. 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

[U-Boot] [PATCH 0/6] ARM: dts: at91: Add dts files for AT91 SoCs' boards
by Wenyou Yang 16 Apr '17

16 Apr '17

The device tree source files of AT91 SoCs's board are copied from the Linux v4.10, and have some changes. Wenyou Yang (6): ARM: dts: at91: Add dts files for at91sam9x5ek ARM: dts: at91: Add dts files for at91sam9n12ek ARM: dts: at91: Add dts files for at91sam9m10g45ek ARM: dts: at91: Add dts files for at91sam9260ek/9g20ek ARM: dts: at91: Add dts files for at91sam9rlek ARM: dts: at91: Add dts files for at91sam9263ek arch/arm/dts/Makefile | 20 + arch/arm/dts/at91sam9260.dtsi | 149 ++-- arch/arm/dts/at91sam9260ek.dts | 215 ++++++ arch/arm/dts/at91sam9263.dtsi | 198 ++--- arch/arm/dts/at91sam9263ek.dts | 229 ++++++ arch/arm/dts/at91sam9g15.dtsi | 29 + arch/arm/dts/at91sam9g15ek.dts | 26 + arch/arm/dts/at91sam9g20.dtsi | 4 +- arch/arm/dts/at91sam9g20ek.dts | 29 + arch/arm/dts/at91sam9g20ek_2mmc.dts | 56 ++ arch/arm/dts/at91sam9g20ek_common.dtsi | 227 ++++++ arch/arm/dts/at91sam9g25.dtsi | 31 + arch/arm/dts/at91sam9g25ek.dts | 69 ++ arch/arm/dts/at91sam9g35.dtsi | 30 + arch/arm/dts/at91sam9g35ek.dts | 31 + arch/arm/dts/at91sam9g45.dtsi | 218 +++--- arch/arm/dts/at91sam9m10g45ek.dts | 359 +++++++++ arch/arm/dts/at91sam9n12.dtsi | 1064 ++++++++++++++++++++++++++ arch/arm/dts/at91sam9n12ek.dts | 265 +++++++ arch/arm/dts/at91sam9rl.dtsi | 1139 ++++++++++++++++++++++++++++ arch/arm/dts/at91sam9rlek.dts | 239 ++++++ arch/arm/dts/at91sam9x25.dtsi | 32 + arch/arm/dts/at91sam9x25ek.dts | 30 + arch/arm/dts/at91sam9x35.dtsi | 31 + arch/arm/dts/at91sam9x35ek.dts | 30 + arch/arm/dts/at91sam9x5.dtsi | 1302 ++++++++++++++++++++++++++++++++ arch/arm/dts/at91sam9x5_can.dtsi | 71 ++ arch/arm/dts/at91sam9x5_isi.dtsi | 72 ++ arch/arm/dts/at91sam9x5_lcd.dtsi | 146 ++++ arch/arm/dts/at91sam9x5_macb0.dtsi | 67 ++ arch/arm/dts/at91sam9x5_macb1.dtsi | 55 ++ arch/arm/dts/at91sam9x5_usart3.dtsi | 69 ++ arch/arm/dts/at91sam9x5cm.dtsi | 100 +++ arch/arm/dts/at91sam9x5dm.dtsi | 66 ++ arch/arm/dts/at91sam9x5ek.dtsi | 167 ++++ 35 files changed, 6603 insertions(+), 262 deletions(-) create mode 100644 arch/arm/dts/at91sam9260ek.dts create mode 100644 arch/arm/dts/at91sam9263ek.dts create mode 100644 arch/arm/dts/at91sam9g15.dtsi create mode 100644 arch/arm/dts/at91sam9g15ek.dts create mode 100644 arch/arm/dts/at91sam9g20ek.dts create mode 100644 arch/arm/dts/at91sam9g20ek_2mmc.dts create mode 100644 arch/arm/dts/at91sam9g20ek_common.dtsi create mode 100644 arch/arm/dts/at91sam9g25.dtsi create mode 100644 arch/arm/dts/at91sam9g25ek.dts create mode 100644 arch/arm/dts/at91sam9g35.dtsi create mode 100644 arch/arm/dts/at91sam9g35ek.dts create mode 100644 arch/arm/dts/at91sam9m10g45ek.dts create mode 100644 arch/arm/dts/at91sam9n12.dtsi create mode 100644 arch/arm/dts/at91sam9n12ek.dts create mode 100644 arch/arm/dts/at91sam9rl.dtsi create mode 100644 arch/arm/dts/at91sam9rlek.dts create mode 100644 arch/arm/dts/at91sam9x25.dtsi create mode 100644 arch/arm/dts/at91sam9x25ek.dts create mode 100644 arch/arm/dts/at91sam9x35.dtsi create mode 100644 arch/arm/dts/at91sam9x35ek.dts create mode 100644 arch/arm/dts/at91sam9x5.dtsi create mode 100644 arch/arm/dts/at91sam9x5_can.dtsi create mode 100644 arch/arm/dts/at91sam9x5_isi.dtsi create mode 100644 arch/arm/dts/at91sam9x5_lcd.dtsi create mode 100644 arch/arm/dts/at91sam9x5_macb0.dtsi create mode 100644 arch/arm/dts/at91sam9x5_macb1.dtsi create mode 100644 arch/arm/dts/at91sam9x5_usart3.dtsi create mode 100644 arch/arm/dts/at91sam9x5cm.dtsi create mode 100644 arch/arm/dts/at91sam9x5dm.dtsi create mode 100644 arch/arm/dts/at91sam9x5ek.dtsi -- 2.11.0

2 12

[U-Boot] [RFC 1/1] usb: musb: avoid out of bound access in udc_setup_ep
by Heinrich Schuchardt 16 Apr '17

16 Apr '17

For id = 15 an out of bound access occurs in udc_setup_ep(). Increase the size of epinfo[] from 30 to 32 to encompass ids 0..15. The problem was highlighted by cppcheck. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- I have no hardware for testing the patch. Please, review thoroughly. --- drivers/usb/musb/musb_udc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/musb/musb_udc.c b/drivers/usb/musb/musb_udc.c index 87640f4e32..d643334a2e 100644 --- a/drivers/usb/musb/musb_udc.c +++ b/drivers/usb/musb/musb_udc.c @@ -85,7 +85,7 @@ do { \ /* static implies these initialized to 0 or NULL */ static int debug_setup; static int debug_level; -static struct musb_epinfo epinfo[MAX_ENDPOINT * 2]; +static struct musb_epinfo epinfo[MAX_ENDPOINT * 2 + 2]; static enum ep0_state_enum { IDLE = 0, TX, @@ -944,7 +944,7 @@ int udc_init(void) musbr = musb_cfg.regs; /* Initialize the endpoints */ - for (ep_loop = 0; ep_loop < MAX_ENDPOINT * 2; ep_loop++) { + for (ep_loop = 0; ep_loop <= MAX_ENDPOINT * 2; ep_loop++) { epinfo[ep_loop].epnum = (ep_loop / 2) + 1; epinfo[ep_loop].epdir = ep_loop % 2; /* OUT, IN */ epinfo[ep_loop].epsize = 0; -- 2.11.0

2 1

[U-Boot] [PATCH 1/1] musb: properly detect failed initialization of controller
by Heinrich Schuchardt 16 Apr '17

16 Apr '17

We want to check the result of musb_init_controller and not the address were the result is stored. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/usb/musb-new/musb_uboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/musb-new/musb_uboot.c b/drivers/usb/musb-new/musb_uboot.c index ea71f75947..8662c0ff70 100644 --- a/drivers/usb/musb-new/musb_uboot.c +++ b/drivers/usb/musb-new/musb_uboot.c @@ -446,7 +446,7 @@ int musb_register(struct musb_hdrc_platform_data *plat, void *bdata, } *musbp = musb_init_controller(plat, (struct device *)bdata, ctl_regs); - if (!musbp) { + if (!*musbp) { printf("Failed to init the controller\n"); return -EIO; } -- 2.11.0

2 1