May 2017 - U-Boot

[U-Boot] [PATCH v2 0/5] rockchip: video: rk3399: enable HDMI output
by Philipp Tomsich 02 May '17

02 May '17

This series provides HDMI enablement for the RK3399 and will support video console on the RK3399 either with VOP-lit or VOP-big: - pinctrl and clk support for the hdmi node - a refactoring of rk_vop.c and rk_hdmi.c to allow for the minor differences between the RK3288 and RK3399 VOP and HDMI blocks To see the full series in the context of a working configuration (i.e. including DTS, defconfig, etc. and on top of the MIPI enablement change series from Rockchip), refer to https://git.theobroma-systems.com/puma-u-boot.git/log/?h=puma-hdmi-rfc This has been tested (on top of Eric Gao's change series for MIPI-DSI) using 'bmp display' and 'setenv stdout vidconsole' on the RK3399-Q7 with various HDMI monitors, both for VOP-lit and VOP-big (setting the other one to 'disabled'). Changes in v2: - removed DEBUG from the patch (as was done in our production branches, but missing from the patch-prep branch) - updated SJG's comment (with a TODO for the RK3288) to reflect the new code structure Philipp Tomsich (5): rockchip: clk: rk3399: allow requests for HDMI clocks rockchip: pinctrl: rk3399: add support for the HDMI I2C pins rockchip: video: rk3399: enable HDMI output (from the rk_vop) for the RK3399 rockchip: video: rk3399: add HDMI TX support on the RK3399 rockchip: dts: rk3399: enable HDMI output in the DTS arch/arm/dts/rk3399.dtsi | 110 +++++++++++++++ arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 7 + arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 11 ++ drivers/clk/rockchip/clk_rk3399.c | 7 + drivers/pinctrl/rockchip/pinctrl_rk3399.c | 26 ++++ drivers/video/rockchip/rk_hdmi.c | 164 +++++++++++++++++----- drivers/video/rockchip/rk_vop.c | 178 ++++++++++++++++++++---- 7 files changed, 438 insertions(+), 65 deletions(-) -- 1.9.1

3 10

Re: [U-Boot] [PATCH 00/10] sunxi: Add basic PSCI support to enable SMP on the A80's first cluster
by Jagan Teki 02 May '17

02 May '17

On Tue, May 2, 2017 at 4:16 PM, Jagan Teki <jagannadh.teki(a)gmail.com> wrote: > On Fri, Jan 27, 2017 at 4:14 AM, Rask Ingemann Lambertsen > <rask(a)formelder.dk> wrote: >> On Wed, Jan 25, 2017 at 06:40:38PM +0800, Chen-Yu Tsai wrote: >> >> [hacking around the broken A80 TrustZone implementation] >>> This is doable, and it is actually what Allwinner's kernel does, but is >>> really hackish. The released 3.4 kernel also has the same workarounds >>> for A83T. So it's also possible the A83T has the same issues. >> >> FWIW, the kernel that ships with my A80 based media player produces this: >> [ 0.000000] Linux version 3.4.39+ (lzq@sunchip-CS24-TY) (gcc version 4.6.3 20120201 (prerelease) (crosstool-NG linaro-1.13.1-2012.02-20120222 - Linaro GCC 2012.02) ) #1 SMP PREEMPT Sat Nov 14 03:33:12 UTC 2015 >> ... >> [ 0.262230] CPU4: failed to boot: -22 >> [ 0.302298] CPU5: failed to boot: -22 >> [ 0.342350] CPU6: failed to boot: -22 >> [ 0.382421] CPU7: failed to boot: -22 >> >> So I guess you are not alone in having trouble getting PSCI to work on the >> A80. However, when trying out your patches, I also once or twice got a >> failure booting CPU2 although CPU3 and CPU4 came up fine. >> >>> So, if there's still interest in getting a working PSCI environment >>> for the A80/A83T, I'll look into doing a workaround patch for GIC-400. >>> Otherwise I'm going to go back and revive my MCPM patches for in-kernel >>> SMP support. >> >> I vote for whatever works. I'll also happily test it. Is there a git tree >> I should keep an eye on? > > Any further update on this series? I think there is an issue this wrt comment on > "[U-Boot,09/10] sunxi: Enable PSCI on sun9i/A80" patch, Please send > the next version on once resolved. Will mark this series as > "Superseded" + U-Boot

2 1

[U-Boot] [PATCH 00/10] sunxi: Remove SYS_EXTRA_OPTIONS
by Mylène Josserand 02 May '17

02 May '17

