From 88b842d2156207d15e4cb377ecacab5a0f2e9b39 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Wed, 22 Jan 2014 21:23:58 +0000 Subject: [PATCH] Add support for mapping a small range of the SoC devices for debugging purposes early in boot. --- sys/arm/arm/locore.S | 6 +++++- sys/conf/options.arm | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/sys/arm/arm/locore.S b/sys/arm/arm/locore.S index d52cacdcef9d..209839aa38e3 100644 --- a/sys/arm/arm/locore.S +++ b/sys/arm/arm/locore.S @@ -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 */ diff --git a/sys/conf/options.arm b/sys/conf/options.arm index fa5ee81f2bdf..0296a1a81c1c 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -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