From e58af071ba81f12c3d4e4aa38b057ff9e7c2c870 Mon Sep 17 00:00:00 2001
From: Germain Haugou <germain.haugou@iis.ee.ethz.ch>
Date: Thu, 5 Mar 2020 13:21:52 +0100
Subject: [PATCH] Few fixes for pulpissimo fpga, fll init is now deactivated
 and uart is selected by default

---
 kernel/chips/pulp/soc.c            | 8 ++++++++
 kernel/chips/pulpissimo/soc.c      | 8 ++++++++
 rules/pulpos/targets/pulp.mk       | 5 +++++
 rules/pulpos/targets/pulpissimo.mk | 5 +++++
 4 files changed, 26 insertions(+)

diff --git a/kernel/chips/pulp/soc.c b/kernel/chips/pulp/soc.c
index 1d4b1bb..56ee799 100644
--- a/kernel/chips/pulp/soc.c
+++ b/kernel/chips/pulp/soc.c
@@ -18,6 +18,8 @@
 
 void pos_soc_init()
 {
+#if __PLATFORM__ != ARCHI_PLATFORM_FPGA
+
   pos_fll_constructor();
 
   pos_freq_domains[PI_FREQ_DOMAIN_FC] = pos_fll_init(POS_FLL_FC);
@@ -26,5 +28,11 @@ void pos_soc_init()
 
 
   pos_freq_domains[PI_FREQ_DOMAIN_CL] = pos_fll_init(POS_FLL_CL);
+
+#else
+
+  pos_freq_domains[PI_FREQ_DOMAIN_CL] = PERIPH_FREQUENCY;
+
+#endif
 }
 
diff --git a/kernel/chips/pulpissimo/soc.c b/kernel/chips/pulpissimo/soc.c
index b722bab..6cd805a 100644
--- a/kernel/chips/pulpissimo/soc.c
+++ b/kernel/chips/pulpissimo/soc.c
@@ -18,10 +18,18 @@
 
 void pos_soc_init()
 {
+#if __PLATFORM__ != ARCHI_PLATFORM_FPGA
+
   pos_fll_constructor();
 
   pos_freq_domains[PI_FREQ_DOMAIN_FC] = pos_fll_init(POS_FLL_FC);
 
   pos_freq_domains[PI_FREQ_DOMAIN_PERIPH] = pos_fll_init(POS_FLL_PERIPH);
+  
+#else
+
+  pos_freq_domains[PI_FREQ_DOMAIN_CL] = PERIPH_FREQUENCY;
+
+#endif
 }
 
diff --git a/rules/pulpos/targets/pulp.mk b/rules/pulpos/targets/pulp.mk
index 44b698e..ccab7a4 100644
--- a/rules/pulpos/targets/pulp.mk
+++ b/rules/pulpos/targets/pulp.mk
@@ -41,4 +41,9 @@ PULP_SRCS     += kernel/chips/pulp/soc.c
 
 
 include $(PULPRT_HOME)/rules/pulpos/configs/default.mk
+
+ifeq '$(platform)' 'fpga'
+CONFIG_IO_UART=1
+endif
+
 include $(PULPRT_HOME)/rules/pulpos/default_rules.mk
\ No newline at end of file
diff --git a/rules/pulpos/targets/pulpissimo.mk b/rules/pulpos/targets/pulpissimo.mk
index ba12247..31fa720 100644
--- a/rules/pulpos/targets/pulpissimo.mk
+++ b/rules/pulpos/targets/pulpissimo.mk
@@ -40,4 +40,9 @@ PULP_SRCS     += kernel/chips/pulpissimo/soc.c
 
 
 include $(PULPRT_HOME)/rules/pulpos/configs/default.mk
+
+ifeq '$(platform)' 'fpga'
+CONFIG_IO_UART=1
+endif
+
 include $(PULPRT_HOME)/rules/pulpos/default_rules.mk
\ No newline at end of file