Hello everyone, This patchset removes the SYS_EXTRA_OPTIONS from all sunxi defconfigs. The values in this variable are converted to Kconfig or simply removed. Based on u-boot sunxi repository: git://git.denx.de/u-boot-sunxi.git from last commit: 002d907da51fdf10a03d389852645675529c78e6 Patch 1: Convert SUNXI_GMAC config to Kconfig and remove it from all defconfig. Patch 2: Remove AXP209_POWER configuration as this config is already converted in Kconfig (drivers/power). It is automatically chosen when the SoC is sun4i, sun5i or sun7i. Patch 3 and 4: Remove CMD_BMP and CMD_ZIP configs from SYS_EXTRA_OPTIONS. Patch 5: Remove SYS_EXTRA_OPTIONS from mk802_defconfig as it contains only USB_EHCI which is already converted to Kconfig. Patch 6, 7: Convert SUNXI_EMAC and CONFIG_RGMII to Kconfig and remove it from all SYS_EXTRA_OPTIONS entries. Patch 8 and 9: Convert CONFIG_SATAPWR and CONFIG_MACPWR to Kconfig. It becomes a string instead of the gpio number so the function sunxi_name_to_gpio is used to do the conversion from string to int. Patch 10: Convert console index (CONS_INDEX) to Kconfig. The default value is 1 except for sun5i which is 2 and sun8i which is 5. Thank you in advance! Best regards, Mylène Josserand (10): sunxi: Convert SUNXI_GMAC to Kconfig sunxi: icnova-a20-swac_defconfig: Remove AXP209_POWER from SYS_EXTRA_OPTIONS sunxi: icnova-a20-swac_defconfig: Remove CMD_BMP from SYS_EXTRA_OPTIONS sunxi: icnova-a20-swac_defconfig: Remove CMD_UNZIP and SYS_EXTRA_OPTIONS sunxi: mk802_defconfig: Remove SYS_EXTRA_OPTIONS sunxi: Convert SUNXI_EMAC to Kconfig sunxi: Convert CONFIG_RGMII to Kconfig sunxi: Convert CONFIG_SATAPWR to Kconfig sunxi: Convert CONFIG_MACPWR to Kconfig sunxi: Convert CONS_INDEX to Kconfig board/sunxi/Kconfig | 36 ++++++++++++++++++++++++++++++ board/sunxi/board.c | 12 +++++----- configs/A10-OLinuXino-Lime_defconfig | 3 ++- configs/A10s-OLinuXino-M_defconfig | 2 +- configs/A13-OLinuXinoM_defconfig | 1 - configs/A13-OLinuXino_defconfig | 1 - configs/A20-OLinuXino-Lime2_defconfig | 4 +++- configs/A20-OLinuXino-Lime_defconfig | 3 ++- configs/A20-OLinuXino_MICRO_defconfig | 3 ++- configs/A20-Olimex-SOM-EVB_defconfig | 4 +++- configs/Ampe_A76_defconfig | 1 - configs/Bananapi_defconfig | 4 +++- configs/Bananapro_defconfig | 4 +++- configs/CHIP_defconfig | 1 - configs/CSQ_CS908_defconfig | 2 +- configs/Colombus_defconfig | 3 ++- configs/Cubieboard2_defconfig | 3 ++- configs/Cubieboard_defconfig | 3 ++- configs/Cubietruck_defconfig | 4 +++- configs/Empire_electronix_d709_defconfig | 1 - configs/Empire_electronix_m712_defconfig | 1 - configs/Hummingbird_A31_defconfig | 3 ++- configs/Itead_Ibox_A20_defconfig | 3 ++- configs/Lamobo_R1_defconfig | 5 ++++- configs/Linksprite_pcDuino3_Nano_defconfig | 4 +++- configs/Linksprite_pcDuino3_defconfig | 3 ++- configs/Linksprite_pcDuino_defconfig | 2 +- configs/Marsboard_A10_defconfig | 2 +- configs/Mele_A1000G_quad_defconfig | 2 +- configs/Mele_A1000_defconfig | 3 ++- configs/Mele_I7_defconfig | 2 +- configs/Mele_M3_defconfig | 2 +- configs/Mele_M5_defconfig | 2 +- configs/Mele_M9_defconfig | 2 +- configs/Orangepi_defconfig | 4 +++- configs/Orangepi_mini_defconfig | 4 +++- configs/Sinlinx_SinA31s_defconfig | 2 +- configs/Sinovoip_BPI_M2_defconfig | 3 ++- configs/Sinovoip_BPI_M3_defconfig | 2 +- configs/Wits_Pro_A20_DKT_defconfig | 3 ++- configs/ba10_tv_box_defconfig | 2 +- configs/difrnce_dit4350_defconfig | 1 - configs/ga10h_v1_1_defconfig | 1 - configs/gt90h_v4_defconfig | 1 - configs/i12-tvbox_defconfig | 3 ++- configs/iNet_D978_rev2_defconfig | 1 - configs/icnova-a20-swac_defconfig | 2 +- configs/inet86dz_defconfig | 1 - configs/inet98v_rev2_defconfig | 1 - configs/jesurun_q5_defconfig | 3 ++- configs/mixtile_loftq_defconfig | 4 +++- configs/mk802_defconfig | 1 - configs/orangepi_plus2e_defconfig | 2 +- configs/orangepi_plus_defconfig | 3 ++- configs/polaroid_mid2407pxe03_defconfig | 1 - configs/polaroid_mid2809pxe04_defconfig | 1 - configs/q8_a13_tablet_defconfig | 1 - configs/q8_a23_tablet_800x480_defconfig | 1 - configs/q8_a33_tablet_1024x600_defconfig | 1 - configs/q8_a33_tablet_800x480_defconfig | 1 - drivers/net/Kconfig | 6 +++++ 61 files changed, 124 insertions(+), 63 deletions(-) -- 2.11.0

