Patchwork [U-Boot,PATCH1/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 27, 2013, 1:26 p.m.
Message ID <CAEM3b1DmAD1X29bgx0TY2n4faWi6D3RAncAGRQ+LmhywAEX9JA@mail.gmail.com>
Download mbox | patch
Permalink /patch/255081/
State Superseded
Delegated to: Albert ARIBAUD
Headers show

Comments

Chin Liang See - June 27, 2013, 1:26 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 files changed, 21 insertions(+), 7 deletions(-)

--
1.7.7.4
Pavel Machek - June 28, 2013, 11:22 a.m.
Hi!

> 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 files changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/include/configs/socfpga_cyclone5.h
> b/include/configs/socfpga_cyclone5.h
> index 5633d2a..86563b7 100644
> --- a/include/configs/socfpga_cyclone5.h
> +++ b/include/configs/socfpga_cyclone5.h
> @@ -22,6 +22,8 @@
>  /*
>   * High level configuration
>   */
> +/* Running on virtual target or real hardware */ #define
> +CONFIG_SOCFPGA_VIRTUAL_TARGET
>

Unfortunately, it came word-wrapped. Looks ok otherwise.

Reviewed-by: Pavel Machek <pavel@denx.de>

Thanks,
									Pavel
Chin Liang See - June 28, 2013, 4:05 p.m.
Hi Pavel,

On Fri, 2013-06-28 at 13:22 +0200, ZY - pavel wrote:
> Hi!
> 
> > 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 files changed, 21 insertions(+), 7 deletions(-)
> > 
> > diff --git a/include/configs/socfpga_cyclone5.h
> > b/include/configs/socfpga_cyclone5.h
> > index 5633d2a..86563b7 100644
> > --- a/include/configs/socfpga_cyclone5.h
> > +++ b/include/configs/socfpga_cyclone5.h
> > @@ -22,6 +22,8 @@
> >  /*
> >   * High level configuration
> >   */
> > +/* Running on virtual target or real hardware */ #define
> > +CONFIG_SOCFPGA_VIRTUAL_TARGET
> >
> 
> Unfortunately, it came word-wrapped. Looks ok otherwise.

Hmmm... seems the mail client did this when sending.
I will resubmit this patch with new mail client.
Thanks

Chin Liang

> 
> Reviewed-by: Pavel Machek <pavel@denx.de>
> 
> Thanks,
> 									Pavel
Stefan Roese - June 28, 2013, 4:09 p.m.
Hi Chin Liang,

On 06/28/2013 06:05 PM, Chin Liang See wrote:
>>> 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 files changed, 21 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/include/configs/socfpga_cyclone5.h
>>> b/include/configs/socfpga_cyclone5.h
>>> index 5633d2a..86563b7 100644
>>> --- a/include/configs/socfpga_cyclone5.h
>>> +++ b/include/configs/socfpga_cyclone5.h
>>> @@ -22,6 +22,8 @@
>>>  /*
>>>   * High level configuration
>>>   */
>>> +/* Running on virtual target or real hardware */ #define
>>> +CONFIG_SOCFPGA_VIRTUAL_TARGET
>>>
>>
>> Unfortunately, it came word-wrapped. Looks ok otherwise.
> 
> Hmmm... seems the mail client did this when sending.
> I will resubmit this patch with new mail client.

It always recommended to use "git send-email" for patch submission.

Best regards,
Stefan

Patch

diff --git a/include/configs/socfpga_cyclone5.h
b/include/configs/socfpga_cyclone5.h
index 5633d2a..86563b7 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -22,6 +22,8 @@ 
 /*
  * High level configuration
  */
+/* Running on 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

 /*
  * 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