summaryrefslogtreecommitdiffstats
path: root/arch/nios2
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:02:37 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-11-16 14:02:37 +0100
commit61c7155c4b58294fa42b40add811834ecfecda31 (patch)
tree6aca59465aa3de990a41b328bce57fd9ee14c42a /arch/nios2
parent6584c1f8017a4a2c1fb963bf3db3b0d4212c11a6 (diff)
parent37d0f395b2512359ae2ce59660e52475c4c50e21 (diff)
downloadbarebox-61c7155c4b58294fa42b40add811834ecfecda31.tar.gz
Merge branch 'for-next/nios2'
Diffstat (limited to 'arch/nios2')
-rw-r--r--arch/nios2/boards/generic/generic.c11
-rw-r--r--arch/nios2/configs/generic_defconfig11
2 files changed, 19 insertions, 3 deletions
diff --git a/arch/nios2/boards/generic/generic.c b/arch/nios2/boards/generic/generic.c
index 66eb856..499d93b 100644
--- a/arch/nios2/boards/generic/generic.c
+++ b/arch/nios2/boards/generic/generic.c
@@ -3,6 +3,7 @@
#include <driver.h>
#include <partition.h>
#include <fs.h>
+#include <memory.h>
static int phy_address = 1;
@@ -32,11 +33,17 @@ static struct device_d mac_dev = {
.platform_data = &phy_address,
};
+static int mem_init(void)
+{
+ barebox_add_memory_bank("ram0", NIOS_SOPC_MEMORY_BASE, NIOS_SOPC_MEMORY_SIZE);
+
+ return 0;
+}
+mem_initcall(mem_init);
+
static int generic_devices_init(void)
{
add_cfi_flash_device(DEVICE_ID_DYNAMIC, NIOS_SOPC_FLASH_BASE, NIOS_SOPC_FLASH_SIZE, 0);
- add_mem_device("ram0", NIOS_SOPC_MEMORY_BASE, NIOS_SOPC_MEMORY_SIZE,
- IORESOURCE_MEM_WRITEABLE);
platform_device_register(&mac_dev);
/*register_device(&epcs_flash_device);*/
diff --git a/arch/nios2/configs/generic_defconfig b/arch/nios2/configs/generic_defconfig
index 279a71e..5e27cc8 100644
--- a/arch/nios2/configs/generic_defconfig
+++ b/arch/nios2/configs/generic_defconfig
@@ -14,10 +14,19 @@ CONFIG_CMD_LOADENV=y
CONFIG_CMD_EXPORT=y
CONFIG_CMD_PRINTENV=y
CONFIG_CMD_READLINE=y
+CONFIG_CMD_TFTP=y
+CONFIG_CMD_ECHO_E=y
CONFIG_CMD_FLASH=y
-CONFIG_CMD_BOOTM_ZLIB=y
+CONFIG_CMD_BOOTM_SHOW_TYPE=y
+CONFIG_CMD_BOOTM_VERBOSE=y
+CONFIG_CMD_UIMAGE=y
CONFIG_CMD_RESET=y
CONFIG_CMD_GO=y
CONFIG_CMD_TIMEOUT=y
CONFIG_CMD_PARTITION=y
+CONFIG_NET=y
+CONFIG_NET_PING=y
+CONFIG_DRIVER_NET_TSE=y
CONFIG_DRIVER_CFI=y
+CONFIG_FS_TFTP=y
+CONFIG_ZLIB=y