From owner-p4-projects@FreeBSD.ORG Fri Aug 10 05:46:50 2007 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DE0B316A421; Fri, 10 Aug 2007 05:46:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 89AEF16A417 for ; Fri, 10 Aug 2007 05:46:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 797EE13C45E for ; Fri, 10 Aug 2007 05:46:49 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7A5kncR066632 for ; Fri, 10 Aug 2007 05:46:49 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7A5knih066629 for perforce@freebsd.org; Fri, 10 Aug 2007 05:46:49 GMT (envelope-from imp@freebsd.org) Date: Fri, 10 Aug 2007 05:46:49 GMT Message-Id: <200708100546.l7A5knih066629@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 124990 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 10 Aug 2007 05:46:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=124990 Change 124990 by imp@imp_lighthouse on 2007/08/10 05:46:37 XMODEM_DL OBE. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#36 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/bwct_board.c#3 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#11 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#36 (text+ko) ==== @@ -172,10 +172,6 @@ c = 0; if (parse()) xputchar('\a'); -#ifdef XMODEM_DL - else if (*cmd == '*') - Update(); -#endif else load(); } ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/bwct_board.c#3 (text+ko) ==== @@ -35,38 +35,6 @@ mac[1], mac[2], mac[3], mac[4], mac[5]); } -#ifdef XMODEM_DL -#define FLASH_OFFSET (0 * FLASH_PAGE_SIZE) -#define KERNEL_OFFSET (220 * FLASH_PAGE_SIZE) -#define KERNEL_LEN (6 * 1024 * FLASH_PAGE_SIZE) - -static void -UpdateFlash(int offset) -{ - char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ - int len, i, off; - - while ((len = xmodem_rx(addr)) == -1) - continue; - printf("\nDownloaded %u bytes.\n", len); - for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { - off = i + offset; - SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); - } -} -void -Update(void) -{ - UpdateFlash(FLASH_OFFSET); -} - -#else -void -Update(void) -{ -} -#endif - void board_init(void) { ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#11 (text+ko) ==== @@ -87,40 +87,6 @@ mac[1], mac[2], mac[3], mac[4], mac[5]); } -#ifdef XMODEM_DL -#define FLASH_OFFSET (0 * FLASH_PAGE_SIZE) -#define FPGA_OFFSET (15 * FLASH_PAGE_SIZE) -#define FPGA_LEN (212608) -#define KERNEL_OFFSET (220 * FLASH_PAGE_SIZE) -#define KERNEL_LEN (6 * 1024 * FLASH_PAGE_SIZE) - -static void -UpdateFlash(int offset) -{ - char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ - int len, i, off; - - while ((len = xmodem_rx(addr)) == -1) - continue; - printf("\nDownloaded %u bytes.\n", len); - for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { - off = i + offset; - SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); - } -} -void -Update(void) -{ - UpdateFlash(FLASH_OFFSET); -} - -#else -void -Update(void) -{ -} -#endif - void board_init(void) {