diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:49 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:49 +0100 |
| commit | 24e85d1d20a2a92b5340a796db8d1c976dfbd51c (patch) | |
| tree | 99b27b8274f95d0cb531941833479e7424876a0c /arch | |
| parent | 154496f736db54123c3f6daaba18809fab54ed9b (diff) | |
| parent | 7d1546911de43acc8f0851b7cc8e610507372478 (diff) | |
| download | barebox-24e85d1d20a2a92b5340a796db8d1c976dfbd51c.tar.gz barebox-24e85d1d20a2a92b5340a796db8d1c976dfbd51c.tar.xz | |
Merge branch 'for-next/openrisc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/openrisc/Kconfig | 3 | ||||
| -rw-r--r-- | arch/openrisc/boards/generic/config.h | 7 | ||||
| -rw-r--r-- | arch/openrisc/boards/generic/generic.c | 2 | ||||
| -rw-r--r-- | arch/openrisc/configs/generic_defconfig | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig index a3cb33765d..bcfd67f261 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/boards/generic/config.h b/arch/openrisc/boards/generic/config.h index 88d2929af5..95260cdc3f 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 54c73a5aa3..14b5e188e7 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, }; diff --git a/arch/openrisc/configs/generic_defconfig b/arch/openrisc/configs/generic_defconfig index 68e037119f..7ae85b0344 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 |