Patchwork [U-Boot,v2,1/1] socfpga: Separating the configuration file for Virtual Target and real hardware Cyclone V development kit

login
register
mail settings
Submitter Chin Liang See
Date June 28, 2013, 8:23 p.m.
Message ID <1372451028.11240.2.camel@drezykow-VirtualBox.altera.com>
Download mbox | patch
Permalink /patch/255691/
State Superseded
Headers show

Comments

Chin Liang See - June 28, 2013, 8:23 p.m.
socfpga: Separating the configuration file for Virtual
 Target and real hardware Cyclone V development kit

Signed-off-by: Chin Liang See <clsee@altera.com>
---
 include/configs/socfpga_cyclone5.h |   28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

  * FLASH
@@ -195,9 +203,15 @@
 /* This timer use eosc1 where the clock frequency is fixed
  * throughout any condition */
 #define CONFIG_SYS_TIMERBASE		SOCFPGA_OSC1TIMER0_ADDRESS
-
 /* reload value when timer count to zero */
 #define TIMER_LOAD_VAL			0xFFFFFFFF
+/* Timer info */
+#define CONFIG_SYS_HZ			1000
+#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
+#define CONFIG_TIMER_CLOCK_KHZ		2400
+#else
+#define CONFIG_TIMER_CLOCK_KHZ		25000
+#endif
 
 #define CONFIG_ENV_IS_NOWHERE
Wolfgang Denk - June 28, 2013, 10:47 p.m.
Dear Chin Liang See,

In message <1372451028.11240.2.camel@drezykow-VirtualBox.altera.com> you wrote:
> socfpga: Separating the configuration file for Virtual
>  Target and real hardware Cyclone V development kit

Please keep the Subject SHORT - it should be 50 characters or less!

And please do not repeat the Subject in the commit messgae - this is
redundant and thus makes no sense.

Chose a short  and descriptive Subject, and provide prosa in the
commit mesage.

Thanks!!


Wolfgang Denk
Chin Liang See - July 1, 2013, 1:44 p.m.
Hi Wolfgang,

On Sat, 2013-06-29 at 00:47 +0200, ZY - wd wrote:
> Dear Chin Liang See,
> 
> In message <1372451028.11240.2.camel@drezykow-VirtualBox.altera.com> you wrote:
> > socfpga: Separating the configuration file for Virtual
> >  Target and real hardware Cyclone V development kit
> 
> Please keep the Subject SHORT - it should be 50 characters or less!
> 
> And please do not repeat the Subject in the commit messgae - this is
> redundant and thus makes no sense.
> 
> Chose a short  and descriptive Subject, and provide prosa in the
> commit mesage.
> 

Noted with thanks.
Let me fix it on next revision

Chin Liang

> Thanks!!
> 
> 
> Wolfgang Denk
>

Patch

diff --git a/include/configs/socfpga_cyclone5.h
b/include/configs/socfpga_cyclone5.h
index 5633d2a..be3799b 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -22,6 +22,8 @@ 
 /*
  * High level configuration
  */
+/* Virtual target or real hardware */
+#define CONFIG_SOCFPGA_VIRTUAL_TARGET
 
 #define CONFIG_ARMV7
 #define CONFIG_L2_OFF
@@ -32,11 +34,12 @@ 
 #define CONFIG_SINGLE_BOOTLOADER
 #define CONFIG_SOCFPGA
 
+/* base address for .text section */
+#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
 #define CONFIG_SYS_TEXT_BASE		0x08000040
-#define V_NS16550_CLK			1000000
-#define CONFIG_BAUDRATE			57600
-#define CONFIG_SYS_HZ			1000
-#define CONFIG_TIMER_CLOCK_KHZ		2400
+#else
+#define CONFIG_SYS_TEXT_BASE		0x01000040
+#endif
 #define CONFIG_SYS_LOAD_ADDR		0x7fc0
 
 /* Console I/O Buffer Size */
@@ -165,7 +168,7 @@ 
 /* SDRAM Bank #1 */
 #define CONFIG_SYS_SDRAM_BASE		0x00000000
 /* SDRAM memory size */
-#define PHYS_SDRAM_1_SIZE		0x80000000
+#define PHYS_SDRAM_1_SIZE		0x40000000
 
 #define PHYS_SDRAM_1			CONFIG_SYS_SDRAM_BASE
 #define CONFIG_SYS_MEMTEST_START	0x00000000
@@ -181,8 +184,13 @@ 
 #define CONFIG_SYS_NS16550_CLK          V_NS16550_CLK
 #define CONFIG_CONS_INDEX               1
 #define CONFIG_SYS_NS16550_COM1		UART0_BASE
-
 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,
115200}
+#ifdef CONFIG_SOCFPGA_VIRTUAL_TARGET
+#define V_NS16550_CLK			1000000
+#else
+#define V_NS16550_CLK			100000000
+#endif
+#define CONFIG_BAUDRATE			115200
 
 /*