* [PATCH 1/2] openrisc: switch to defaultenv-2 and change boardinfo
2012-10-16 19:54 [PATCH 0/2] openrisc: cleanup generic board Franck Jullien
@ 2012-10-16 19:54 ` Franck Jullien
2012-10-16 19:54 ` [PATCH 2/2] openrisc: generic board cleanup Franck Jullien
2012-10-21 8:57 ` [PATCH 0/2] openrisc: cleanup generic board Sascha Hauer
2 siblings, 0 replies; 6+ messages in thread
From: Franck Jullien @ 2012-10-16 19:54 UTC (permalink / raw)
To: barebox
Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
---
arch/openrisc/Kconfig | 3 ++-
arch/openrisc/configs/generic_defconfig | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index a3cb337..bcfd67f 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -1,6 +1,7 @@
config OPENRISC
bool
select HAVE_CONFIGURABLE_MEMORY_LAYOUT
+ select HAVE_DEFAULT_ENVIRONMENT_NEW
default y
# not used
@@ -9,7 +10,7 @@ config ARCH_TEXT_BASE
default 0x00000000
config BOARDINFO
- default "Openrisc simulator" if GENERIC
+ default "or1k" if GENERIC
choice
prompt "Select your board"
diff --git a/arch/openrisc/configs/generic_defconfig b/arch/openrisc/configs/generic_defconfig
index 68e0371..7ae85b0 100644
--- a/arch/openrisc/configs/generic_defconfig
+++ b/arch/openrisc/configs/generic_defconfig
@@ -3,13 +3,13 @@ CONFIG_HUSH_FANCY_PROMPT=y
CONFIG_CMDLINE_EDITING=y
CONFIG_AUTO_COMPLETE=y
CONFIG_PARTITION=y
-CONFIG_DEFAULT_ENVIRONMENT_GENERIC=y
+CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
CONFIG_CMD_EDIT=y
CONFIG_CMD_SAVEENV=y
-CONFIG_CMD_LOADENV=y
CONFIG_CMD_EXPORT=y
CONFIG_CMD_PRINTENV=y
CONFIG_CMD_TIME=y
+CONFIG_CMD_ECHO_E=y
CONFIG_CMD_MEMINFO=y
CONFIG_CMD_FLASH=y
# CONFIG_CMD_BOOTM is not set
--
1.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/2] openrisc: generic board cleanup
2012-10-16 19:54 [PATCH 0/2] openrisc: cleanup generic board Franck Jullien
2012-10-16 19:54 ` [PATCH 1/2] openrisc: switch to defaultenv-2 and change boardinfo Franck Jullien
@ 2012-10-16 19:54 ` Franck Jullien
2012-10-16 21:33 ` Sascha Hauer
2012-10-21 8:57 ` [PATCH 0/2] openrisc: cleanup generic board Sascha Hauer
2 siblings, 1 reply; 6+ messages in thread
From: Franck Jullien @ 2012-10-16 19:54 UTC (permalink / raw)
To: barebox
Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
---
arch/openrisc/boards/generic/config.h | 7 +++----
arch/openrisc/boards/generic/generic.c | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/arch/openrisc/boards/generic/config.h b/arch/openrisc/boards/generic/config.h
index 88d2929..95260cd 100644
--- a/arch/openrisc/boards/generic/config.h
+++ b/arch/openrisc/boards/generic/config.h
@@ -1,16 +1,15 @@
#ifndef _GENERIC_NAMES_H_
#define _GENERIC_NAMES_H_
-#define CONFIG_SYS_CLK_FREQ 20000000
+#define CONFIG_SYS_CLK_FREQ 50000000
-#define OPENRISC_TIMER_FREQ 20000000
+#define OPENRISC_TIMER_FREQ CONFIG_SYS_CLK_FREQ
#define OPENRISC_SOPC_MEMORY_BASE 0x00000000
#define OPENRISC_SOPC_MEMORY_SIZE 0x02000000
+#define OPENRISC_SOPC_UART_FREQ CONFIG_SYS_CLK_FREQ
#define OPENRISC_SOPC_UART_BASE 0x90000000
-#define CONFIG_SYS_UART_FREQ CONFIG_SYS_CLK_FREQ
-#define CONFIG_SYS_UART_BAUD 115200
/* We reserve 256K for barebox */
#define BAREBOX_RESERVED_SIZE 0x40000
diff --git a/arch/openrisc/boards/generic/generic.c b/arch/openrisc/boards/generic/generic.c
index 54c73a5..14b5e18 100644
--- a/arch/openrisc/boards/generic/generic.c
+++ b/arch/openrisc/boards/generic/generic.c
@@ -5,7 +5,7 @@
#include <ns16550.h>
static struct NS16550_plat serial_plat = {
- .clock = 50000000, /* 48MHz (APLL96/2) */
+ .clock = OPENRISC_SOPC_UART_FREQ,
.shift = 0,
};
--
1.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 2/2] openrisc: generic board cleanup
2012-10-16 19:54 ` [PATCH 2/2] openrisc: generic board cleanup Franck Jullien
@ 2012-10-16 21:33 ` Sascha Hauer
2012-10-17 6:10 ` Franck Jullien
0 siblings, 1 reply; 6+ messages in thread
From: Sascha Hauer @ 2012-10-16 21:33 UTC (permalink / raw)
To: Franck Jullien; +Cc: barebox
On Tue, Oct 16, 2012 at 09:54:56PM +0200, Franck Jullien wrote:
> Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
> ---
> arch/openrisc/boards/generic/config.h | 7 +++----
> arch/openrisc/boards/generic/generic.c | 2 +-
> 2 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/openrisc/boards/generic/config.h b/arch/openrisc/boards/generic/config.h
> index 88d2929..95260cd 100644
> --- a/arch/openrisc/boards/generic/config.h
> +++ b/arch/openrisc/boards/generic/config.h
> @@ -1,16 +1,15 @@
> #ifndef _GENERIC_NAMES_H_
> #define _GENERIC_NAMES_H_
>
> -#define CONFIG_SYS_CLK_FREQ 20000000
> +#define CONFIG_SYS_CLK_FREQ 50000000
>
> -#define OPENRISC_TIMER_FREQ 20000000
> +#define OPENRISC_TIMER_FREQ CONFIG_SYS_CLK_FREQ
The timer frequency changes from 20MHz to 50MHz. Is this intended?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] openrisc: generic board cleanup
2012-10-16 21:33 ` Sascha Hauer
@ 2012-10-17 6:10 ` Franck Jullien
0 siblings, 0 replies; 6+ messages in thread
From: Franck Jullien @ 2012-10-17 6:10 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
2012/10/16 Sascha Hauer <s.hauer@pengutronix.de>:
> On Tue, Oct 16, 2012 at 09:54:56PM +0200, Franck Jullien wrote:
>> Signed-off-by: Franck Jullien <franck.jullien@gmail.com>
>> ---
>> arch/openrisc/boards/generic/config.h | 7 +++----
>> arch/openrisc/boards/generic/generic.c | 2 +-
>> 2 files changed, 4 insertions(+), 5 deletions(-)
>>
>> diff --git a/arch/openrisc/boards/generic/config.h b/arch/openrisc/boards/generic/config.h
>> index 88d2929..95260cd 100644
>> --- a/arch/openrisc/boards/generic/config.h
>> +++ b/arch/openrisc/boards/generic/config.h
>> @@ -1,16 +1,15 @@
>> #ifndef _GENERIC_NAMES_H_
>> #define _GENERIC_NAMES_H_
>>
>> -#define CONFIG_SYS_CLK_FREQ 20000000
>> +#define CONFIG_SYS_CLK_FREQ 50000000
>>
>> -#define OPENRISC_TIMER_FREQ 20000000
>> +#define OPENRISC_TIMER_FREQ CONFIG_SYS_CLK_FREQ
>
> The timer frequency changes from 20MHz to 50MHz. Is this intended?
>
Yes it is, 50MHz is the frequency the CPU is running most of the time.
However, it's not really important since this is a generic board.
The important thing is that OPENRISC_TIMER_FREQ = CONFIG_SYS_CLK_FREQ.
> Sascha
>
>
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Franck.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 0/2] openrisc: cleanup generic board
2012-10-16 19:54 [PATCH 0/2] openrisc: cleanup generic board Franck Jullien
2012-10-16 19:54 ` [PATCH 1/2] openrisc: switch to defaultenv-2 and change boardinfo Franck Jullien
2012-10-16 19:54 ` [PATCH 2/2] openrisc: generic board cleanup Franck Jullien
@ 2012-10-21 8:57 ` Sascha Hauer
2 siblings, 0 replies; 6+ messages in thread
From: Sascha Hauer @ 2012-10-21 8:57 UTC (permalink / raw)
To: Franck Jullien; +Cc: barebox
On Tue, Oct 16, 2012 at 09:54:54PM +0200, Franck Jullien wrote:
> Franck Jullien (2):
> openrisc: switch to defaultenv-2 and change boardinfo
> openrisc: generic board cleanup
Applied, thanks
Sascha
>
> arch/openrisc/Kconfig | 3 ++-
> arch/openrisc/boards/generic/config.h | 7 +++----
> arch/openrisc/boards/generic/generic.c | 2 +-
> arch/openrisc/configs/generic_defconfig | 4 ++--
> 4 files changed, 8 insertions(+), 8 deletions(-)
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 6+ messages in thread