Ticket #1970: soc11_2.diff

c/src/lib/libbsp/lm32/milkymist/include/system_conf.h

@@ -15 +15 @@
 #ifndef __SYSTEM_CONFIG_H_
 #define __SYSTEM_CONFIG_H_
 
-#define CPU_FREQUENCY           (80000000)
 #define UART_BAUD_RATE          (115200)
 
+/* Clock frequency */
+#define MM_FREQUENCY            (0xe0001074)
+
 /* FML bridge */
 #define FMLBRG_FLUSH_BASE       (0xc8000000)
 #define FMLBRG_LINE_LENGTH      (32)
@@ -65 +67 @@
 #define GPIO_LED2               (0x00000002)
 
 /* System ID and reset */
-#define MM_SYSTEM_ID            (0xe000103c)
+#define MM_SYSTEM_ID            (0xe000107c)
 
 /* ICAP */
-#define MM_ICAP                 (0xe0001034)
+#define MM_ICAP                 (0xe0001040)
 
 #define ICAP_READY              (0x01)
 #define ICAP_CE                 (0x10000)

c/src/lib/libbsp/lm32/shared/milkymist_console/console.c

@@ -109 +109 @@
   }
 
   if (baud > 0)
-    MM_WRITE(MM_UART_DIV, CPU_FREQUENCY/baud/16);
+    MM_WRITE(MM_UART_DIV, MM_READ(MM_FREQUENCY)/baud/16);
 
   return 0;
 }

c/src/lib/libbsp/lm32/shared/milkymist_console/uart.c

@@ -17 +17 @@
 
 void BSP_uart_init(int baud)
 {
-  MM_WRITE(MM_UART_DIV, CPU_FREQUENCY/baud/16);
+  MM_WRITE(MM_UART_DIV, MM_READ(MM_FREQUENCY)/baud/16);
 }
 
 void BSP_uart_polled_write(char ch)

c/src/lib/libbsp/lm32/shared/milkymist_timer/timer.c

@@ -58 +58 @@
   if (ticks == 0xffffffff)
     printk("Timer overflow!\n");
 
-  total = ticks / (CPU_FREQUENCY / 1000000);
+  total = ticks / (MM_READ(MM_FREQUENCY) / 1000000);
 
   if (benchmark_timer_find_average_overhead)
     return total;

c/src/lib/libbsp/lm32/shared/milkymist_clock/ckinit.c

@@ -35 +35 @@
 void Clock_driver_support_initialize_hardware(void)
 {
   MM_WRITE(MM_TIMER0_COMPARE, 
-   (CPU_FREQUENCY/(1000000/rtems_configuration_get_microseconds_per_tick())));
+   (MM_READ(MM_FREQUENCY)/(1000000/rtems_configuration_get_microseconds_per_tick())));
   MM_WRITE(MM_TIMER0_COUNTER, 0);
   MM_WRITE(MM_TIMER0_CONTROL, TIMER_ENABLE | TIMER_AUTORESTART);
   bsp_interrupt_vector_enable(MM_IRQ_TIMER0);