diff mbox

[U-Boot,v6,1/1] socfpga: Adding configuration for development kit

Message ID 1375888016-2598-1-git-send-email-clsee@altera.com
State Accepted
Delegated to: Albert ARIBAUD
Headers show

Commit Message

Chin Liang See Aug. 7, 2013, 3:06 p.m. UTC 
Separating the configuration file for Virtual
Target and real hardware Cyclone V development kit

Signed-off-by: Chin Liang See <clsee@altera.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
Cc: Wolfgang Denk <wd@denx.de>
Cc: Pavel Machek <pavel@denx.de>
Cc: Dinh Nguyen <dinguyen@altera.com>
Cc: Tom Rini <trini@ti.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
---
Changes for v6:
- Re-shuffle the change list
Changes for v5:
- Added Reviewed-by: Pavel Machek
- Cc: Tom Rini
Changes for v4:
- Added change log for each revision change
Changes for v3:
- Fixed the long subject of the patch
Changes for v2:
- Fixed the word wrap issue within patch
---
 include/configs/socfpga_cyclone5.h |   28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

Comments

Pavel Machek Aug. 15, 2013, 1:19 p.m. UTC | #1 
Hi!

Albert, Tom.... this patch has been here for a week, without any
comments. As far as I can tell, it is pretty much perfect. Can we get
any comments on it, or (better), get it applied?

If you excuse one extra newline at end of file,
[PATCH v6 1/1] socfpga: Creating driver for Reset Manager
is in good shape too, and applying it would be nice.

Thanks,
								Pavel


> Separating the configuration file for Virtual
> Target and real hardware Cyclone V development kit
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Reviewed-by: Pavel Machek <pavel@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Pavel Machek <pavel@denx.de>
> Cc: Dinh Nguyen <dinguyen@altera.com>
> Cc: Tom Rini <trini@ti.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> ---
> Changes for v6:
> - Re-shuffle the change list
> Changes for v5:
> - Added Reviewed-by: Pavel Machek
> - Cc: Tom Rini
> Changes for v4:
> - Added change log for each revision change
> Changes for v3:
> - Fixed the long subject of the patch
> Changes for v2:
> - Fixed the word wrap issue within patch
> ---
>  include/configs/socfpga_cyclone5.h |   28 +++++++++++++++++++++-------
>  1 file changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
> index b5a7a9a..06aeba6 100644
> --- a/include/configs/socfpga_cyclone5.h
> +++ b/include/configs/socfpga_cyclone5.h
> @@ -11,6 +11,8 @@
>  /*
>   * High level configuration
>   */
> +/* Virtual target or real hardware */
> +#define CONFIG_SOCFPGA_VIRTUAL_TARGET
>  
>  #define CONFIG_ARMV7
>  #define CONFIG_L2_OFF
> @@ -21,11 +23,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 */
> @@ -154,7 +157,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
> @@ -170,8 +173,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
> @@ -184,9 +192,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
>
Pavel Machek Aug. 22, 2013, 11:05 a.m. UTC | #2 
Hi!

> Albert, Tom.... this patch has been here for a week, without any
> comments. As far as I can tell, it is pretty much perfect. Can we get
> any comments on it, or (better), get it applied?

Another week passed, and nothing happens. Is there just slow holiday
time, or are we doing something wrong?

Thanks,
								Pavel

> If you excuse one extra newline at end of file,
> [PATCH v6 1/1] socfpga: Creating driver for Reset Manager
> is in good shape too, and applying it would be nice.
> 
> Thanks,
> 								Pavel
> 
> 
> > Separating the configuration file for Virtual
> > Target and real hardware Cyclone V development kit
> > 
> > Signed-off-by: Chin Liang See <clsee@altera.com>
> > Reviewed-by: Pavel Machek <pavel@denx.de>
> > Cc: Wolfgang Denk <wd@denx.de>
> > Cc: Pavel Machek <pavel@denx.de>
> > Cc: Dinh Nguyen <dinguyen@altera.com>
> > Cc: Tom Rini <trini@ti.com>
> > Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> > ---
> > Changes for v6:
> > - Re-shuffle the change list
> > Changes for v5:
> > - Added Reviewed-by: Pavel Machek
> > - Cc: Tom Rini
> > Changes for v4:
> > - Added change log for each revision change
> > Changes for v3:
> > - Fixed the long subject of the patch
> > Changes for v2:
> > - Fixed the word wrap issue within patch
> > ---
> >  include/configs/socfpga_cyclone5.h |   28 +++++++++++++++++++++-------
> >  1 file changed, 21 insertions(+), 7 deletions(-)
> > 
> > diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
> > index b5a7a9a..06aeba6 100644
> > --- a/include/configs/socfpga_cyclone5.h
> > +++ b/include/configs/socfpga_cyclone5.h
> > @@ -11,6 +11,8 @@
> >  /*
> >   * High level configuration
> >   */
> > +/* Virtual target or real hardware */
> > +#define CONFIG_SOCFPGA_VIRTUAL_TARGET
> >  
> >  #define CONFIG_ARMV7
> >  #define CONFIG_L2_OFF
> > @@ -21,11 +23,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 */
> > @@ -154,7 +157,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
> > @@ -170,8 +173,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
> > @@ -184,9 +192,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
> >  
>
Tom Rini Aug. 22, 2013, 1:38 p.m. UTC | #3 
On Thu, Aug 22, 2013 at 01:05:42PM +0200, Pavel Machek wrote:

> Hi!
> 
> > Albert, Tom.... this patch has been here for a week, without any
> > comments. As far as I can tell, it is pretty much perfect. Can we get
> > any comments on it, or (better), get it applied?
> 
> Another week passed, and nothing happens. Is there just slow holiday
> time, or are we doing something wrong?

