diff --git a/XilinxProcessorIPLib/drivers/cpu_cortexr5/data/cpu_cortexr5.mdd b/XilinxProcessorIPLib/drivers/cpu_cortexr5/data/cpu_cortexr5.mdd
index 13252215..80d198ea 100644
--- a/XilinxProcessorIPLib/drivers/cpu_cortexr5/data/cpu_cortexr5.mdd
+++ b/XilinxProcessorIPLib/drivers/cpu_cortexr5/data/cpu_cortexr5.mdd
@@ -41,9 +41,9 @@ OPTION VERSION = 1.1;
 OPTION NAME = cpu_cortexr5;
 
 
-PARAM name = compiler, desc = "Compiler used to compile both BSP/Libraries and Applications.", type = string, default = arm-none-eabi-gcc;
-PARAM name = archiver, desc = "Archiver used to archive libraries for both BSP generation as well as for applications", type = string, default =  arm-none-eabi-ar;
-PARAM name = compiler_flags, desc = "Compiler flags used in BSP and library generation. '-c' flag stands for 'compile and assemble, but do not link'. Without this flag, gcc tries to link the code, which will fail bacause there is no application involved during libgen. '-O2' can be overwritten by extra compiler flags", type = string, default = "-O2 -c", permit = none;
+PARAM name = compiler, desc = "Compiler used to compile both BSP/Libraries and Applications.", type = string, default = armr5-none-eabi-gcc;
+PARAM name = archiver, desc = "Archiver used to archive libraries for both BSP generation as well as for applications", type = string, default =  armr5-none-eabi-ar;
+PARAM name = compiler_flags, desc = "Compiler flags used in BSP and library generation. '-c' flag stands for 'compile and assemble, but do not link'. Without this flag, gcc tries to link the code, which will fail bacause there is no application involved during libgen. '-O2' can be overwritten by extra compiler flags", type = string, default = "-O2 -c -mcpu=cortex-r5", permit = none;
 PARAM name = extra_compiler_flags, desc = "Extra compiler flags used in BSP and library generation.", type = string, default = "-g -DARMR5";
 
 END driver