4 23

[U-Boot] [PATCH 0/6] sunxi: update Pine64/A64 DTs
by Andre Przywara 02 May '17

02 May '17

Hi, in the wake of the sunxi DM enablement series it became apparent that the current device tree files for the A64 SoC and its board are outdated. Since Linux v4.10-rc1 there are now basic .dts files for the Allwinner A64 SoC and the Pine64 boards in the mainline kernel. Linux v4.11-rc1 added MMC and USB support. Because our preliminary device trees used in U-Boot differ significantly, let's update our copy with what's in the current Linus' master tree. Since in contrast to U-Boot the kernel still lacks support for Ethernet, we keep our preliminary nodes for that IP, but adjust it slightly to match the new clocks and reset bindings. As the sun8i-emac driver is actually using the DT for the pinmux setup, we teach it how to cope with the new pinctrl bindings in the first two patches. This is probably becoming somewhat obsolete very soon (with DM GPIO support on the list already), however I consider these two patches as merely fixes for the existing driver to maintain bisectability. It would make sense to merge the new DTs before the DM patches, so we need to have something in place which works meanwhile. Let me know what you think. Cheers, Andre. Andre Przywara (6): sunxi: GPIO: introduce sunxi_gpio_setup_dt_pins() net: sun8i-emac: use new, generic GPIO setup routine sunxi: dts: update sun50i-a64.dtsi from Linux sunxi: dts: update Pine64 .dts sunxi: dts: remove now obsolete pine64-common.dtsi sunxi: dts: add Bananapi M64 .dts arch/arm/dts/Makefile | 3 +- arch/arm/dts/sun50i-a64-bananapi-m64.dts | 135 +++++++ arch/arm/dts/sun50i-a64-pine64-common.dtsi | 93 ----- arch/arm/dts/sun50i-a64-pine64-plus.dts | 16 +- arch/arm/dts/sun50i-a64-pine64.dts | 72 +++- arch/arm/dts/sun50i-a64.dtsi | 615 +++++++++-------------------- arch/arm/include/asm/arch-sunxi/gpio.h | 4 + arch/arm/mach-sunxi/pinmux.c | 77 ++++ drivers/net/sun8i_emac.c | 38 +- include/dt-bindings/clock/sun50i-a64-ccu.h | 134 +++++++ include/dt-bindings/reset/sun50i-a64-ccu.h | 98 +++++ 11 files changed, 706 insertions(+), 579 deletions(-) create mode 100644 arch/arm/dts/sun50i-a64-bananapi-m64.dts delete mode 100644 arch/arm/dts/sun50i-a64-pine64-common.dtsi create mode 100644 include/dt-bindings/clock/sun50i-a64-ccu.h create mode 100644 include/dt-bindings/reset/sun50i-a64-ccu.h -- 2.8.2

4 13

[U-Boot] [PATCH v7 0/9] Add mipi dsi display support for rockchip soc.
by Eric Gao 02 May '17

02 May '17

