May 2012 - U-Boot

[U-Boot] [PATCH 1/3] common/lcd.c: use ARRAY_SIZE
by Anatolij Gustschin 24 May '12

24 May '12

Use available macro for obtaining the size of bmp_logo_palette[] Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- common/lcd.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/lcd.c b/common/lcd.c index bf1a6a9..0ea45d0 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -523,7 +523,7 @@ void bitmap_plot (int x, int y) debug ("Logo: width %d height %d colors %d cmap %d\n", BMP_LOGO_WIDTH, BMP_LOGO_HEIGHT, BMP_LOGO_COLORS, - (int)(sizeof(bmp_logo_palette)/(sizeof(ushort)))); + ARRAY_SIZE(bmp_logo_palette)); bmap = &bmp_logo_bitmap[0]; fb = (uchar *)(lcd_base + y * lcd_line_length + x); @@ -548,7 +548,7 @@ void bitmap_plot (int x, int y) WATCHDOG_RESET(); /* Set color map */ - for (i=0; i<(sizeof(bmp_logo_palette)/(sizeof(ushort))); ++i) { + for (i = 0; i < ARRAY_SIZE(bmp_logo_palette); ++i) { ushort colreg = bmp_logo_palette[i]; #ifdef CONFIG_ATMEL_LCD uint lut_entry; -- 1.7.7.6

1 1

[U-Boot] [PATCH] cmd_bmp.c: make bmp_display() usable by drivers or board code
by Anatolij Gustschin 24 May '12

24 May '12

Currently bmp_display() is static and can not be used directly in the driver or board code. Export it for other users. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- common/cmd_bmp.c | 3 +-- include/lcd.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c index 4c29fa3..b8809e3 100644 --- a/common/cmd_bmp.c +++ b/common/cmd_bmp.c @@ -33,7 +33,6 @@ #include <malloc.h> static int bmp_info (ulong addr); -static int bmp_display (ulong addr, int x, int y); /* * Allocate and decompress a BMP image using gunzip(). @@ -221,7 +220,7 @@ static int bmp_info(ulong addr) * Return: None * */ -static int bmp_display(ulong addr, int x, int y) +int bmp_display(ulong addr, int x, int y) { int ret; bmp_image_t *bmp = (bmp_image_t *)addr; diff --git a/include/lcd.h b/include/lcd.h index d95feeb..f9377bf 100644 --- a/include/lcd.h +++ b/include/lcd.h @@ -55,6 +55,7 @@ extern void lcd_initcolregs (void); /* gunzip_bmp used if CONFIG_VIDEO_BMP_GZIP */ extern struct bmp_image *gunzip_bmp(unsigned long addr, unsigned long *lenp); +extern int bmp_display(ulong addr, int x, int y); #if defined CONFIG_MPC823 /* -- 1.7.7.6

1 1

[U-Boot] [PATCH] LCD: support another s6e8ax0 panel type
by Donghwa Lee 24 May '12

24 May '12

s6e8ax0 panel has many panel of types. This patch support another panel on TIZEN lunchbox board(HWREVISION 2). This panel has reversed panel display type. So, I had added necessary command. Signed-off-by: Donghwa Lee <dh09.lee(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/include/asm/arch-exynos/mipi_dsim.h | 1 + board/samsung/trats/trats.c | 8 ++++++++ drivers/video/s6e8ax0.c | 17 ++++++++++++++++- 3 files changed, 25 insertions(+), 1 deletions(-) diff --git a/arch/arm/include/asm/arch-exynos/mipi_dsim.h b/arch/arm/include/asm/arch-exynos/mipi_dsim.h index ef6a3d1..9a7cbeb 100644 --- a/arch/arm/include/asm/arch-exynos/mipi_dsim.h +++ b/arch/arm/include/asm/arch-exynos/mipi_dsim.h @@ -329,6 +329,7 @@ struct mipi_dsim_lcd_device { char *name; int id; int bus_id; + int reverse_panel; struct mipi_dsim_device *master; void *platform_data; diff --git a/board/samsung/trats/trats.c b/board/samsung/trats/trats.c index 9d75b8f..4a314c0 100644 --- a/board/samsung/trats/trats.c +++ b/board/samsung/trats/trats.c @@ -54,6 +54,11 @@ u32 get_board_rev(void) static void check_hw_revision(void); +static int hwrevision(int rev) +{ + return (board_rev & 0xf) == rev; +} + int board_init(void) { gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100; @@ -505,6 +510,9 @@ vidinfo_t panel_info = { void init_panel_info(vidinfo_t *vid) { + if (hwrevision(2)) + mipi_lcd_device.reverse_panel = 1; + strcpy(s6e8ax0_platform_data.lcd_panel_name, mipi_lcd_device.name); s6e8ax0_platform_data.lcd_power = lcd_power; s6e8ax0_platform_data.mipi_power = mipi_power; diff --git a/drivers/video/s6e8ax0.c b/drivers/video/s6e8ax0.c index 02c5ccf..176c518 100644 --- a/drivers/video/s6e8ax0.c +++ b/drivers/video/s6e8ax0.c @@ -28,6 +28,7 @@ static void s6e8ax0_panel_cond(struct mipi_dsim_device *dsim_dev) { struct mipi_dsim_master_ops *ops = dsim_dev->master_ops; + int reverse = dsim_dev->dsim_lcd_dev->reverse_panel; const unsigned char data_to_send[] = { 0xf8, 0x3d, 0x35, 0x00, 0x00, 0x00, 0x8d, 0x00, 0x4c, 0x6e, 0x10, 0x27, 0x7d, 0x3f, 0x10, 0x00, 0x00, 0x20, @@ -36,8 +37,22 @@ static void s6e8ax0_panel_cond(struct mipi_dsim_device *dsim_dev) 0xff, 0xff, 0xc8 }; - ops->cmd_write(dsim_dev, MIPI_DSI_DCS_LONG_WRITE, + const unsigned char data_to_send_reverse[] = { + 0xf8, 0x19, 0x35, 0x00, 0x00, 0x00, 0x93, 0x00, 0x3c, + 0x7d, 0x08, 0x27, 0x7d, 0x3f, 0x00, 0x00, 0x00, 0x20, + 0x04, 0x08, 0x6e, 0x00, 0x00, 0x00, 0x02, 0x08, 0x08, + 0x23, 0x23, 0xc0, 0xc1, 0x01, 0x41, 0xc1, 0x00, 0xc1, + 0xf6, 0xf6, 0xc1 + }; + + if (reverse) { + ops->cmd_write(dsim_dev, MIPI_DSI_DCS_LONG_WRITE, + (unsigned int)data_to_send_reverse, + ARRAY_SIZE(data_to_send_reverse)); + } else { + ops->cmd_write(dsim_dev, MIPI_DSI_DCS_LONG_WRITE, (unsigned int)data_to_send, ARRAY_SIZE(data_to_send)); + } } static void s6e8ax0_display_cond(struct mipi_dsim_device *dsim_dev) -- 1.7.4.1

3 2

[U-Boot] [PATCH] LCD: change s6e8ax0 panel gamma value
by Donghwa Lee 24 May '12

24 May '12

s6e8ax0 panel init gamma value is changed because existing it was not proper value for this panel. Signed-off-by: Donghwa Lee <dh09.lee(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> Signed-off-by: Inki Dae <inki.dae(a)samsung.com> --- drivers/video/s6e8ax0.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/video/s6e8ax0.c b/drivers/video/s6e8ax0.c index 1ec7fd6..02c5ccf 100644 --- a/drivers/video/s6e8ax0.c +++ b/drivers/video/s6e8ax0.c @@ -55,11 +55,11 @@ static void s6e8ax0_display_cond(struct mipi_dsim_device *dsim_dev) static void s6e8ax0_gamma_cond(struct mipi_dsim_device *dsim_dev) { struct mipi_dsim_master_ops *ops = dsim_dev->master_ops; - /* 7500K 2.2 Set (M3, 300cd) */ + /* 7500K 2.2 Set : 30cd */ const unsigned char data_to_send[] = { - 0xfa, 0x01, 0x0f, 0x00, 0x0f, 0xda, 0xc0, 0xe4, 0xc8, - 0xc8, 0xc6, 0xd3, 0xd6, 0xd0, 0xab, 0xb2, 0xa6, 0xbf, - 0xc2, 0xb9, 0x00, 0x93, 0x00, 0x86, 0x00, 0xd1 + 0xfa, 0x01, 0x60, 0x10, 0x60, 0xf5, 0x00, 0xff, 0xad, + 0xaf, 0xba, 0xc3, 0xd8, 0xc5, 0x9f, 0xc6, 0x9e, 0xc1, + 0xdc, 0xc0, 0x00, 0x61, 0x00, 0x5a, 0x00, 0x74, }; ops->cmd_write(dsim_dev, MIPI_DSI_DCS_LONG_WRITE, -- 1.7.4.1

2 2

[U-Boot] [PATCH] include/video.h: drop unused video_printf()
by Anatolij Gustschin 24 May '12

24 May '12

There is no such function in the code, so remove this prorotype. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- include/video.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/include/video.h b/include/video.h index efcc682..9519cea 100644 --- a/include/video.h +++ b/include/video.h @@ -14,6 +14,5 @@ int video_init (void *videobase); void video_putc (const char c); void video_puts (const char *s); -void video_printf (const char *fmt, ...); #endif -- 1.7.7.6

1 1

[U-Boot] Pull request: u-boot-net.git master
by Joe Hershberger 24 May '12

24 May '12

Hi Wolfgang, This should include fixes for all the warnings from db288a96027fa1cb3f8a53f330724f864224a56c "net: Remove volatile from net API" The following changes since commit b86a475c1a602c6ee44f4469d933df8792418a7a: Joe Hershberger (1): MAKEALL: Report boards with errors vs warnings are available in the git repository at: git://git.denx.de/u-boot-net.git master Anatolij Gustschin (7): drivers/net/smc911x.c: Fix GCC 4.6 warning drivers/usb/eth/smsc95xx.c: Fix GCC 4.6 warning drivers/net/mpc5xxx_fec.c: Fix build warning arch/arm/cpu/ixp/npe/npe.c: Fix build warning drivers/usb/eth/asix.c: Fix build warning drivers/net/mpc512x_fec.c: Fix build warning drivers/net/4xx_enet.c: Fix build warning Joe Hershberger (77): ppc: Fix warning in TSEC Ethernet driver davinci: Fix Ethernet driver interface warning drivers/net/armada100_fec.c: Fix compile warning drivers/net/at91_emac.c: Fix compile warning drivers/net/calxedaxgmac.c: Fix compile warning drivers/net/cs8900.c: Fix compile warning drivers/net/dc2114x.c: Fix compile warning drivers/net/dm9000x.c: Fix compile warning drivers/net/dnet.c: Fix compile warning drivers/net/eepro100.c: Fix compile warning drivers/net/enc28j60.c: Fix compile warning drivers/net/fec_mxc.c: Fix compile warning drivers/net/ftmac100.c: Fix compile warning drivers/net/ks8695eth.c: Fix compile warning drivers/net/lan91c96.c: Fix compile warning drivers/net/macb.c: Fix compile warning drivers/net/smc91111.c: Fix compile warning arch/powerpc/cpu/mpc8220/fec.c: Fix compile warning arch/powerpc/cpu/mpc8260/ether_fcc.c: Fix compile warning arch/powerpc/cpu/mpc85xx/ether_fcc.c: Fix compile warning board/esd/cpci405/cpci405.c: Fix compile warning drivers/net/e1000.c: Fix compile warning drivers/net/fm/eth.c: Fix compile warning drivers/net/natsemi.c: Fix compile warning drivers/net/ns8382x.c: Fix compile warning drivers/net/rtl8139.c: Fix compile warning drivers/net/tsi108_eth.c: Fix compile warning drivers/net/uli526x.c: Fix compile warning drivers/qe/uec.c: Fix compile warning net: Remove redefinitions of net.h functions arch/powerpc/cpu/mpc8260/ether_scc.c: Fix compile warning drivers/net/pcnet.c: Fix compile warning drivers/net/rtl8169.c: Fix compile warning net: Fix remaining API interface breakage net: Remove CMD_PING where there's no CMD_NET net: Move MAC-seeded rand out of bootp.c net: Move CDP out of net.c net: Encapsulate CDP packet identification net: Move ARP out of net.c net: Move PING out of net.c net: Move RARP receive logic out of net.c net: cosmetic: Un-typedef IP_t net: cosmetic: Split struct ip_udp_hdr into ip_hdr net: cosmetic: Un-typedef Ethernet_t net: cosmetic: Un-typedef VLAN_Ethernet_t net: cosmetic: Un-typedef ARP_t net: cosmetic: Un-typedef ICMP_t net: cosmetic: Rename parameter len to payload_len net: cosmetic: Add a more explicit comment about 802.2 net: cosmetic: Rename "x" to "eth_proto" net: cosmetic: Rename CDPHandler to cdp_receive net: cosmetic: Rename OPT_SIZE to OPT_FIELD_SIZE net: cosmetic: Alphabetize includes in net.c net: cosmetic: Rename tmp to reply_ip_addr in arp.c net: cosmetic: Replace magic numbers in arp.c with constants net: Refactor IP, UPD, and ICMP header writing functions net: Refactor NetSendUDPPacket to share more code net: Refactor packet length computations net: Refactor bootp packet length computations net: Move debug trace to point of action net: Refactor ping receive handler net: Refactor to use NetSendPacket instead of eth_send directly net: Refactor to protect access to the NetState variable net: Refactor to separate the UDP handler from the ARP handler net: Add net_update_ether() to handle ARP and Ping replies net: Don't write the "serverip" env var if configured not to net: Fix unused variable compile warning net: Add option CONFIG_BOOTP_MAY_FAIL net: Remove static allocation for MAC address in PingSend() net: Remove unused parameter from NetInitLoop() net: Fix net buffer initialization net: Make sure NetLoop is initialized when using NetConsole net: Don't copy every packet that waits for an ARP net: Separate ArpRequest() into lower-level func net: Add link-local addressing support net: Work-around for brain-damaged Cisco equipment with arp-proxy net: Allow filtering on debug traces in the net subsystem Nobuhiro Iwamatsu (2): net: sh_eth: Add support SH7734 Ethernet device net: sh-eth: Add support Gigabit of SH7734 Stephan Linz (3): drivers/net/xilinx_ll_temac.c: Fix compile warning drivers/net/xilinx_emaclite.c: Fix compile warning drivers/net/xilinx_axi_emac.c: Fix compile warning Wolfgang Denk (1): MPC8xx: fix "Remove volatile from net API" aftermath README | 17 + arch/arm/cpu/ixp/npe/npe.c | 2 +- arch/mips/cpu/mips32/au1x00/au1x00_eth.c | 3 +- arch/powerpc/cpu/mpc8220/fec.c | 5 +- arch/powerpc/cpu/mpc8260/ether_fcc.c | 19 +- arch/powerpc/cpu/mpc8260/ether_scc.c | 2 +- arch/powerpc/cpu/mpc85xx/ether_fcc.c | 2 +- arch/powerpc/cpu/mpc8xx/fec.c | 8 +- arch/powerpc/cpu/mpc8xx/scc.c | 4 +- board/Marvell/db64360/mv_eth.c | 5 +- board/Marvell/db64360/mv_eth.h | 4 +- board/Marvell/db64460/mv_eth.c | 5 +- board/Marvell/db64460/mv_eth.h | 4 +- board/esd/cpci405/cpci405.c | 7 +- board/esd/cpci750/mv_eth.c | 5 +- board/esd/cpci750/mv_eth.h | 4 +- board/evb64260/eth.c | 3 +- board/evb64260/eth.h | 2 +- board/prodrive/p3mx/mv_eth.c | 5 +- board/prodrive/p3mx/mv_eth.h | 4 +- common/cmd_net.c | 39 +- doc/README.link-local | 76 ++ drivers/net/4xx_enet.c | 3 +- drivers/net/altera_tse.c | 3 +- drivers/net/armada100_fec.c | 3 +- drivers/net/at91_emac.c | 3 +- drivers/net/ax88180.c | 3 +- drivers/net/bfin_mac.c | 5 +- drivers/net/bfin_mac.h | 2 +- drivers/net/calxedaxgmac.c | 6 +- drivers/net/cs8900.c | 3 +- drivers/net/davinci_emac.c | 2 +- drivers/net/dc2114x.c | 4 +- drivers/net/designware.c | 5 +- drivers/net/dm9000x.c | 3 +- drivers/net/dnet.c | 3 +- drivers/net/e1000.c | 5 +- drivers/net/eepro100.c | 7 +- drivers/net/enc28j60.c | 2 +- drivers/net/ep93xx_eth.c | 2 +- drivers/net/ethoc.c | 2 +- drivers/net/fec_mxc.c | 2 +- drivers/net/fm/eth.c | 2 +- drivers/net/fsl_mcdmafec.c | 7 +- drivers/net/ftgmac100.c | 3 +- drivers/net/ftmac100.c | 3 +- drivers/net/greth.c | 2 +- drivers/net/inca-ip_sw.c | 4 +- drivers/net/ks8695eth.c | 3 +- drivers/net/lan91c96.c | 4 +- drivers/net/macb.c | 3 +- drivers/net/mcffec.c | 3 +- drivers/net/mpc512x_fec.c | 4 +- drivers/net/mpc5xxx_fec.c | 2 +- drivers/net/mvgbe.c | 3 +- drivers/net/natsemi.c | 6 +- drivers/net/ne2000_base.c | 2 +- drivers/net/netarm_eth.c | 2 +- drivers/net/netconsole.c | 24 +- drivers/net/ns8382x.c | 6 +- drivers/net/pcnet.c | 6 +- drivers/net/plb2800_eth.c | 6 +- drivers/net/rtl8139.c | 4 +- drivers/net/rtl8169.c | 2 +- drivers/net/sh_eth.c | 36 +- drivers/net/sh_eth.h | 86 ++- drivers/net/smc91111.c | 3 +- drivers/net/smc911x.c | 3 +- drivers/net/tsec.c | 5 +- drivers/net/tsi108_eth.c | 14 +- drivers/net/uli526x.c | 6 +- drivers/net/xilinx_axi_emac.c | 2 +- drivers/net/xilinx_emaclite.c | 6 +- drivers/net/xilinx_ll_temac_fifo.c | 3 +- drivers/net/xilinx_ll_temac_fifo.h | 3 +- drivers/net/xilinx_ll_temac_sdma.c | 3 +- drivers/net/xilinx_ll_temac_sdma.h | 3 +- drivers/qe/uec.c | 2 +- drivers/usb/eth/asix.c | 2 +- drivers/usb/eth/smsc95xx.c | 3 +- drivers/usb/gadget/ether.c | 7 +- include/common.h | 14 +- include/configs/am3517_crane.h | 2 +- include/configs/am3517_evm.h | 2 +- include/configs/origen.h | 2 +- include/net.h | 157 +++-- net/Makefile | 8 +- net/arp.c | 236 ++++++ net/arp.h | 30 + net/bootp.c | 133 ++--- net/bootp.h | 10 +- net/cdp.c | 366 ++++++++++ net/cdp.h | 21 + net/dns.c | 12 +- net/link_local.c | 334 +++++++++ net/link_local.h | 24 + net/net.c | 1149 ++++++++---------------------- net/net_rand.c | 68 ++ net/net_rand.h | 26 + net/nfs.c | 16 +- net/ping.c | 115 +++ net/ping.h | 34 + net/rarp.c | 61 +- net/rarp.h | 7 +- net/sntp.c | 8 +- net/tftp.c | 14 +- 106 files changed, 2136 insertions(+), 1294 deletions(-) create mode 100644 doc/README.link-local create mode 100644 net/arp.c create mode 100644 net/arp.h create mode 100644 net/cdp.c create mode 100644 net/cdp.h create mode 100644 net/link_local.c create mode 100644 net/link_local.h create mode 100644 net/net_rand.c create mode 100644 net/net_rand.h create mode 100644 net/ping.c create mode 100644 net/ping.h

2 1

[U-Boot] [PATCH v2] kwboot: boot Marvell Kirkwood SoCs over a serial link
by Luka Perkov 24 May '12

24 May '12

The kwboot program boots boards based on Marvell's Kirkwood platform via Xmodem over their integrated UART. Signed-off-by: Daniel Stodden <daniel.stodden(a)googlemail.com> Acked-by: Luka Perkov <uboot(a)lukaperkov.net> --- Changes from version v1: * fix man page * minor cosmetic fixes in tools/kwboot.c I changed things pointed out on v1 of this patch which was originally made by Daniel. doc/kwboot.1 | 76 ++++++ tools/Makefile | 6 + tools/kwboot.c | 738 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 820 insertions(+) diff --git a/doc/kwboot.1 b/doc/kwboot.1 new file mode 100644 index 0000000..70a2088 --- /dev/null +++ b/doc/kwboot.1 @@ -0,0 +1,76 @@ +.TH KWBOOT 1 "2012-05-02" + +.SH NAME +kwboot \- Boot Marvell Kirkwood SoCs over a serial link. +.SH SYNOPSIS +.B kwboot +.RB [ "-b \fIimage\fP" ] +.RB [ "-p" ] +.RB [ "-t" ] +.RB [ "-B \fIbaudrate\fP" ] +.RB [\fITTY\fP] +.SH "DESCRIPTION" + +The +.B kwboot +program boots boards based on Marvell's Kirkwood platform over their integrated +UART. Boot image files will typically contain a second stage boot loader, such +as U-Boot. The image file must conform to Marvell's BootROM firmware image +format (\fIkwbimage\fP), created using a tool such as .B mkimage. + +Following power-up or a system reset, system BootROM code polls the UART for a +brief period of time, sensing a handshake message which initiates an image +upload. This program sends this boot message until it receives a positive +acknowledgement. The image is transfered using Xmodem. + +Additionally, this program implements a minimal terminal mode, which can be +used either standalone, or entered immediately following boot image transfer +completion. This is often useful to catch early boot messages, or to manually +interrupt a default boot procedure performed by the second-stage loader. + +.SH "OPTIONS" + +.TP +.BI "\-b \fIimage\fP" +Handshake; then upload file \fIimage\fP over \fITTY\fP. + +Note that for the encapsulated boot code to be executed, \fIimage\fP must be of +type "UART boot" (0x69). Boot images of different types, such as backup images +of vendor firmware downloaded from flash memory (type 0x8B), will not work (or +not as expected). See \fB-p\fP for a workaround. + +This mode writes handshake status and upload progress indication to stdout. + +.TP +.BI "\-p" +In combination with \fB-b\fP, patches the header in \fIimage\fP prior to +upload, to "UART boot" type. + +This option attempts on-the-fly conversion of some none-UART image types, such +as images which were originally formatted to be stored in flash memory. + +Conversion is performed in memory. The contents of \fIimage\fP will not be +altered. + +.TP +.BI "\-t" +Run a terminal program, connecting standard input and output to +.RB \fITTY\fP. + +If used in combination with \fB-b\fP, terminal mode is entered immediately +following a successful image upload. + +If standard I/O streams connect to a console, this mode will terminate after +receiving 'ctrl-\\' followed by 'c' from console input. + +.TP +.BI "\-B \fIbaudrate\fP" +Adjust the baud rate on \fITTY\fP. Default rate is 115200. + +.SH "SEE ALSO" +.PP +\fBmkimage\fP(1) + +.SH "AUTHORS" + +Daniel Stodden <daniel.stodden(a)gmail.com> diff --git a/tools/Makefile b/tools/Makefile index 8993fdd..8097d95 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -72,6 +72,7 @@ BIN_FILES-$(CONFIG_SMDK5250) += mksmdk5250spl$(SFX) BIN_FILES-$(CONFIG_MX28) += mxsboot$(SFX) BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX) BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX) +BIN_FILES-$(CONFIG_KIRKWOOD) += kwboot$(SFX) # Source files which exist outside the tools directory EXT_OBJ_FILES-$(CONFIG_BUILD_ENVCRC) += common/env_embedded.o @@ -101,6 +102,7 @@ OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o NOPED_OBJ_FILES-y += os_support.o OBJ_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1.o NOPED_OBJ_FILES-y += ublimage.o +OBJ_FILES-$(CONFIG_KIRKWOOD) += kwboot.o # Don't build by default #ifeq ($(ARCH),ppc) @@ -234,6 +236,10 @@ $(obj)ncb$(SFX): $(obj)ncb.o $(obj)ubsha1$(SFX): $(obj)os_support.o $(obj)sha1.o $(obj)ubsha1.o $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ +$(obj)kwboot$(SFX): $(obj)kwboot.o + $(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ + $(HOSTSTRIP) $@ + # Some of the tool objects need to be accessed from outside the tools directory $(obj)%.o: $(SRCTREE)/common/%.c $(HOSTCC) -g $(HOSTCFLAGS_NOPED) -c -o $@ $< diff --git a/tools/kwboot.c b/tools/kwboot.c new file mode 100644 index 0000000..6254296 --- /dev/null +++ b/tools/kwboot.c @@ -0,0 +1,738 @@ +/* + * Boot a Marvell Kirkwood SoC, with Xmodem over UART0. + * + * (c) 2012 Daniel Stodden <daniel.stodden(a)gmail.com> + * + * References: marvell.com, "88F6180, 88F6190, 88F6192, and 88F6281 + * Integrated Controller: Functional Specifications" December 2, + * 2008. Chapter 24.2 "BootROM Firmware". + */ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <stdarg.h> +#include <libgen.h> +#include <fcntl.h> +#include <errno.h> +#include <unistd.h> +#include <stdint.h> +#include <termios.h> +#include <sys/mman.h> +#include <sys/stat.h> + +#include "kwbimage.h" + +#ifdef __GNUC__ +#define PACKED __attribute((packed)) +#else +#define PACKED +#endif + +/* + * Marvell BootROM UART Sensing + */ + +static unsigned char kwboot_msg_boot[] = { + 0xBB, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77 +}; + +#define KWBOOT_MSG_REQ_DELAY 10 /* ms */ +#define KWBOOT_MSG_RSP_TIMEO 50 /* ms */ + +/* + * Xmodem Transfers + */ + +#define SOH 1 /* sender start of block header */ +#define EOT 4 /* sender end of block transfer */ +#define ACK 6 /* target block ack */ +#define NAK 21 /* target block negative ack */ +#define CAN 24 /* target/sender transfer cancellation */ + +struct kwboot_block { + uint8_t soh; + uint8_t pnum; + uint8_t _pnum; + uint8_t data[128]; + uint8_t csum; +} PACKED; + +#define KWBOOT_BLK_RSP_TIMEO 1000 /* ms */ + +static int kwboot_verbose; + +static void +kwboot_printv(const char *fmt, ...) +{ + va_list ap; + + if (kwboot_verbose) { + va_start(ap, fmt); + vprintf(fmt, ap); + va_end(ap); + fflush(stdout); + } +} + +static void +__spinner(void) +{ + const char seq[] = { '-', '\\', '|', '/' }; + const int div = 8; + static int state, bs; + + if (state % div == 0) { + fputc(bs, stdout); + fputc(seq[state / div % sizeof(seq)], stdout); + fflush(stdout); + } + + bs = '\b'; + state++; +} + +static void +kwboot_spinner(void) +{ + if (kwboot_verbose) + __spinner(); +} + +static void +__progress(int pct, char c) +{ + const int width = 70; + static const char *nl = ""; + static int pos; + + if (pos % width == 0) + printf("%s%3d %% [", nl, pct); + + fputc(c, stdout); + + nl = "]\n"; + pos++; + + if (pct == 100) { + while (pos++ < width) + fputc(' ', stdout); + fputs(nl, stdout); + } + + fflush(stdout); + +} + +static void +kwboot_progress(int _pct, char c) +{ + static int pct; + + if (_pct != -1) + pct = _pct; + + if (kwboot_verbose) + __progress(pct, c); +} + +static int +kwboot_tty_recv(int fd, void *buf, size_t len, int timeo) +{ + int rc, nfds; + fd_set rfds; + struct timeval tv; + ssize_t n; + + rc = -1; + + FD_ZERO(&rfds); + FD_SET(fd, &rfds); + + tv.tv_sec = 0; + tv.tv_usec = timeo * 1000; + if (tv.tv_usec > 1000000) { + tv.tv_sec += tv.tv_usec / 1000000; + tv.tv_usec %= 1000000; + } + + do { + nfds = select(fd + 1, &rfds, NULL, NULL, &tv); + if (nfds < 0) + goto out; + + n = read(fd, buf, len); + if (n < 0) + goto out; + + buf = (char *)buf + n; + len -= n; + } while (len > 0); + + rc = 0; +out: + return rc; +} + +static int +kwboot_tty_send(int fd, const void *buf, size_t len) +{ + int rc; + ssize_t n; + + rc = -1; + + do { + n = write(fd, buf, len); + if (n < 0) + goto out; + + buf = (char *)buf + n; + len -= n; + } while (len > 0); + + rc = tcdrain(fd); +out: + return rc; +} + +static int +kwboot_tty_send_char(int fd, unsigned char c) +{ + return kwboot_tty_send(fd, &c, 1); +} + +static speed_t +kwboot_tty_speed(int baudrate) +{ + switch (baudrate) { + case 115200: + return B115200; + case 57600: + return B57600; + case 38400: + return B38400; + case 19200: + return B19200; + case 9600: + return B9600; + } + + return -1; +} + +static int +kwboot_open_tty(const char *path, speed_t speed) +{ + int rc, fd; + struct termios tio; + + rc = -1; + + fd = open(path, O_RDWR|O_NOCTTY|O_NDELAY); + if (fd < 0) + goto out; + + memset(&tio, 0, sizeof(tio)); + + tio.c_iflag = 0; + tio.c_cflag = CREAD|CLOCAL|CS8; + + tio.c_cc[VMIN] = 1; + tio.c_cc[VTIME] = 10; + + cfsetospeed(&tio, speed); + cfsetispeed(&tio, speed); + + rc = tcsetattr(fd, TCSANOW, &tio); + if (rc) + goto out; + + rc = fd; +out: + if (rc < 0) { + if (fd >= 0) + close(fd); + } + + return rc; +} + +static int +kwboot_bootmsg(int tty, void *msg) +{ + int rc; + char c; + + kwboot_printv("Sending boot message. Please reboot the target..."); + + do { + rc = tcflush(tty, TCIOFLUSH); + if (rc) + break; + + rc = kwboot_tty_send(tty, msg, 8); + if (rc) { + usleep(KWBOOT_MSG_REQ_DELAY * 1000); + continue; + } + + rc = kwboot_tty_recv(tty, &c, 1, KWBOOT_MSG_RSP_TIMEO); + + kwboot_spinner(); + + } while (rc || c != NAK); + + kwboot_printv("\n"); + + return rc; +} + +static int +kwboot_xm_makeblock(struct kwboot_block *block, const void *data, + size_t size, int pnum) +{ + const size_t blksz = sizeof(block->data); + size_t n; + int i; + + block->pnum = pnum; + block->_pnum = ~block->pnum; + + n = size < blksz ? size : blksz; + memcpy(&block->data[0], data, n); + memset(&block->data[n], 0, blksz - n); + + block->csum = 0; + for (i = 0; i < n; i++) + block->csum += block->data[i]; + + return n; +} + +static int +kwboot_xm_sendblock(int fd, struct kwboot_block *block) +{ + int rc, retries; + char c; + + retries = 16; + do { + rc = kwboot_tty_send(fd, block, sizeof(*block)); + if (rc) + break; + + rc = kwboot_tty_recv(fd, &c, 1, KWBOOT_BLK_RSP_TIMEO); + if (rc) + break; + + if (c != ACK) + kwboot_progress(-1, '+'); + + } while (c == NAK && retries-- > 0); + + rc = -1; + + switch (c) { + case ACK: + rc = 0; + break; + case NAK: + errno = EBADMSG; + break; + case CAN: + errno = ECANCELED; + break; + default: + errno = EPROTO; + break; + } + + return rc; +} + +static int +kwboot_xmodem(int tty, const void *_data, size_t size) +{ + const uint8_t *data = _data; + int rc, pnum, N, err; + + pnum = 1; + N = 0; + + kwboot_printv("Sending boot image...\n"); + + do { + struct kwboot_block block; + int n; + + n = kwboot_xm_makeblock(&block, + data + N, size - N, + pnum++); + if (n < 0) + goto can; + + if (!n) + break; + + rc = kwboot_xm_sendblock(tty, &block); + if (rc) + goto out; + + N += n; + kwboot_progress(N * 100 / size, '.'); + } while (1); + + rc = kwboot_tty_send_char(tty, EOT); + +out: + return rc; + +can: + err = errno; + kwboot_tty_send_char(tty, CAN); + errno = err; + goto out; +} + +static int +kwboot_term_pipe(int in, int out, char *quit, int *s) +{ + ssize_t nin, nout; + char _buf[128], *buf = _buf; + + nin = read(in, buf, sizeof(buf)); + if (nin < 0) + return -1; + + if (quit) { + int i; + + for (i = 0; i < nin; i++) { + if (*buf == quit[*s]) { + (*s)++; + if (!quit[*s]) + return 0; + buf++; + nin--; + } else + while (*s > 0) { + nout = write(out, quit, *s); + if (nout <= 0) + return -1; + (*s) -= nout; + } + } + } + + while (nin > 0) { + nout = write(out, buf, nin); + if (nout <= 0) + return -1; + nin -= nout; + } + + return 0; +} + +static int +kwboot_terminal(int tty) +{ + int rc, in, s; + char *quit = "\34c"; + struct termios otio, tio; + + rc = -1; + + in = STDIN_FILENO; + if (isatty(in)) { + rc = tcgetattr(in, &otio); + if (!rc) { + tio = otio; + cfmakeraw(&tio); + rc = tcsetattr(in, TCSANOW, &tio); + } + if (rc) { + perror("tcsetattr"); + goto out; + } + + kwboot_printv("[Type Ctrl-%c + %c to quit]\r\n", + quit[0]|0100, quit[1]); + } else + in = -1; + + rc = 0; + s = 0; + + do { + fd_set rfds; + int nfds = 0; + + FD_SET(tty, &rfds); + nfds = nfds < tty ? tty : nfds; + + if (in >= 0) { + FD_SET(in, &rfds); + nfds = nfds < in ? in : nfds; + } + + nfds = select(nfds + 1, &rfds, NULL, NULL, NULL); + if (nfds < 0) + break; + + if (FD_ISSET(tty, &rfds)) { + rc = kwboot_term_pipe(tty, STDOUT_FILENO, NULL, NULL); + if (rc) + break; + } + + if (FD_ISSET(in, &rfds)) { + rc = kwboot_term_pipe(in, tty, quit, &s); + if (rc) + break; + } + } while (quit[s] != 0); + + tcsetattr(in, TCSANOW, &otio); +out: + return rc; +} + +static void * +kwboot_mmap_image(const char *path, size_t *size, int prot) +{ + int rc, fd, flags; + struct stat st; + void *img; + + rc = -1; + fd = -1; + img = NULL; + + fd = open(path, O_RDONLY); + if (fd < 0) + goto out; + + rc = fstat(fd, &st); + if (rc) + goto out; + + flags = (prot & PROT_WRITE) ? MAP_PRIVATE : MAP_SHARED; + + img = mmap(NULL, st.st_size, prot, flags, fd, 0); + if (img == MAP_FAILED) { + img = NULL; + goto out; + } + + rc = 0; + *size = st.st_size; +out: + if (rc && img) { + munmap(img, st.st_size); + img = NULL; + } + if (fd >= 0) + close(fd); + + return img; +} + +static uint8_t +kwboot_img_csum8(void *_data, size_t size) +{ + uint8_t *data = _data, csum; + + for (csum = 0; size-- > 0; data++) + csum += *data; + + return csum; +} + +static int +kwboot_img_patch_hdr(void *img, size_t size) +{ + int rc; + bhr_t *hdr; + uint8_t csum; + const size_t hdrsz = sizeof(*hdr); + + rc = -1; + hdr = img; + + if (size < hdrsz) { + errno = EINVAL; + goto out; + } + + csum = kwboot_img_csum8(hdr, hdrsz) - hdr->checkSum; + if (csum != hdr->checkSum) { + errno = EINVAL; + goto out; + } + + if (hdr->blockid == IBR_HDR_UART_ID) { + rc = 0; + goto out; + } + + hdr->blockid = IBR_HDR_UART_ID; + + hdr->nandeccmode = IBR_HDR_ECC_DISABLED; + hdr->nandpagesize = 0; + + hdr->srcaddr = hdr->ext + ? sizeof(struct kwb_header) + : sizeof(*hdr); + + hdr->checkSum = kwboot_img_csum8(hdr, hdrsz) - csum; + + rc = 0; +out: + return rc; +} + +static void +kwboot_usage(FILE *stream, char *progname) +{ + fprintf(stream, + "Usage: %s -b <image> [ -p ] [ -t ] " + "[-B <baud> ] <TTY>\n", progname); + fprintf(stream, "\n"); + fprintf(stream, " -b <image>: boot <image>\n"); + fprintf(stream, " -p: patch <image> to type 0x69 (uart boot)\n"); + fprintf(stream, "\n"); + fprintf(stream, " -t: mini terminal\n"); + fprintf(stream, "\n"); + fprintf(stream, " -B <baud>: set baud rate\n"); + fprintf(stream, "\n"); +} + +int +main(int argc, char **argv) +{ + const char *ttypath, *imgpath; + int rv, rc, tty, term, prot, patch; + void *bootmsg; + void *img; + size_t size; + speed_t speed; + + rv = 1; + tty = -1; + bootmsg = NULL; + imgpath = NULL; + img = NULL; + term = 0; + patch = 0; + size = 0; + speed = B115200; + + kwboot_verbose = isatty(STDOUT_FILENO); + + do { + int c = getopt(argc, argv, "hb:ptB:"); + if (c < 0) + break; + + switch (c) { + case 'b': + bootmsg = kwboot_msg_boot; + imgpath = optarg; + break; + + case 'p': + patch = 1; + break; + + case 't': + term = 1; + break; + + case 'B': + speed = kwboot_tty_speed(atoi(optarg)); + if (speed == -1) + goto usage; + break; + + case 'h': + rv = 0; + default: + goto usage; + } + } while (1); + + if (!bootmsg && !term) + goto usage; + + if (patch && !imgpath) + goto usage; + + if (argc - optind < 1) + goto usage; + + ttypath = argv[optind++]; + + tty = kwboot_open_tty(ttypath, speed); + if (tty < 0) { + perror(ttypath); + goto out; + } + + if (imgpath) { + prot = PROT_READ | (patch ? PROT_WRITE : 0); + + img = kwboot_mmap_image(imgpath, &size, prot); + if (!img) { + perror(imgpath); + goto out; + } + } + + if (patch) { + rc = kwboot_img_patch_hdr(img, size); + if (rc) { + fprintf(stderr, "%s: Invalid image.\n", imgpath); + goto out; + } + } + + if (bootmsg) { + rc = kwboot_bootmsg(tty, bootmsg); + if (rc) { + perror("bootmsg"); + goto out; + } + } + + if (img) { + rc = kwboot_xmodem(tty, img, size); + if (rc) { + perror("xmodem"); + goto out; + } + } + + if (term) { + rc = kwboot_terminal(tty); + if (rc && !(errno == EINTR)) { + perror("terminal"); + goto out; + } + } + + rv = 0; +out: + if (tty >= 0) + close(tty); + + if (img) + munmap(img, size); + + return rv; + +usage: + kwboot_usage(rv ? stderr : stdout, basename(argv[0])); + goto out; +}

8 15

[U-Boot] [PATCH] drivers/net/armada100_fec.c: Fix compile warning
by Joe Hershberger 24 May '12

24 May '12

Fix this: armada100_fec.c: In function 'armada100_fec_register': armada100_fec.c:723:12: warning: assignment from incompatible pointer type Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Joe Hershberger <joe.hershberger(a)gmail.com> --- drivers/net/armada100_fec.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/armada100_fec.c b/drivers/net/armada100_fec.c index 52be3a7..d318a36 100644 --- a/drivers/net/armada100_fec.c +++ b/drivers/net/armada100_fec.c @@ -558,8 +558,7 @@ static void armdfec_halt(struct eth_device *dev) clrbits_le32(&regs->pconf, PCR_EN); } -static int armdfec_send(struct eth_device *dev, volatile void *dataptr, - int datasize) +static int armdfec_send(struct eth_device *dev, void *dataptr, int datasize) { struct armdfec_device *darmdfec = to_darmdfec(dev); struct armdfec_reg *regs = darmdfec->regs; -- 1.6.0.2

2 15

[U-Boot] [PATCH V5 0/3] mtd/NAND: Support for FSMC controller
by Amit Virdi 24 May '12

24 May '12

This patchset adds support for ST's FSMC controller. In the current u-boot, a SPEAr specific driver exists for FSMC controller. This patchset adds a full fledged driver that can be used across multiple platforms and removes the obsolete SPEAr specific driver. V4 -> V5 - Dropped the patch that defined change_bit as wrapper over __change_bit and, instead, used __change_bit directly in the driver code V3 -> V4 - Removed local_irq_save and local_irq_restore calls from change_bit wrapper - Report the total bit flips, including that of ECC, to the upper layers - Replace change_bit calls for err_idx's 0th and 1st bit with "^= 3" operation V2 -> V3 - Implemented timeout during hardware ecc read - Used __attribute__ ((aligned(2))) instead of using array of U16 - Removed unnecessary enum V1 -> V2 - Defined CONFIG_SYS_NAND_SELF_INIT and did the related changes - Modified the error index calculation process - Modified newly erased page read algorithm - Initialized the badblockbits index to 7 - Improved fsmc_bch8_correct_data() implementation Vipin KUMAR (3): mtd/NAND: Add FSMC driver support SPEAr: Configure FSMC driver for NAND interface mtd/NAND: Remove obsolete SPEAr specific NAND drivers arch/arm/include/asm/arch-spear/hardware.h | 8 +- arch/arm/include/asm/arch-spear/spr_nand.h | 57 ---- board/spear/spear300/spear300.c | 14 +- board/spear/spear310/spear310.c | 14 +- board/spear/spear320/spear320.c | 13 +- board/spear/spear600/spear600.c | 14 +- drivers/mtd/nand/Makefile | 1 + drivers/mtd/nand/fsmc_nand.c | 486 ++++++++++++++++++++++++++++ drivers/mtd/nand/spr_nand.c | 124 ------- include/configs/spear-common.h | 3 +- include/configs/spear3xx.h | 4 + include/configs/spear6xx.h | 3 + include/linux/mtd/fsmc_nand.h | 101 ++++++ 13 files changed, 637 insertions(+), 205 deletions(-) delete mode 100644 arch/arm/include/asm/arch-spear/spr_nand.h create mode 100644 drivers/mtd/nand/fsmc_nand.c delete mode 100644 drivers/mtd/nand/spr_nand.c create mode 100644 include/linux/mtd/fsmc_nand.h -- 1.7.2.2

1 4

[U-Boot] EFI/GPT support in U-Boot : real-world tests
by David Purdy 24 May '12

24 May '12

Hi folks, I'm hoping that a few of you (perhaps Kirkwood users in particular) can tell me of their own personal experiences (hopefully all good) when using EFI/GPT partitions w/ U-Boot. Does it work as advertised? Is it just a matter of setting CONFIG_EFI_PARTITION in the config? Any unexpected/counterintuitive/gottcha issues to think about? (other that proper kernel suppport) thanks, Dave

2 1