Date: Tue, 11 Mar 2014 23:49:59 +0000 (UTC) From: Andrew Turner <andrew@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r263060 - in projects/specific_leg/sys/arm: arm broadcom/bcm2835 include ti Message-ID: <201403112349.s2BNnxU6056092@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: andrew Date: Tue Mar 11 23:49:59 2014 New Revision: 263060 URL: http://svnweb.freebsd.org/changeset/base/263060 Log: Fix the build after the MFC Deleted: projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_common.c projects/specific_leg/sys/arm/ti/ti_common.c Modified: projects/specific_leg/sys/arm/arm/locore.S projects/specific_leg/sys/arm/arm/machdep.c projects/specific_leg/sys/arm/arm/mpcore_timer.c projects/specific_leg/sys/arm/arm/platform.c projects/specific_leg/sys/arm/arm/platform_if.m projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c projects/specific_leg/sys/arm/broadcom/bcm2835/files.bcm2835 projects/specific_leg/sys/arm/include/ofw_machdep.h projects/specific_leg/sys/arm/ti/files.ti projects/specific_leg/sys/arm/ti/ti_machdep.c Modified: projects/specific_leg/sys/arm/arm/locore.S ============================================================================== --- projects/specific_leg/sys/arm/arm/locore.S Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/arm/locore.S Tue Mar 11 23:49:59 2014 (r263060) @@ -123,6 +123,7 @@ Lram_offset: .word from_ram-_C_LABEL(_st from_ram: nop #endif +#if 0 adr r7, Lunmapped bic r7, r7, #0xf0000000 orr r7, r7, #PHYSADDR @@ -142,6 +143,7 @@ disable_mmu: nop mov pc, r7 Lunmapped: +#endif /* * Build page table from scratch. */ @@ -172,13 +174,12 @@ Lunmapped: ldr r2, =(L1_S_OFFSET) bic r5, r2 mov r1, r5 - /* Use it as the physical and virtual address */ mov r2, r5 - /* Map 64MiB */ - ldr r3, =64 - + /* Map 64MiB, preserved over calls to build_pagetables */ + mov r3, #64 bl build_pagetables + /* Create the kernel map to jump to */ mov r1, r5 ldr r2, =(KERNVIRTADDR) bl build_pagetables @@ -301,7 +302,6 @@ Lpagetable: Lvirtaddr: .word KERNVIRTADDR -#if defined (FLASHADDR) && defined(LOADERRAMADDR) Lreal_start: .word _start Lend: Modified: projects/specific_leg/sys/arm/arm/machdep.c ============================================================================== --- projects/specific_leg/sys/arm/arm/machdep.c Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/arm/machdep.c Tue Mar 11 23:49:59 2014 (r263060) @@ -474,7 +474,6 @@ arm_generic_initclocks(void) #endif #endif } -__weak_reference(arm_generic_initclocks, cpu_initclocks); int fill_regs(struct thread *td, struct reg *regs) @@ -783,7 +782,6 @@ makectx(struct trapframe *tf, struct pcb pcb->un_32.pcb32_sp = tf->tf_usr_sp; } -#ifndef FDT /* * Fake up a boot descriptor table */ Modified: projects/specific_leg/sys/arm/arm/mpcore_timer.c ============================================================================== --- projects/specific_leg/sys/arm/arm/mpcore_timer.c Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/arm/mpcore_timer.c Tue Mar 11 23:49:59 2014 (r263060) @@ -58,7 +58,6 @@ __FBSDID("$FreeBSD$"); #include <machine/bus.h> #include <machine/cpu.h> #include <machine/intr.h> -#include <machine/intr.h> #include <machine/platformvar.h> #include <dev/fdt/fdt_common.h> Modified: projects/specific_leg/sys/arm/arm/platform.c ============================================================================== --- projects/specific_leg/sys/arm/arm/platform.c Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/arm/platform.c Tue Mar 11 23:49:59 2014 (r263060) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> +#include <sys/bus.h> #include <sys/kernel.h> #include <sys/lock.h> #include <sys/ktr.h> Modified: projects/specific_leg/sys/arm/arm/platform_if.m ============================================================================== --- projects/specific_leg/sys/arm/arm/platform_if.m Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/arm/platform_if.m Tue Mar 11 23:49:59 2014 (r263060) @@ -32,6 +32,7 @@ #include <sys/systm.h> #include <sys/smp.h> +#include <machine/machdep.h> #include <machine/platform.h> #include <machine/platformvar.h> #include <machine/smp.h> @@ -90,6 +91,10 @@ CODE { #endif } #endif + static void platform_generic_cpu_initclocks(platform_t plat) + { + arm_generic_initclocks(); + } }; /** @@ -190,7 +195,7 @@ METHOD int bus_dma_get_range_nb { */ METHOD void cpu_initclocks { platform_t _plat; -}; +} DEFAULT platform_generic_cpu_initclocks; /** */ Modified: projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c ============================================================================== --- projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/broadcom/bcm2835/bcm2835_machdep.c Tue Mar 11 23:49:59 2014 (r263060) @@ -111,7 +111,6 @@ bcm_2835_cpu_reset(platform_t plat) int bcm2835_get_next_irq(platform_t, int); void bcm2835_mask_irq(platform_t, uintptr_t); void bcm2835_unmask_irq(platform_t, uintptr_t); -void bcm2835_cpu_initclocks(platform_t); void bcm2835_delay(platform_t, int); static platform_method_t bcm2835_methods[] = { @@ -125,7 +124,6 @@ static platform_method_t bcm2835_methods PLATFORMMETHOD(platform_mask_irq, bcm2835_mask_irq), PLATFORMMETHOD(platform_unmask_irq, bcm2835_unmask_irq), - PLATFORMMETHOD(platform_cpu_initclocks, bcm2835_cpu_initclocks), PLATFORMMETHOD(platform_delay, bcm2835_delay), PLATFORMMETHOD_END, Modified: projects/specific_leg/sys/arm/broadcom/bcm2835/files.bcm2835 ============================================================================== --- projects/specific_leg/sys/arm/broadcom/bcm2835/files.bcm2835 Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/broadcom/bcm2835/files.bcm2835 Tue Mar 11 23:49:59 2014 (r263060) @@ -1,7 +1,6 @@ # $FreeBSD$ arm/broadcom/bcm2835/bcm2835_bsc.c optional bcm2835_bsc -arm/broadcom/bcm2835/bcm2835_common.c optional fdt arm/broadcom/bcm2835/bcm2835_dma.c standard arm/broadcom/bcm2835/bcm2835_fb.c optional sc arm/broadcom/bcm2835/bcm2835_fbd.c optional vt Modified: projects/specific_leg/sys/arm/include/ofw_machdep.h ============================================================================== --- projects/specific_leg/sys/arm/include/ofw_machdep.h Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/include/ofw_machdep.h Tue Mar 11 23:49:59 2014 (r263060) @@ -34,11 +34,8 @@ #include <vm/vm.h> -typedef uint32_t cell_t; +#include <machine/platform.h> -struct mem_region { - vm_offset_t mr_start; - vm_size_t mr_size; -}; +typedef uint32_t cell_t; #endif /* _MACHINE_OFW_MACHDEP_H_ */ Modified: projects/specific_leg/sys/arm/ti/files.ti ============================================================================== --- projects/specific_leg/sys/arm/ti/files.ti Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/ti/files.ti Tue Mar 11 23:49:59 2014 (r263060) @@ -10,7 +10,6 @@ arm/arm/cpufunc_asm_arm10.S standard arm/arm/cpufunc_asm_arm11.S standard arm/arm/cpufunc_asm_armv7.S standard -arm/ti/ti_common.c standard arm/ti/ti_cpuid.c standard arm/ti/ti_machdep.c standard arm/ti/ti_prcm.c standard Modified: projects/specific_leg/sys/arm/ti/ti_machdep.c ============================================================================== --- projects/specific_leg/sys/arm/ti/ti_machdep.c Tue Mar 11 23:41:35 2014 (r263059) +++ projects/specific_leg/sys/arm/ti/ti_machdep.c Tue Mar 11 23:49:59 2014 (r263060) @@ -125,7 +125,6 @@ static platform_method_t omap4_methods[] PLATFORMMETHOD(platform_mask_irq, gic_mask_irq), PLATFORMMETHOD(platform_unmask_irq, gic_unmask_irq), - PLATFORMMETHOD(platform_cpu_initclocks, arm_tmr_cpu_initclocks), PLATFORMMETHOD(platform_delay, arm_tmr_delay), PLATFORMMETHOD_END,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403112349.s2BNnxU6056092>