Changes in v7: -Using IS_ERR_VALUE to check the clk_set_rate' return value. Changes in v6: -Move panel and backlight configuration to it's define node, and set it disbabled defaultly. Changes in v5: -Modify indentation for better readability. -Make all enum variate have explicit value. -Merge Kconfig and Makefile changes into this patch. -Drop previous change, and modify clk_set_rate implement in rk3399. -Regenerate defconfig file using "make savedefconfig" Changes in v4: -Move this patch to an early stage. Changes in v3: -Split GRF changes as a single patch -Split mipi dsi driver file and header as a single patch. -Improve indentation relationship -Add more description in the commit message -Add ret value in debug message. Changes in v2: -Fix rk_display_init() function report error(err:-19). -Add mipi display mode for vop. -Add compatible items for rk3399 vop. -Change the bitwidth for different display mode. -Extend frame buffer size for mipi display -Add pwm0 pinctrl init for lcd backlight. -Add dts config for mipi display. -Add defconfigs for mipi display, so that it can be enabled by default. Eric Gao (9): rockchip: include: grf: Add GRF register declaration for mipi dsi rockchip: video: Add mipi driver support for rockchip soc rockchip: video: vop: Fix rk_display_init() return error rockchip: video: vop: Add mipi display mode for rk3399 rockchip: video: vop: Set different bitwidth for different display mode rockchip: video: vop: Reserve enough space for mipi dispaly rockchip: board: evb_rk3399: initialize pwm0 for dispaly backlight rockchip: dts: Add mipi dsi support for rk3399 rockchip: defconfigs: Add mipi dsi support for rk3399 evb board arch/arm/dts/rk3399-evb.dts | 76 ++++ arch/arm/dts/rk3399.dtsi | 72 +++ arch/arm/include/asm/arch-rockchip/grf_rk3399.h | 29 +- .../include/asm/arch-rockchip/rockchip_mipi_dsi.h | 195 ++++++++ arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 1 + board/rockchip/evb_rk3399/evb-rk3399.c | 7 + configs/evb-rk3399_defconfig | 14 +- drivers/video/rockchip/Kconfig | 9 +- drivers/video/rockchip/Makefile | 1 + drivers/video/rockchip/rk_mipi.c | 491 +++++++++++++++++++++ drivers/video/rockchip/rk_vop.c | 30 +- 11 files changed, 909 insertions(+), 16 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/rockchip_mipi_dsi.h create mode 100644 drivers/video/rockchip/rk_mipi.c -- 1.9.1

3 12

[U-Boot] [PATCH 1/2] sunxi: add clock configuration of R40 sata
by Icenowy Zheng 02 May '17

02 May '17

