Merge pull request #3 from wpd/patches

Allow board to override SYS_TEXT_BASE and SYS_AT91_MAIN_CLOCK
linux4sam · Oct 23, 2015 · a9a6808 · a9a6808
2 parents 1806ce0 + 1c61d86
commit a9a6808
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h
@@ -12,11 +12,15 @@
 
 #include <asm/hardware.h>
 
+#ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE		0x26f00000
+#endif
 
 /* ARM asynchronous clock */
 #define CONFIG_SYS_AT91_SLOW_CLOCK      32768
+#ifndef CONFIG_SYS_AT91_MAIN_CLOCK
 #define CONFIG_SYS_AT91_MAIN_CLOCK      12000000 /* from 12 MHz crystal */
+#endif
 
 #define CONFIG_ARCH_CPU_INIT