From owner-svn-src-projects@FreeBSD.ORG Wed Feb 8 06:15:39 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 50E00106566C; Wed, 8 Feb 2012 06:15:39 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 223868FC0C; Wed, 8 Feb 2012 06:15:39 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q186Fdrp025594; Wed, 8 Feb 2012 06:15:39 GMT (envelope-from gonzo@svn.freebsd.org) Received: (from gonzo@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q186Fdb8025591; Wed, 8 Feb 2012 06:15:39 GMT (envelope-from gonzo@svn.freebsd.org) Message-Id: <201202080615.q186Fdb8025591@svn.freebsd.org> From: Oleksandr Tymoshenko Date: Wed, 8 Feb 2012 06:15:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r231182 - projects/armv6/sys/arm/ti X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Feb 2012 06:15:39 -0000 Author: gonzo Date: Wed Feb 8 06:15:38 2012 New Revision: 231182 URL: http://svn.freebsd.org/changeset/base/231182 Log: Provide placeholder for per-board reset function implementation - Minor empty lines clean-up Modified: projects/armv6/sys/arm/ti/omapvar.h projects/armv6/sys/arm/ti/ti_machdep.c Modified: projects/armv6/sys/arm/ti/omapvar.h ============================================================================== --- projects/armv6/sys/arm/ti/omapvar.h Wed Feb 8 05:03:04 2012 (r231181) +++ projects/armv6/sys/arm/ti/omapvar.h Wed Feb 8 06:15:38 2012 (r231182) @@ -62,6 +62,8 @@ extern struct bus_space omap_bs_tag; +/* board-dependent reset function implementation */ +extern void (*ti_cpu_reset)(void); unsigned int omap_sdram_size(void); @@ -97,9 +99,6 @@ omap_teardown_intr(device_t dev, device_ #define OMAP_CPUID_OMAP4430_ES1_2 0xB852 #define OMAP_CPUID_OMAP4430 0xB95C - - - /** * struct omap_softc * @@ -114,7 +113,6 @@ omap_cpu_is(uint32_t cpu) return ((omap3_chip_id & 0xffff) == cpu); } - /** * struct omap_softc * @@ -131,7 +129,6 @@ struct omap_softc { bus_dma_tag_t sc_dmat; }; - struct omap_mem_range { bus_addr_t base; bus_size_t size; @@ -152,14 +149,8 @@ struct omap_cpu_dev { int irqs[16]; }; - - struct omap_ivar { struct resource_list resources; }; - - - - #endif /* _OMAP3VAR_H_ */ Modified: projects/armv6/sys/arm/ti/ti_machdep.c ============================================================================== --- projects/armv6/sys/arm/ti/ti_machdep.c Wed Feb 8 05:03:04 2012 (r231181) +++ projects/armv6/sys/arm/ti/ti_machdep.c Wed Feb 8 06:15:38 2012 (r231182) @@ -155,6 +155,7 @@ static void print_kernel_section_addr(vo static void physmap_init(void); static int platform_devmap_init(void); +void (*ti_cpu_reset)(void); static char * kenv_next(char *cp) @@ -210,6 +211,7 @@ physmap_init(void) phys_kernelend = KERNPHYSADDR + (virtual_avail - KERNVIRTADDR); kernload = KERNPHYSADDR; + ti_cpu_reset = NULL; /* * Remove kernel physical address range from avail @@ -640,7 +642,10 @@ bus_dma_get_range_nb(void) void cpu_reset() { -// omap_prcm_reset(); + if (ti_cpu_reset) + (*ti_cpu_reset)(); + else + printf("no cpu_reset implementation\n"); printf("Reset failed!\n"); while (1); }