board: atmel: Convert to support DM_VIDEO
cover board: atmel: Convert to support DM_VIDEO
Add a common code to display the company's logo and board information by using the API from DM_VIDEO under the board/$(VENDOR)/common folder, and the logo files can be used by the API from DM_VIDEO, and then convert the board to enable the driver model support for LCD/video.
It is based on the patch series:
[PATCH v2 0/3] board: atmel: Set the ethernet mac address from eeprom https://lists.denx.de/pipermail/u-boot/2017-July/300527.html
Wenyou Yang (7):
lib: at91: Add logo files used by API from DM_VIDEO
atmel: common: Add function to display via DM_VIDEO's API
board: sama5d2_xplained: Convert to support DM_VIDEO
board: sama5d3xek: Convert to support DM_VIDEO
board: sama5d4ek: Convert to support DM_VIDEO
board: sama5d4_xplained: Convert to support DM_VIDEO
board: at91sam9x5ek: Convert to support DM_VIDEO
arch/arm/dts/at91-sama5d2_xplained.dts | 60 ++ arch/arm/dts/at91-sama5d4_xplained.dts | 25 + arch/arm/dts/at91-sama5d4ek.dts | 26 + arch/arm/dts/sama5d2.dtsi | 7 + arch/arm/dts/sama5d36ek_cmp.dts | 1 + arch/arm/dts/sama5d3_lcd.dtsi | 21 +- arch/arm/dts/sama5d3xdm.dtsi | 26 + arch/arm/dts/sama5d4.dtsi | 21 +- arch/arm/mach-at91/Kconfig | 4 + arch/arm/mach-at91/include/mach/at91_common.h | 1 + board/atmel/at91sam9x5ek/at91sam9x5ek.c | 111 +- board/atmel/common/Makefile | 1 + board/atmel/common/video_display.c | 72 ++ board/atmel/sama5d2_xplained/sama5d2_xplained.c | 95 +- board/atmel/sama5d3xek/sama5d3xek.c | 93 +- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 102 +- board/atmel/sama5d4ek/sama5d4ek.c | 97 +- configs/at91sam9x5ek_dataflash_defconfig | 3 +- configs/at91sam9x5ek_mmc_defconfig | 3 +- configs/at91sam9x5ek_nandflash_defconfig | 3 +- configs/at91sam9x5ek_spiflash_defconfig | 3 +- configs/sama5d2_xplained_mmc_defconfig | 2 + configs/sama5d2_xplained_spiflash_defconfig | 2 + configs/sama5d36ek_cmp_mmc_defconfig | 3 +- configs/sama5d36ek_cmp_nandflash_defconfig | 3 +- configs/sama5d36ek_cmp_spiflash_defconfig | 3 +- configs/sama5d3xek_mmc_defconfig | 3 +- configs/sama5d3xek_nandflash_defconfig | 3 +- configs/sama5d3xek_spiflash_defconfig | 3 +- configs/sama5d4_xplained_mmc_defconfig | 2 + configs/sama5d4_xplained_nandflash_defconfig | 2 + configs/sama5d4_xplained_spiflash_defconfig | 2 + configs/sama5d4ek_mmc_defconfig | 3 +- configs/sama5d4ek_nandflash_defconfig | 3 +- configs/sama5d4ek_spiflash_defconfig | 3 +- include/atmel_lcd.h | 9 + include/configs/at91sam9x5ek.h | 10 - include/configs/sama5d2_xplained.h | 12 - include/configs/sama5d3xek.h | 12 - include/configs/sama5d4_xplained.h | 11 - include/configs/sama5d4ek.h | 9 - lib/Makefile | 1 + lib/at91/Makefile | 8 + lib/at91/at91.c | 30 + lib/at91/atmel_logo_8bpp.h | 1310 +++++++++++++++++++++++ lib/at91/microchip_logo_8bpp.h | 1082 +++++++++++++++++++ tools/logos/microchip.bmp | Bin 0 -> 12726 bytes 47 files changed, 2729 insertions(+), 577 deletions(-) create mode 100644 board/atmel/common/video_display.c create mode 100644 lib/at91/Makefile create mode 100644 lib/at91/at91.c create mode 100644 lib/at91/atmel_logo_8bpp.h create mode 100644 lib/at91/microchip_logo_8bpp.h create mode 100644 tools/logos/microchip.bmp
Signature · 1 line
2.13.0
PATCH 1/7 lib: at91: Add logo files used by API from DM_VIDEO
From: Wenyou Yang <[email protected]>
In order to display the company's logo by using the API from DM_VIDEO, and add the Atmel and Microchip logo files.
---
include/atmel_lcd.h | 9 + lib/Makefile | 1 + lib/at91/Makefile | 8 + lib/at91/at91.c | 30 + lib/at91/atmel_logo_8bpp.h | 1310 ++++++++++++++++++++++++++++++++++++++++ lib/at91/microchip_logo_8bpp.h | 1082 +++++++++++++++++++++++++++++++++ tools/logos/microchip.bmp | Bin 0 -> 12726 bytes 7 files changed, 2440 insertions(+) create mode 100644 lib/at91/Makefile create mode 100644 lib/at91/at91.c create mode 100644 lib/at91/atmel_logo_8bpp.h create mode 100644 lib/at91/microchip_logo_8bpp.h create mode 100644 tools/logos/microchip.bmp
include/atmel_lcd.h +9 -0
@@ -43,6 +43,15 @@ typedef struct vidinfo {u_long vl_lower_margin;/* Time from picture to sync */ u_long mmio;/* Memory mapped registers */ + +u_int logo_width; +u_int logo_height; +int logo_x_offset; +int logo_y_offset; + u_long logo_addr; } vidinfo_t; +void atmel_logo_info (vidinfo_t *info); +void microchip_logo_info (vidinfo_t *info); +#endif
lib/Makefile +1 -0
@@ -17,6 +17,7 @@ obj-$(CONFIG_TIZEN) += tizen/ obj-$(CONFIG_FIT) += libfdt/ obj-$(CONFIG_OF_LIVE) += of_live.o obj-$(CONFIG_CMD_DHRYSTONE) += dhry/ +obj-$(CONFIG_ARCH_AT91) += at91/ obj-$(CONFIG_AES) += aes.o obj-$(CONFIG_USB_TTY) += circbuf.o
lib/at91/Makefile new file +8 -0
@@ -0,0 +1,8 @@ +# +# Copyright (C) 2017 Microchip +# Wenyou.Yang <[email protected]> +# +# SPDX-License-Identifier: GPL-2.0+ +# + +obj-$(CONFIG_ARCH_AT91) += at91.o
lib/at91/at91.c new file +30 -0
@@ -0,0 +1,30 @@ +/* +* Copyright (C) 2016 Microchip +* Wenyou.Yang <[email protected]> +* +* SPDX-License-Identifier: GPL-2.0+ +*/ + +#include <common.h> +#include <atmel_lcd.h> + +#include "atmel_logo_8bpp.h" +#include "microchip_logo_8bpp.h" + +void atmel_logo_info (vidinfo_t *info) +{ + info->logo_width =ATMEL_LOGO_8BPP_WIDTH ; + info->logo_height =ATMEL_LOGO_8BPP_HEIGHT ; + info->logo_x_offset =ATMEL_LOGO_8BPP_X_OFFSET ; + info->logo_y_offset =ATMEL_LOGO_8BPP_X_OFFSET ; + info->logo_addr = (u_long )atmel_logo_8bpp; +} + +void microchip_logo_info (vidinfo_t *info) +{ + info->logo_width =MICROCHIP_LOGO_8BPP_WIDTH ; + info->logo_height =MICROCHIP_LOGO_8BPP_HEIGHT ; + info->logo_x_offset =MICROCHIP_LOGO_8BPP_X_OFFSET ; + info->logo_y_offset =MICROCHIP_LOGO_8BPP_X_OFFSET ; + info->logo_addr = (u_long )microchip_logo_8bpp; +}
lib/at91/atmel_logo_8bpp.h new file +1310 -0
1,310 lines not on this page · raw message
lib/at91/microchip_logo_8bpp.h new file +1082 -0
1,082 lines not on this page · raw message
tools/logos/microchip.bmp new file binary +0 -0
zcmeI2v5xyT62=+e0J}4APoVOe6lo4u3fH+f7;xjl#p)sQ0DKP at t3o)J?ozY9Di4rC zZ=h6ikwW>+3 at K6auJPaCa6TjE?qY=NzKRkIHa}v&wu^&gVXf)zc}|du6_pp0N=T_ z*8A_B|+;^tr$PNbNo8*E#s3*7ea91m*9T=&%d23N>BlA6g3E-b*^-v09=$6 at Sp|( zw9Zuy6rcnYDi3N9KpUT1ke8qW9 at HR!);TU+U4Rl)z=IkD&|;(m1t>uUJg7kct#kak zwg4rlfCnQpmn9gOjiK;selJH2%t4;ML}MI3V2Y109vD67UU(UfCnQptUKf3i1+E zz=IkD(AsqQg1iJ3 at Sp|(v^JG>L0*Cicu<1?TASujke8qW9 at HR!R$WlG1$hZ7;6V)n zXq|_@cLfmU6_B4A1kgHPI8cBRRKSB81kjq>%7VNE74V=20kr1Qsvs{x1w5!h0Ij*3 zhj?Ft3V2Y109unmU67Zc0v^;LfYxLZ3i1+Ez=IkD(5i%dTacHa0v^;LfYt^02Uma+ zRKSB8$WLq1Dhl!vRKSB81kjr7%7VNE74V=20kkHsvs{x1w5!h0IkW at 7vv?VfCnQ zpfxGi1$hZ7;6V)nXies!ATL1$JgD8TzYVUToo77f2K{xzAXk7Nsgm+5y=LGw1FsqQ zbIm~Cb?5iPVYfRR-p*au_s>kf at 6T_$Svs7%r)AW4=NXq+czaSt{fBIX)O+YqU%^Q zpQXd)*+kc0?$8kzJsFJt!?JM+B}!!oq%x&8%WcryQ77WSXJ_l(fy$=ovxeQy44 z!*a=MHs>dE4}>zsZ4R<prWz|hS<LQsNno4ZMQ!hPmNpwJKN+F($mcDpE7pkmo-p-q zMrcx(DQ+r%kyM}3r~Pglq?-T640g7JHs|sAoeC~fTYOC49FNCUY?dB<rLGzJ6Q5M| z*W*5=W<5xc#yW84cv{a|Xb)<dsSho*kBu&uC#~SIvHxi0rxzD7f40>S^)^X;(oNz7 zX}#y=ikZig#C+0y8R$8V7J&Jr7<1*o*w&Xn{;L}PUCGZ<es#d(q7A{&z4cG!F6b8 zlqOT3oPW%|;Gnq8F4=OIMXf4c2l3MeDvz10}6wa^4YKTnUihX)sXR#hO1#U-Igmx z6FalCUd+Ka^3m8F8490CZG)_+MLFJ8+hw}1VgTmG*=-V^*;I@9!pEMXu3OFBqYhg1 zD1*#Oi$vD{9to|&Y~Q}Ct5j*M1+0Pd#;we6+A-L223_&9;@Mt7vB}1Yx1~si3CU zEOt2__e+h={L$imR2U>=ny0|c|ZePrZx?4i*lqV(hzA!(IBuv%~=_rekHc$8drkU z#bn01tC?Y~;{c;&v-Jb}8J{!|b2%q;nN|qf&EEDPJ%(MKFYhuMR{^lH at T=%~@xB z;!?H&=X?<8TD+7@5nrujfSW$s=mu$>$AgK_Y}$r_m=-lfxSpx28}FD&9n9m&L6?n0 zF>!+=v?m5SGCud}AJOBOZum&oZMrS;H9o0E at _C<6NVA?_JoffKW*_}rtw5=`9Vk3 zmtwanWS!(D*61}8evi*q6RqL at F&~SR(TIC|wzjv)ShGIjpPe4iWbr3+Wk6BiqP!bp zd0Zb74YrLqrcpk~<qn^{#e<cs1zr8O{y9$bdEY<RwI<Q~tPk-(2pxK+f4<egG7sgQ zsBK(Lx}mB<m}*h~zLzD%(D(R6W5tL$ADNer*AF*RnysH0YeeL68;FA|A3Slp)y&n# z{S*x7sT@|iPhE#w1Dd;J~wMSJ$U5f2#cD=crZo?sg{Rq8x07efv@nvMK|hNs0}_- z>{dQkbIhRPYh+EcG>wl2hh{un^6ike1Zk2TmTdnyaf2G27u$bszT?hX0w>iJ382{ z-um=jXRfxTsApZe at PYVg^p0rO?4|J!nX3!?UNZzX>S#_hGn_gfq at oMr4?~Mo%(F= z?xz+Hv?rp-Q+l(r+-hd!x!UM16QfCltn(|Sk&o^E)HJ;9LOtVMzVxDWff)VE}yL3 zJYHKs*de(0X}^%SBg=B8wv2)X7mW_1jw0xCWvtcpR9FKxm8eC{r;i?+M(pJ^yP zJZ27>1UGIzy47$tNCfqZQARi8gBhggEg3rUNmcgTlg{<RhS9}RFPm>atKqAZt~q_c z&H5R~+L{I0%05QHB at e_mJL7Va(*tQpT+=$WR$Z~-!#otYFF}|&l2VSN_|RtAL91 zHfUn_U5z!T*e5pC?luTJcN&L0-p}ap9tX8aN~fI;wcV6Q=ULatAZgbY!z at DQkNDqS zU(|X&ECiU^l#nWJcF;+dX+UOMjAfI4+F(+n2j%^HB&4rF|&*w1o4WN^OJ&FDT2<9 z8jIqCh@{7ke=6aG)19N*)Iqz8mCvc^n9JJDLW?>mu7a6!!9O5JK0F5w6Su2E{#U^ z&3=5tBURV^J}st)(U=}Q5z5)XOWED1O*^J&9!HtISeZtC(A7w2^38O0tF{MOGv>c zA#`9f|0vLZVe|(y{ru0t-LT at l<^RoM|JJ$byT$(=M8R>;VX^N&*onV&<VUspkdef; z^>H4|9%bN{pUb~gyrtuhxQBmv(J<Dp7t!p?BR{M|-*=a at rVIbR^Dr}B4}Q(SYX)93 I@P}vMcQ9A-m;e9(
literal 0
HcmV?d00001
Signature · 1 line
2.13.0
PATCH 2/7 atmel: common: Add function to display via DM_VIDEO's API
In reply to Wenyou YangAdd a function to display the company's logo and board information by using the API from DM_VIDEO. This function can be shared by other atmel boards, so locate it in common folder.
---
arch/arm/mach-at91/include/mach/at91_common.h | 1 + board/atmel/common/Makefile | 1 + board/atmel/common/video_display.c | 72 +++++++++++++++++++++++++++ 3 files changed, 74 insertions(+) create mode 100644 board/atmel/common/video_display.c
arch/arm/mach-at91/include/mach/at91_common.h +1 -0
@@ -37,5 +37,6 @@ void redirect_int_from_saic_to_aic(void);void configure_2nd_sram_as_l2_cache (void );int at91_set_ethaddr (int offset); +int at91_video_show_board_info (void );#endif /* AT91_COMMON_H */
board/atmel/common/Makefile +1 -0
@@ -8,4 +8,5 @@ obj-y += board.o ifndef CONFIG_SPL_BUILD obj-$(CONFIG_I2C_EEPROM) += mac_eeprom.o +obj-$(CONFIG_DM_VIDEO) += video_display.o endif
board/atmel/common/video_display.c new file +72 -0
72 lines not on this page · raw message
Signature · 1 line
2.13.0
PATCH 3/7 board: sama5d2_xplained: Convert to support DM_VIDEO
In reply to Wenyou YangConvert the board to enable the driver model support for LCD/video.
---
arch/arm/dts/at91-sama5d2_xplained.dts | 60 ++++++++++++++++ arch/arm/dts/sama5d2.dtsi | 7 ++ arch/arm/mach-at91/Kconfig | 1 + board/atmel/sama5d2_xplained/sama5d2_xplained.c | 95 ++----------------------- configs/sama5d2_xplained_mmc_defconfig | 2 + configs/sama5d2_xplained_spiflash_defconfig | 2 + include/configs/sama5d2_xplained.h | 12 ---- 7 files changed, 79 insertions(+), 100 deletions(-)
arch/arm/dts/at91-sama5d2_xplained.dts +60 -0
@@ -41,6 +41,31 @@ }; apb { + hlcdc: hlcdc at f0000000 { + atmel,vl-bpix = <4>; + atmel,guard-time = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb666>; + status = "okay"; + u-boot,dm-pre-reloc; + + display-timings { + u-boot,dm-pre-reloc; + 480x272 { + clock-frequency = <9000000>; + hactive = <480>; + vactive = <272>; + hsync-len = <41>; + hfront-porch = <2>; + hback-porch = <2>; + vfront-porch = <2>; + vback-porch = <2>; + vsync-len = <11>; + u-boot,dm-pre-reloc; + }; + }; + }; + qspi0: spi at f0020000 { status = "okay";
@@ -117,6 +142,41 @@ bias-disable; }; + pinctrl_lcd_base: pinctrl_lcd_base { + pinmux = <PIN_PC30__LCDVSYNC>, + <PIN_PC31__LCDHSYNC>, + <PIN_PD1__LCDDEN>, + <PIN_PD0__LCDPCK>; + bias-disable; + }; + + pinctrl_lcd_pwm: pinctrl_lcd_pwm { + pinmux = <PIN_PC28__LCDPWM>; + bias-disable; + }; + + pinctrl_lcd_rgb666: pinctrl_lcd_rgb666 { + pinmux = <PIN_PC10__LCDDAT2>, + <PIN_PC11__LCDDAT3>, + <PIN_PC12__LCDDAT4>, + <PIN_PC13__LCDDAT5>, + <PIN_PC14__LCDDAT6>, + <PIN_PC15__LCDDAT7>, + <PIN_PC16__LCDDAT10>, + <PIN_PC17__LCDDAT11>, + <PIN_PC18__LCDDAT12>, + <PIN_PC19__LCDDAT13>, + <PIN_PC20__LCDDAT14>, + <PIN_PC21__LCDDAT15>, + <PIN_PC22__LCDDAT18>, + <PIN_PC23__LCDDAT19>, + <PIN_PC24__LCDDAT20>, + <PIN_PC25__LCDDAT21>, + <PIN_PC26__LCDDAT22>, + <PIN_PC27__LCDDAT23>; + bias-disable; + }; + pinctrl_macb0_phy_irq: macb0_phy_irq { pinmux = <PIN_PC9__GPIO>; bias-disable;
arch/arm/dts/sama5d2.dtsi +7 -0
@@ -69,6 +69,13 @@ #size-cells = <1>; u-boot,dm-pre-reloc; + hlcdc: hlcdc at f0000000 { + compatible = "atmel,at91sam9x5-hlcdc"; + reg = <0xf0000000 0x2000>; + clocks = <&lcdc_clk>; + status = "disabled"; + }; + pmc: pmc at f0014000 { compatible = "atmel,sama5d2-pmc", "syscon"; reg = <0xf0014000 0x160>;
arch/arm/mach-at91/Kconfig +1 -0
@@ -97,6 +97,7 @@ config TARGET_SAMA5D2_XPLAINED select CPU_V7 select SUPPORT_SPL select BOARD_EARLY_INIT_F + select BOARD_LATE_INIT config TARGET_SAMA5D3_XPLAINED bool "SAMA5D3 Xplained board"
board/atmel/sama5d2_xplained/sama5d2_xplained.c +7 -88
116 lines not on this page · raw message
configs/sama5d2_xplained_mmc_defconfig +2 -0
@@ -78,3 +78,5 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_FAT_WRITE=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
configs/sama5d2_xplained_spiflash_defconfig +2 -0
@@ -75,3 +75,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
include/configs/sama5d2_xplained.h +0 -12
@@ -38,18 +38,6 @@/* NAND flash */ #undef CONFIG_CMD_NAND -/* LCD */ - -#ifdef CONFIG_LCD -#define LCD_BPP LCD_COLOR16 -#define LCD_OUTPUT_BPP 24 -#define CONFIG_LCD_LOGO -#define CONFIG_LCD_INFO -#define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_HLCD -#define CONFIG_ATMEL_LCD_RGB565 -#endif -#ifdef CONFIG_SYS_USE_MMC /* bootstrap + u-boot + env in sd card */
Signature · 1 line
2.13.0
PATCH 4/7 board: sama5d3xek: Convert to support DM_VIDEO
In reply to Wenyou YangFrom: Wenyou Yang <[email protected]>
Convert the board to enable the driver model support for LCD/video.
---
arch/arm/dts/sama5d36ek_cmp.dts | 1 + arch/arm/dts/sama5d3_lcd.dtsi | 21 +------ arch/arm/dts/sama5d3xdm.dtsi | 26 +++++++++ board/atmel/sama5d3xek/sama5d3xek.c | 93 +----------------------------- configs/sama5d36ek_cmp_mmc_defconfig | 3 +- configs/sama5d36ek_cmp_nandflash_defconfig | 3 +- configs/sama5d36ek_cmp_spiflash_defconfig | 3 +- configs/sama5d3xek_mmc_defconfig | 3 +- configs/sama5d3xek_nandflash_defconfig | 3 +- configs/sama5d3xek_spiflash_defconfig | 3 +- include/configs/sama5d3xek.h | 12 ---- 11 files changed, 42 insertions(+), 129 deletions(-)
arch/arm/dts/sama5d36ek_cmp.dts +1 -0
@@ -8,6 +8,7 @@ /dts-v1/; #include "sama5d36.dtsi" #include "sama5d3xmb_cmp.dtsi" +#include "sama5d3xdm.dtsi" / { model = "Atmel SAMA5D36-EK";
arch/arm/dts/sama5d3_lcd.dtsi +1 -20
@@ -14,31 +14,12 @@ ahb { apb { hlcdc: hlcdc at f0030000 { - compatible = "atmel,sama5d3-hlcdc"; + compatible = "atmel,at91sam9x5-hlcdc"; reg = <0xf0030000 0x2000>; interrupts = <36 IRQ_TYPE_LEVEL_HIGH 0>; clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>; clock-names = "periph_clk","sys_clk", "slow_clk"; status = "disabled"; - - hlcdc-display-controller { - compatible = "atmel,hlcdc-display-controller"; - #address-cells = <1>; - #size-cells = <0>; - - port at 0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - }; - }; - - hlcdc_pwm: hlcdc-pwm { - compatible = "atmel,hlcdc-pwm"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcd_pwm>; - #pwm-cells = <3>; - }; }; pinctrl at fffff200 {
arch/arm/dts/sama5d3xdm.dtsi +26 -0
@@ -10,6 +10,32 @@ / { ahb { apb { + hlcdc: hlcdc at f0030000 { + atmel,vl-bpix = <4>; + atmel,output-mode = <24>; + atmel,guard-time = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb888_alt>; + status = "okay"; + u-boot,dm-pre-reloc; + + display-timings { + u-boot,dm-pre-reloc; + 800x480 { + clock-frequency = <24000000>; + hactive = <800>; + vactive = <480>; + hsync-len = <5>; + hfront-porch = <64>; + hback-porch = <64>; + vfront-porch = <22>; + vback-porch = <21>; + vsync-len = <5>; + u-boot,dm-pre-reloc; + }; + }; + }; + i2c1: i2c at f0018000 { qt1070: keyboard at 1b { compatible = "qt1070";
board/atmel/sama5d3xek/sama5d3xek.c +2 -91
118 lines not on this page · raw message
configs/sama5d36ek_cmp_mmc_defconfig +2 -1
@@ -49,5 +49,6 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_DM_SPI=y CONFIG_ATMEL_SPI=y -CONFIG_LCD=y CONFIG_FAT_WRITE=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
configs/sama5d36ek_cmp_nandflash_defconfig +2 -1
@@ -49,5 +49,6 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_DM_SPI=y CONFIG_ATMEL_SPI=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y CONFIG_FAT_WRITE=y
configs/sama5d36ek_cmp_spiflash_defconfig +2 -1
@@ -49,5 +49,6 @@ CONFIG_DEBUG_UART_ANNOUNCE=y CONFIG_ATMEL_USART=y CONFIG_DM_SPI=y CONFIG_ATMEL_SPI=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y CONFIG_FAT_WRITE=y
configs/sama5d3xek_mmc_defconfig +2 -1
@@ -74,5 +74,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y CONFIG_FAT_WRITE=y
configs/sama5d3xek_nandflash_defconfig +2 -1
@@ -69,5 +69,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y CONFIG_FAT_WRITE=y
configs/sama5d3xek_spiflash_defconfig +2 -1
@@ -70,5 +70,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y CONFIG_FAT_WRITE=y
include/configs/sama5d3xek.h +0 -12
@@ -28,18 +28,6 @@*/ #define ATMEL_PMC_UHP AT91SAM926x_PMC_UHP -/* LCD */ -#define LCD_BPP LCD_COLOR16 -#define LCD_OUTPUT_BPP 24 -#define CONFIG_LCD_LOGO -#define CONFIG_LCD_INFO -#define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_HLCD -#define CONFIG_ATMEL_LCD_RGB565 - -/* board specific (not enough SRAM) */ -#define CONFIG_SAMA5D3_LCD_BASE 0x23E00000 -/* NOR flash */ #ifdef CONFIG_MTD_NOR_FLASH #define CONFIG_FLASH_CFI_DRIVER
Signature · 1 line
2.13.0
PATCH 5/7 board: sama5d4ek: Convert to support DM_VIDEO
In reply to Wenyou YangFrom: Wenyou Yang <[email protected]>
Convert the board to enable the driver model support for LCD/video.
---
arch/arm/dts/at91-sama5d4ek.dts | 26 ++++++++++ arch/arm/mach-at91/Kconfig | 1 + board/atmel/sama5d4ek/sama5d4ek.c | 97 +++-------------------------------- configs/sama5d4ek_mmc_defconfig | 3 +- configs/sama5d4ek_nandflash_defconfig | 3 +- configs/sama5d4ek_spiflash_defconfig | 3 +- include/configs/sama5d4ek.h | 9 ---- 7 files changed, 39 insertions(+), 103 deletions(-)
arch/arm/dts/at91-sama5d4ek.dts +26 -0
@@ -75,6 +75,32 @@ ahb { apb { + hlcdc: hlcdc at f0000000 { + atmel,vl-bpix = <4>; + atmel,output-mode = <18>; + atmel,guard-time = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb666>; + status = "okay"; + u-boot,dm-pre-reloc; + + display-timings { + u-boot,dm-pre-reloc; + 800x480 { + clock-frequency = <33260000>; + hactive = <800>; + vactive = <480>; + hsync-len = <5>; + hfront-porch = <128>; + hback-porch = <0>; + vfront-porch = <23>; + vback-porch = <22>; + vsync-len = <5>; + u-boot,dm-pre-reloc; + }; + }; + }; + adc0: adc at fc034000 { pinctrl-names = "default"; pinctrl-0 = <
arch/arm/mach-at91/Kconfig +1 -0
@@ -123,6 +123,7 @@ config TARGET_SAMA5D4EK select CPU_V7 select SUPPORT_SPL select BOARD_EARLY_INIT_F + select BOARD_LATE_INIT config TARGET_MA5D4EVK bool "Aries MA5D4EVK Evaluation Kit"
board/atmel/sama5d4ek/sama5d4ek.c +6 -91
119 lines not on this page · raw message
configs/sama5d4ek_mmc_defconfig +2 -1
@@ -72,5 +72,6 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y CONFIG_FAT_WRITE=y
configs/sama5d4ek_nandflash_defconfig +2 -1
@@ -69,4 +69,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
configs/sama5d4ek_spiflash_defconfig +2 -1
@@ -68,4 +68,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
include/configs/sama5d4ek.h +0 -9
@@ -47,15 +47,6 @@#define CONFIG_ATMEL_NAND_HW_PMECC #endif -/* LCD */ -#define LCD_BPP LCD_COLOR16 -#define LCD_OUTPUT_BPP 18 -#define CONFIG_LCD_LOGO -#define CONFIG_LCD_INFO -#define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_HLCD -#define CONFIG_ATMEL_LCD_RGB565 -#ifdef CONFIG_SYS_USE_SERIALFLASH /* override the bootcmd, bootargs and other configuration for spi flash env*/ #elif CONFIG_SYS_USE_NANDFLASH
Signature · 1 line
2.13.0
PATCH 6/7 board: sama5d4_xplained: Convert to support DM_VIDEO
In reply to Wenyou YangFrom: Wenyou Yang <[email protected]>
Convert the board to enable the driver model support for LCD/video.
---
arch/arm/dts/at91-sama5d4_xplained.dts | 25 ++++++ arch/arm/dts/sama5d4.dtsi | 21 +---- arch/arm/mach-at91/Kconfig | 1 + board/atmel/common/video_display.c | 2 +- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 102 ++---------------------- configs/sama5d4_xplained_mmc_defconfig | 2 + configs/sama5d4_xplained_nandflash_defconfig | 2 + configs/sama5d4_xplained_spiflash_defconfig | 2 + include/configs/sama5d4_xplained.h | 11 --- 9 files changed, 40 insertions(+), 128 deletions(-)
arch/arm/dts/at91-sama5d4_xplained.dts +25 -0
@@ -74,6 +74,31 @@ ahb { apb { + hlcdc: hlcdc at f0000000 { + atmel,vl-bpix = <4>; + atmel,guard-time = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_pwm &pinctrl_lcd_rgb888>; + status = "okay"; + u-boot,dm-pre-reloc; + + display-timings { + u-boot,dm-pre-reloc; + 480x272 { + clock-frequency = <9000000>; + hactive = <480>; + vactive = <272>; + hsync-len = <41>; + hfront-porch = <2>; + hback-porch = <2>; + vfront-porch = <2>; + vback-porch = <2>; + vsync-len = <11>; + u-boot,dm-pre-reloc; + }; + }; + }; + spi0: spi at f8010000 { u-boot,dm-pre-reloc; cs-gpios = <&pioC 3 0>, <0>, <0>, <0>;
arch/arm/dts/sama5d4.dtsi +1 -20
@@ -320,31 +320,12 @@ u-boot,dm-pre-reloc; hlcdc: hlcdc at f0000000 { - compatible = "atmel,sama5d4-hlcdc"; + compatible = "atmel,at91sam9x5-hlcdc"; reg = <0xf0000000 0x4000>; interrupts = <51 IRQ_TYPE_LEVEL_HIGH 0>; clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>; clock-names = "periph_clk","sys_clk", "slow_clk"; status = "disabled"; - - hlcdc-display-controller { - compatible = "atmel,hlcdc-display-controller"; - #address-cells = <1>; - #size-cells = <0>; - - port at 0 { - #address-cells = <1>; - #size-cells = <0>; - reg = <0>; - }; - }; - - hlcdc_pwm: hlcdc-pwm { - compatible = "atmel,hlcdc-pwm"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcd_pwm>; - #pwm-cells = <3>; - }; }; dma1: dma-controller at f0004000 {
arch/arm/mach-at91/Kconfig +1 -0
@@ -117,6 +117,7 @@ config TARGET_SAMA5D4_XPLAINED select CPU_V7 select SUPPORT_SPL select BOARD_EARLY_INIT_F + select BOARD_LATE_INIT config TARGET_SAMA5D4EK bool "SAMA5D4 Evaluation Kit"
board/atmel/common/video_display.c +1 -1
@@ -43,7 +43,7 @@ int at91_video_show_board_info(void) nand_size =0 ;#ifdef CONFIG_NAND_ATMEL for (i =0 ; i <CONFIG_SYS_MAX_NAND_DEVICE ; i++) - nand_size += nand_info[i]->size; + nand_size +=get_nand_dev_by_index (i)->size;#endif len += sprintf(&buf[len], "%ld MB SDRAM, %ld MB NAND\n",
board/atmel/sama5d4_xplained/sama5d4_xplained.c +6 -96
124 lines not on this page · raw message
configs/sama5d4_xplained_mmc_defconfig +2 -0
@@ -74,3 +74,5 @@ CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y CONFIG_FAT_WRITE=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
configs/sama5d4_xplained_nandflash_defconfig +2 -0
@@ -70,3 +70,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
configs/sama5d4_xplained_spiflash_defconfig +2 -0
@@ -72,3 +72,5 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_ATMEL_USBA=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
include/configs/sama5d4_xplained.h +0 -11
@@ -49,17 +49,6 @@#define CONFIG_ATMEL_NAND_HW_PMECC #endif -/* LCD */ -#ifdef CONFIG_LCD -#define LCD_BPP LCD_COLOR16 -#define LCD_OUTPUT_BPP 24 -#define CONFIG_LCD_LOGO -#define CONFIG_LCD_INFO -#define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_HLCD -#define CONFIG_ATMEL_LCD_RGB565 -#endif -#ifdef CONFIG_SYS_USE_SERIALFLASH /* override the bootcmd, bootargs and other configuration for spi flash env */ #elif CONFIG_SYS_USE_NANDFLASH
Signature · 1 line
2.13.0
PATCH 7/7 board: at91sam9x5ek: Convert to support DM_VIDEO
In reply to Wenyou YangConvert the board to enable the driver model support for LCD/video.
---
arch/arm/mach-at91/Kconfig | 1 + board/atmel/at91sam9x5ek/at91sam9x5ek.c | 111 ++----------------------------- configs/at91sam9x5ek_dataflash_defconfig | 3 +- configs/at91sam9x5ek_mmc_defconfig | 3 +- configs/at91sam9x5ek_nandflash_defconfig | 3 +- configs/at91sam9x5ek_spiflash_defconfig | 3 +- include/configs/at91sam9x5ek.h | 10 --- 7 files changed, 16 insertions(+), 118 deletions(-)
arch/arm/mach-at91/Kconfig +1 -0
@@ -85,6 +85,7 @@ config TARGET_AT91SAM9X5EK select CPU_ARM926EJS select SUPPORT_SPL select BOARD_EARLY_INIT_F + select BOARD_LATE_INIT config TARGET_SAMA5D2_PTC bool "SAMA5D2 PTC board"
board/atmel/at91sam9x5ek/at91sam9x5ek.c +7 -104
131 lines not on this page · raw message
configs/at91sam9x5ek_dataflash_defconfig +2 -1
@@ -54,4 +54,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
configs/at91sam9x5ek_mmc_defconfig +2 -1
@@ -54,5 +54,6 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y CONFIG_FAT_WRITE=y
configs/at91sam9x5ek_nandflash_defconfig +2 -1
@@ -54,4 +54,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
configs/at91sam9x5ek_spiflash_defconfig +2 -1
@@ -54,4 +54,5 @@ CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y -CONFIG_LCD=y +CONFIG_DM_VIDEO=y +CONFIG_ATMEL_HLCD=y
include/configs/at91sam9x5ek.h +0 -10
@@ -27,16 +27,6 @@/* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ -/* LCD */ -#define LCD_BPP LCD_COLOR16 -#define LCD_OUTPUT_BPP 24 -#define CONFIG_LCD_LOGO -#define CONFIG_LCD_INFO -#define CONFIG_LCD_INFO_BELOW_LOGO -#define CONFIG_ATMEL_HLCD -#define CONFIG_ATMEL_LCD_RGB565 - -/* * BOOTP options */
Signature · 1 line
2.13.0
Yang
cover board: atmel: Convert to support DM_VIDEO
In reply to Wenyou YangHi
Quoted 9 lines · Wenyou Yang
Add a common code to display the company's logo and board information by using the API from
DM_VIDEOunder the board/$(VENDOR)/common folder, and the logo files can be used by the API fromDM_VIDEO, and then convert the board to enable the driver model support for LCD/video.It is based on the patch series:
[PATCH v2 0/3] board: atmel: Set the ethernet mac address from eeprom https://lists.denx.de/pipermail/u-boot/2017-July/300527.html
Do you have any comments on this patch set?
Best Regards,
Wenyou Yang
Quoted 66 lines
Wenyou Yang (7):
lib: at91: Add logo files used by API fromDM_VIDEO
atmel: common: Add function to display via DM_VIDEO's API
board:sama5d2_xplained: Convert to supportDM_VIDEO
board: sama5d3xek: Convert to supportDM_VIDEO
board: sama5d4ek: Convert to supportDM_VIDEO
board:sama5d4_xplained: Convert to supportDM_VIDEO
board: at91sam9x5ek: Convert to supportDM_VIDEOarch/arm/dts/at91-sama5d2_xplained.dts | 60 ++ arch/arm/dts/at91-sama5d4_xplained.dts | 25 + arch/arm/dts/at91-sama5d4ek.dts | 26 + arch/arm/dts/sama5d2.dtsi | 7 + arch/arm/dts/sama5d36ek_cmp.dts | 1 + arch/arm/dts/sama5d3_lcd.dtsi | 21 +- arch/arm/dts/sama5d3xdm.dtsi | 26 + arch/arm/dts/sama5d4.dtsi | 21 +- arch/arm/mach-at91/Kconfig | 4 + arch/arm/mach-at91/include/mach/at91_common.h | 1 + board/atmel/at91sam9x5ek/at91sam9x5ek.c | 111 +- board/atmel/common/Makefile | 1 + board/atmel/common/video_display.c | 72 ++ board/atmel/sama5d2_xplained/sama5d2_xplained.c | 95 +- board/atmel/sama5d3xek/sama5d3xek.c | 93 +- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 102 +- board/atmel/sama5d4ek/sama5d4ek.c | 97 +- configs/at91sam9x5ek_dataflash_defconfig | 3 +- configs/at91sam9x5ek_mmc_defconfig | 3 +- configs/at91sam9x5ek_nandflash_defconfig | 3 +- configs/at91sam9x5ek_spiflash_defconfig | 3 +- configs/sama5d2_xplained_mmc_defconfig | 2 + configs/sama5d2_xplained_spiflash_defconfig | 2 + configs/sama5d36ek_cmp_mmc_defconfig | 3 +- configs/sama5d36ek_cmp_nandflash_defconfig | 3 +- configs/sama5d36ek_cmp_spiflash_defconfig | 3 +- configs/sama5d3xek_mmc_defconfig | 3 +- configs/sama5d3xek_nandflash_defconfig | 3 +- configs/sama5d3xek_spiflash_defconfig | 3 +- configs/sama5d4_xplained_mmc_defconfig | 2 + configs/sama5d4_xplained_nandflash_defconfig | 2 + configs/sama5d4_xplained_spiflash_defconfig | 2 + configs/sama5d4ek_mmc_defconfig | 3 +- configs/sama5d4ek_nandflash_defconfig | 3 +- configs/sama5d4ek_spiflash_defconfig | 3 +- include/atmel_lcd.h | 9 + include/configs/at91sam9x5ek.h | 10 - include/configs/sama5d2_xplained.h | 12 - include/configs/sama5d3xek.h | 12 - include/configs/sama5d4_xplained.h | 11 - include/configs/sama5d4ek.h | 9 - lib/Makefile | 1 + lib/at91/Makefile | 8 + lib/at91/at91.c | 30 + lib/at91/atmel_logo_8bpp.h | 1310 +++++++++++++++++++++++ lib/at91/microchip_logo_8bpp.h | 1082 +++++++++++++++++++ tools/logos/microchip.bmp | Bin 0 -> 12726 bytes 47 files changed, 2729 insertions(+), 577 deletions(-)create mode 100644
board/atmel/common/video_display.ccreate mode 100644lib/at91/Makefile
create mode 100644lib/at91/at91.c
create mode 100644lib/at91/atmel_logo_8bpp.hcreate mode 100644lib/at91/microchip_logo_8bpp.hcreate mode 100644tools/logos/microchip.bmp