R40 has a similar SATA controller with the ones on A10/A20, but with a reset line added (like other peripherals on sun6i+), and two extra VDD pins added (1.2v and 2.5v). Add clock configuration of R40 SATA. Signed-off-by: Icenowy Zheng <icenowy(a)aosc.io> --- arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 18 ++++++++++++++++-- arch/arm/mach-sunxi/clock_sun6i.c | 7 +++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h index a44ea77576..faa14791f9 100644 --- a/arch/arm/include/asm/arch-sunxi/clock_sun6i.h +++ b/arch/arm/include/asm/arch-sunxi/clock_sun6i.h @@ -25,7 +25,7 @@ struct sunxi_ccm_reg { u32 pll6_cfg; /* 0x28 pll6 control */ u32 reserved5; u32 pll7_cfg; /* 0x30 pll7 control */ - u32 reserved6; + u32 sata_pll_cfg; /* 0x34 SATA pll control (R40 only) */ u32 pll8_cfg; /* 0x38 pll8 control */ u32 reserved7; u32 mipi_pll_cfg; /* 0x40 MIPI pll control */ @@ -58,7 +58,8 @@ struct sunxi_ccm_reg { u32 i2s1_clk_cfg; /* 0xb4 I2S1 clock control */ u32 reserved10[2]; u32 spdif_clk_cfg; /* 0xc0 SPDIF clock control */ - u32 reserved11[2]; + u32 reserved11; + u32 sata_clk_cfg; /* 0xc8 SATA clock control (R40 only) */ u32 usb_clk_cfg; /* 0xcc USB clock control */ u32 gmac_clk_cfg; /* 0xd0 GMAC clock control */ u32 reserved12[7]; @@ -224,6 +225,8 @@ struct sunxi_ccm_reg { #define CCM_PLL6_CTRL_K_MASK (0x3 << CCM_PLL6_CTRL_K_SHIFT) #define CCM_PLL6_CTRL_LOCK (1 << 28) +#define CCM_SATA_PLL_DEFAULT 0x90005811 /* 100 MHz */ + #define CCM_MIPI_PLL_CTRL_M_SHIFT 0 #define CCM_MIPI_PLL_CTRL_M_MASK (0xf << CCM_MIPI_PLL_CTRL_M_SHIFT) #define CCM_MIPI_PLL_CTRL_M(n) ((((n) - 1) & 0xf) << 0) @@ -280,7 +283,12 @@ struct sunxi_ccm_reg { #define AHB_GATE_OFFSET_USB_EHCI1 27 #define AHB_GATE_OFFSET_USB_EHCI0 26 #endif +#ifndef CONFIG_MACH_SUN8I_R40 #define AHB_GATE_OFFSET_USB0 24 +#else +#define AHB_GATE_OFFSET_USB0 25 +#define AHB_GATE_OFFSET_SATA 24 +#endif #define AHB_GATE_OFFSET_MCTL 14 #define AHB_GATE_OFFSET_GMAC 17 #define AHB_GATE_OFFSET_NAND0 13 @@ -315,6 +323,9 @@ struct sunxi_ccm_reg { #define CCM_MMC_CTRL_PLL6 (0x1 << 24) #define CCM_MMC_CTRL_ENABLE (0x1 << 31) +#define CCM_SATA_CTRL_ENABLE (0x1 << 31) +#define CCM_SATA_CTRL_USE_EXTCLK (0x1 << 24) + #define CCM_USB_CTRL_PHY0_RST (0x1 << 0) #define CCM_USB_CTRL_PHY1_RST (0x1 << 1) #define CCM_USB_CTRL_PHY2_RST (0x1 << 2) @@ -417,6 +428,9 @@ struct sunxi_ccm_reg { #define CCM_PLL11_PATTERN 0xf5860000 /* ahb_reset0 offsets */ +#ifdef CONFIG_MACH_SUN8I_R40 +#define AHB_RESET_OFFSET_SATA 24 +#endif #define AHB_RESET_OFFSET_GMAC 17 #define AHB_RESET_OFFSET_MCTL 14 #define AHB_RESET_OFFSET_MMC3 11 diff --git a/arch/arm/mach-sunxi/clock_sun6i.c b/arch/arm/mach-sunxi/clock_sun6i.c index 631bc6e250..ec5b026ef5 100644 --- a/arch/arm/mach-sunxi/clock_sun6i.c +++ b/arch/arm/mach-sunxi/clock_sun6i.c @@ -51,6 +51,13 @@ void clock_init_safe(void) writel(MBUS_CLK_DEFAULT, &ccm->mbus0_clk_cfg); if (IS_ENABLED(CONFIG_MACH_SUN6I)) writel(MBUS_CLK_DEFAULT, &ccm->mbus1_clk_cfg); + +#if defined(CONFIG_MACH_SUN8I_R40) && defined(CONFIG_SUNXI_AHCI) + setbits_le32(&ccm->sata_pll_cfg, CCM_SATA_PLL_DEFAULT); + setbits_le32(&ccm->ahb_reset0_cfg, 0x1 << AHB_GATE_OFFSET_SATA); + setbits_le32(&ccm->ahb_gate0, 0x1 << AHB_GATE_OFFSET_SATA); + setbits_le32(&ccm->sata_clk_cfg, CCM_SATA_CTRL_ENABLE); +#endif } #endif -- 2.12.2

2 2

[U-Boot] [PATCH v2 1/2] ARM: sunxi: move board/sunxi/Kconfig to arch/arm/mach-sunxi/Kconfig
by Masahiro Yamada 02 May '17

02 May '17

For the consistent location of SoC-level Kconfig. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v2: - Rebase on u-boot-sunxi/master arch/arm/Kconfig | 3 ++- {board/sunxi => arch/arm/mach-sunxi}/Kconfig | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename {board/sunxi => arch/arm/mach-sunxi}/Kconfig (100%) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 42f93b4..07fd1e0 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1226,6 +1226,8 @@ source "arch/arm/mach-sti/Kconfig" source "arch/arm/mach-stm32/Kconfig" +source "arch/arm/mach-sunxi/Kconfig" + source "arch/arm/mach-tegra/Kconfig" source "arch/arm/mach-uniphier/Kconfig" @@ -1311,7 +1313,6 @@ source "board/spear/spear320/Kconfig" source "board/spear/spear600/Kconfig" source "board/spear/x600/Kconfig" source "board/st/stv0991/Kconfig" -source "board/sunxi/Kconfig" source "board/syteco/zmx25/Kconfig" source "board/tcl/sl50/Kconfig" source "board/ti/am335x/Kconfig" diff --git a/board/sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig similarity index 100% rename from board/sunxi/Kconfig rename to arch/arm/mach-sunxi/Kconfig -- 2.7.4

2 2

[U-Boot] [PATCH] video: bmp: rename CONFIG_BMP_24BMP to CONFIG_BMP_24BPP
by Philipp Tomsich 02 May '17

02 May '17

Due to a typo, the 24 bit-per-pixel configuration ends in 24BMP instead of 24BPP. This change renames it throughout the source tree for consistency and to make moving these options into Kconfig easier and less error-prone. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)theobroma-systems.com> --- common/lcd.c | 4 ++-- drivers/video/video_bmp.c | 4 ++-- include/configs/brxre1.h | 2 +- scripts/config_whitelist.txt | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index 783626e..2405146 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -704,7 +704,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) } break; #endif /* CONFIG_BMP_16BPP */ -#if defined(CONFIG_BMP_24BMP) +#if defined(CONFIG_BMP_24BPP) case 24: for (i = 0; i < height; ++i) { for (j = 0; j < width; j++) { @@ -716,7 +716,7 @@ int lcd_display_bitmap(ulong bmp_image, int x, int y) fb -= lcd_line_length + width * (bpix / 8); } break; -#endif /* CONFIG_BMP_24BMP */ +#endif /* CONFIG_BMP_24BPP */ #if defined(CONFIG_BMP_32BPP) case 32: for (i = 0; i < height; ++i) { diff --git a/drivers/video/video_bmp.c b/drivers/video/video_bmp.c index 32a4e7f..f803067 100644 --- a/drivers/video/video_bmp.c +++ b/drivers/video/video_bmp.c @@ -316,7 +316,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, } break; #endif /* CONFIG_BMP_16BPP */ -#if defined(CONFIG_BMP_24BMP) +#if defined(CONFIG_BMP_24BPP) case 24: for (i = 0; i < height; ++i) { for (j = 0; j < width; j++) { @@ -328,7 +328,7 @@ int video_bmp_display(struct udevice *dev, ulong bmp_image, int x, int y, fb -= priv->line_length + width * (bpix / 8); } break; -#endif /* CONFIG_BMP_24BMP */ +#endif /* CONFIG_BMP_24BPP */ #if defined(CONFIG_BMP_32BPP) case 32: for (i = 0; i < height; ++i) { diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 82ee7c6..6cd166a 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -23,7 +23,7 @@ #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE (1366*767*4) #define CONFIG_CMD_BMP -#define CONFIG_BMP_24BMP +#define CONFIG_BMP_24BPP #define CONFIG_BMP_32BPP /* memory */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5e515d2..59fa89d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -247,7 +247,7 @@ CONFIG_BL1_SIZE CONFIG_BL2_OFFSET CONFIG_BL2_SIZE CONFIG_BMP_16BPP -CONFIG_BMP_24BMP +CONFIG_BMP_24BPP CONFIG_BMP_24BPP CONFIG_BMP_32BPP CONFIG_BOARDDIR -- 1.9.1

