Date: Wed, 22 Jan 2014 21:23:58 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r261039 - in head/sys: arm/arm conf Message-ID: <201401222123.s0MLNwvH070583@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Wed Jan 22 21:23:58 2014 New Revision: 261039 URL: http://svnweb.freebsd.org/changeset/base/261039 Log: Add support for mapping a small range of the SoC devices for debugging purposes early in boot. Modified: head/sys/arm/arm/locore.S head/sys/conf/options.arm Modified: head/sys/arm/arm/locore.S ============================================================================== --- head/sys/arm/arm/locore.S Wed Jan 22 21:20:08 2014 (r261038) +++ head/sys/arm/arm/locore.S Wed Jan 22 21:23:58 2014 (r261039) @@ -258,9 +258,13 @@ mmu_init_table: /* fill all table VA==PA */ /* map SDRAM VA==PA, WT cacheable */ #if !defined(SMP) - MMU_INIT(PHYSADDR, PHYSADDR , 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) + MMU_INIT(PHYSADDR, PHYSADDR, 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) /* map VA 0xc0000000..0xc3ffffff to PA */ MMU_INIT(KERNBASE, PHYSADDR, 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) +#if defined(SOCDEV_PA) && defined(SOCKDEV_VA) + /* Map in 0x04000000 worth of the SoC's devices for bootstrap debugging */ + MMU_INIT(SOCKDEV_VA, SOCDEV_PA, 64, L1_TYPE_S|L1_S_C|L1_S_AP(AP_KRW)) +#endif #else MMU_INIT(PHYSADDR, PHYSADDR , 64, L1_TYPE_S|L1_SHARED|L1_S_C|L1_S_AP(AP_KRW)) /* map VA 0xc0000000..0xc3ffffff to PA */ Modified: head/sys/conf/options.arm ============================================================================== --- head/sys/conf/options.arm Wed Jan 22 21:20:08 2014 (r261038) +++ head/sys/conf/options.arm Wed Jan 22 21:23:58 2014 (r261039) @@ -35,6 +35,8 @@ LINUX_BOOT_ABI opt_global.h LOADERRAMADDR opt_global.h NO_EVENTTIMERS opt_timer.h PHYSADDR opt_global.h +SOCDEV_PA opt_global.h +SOCDEV_VA opt_global.h PV_STATS opt_pmap.h QEMU_WORKAROUNDS opt_global.h SOC_MV_ARMADAXP opt_global.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401222123.s0MLNwvH070583>