summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatalin Udma <b32721@freescale.com>2012-01-24 16:16:29 (GMT)
committerFleming Andrew-AFLEMING <AFLEMING@freescale.com>2013-04-19 19:57:38 (GMT)
commitcb06e9191a42ce2506be575410ab9cbdbe074f1d (patch)
treeccd86c11f69e61e70abe083fe710b41825bb8edb
parent17b8bf81e383ee5df50e691713b6e470268f8cdf (diff)
downloadlinux-fsl-qoriq-cb06e9191a42ce2506be575410ab9cbdbe074f1d.tar.xz
Added CodeWarrior support for 64 bits
Enable the configuration option to include CodeWarrior support for kernel debugging also for 64 bits (Kernel hacking sub-menu). Signed-off-by: Catalin Udma <b32721@freescale.com> Conflicts: arch/powerpc/Kconfig.debug Change-Id: Ieb381cd967c5a61d572635db0da488c177ef553d Reviewed-on: http://git.am.freescale.net:8181/1620 Reviewed-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com> Tested-by: Fleming Andrew-AFLEMING <AFLEMING@freescale.com>
-rw-r--r--arch/powerpc/Kconfig.debug6
-rw-r--r--arch/powerpc/include/asm/reg_booke.h5
2 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index 5416e28..90e85c6 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -122,6 +122,12 @@ config BDI_SWITCH
Unless you are intending to debug the kernel with one of these
machines, say N here.
+config DEBUG_CW
+ bool "Include CodeWarrior kernel debugging"
+ depends on DEBUG_KERNEL
+ help
+ Say Y here to enable CodeWarrior kernel debugging.
+
config BOOTX_TEXT
bool "Support for early boot text console (BootX or OpenFirmware only)"
depends on PPC_OF && PPC_BOOK3S
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index b8682a3..5dac6b2 100644
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -30,8 +30,13 @@
#define MSR_64BIT MSR_CM
#define MSR_ MSR_ME | MSR_CE
+#if defined(CONFIG_DEBUG_CW)
+#define MSR_KERNEL (MSR_ | MSR_64BIT | MSR_DE)
+#define MSR_USER32 (MSR_ | MSR_PR | MSR_EE | MSR_DE)
+#else
#define MSR_KERNEL MSR_ | MSR_64BIT
#define MSR_USER32 MSR_ | MSR_PR | MSR_EE
+#endif
#define MSR_USER64 MSR_USER32 | MSR_64BIT
#elif defined (CONFIG_40x)
#define MSR_KERNEL (MSR_ME|MSR_RI|MSR_IR|MSR_DR|MSR_CE)