3 2

[U-Boot] [PATCH] fdt: Move fdt_fixup_ethernet to a common place
by Tom Rini 02 May '17

02 May '17

With 3f66149d9fb4 we no longer have a common call fdt_fixup_ethernet. This was fine to do on PowerPC as they largely had calls already in ft_cpu_fixup. On ARM however we largely relied on this call. Rather than introduce a large number of changes to ft_cpu_fixup / ft_board_fixup we recognize that this is a common enough call that we should be doing it in a central location. Do it early enough that we can do any further updates in ft_cpu_fixup / ft_board_fixup. Cc: Gerd Hoffmann <kraxel(a)redhat.com> Cc: Chen-Yu Tsai <wens(a)csie.org> Cc: Maxime Ripard <maxime.ripard(a)free-electrons.com> Cc: Thomas Chou <thomas(a)wytron.com.tw> (maintainer:NIOS) Cc: York Sun <york.sun(a)nxp.com> (maintainer:POWERPC MPC85XX) Cc: Stefan Roese <sr(a)denx.de> (maintainer:POWERPC PPC4XX) Cc: Simon Glass <sjg(a)chromium.org> Cc: Joakim Tjernlund <Joakim.Tjernlund(a)infinera.com> Fixes: 3f66149d9fb4 ("Remove extra fdt_fixup_ethernet() call") Signed-off-by: Tom Rini <trini(a)konsulko.com> --- This replaces my previous patch to fix just rpi. --- arch/arm/cpu/armv7/ls102xa/fdt.c | 2 -- arch/nios2/cpu/Makefile | 1 - arch/nios2/cpu/fdt.c | 38 -------------------------------------- arch/powerpc/cpu/mpc512x/cpu.c | 3 --- arch/powerpc/cpu/mpc8260/cpu.c | 5 ----- arch/powerpc/cpu/mpc83xx/fdt.c | 1 - arch/powerpc/cpu/mpc85xx/fdt.c | 2 -- arch/powerpc/cpu/mpc86xx/fdt.c | 5 ----- arch/powerpc/cpu/mpc8xx/fdt.c | 3 --- arch/powerpc/cpu/ppc4xx/fdt.c | 6 ------ common/bootm_os.c | 2 -- common/image-fdt.c | 2 ++ configs/10m50_defconfig | 1 - configs/3c120_defconfig | 1 - 14 files changed, 2 insertions(+), 70 deletions(-) delete mode 100644 arch/nios2/cpu/fdt.c diff --git a/arch/arm/cpu/armv7/ls102xa/fdt.c b/arch/arm/cpu/armv7/ls102xa/fdt.c index ae5e794230cd..d21ad39f8adc 100644 --- a/arch/arm/cpu/armv7/ls102xa/fdt.c +++ b/arch/arm/cpu/armv7/ls102xa/fdt.c @@ -94,8 +94,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) } #endif - fdt_fixup_ethernet(blob); - off = fdt_node_offset_by_prop_value(blob, -1, "device_type", "cpu", 4); while (off != -FDT_ERR_NOTFOUND) { val = gd->cpu_clk; diff --git a/arch/nios2/cpu/Makefile b/arch/nios2/cpu/Makefile index 185ca3cdb76e..c859b46bf830 100644 --- a/arch/nios2/cpu/Makefile +++ b/arch/nios2/cpu/Makefile @@ -8,4 +8,3 @@ extra-y = start.o obj-y = exceptions.o obj-y += cpu.o interrupts.o traps.o -obj-y += fdt.o diff --git a/arch/nios2/cpu/fdt.c b/arch/nios2/cpu/fdt.c deleted file mode 100644 index a44f51a7f2a8..000000000000 --- a/arch/nios2/cpu/fdt.c +++ /dev/null @@ -1,38 +0,0 @@ -/* - * (C) Copyright 2011, Missing Link Electronics - * Joachim Foerster <joachim(a)missinglinkelectronics.com> - * - * Taken from arch/powerpc/cpu/ppc4xx/fdt.c: - * - * (C) Copyright 2007-2008 - * Stefan Roese, DENX Software Engineering, sr(a)denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include <common.h> - -#ifdef CONFIG_OF_BOARD_SETUP -#include <libfdt.h> -#include <fdt_support.h> - -DECLARE_GLOBAL_DATA_PTR; - -int __ft_board_setup(void *blob, bd_t *bd) -{ - ft_cpu_setup(blob, bd); - - return 0; -} -int ft_board_setup(void *blob, bd_t *bd) - __attribute__((weak, alias("__ft_board_setup"))); - -void ft_cpu_setup(void *blob, bd_t *bd) -{ - /* - * Fixup all ethernet nodes - * Note: aliases in the dts are required for this - */ - fdt_fixup_ethernet(blob); -} -#endif /* CONFIG_OF_BOARD_SETUP */ diff --git a/arch/powerpc/cpu/mpc512x/cpu.c b/arch/powerpc/cpu/mpc512x/cpu.c index 4ee91e16f9c6..ce524fcdc797 100644 --- a/arch/powerpc/cpu/mpc512x/cpu.c +++ b/arch/powerpc/cpu/mpc512x/cpu.c @@ -176,9 +176,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) old_ft_cpu_setup(blob, bd); #endif ft_clock_setup(blob, bd); -#ifdef CONFIG_HAS_ETH0 - fdt_fixup_ethernet(blob); -#endif fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); } #endif diff --git a/arch/powerpc/cpu/mpc8260/cpu.c b/arch/powerpc/cpu/mpc8260/cpu.c index 58d1c0261cba..7302b37f2095 100644 --- a/arch/powerpc/cpu/mpc8260/cpu.c +++ b/arch/powerpc/cpu/mpc8260/cpu.c @@ -294,11 +294,6 @@ void watchdog_reset (void) #ifdef CONFIG_OF_BOARD_SETUP void ft_cpu_setup (void *blob, bd_t *bd) { -#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ - defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) - fdt_fixup_ethernet(blob); -#endif - do_fixup_by_compat_u32(blob, "fsl,cpm2-brg", "clock-frequency", bd->bi_brgfreq, 1); diff --git a/arch/powerpc/cpu/mpc83xx/fdt.c b/arch/powerpc/cpu/mpc83xx/fdt.c index f249a585edf1..3ac4eb1dd8f2 100644 --- a/arch/powerpc/cpu/mpc83xx/fdt.c +++ b/arch/powerpc/cpu/mpc83xx/fdt.c @@ -53,7 +53,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) #if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) ||\ defined(CONFIG_HAS_ETH4) || defined(CONFIG_HAS_ETH5) - fdt_fixup_ethernet(blob); #ifdef CONFIG_MPC8313 /* * mpc8313e erratum IPIC1 swapped TSEC interrupt ID numbers on rev. 1 diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 67140ba9ee18..a9ea947305ff 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -612,8 +612,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) } #endif - fdt_fixup_ethernet(blob); - fdt_add_enet_stashing(blob); #ifndef CONFIG_FSL_TBCLK_EXTRA_DIV diff --git a/arch/powerpc/cpu/mpc86xx/fdt.c b/arch/powerpc/cpu/mpc86xx/fdt.c index 5f9ad6b0b6d4..30fbf14f1bdb 100644 --- a/arch/powerpc/cpu/mpc86xx/fdt.c +++ b/arch/powerpc/cpu/mpc86xx/fdt.c @@ -32,11 +32,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); -#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) \ - || defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) - fdt_fixup_ethernet(blob); -#endif - #ifdef CONFIG_SYS_NS16550 do_fixup_by_compat_u32(blob, "ns16550", "clock-frequency", CONFIG_SYS_NS16550_CLK, 1); diff --git a/arch/powerpc/cpu/mpc8xx/fdt.c b/arch/powerpc/cpu/mpc8xx/fdt.c index 97830e3c8bd4..34d36478d30a 100644 --- a/arch/powerpc/cpu/mpc8xx/fdt.c +++ b/arch/powerpc/cpu/mpc8xx/fdt.c @@ -23,8 +23,5 @@ void ft_cpu_setup(void *blob, bd_t *bd) do_fixup_by_compat_u32(blob, "fsl,cpm-brg", "clock-frequency", gd->arch.brg_clk, 1); - /* Fixup ethernet MAC addresses */ - fdt_fixup_ethernet(blob); - fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); } diff --git a/arch/powerpc/cpu/ppc4xx/fdt.c b/arch/powerpc/cpu/ppc4xx/fdt.c index c73509b3ee35..28080583a792 100644 --- a/arch/powerpc/cpu/ppc4xx/fdt.c +++ b/arch/powerpc/cpu/ppc4xx/fdt.c @@ -150,12 +150,6 @@ void ft_cpu_setup(void *blob, bd_t *bd) } /* - * Fixup all ethernet nodes - * Note: aliases in the dts are required for this - */ - fdt_fixup_ethernet(blob); - - /* * Fixup all available PCIe nodes by setting the device_type property */ fdt_pcie_setup(blob); diff --git a/common/bootm_os.c b/common/bootm_os.c index 6e463c317e84..e1024069766a 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -288,8 +288,6 @@ void do_bootvx_fdt(bootm_headers_t *images) if (ret) return; - fdt_fixup_ethernet(*of_flat_tree); - ret = fdt_add_subnode(*of_flat_tree, 0, "chosen"); if ((ret >= 0 || ret == -FDT_ERR_EXISTS)) { bootline = getenv("bootargs"); diff --git a/common/image-fdt.c b/common/image-fdt.c index 7468b902b8d4..c6e8832d6688 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -478,6 +478,8 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, printf("ERROR: arch-specific fdt fixup failed\n"); goto err; } + /* Update ethernet nodes */ + fdt_fixup_ethernet(blob); if (IMAGE_OF_BOARD_SETUP) { fdt_ret = ft_board_setup(blob, gd->bd); if (fdt_ret) { diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig index 68da5ff11088..ed9a867d7287 100644 --- a/configs/10m50_defconfig +++ b/configs/10m50_defconfig @@ -2,7 +2,6 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="10m50_devboard" CONFIG_DEFAULT_DEVICE_TREE="10m50_devboard" CONFIG_FIT=y -CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y diff --git a/configs/3c120_defconfig b/configs/3c120_defconfig index 9adf97adb638..95e794afca86 100644 --- a/configs/3c120_defconfig +++ b/configs/3c120_defconfig @@ -2,7 +2,6 @@ CONFIG_NIOS2=y CONFIG_SYS_CONFIG_NAME="3c120_devboard" CONFIG_DEFAULT_DEVICE_TREE="3c120_devboard" CONFIG_FIT=y -CONFIG_OF_BOARD_SETUP=y CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_VERSION_VARIABLE=y CONFIG_HUSH_PARSER=y -- 1.9.1

5 5

[U-Boot] [ANN] U-Boot v2017.05-rc3 released
by Tom Rini 02 May '17

02 May '17

Hey all, It's release day and v2017.05-rc3 is out. Most of the changes from -rc2 to -rc3 are Kconfig migrations, and I'm happy with that. I also re-synced the defconfig files and CONFIG symbol whitelist. If anyone has critical fixes I've missed, or some other Kconfig changes (that I can prove out as correct), please speak up. As a final note, I expect us to release v2017.05 on schedule on the 8th of May. Thanks all! -- Tom

1 0