I believe Albert is on holiday right now and it needs to come in via his
tree.  Sorry/thanks!
Chin Liang See Aug. 27, 2013, 4:12 p.m. UTC | #4 
Hi guys,

Wonder any updates on this? We plan to send the new patches only once
these existing patches are accepted. Appreciate for your helps again.

Chin Liang



On Thu, 2013-08-22 at 13:05 +0200, ZY - pavel wrote:
> Hi!
> 
> > Albert, Tom.... this patch has been here for a week, without any
> > comments. As far as I can tell, it is pretty much perfect. Can we get
> > any comments on it, or (better), get it applied?
> 
> Another week passed, and nothing happens. Is there just slow holiday
> time, or are we doing something wrong?
> 
> Thanks,
> 								Pavel
> 
> > If you excuse one extra newline at end of file,
> > [PATCH v6 1/1] socfpga: Creating driver for Reset Manager
> > is in good shape too, and applying it would be nice.
> > 
> > Thanks,
> > 								Pavel
> > 
> >
Pavel Machek Sept. 5, 2013, 11:10 a.m. UTC | #5 
Hi!

> Wonder any updates on this? We plan to send the new patches only once
> these existing patches are accepted. Appreciate for your helps
> again.

Albert seems to be back, perhaps he'll us how he wants us to proceed?

Thanks,
									Pavel

> > > Albert, Tom.... this patch has been here for a week, without any
> > > comments. As far as I can tell, it is pretty much perfect. Can we get
> > > any comments on it, or (better), get it applied?
> > 
> > Another week passed, and nothing happens. Is there just slow holiday
> > time, or are we doing something wrong?
> > 
> > > If you excuse one extra newline at end of file,
> > > [PATCH v6 1/1] socfpga: Creating driver for Reset Manager
> > > is in good shape too, and applying it would be nice.
Chin Liang See Sept. 5, 2013, 11:35 a.m. UTC | #6 
Hi Pavel,


On Thu, 2013-09-05 at 13:10 +0200, ZY - pavel wrote:
> Hi!
> 
> > Wonder any updates on this? We plan to send the new patches only once
> > these existing patches are accepted. Appreciate for your helps
> > again.
> 
> Albert seems to be back, perhaps he'll us how he wants us to proceed?

Yup, I saw his posting again. Hope we can hear from Albert soon on these
patches. Thanks

Chin Liang

> 
> Thanks,
> 									Pavel
> 
> > > > Albert, Tom.... this patch has been here for a week, without any
> > > > comments. As far as I can tell, it is pretty much perfect. Can we get
> > > > any comments on it, or (better), get it applied?
> > > 
> > > Another week passed, and nothing happens. Is there just slow holiday
> > > time, or are we doing something wrong?
> > > 
> > > > If you excuse one extra newline at end of file,
> > > > [PATCH v6 1/1] socfpga: Creating driver for Reset Manager
> > > > is in good shape too, and applying it would be nice.
>
Albert ARIBAUD Sept. 6, 2013, 10:10 a.m. UTC | #7 
Hi Chin,

On Wed, 7 Aug 2013 10:06:56 -0500, Chin Liang See <clsee@altera.com>
wrote:

> Separating the configuration file for Virtual
> Target and real hardware Cyclone V development kit
> 
> Signed-off-by: Chin Liang See <clsee@altera.com>
> Reviewed-by: Pavel Machek <pavel@denx.de>
> Cc: Wolfgang Denk <wd@denx.de>
> Cc: Pavel Machek <pavel@denx.de>
> Cc: Dinh Nguyen <dinguyen@altera.com>
> Cc: Tom Rini <trini@ti.com>
> Cc: Albert Aribaud <albert.u.boot@aribaud.net>
> ---
> Changes for v6:
> - Re-shuffle the change list
> Changes for v5:
> - Added Reviewed-by: Pavel Machek
> - Cc: Tom Rini
> Changes for v4:
> - Added change log for each revision change
> Changes for v3:
> - Fixed the long subject of the patch
> Changes for v2:
> - Fixed the word wrap issue within patch
> ---
>  include/configs/socfpga_cyclone5.h |   28 +++++++++++++++++++++-------
>  1 file changed, 21 insertions(+), 7 deletions(-)
> 
> diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
> index b5a7a9a..06aeba6 100644
> --- a/include/configs/socfpga_cyclone5.h
> +++ b/include/configs/socfpga_cyclone5.h
> @@ -11,6 +11,8 @@
>  /*
>   * High level configuration
>   */
> +/* Virtual target or real hardware */
> +#define CONFIG_SOCFPGA_VIRTUAL_TARGET
>  
>  #define CONFIG_ARMV7
>  #define CONFIG_L2_OFF
> @@ -21,11 +23,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 */
> @@ -154,7 +157,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
> @@ -170,8 +173,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
> @@ -184,9 +192,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
>  

Applied to u-boot-arm/master, thanks!

Amicalement,
diff mbox

Patch

diff --git a/include/configs/socfpga_cyclone5.h b/include/configs/socfpga_cyclone5.h
index b5a7a9a..06aeba6 100644
--- a/include/configs/socfpga_cyclone5.h
+++ b/include/configs/socfpga_cyclone5.h
@@ -11,6 +11,8 @@ 
 /*
  * High level configuration
  */
+/* Virtual target or real hardware */
+#define CONFIG_SOCFPGA_VIRTUAL_TARGET
 
 #define CONFIG_ARMV7
 #define CONFIG_L2_OFF
@@ -21,11 +23,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 */
@@ -154,7 +157,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
@@ -170,8 +173,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
@@ -184,9 +192,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