diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:25 +0200 |
|---|---|---|
| committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:25 +0200 |
| commit | ca24324ce1388f7c6740c9b4f6acc119ab70c831 (patch) | |
| tree | 24a79bd3db8491450a6c0fc8b4f424d51ea3dbd9 /board | |
| parent | 4a01ad9260efb1ea23020d9cb8587e318082bbb5 (diff) | |
| download | barebox-ca24324ce1388f7c6740c9b4f6acc119ab70c831.tar.gz barebox-ca24324ce1388f7c6740c9b4f6acc119ab70c831.tar.xz | |
svn_rev_129
make it work again
Diffstat (limited to 'board')
| -rw-r--r-- | board/eco920/Makefile | 2 | ||||
| -rw-r--r-- | board/eco920/eco920.c | 32 |
2 files changed, 16 insertions, 18 deletions
diff --git a/board/eco920/Makefile b/board/eco920/Makefile index 1793714c90..65266285c1 100644 --- a/board/eco920/Makefile +++ b/board/eco920/Makefile @@ -1 +1,3 @@ obj-y += eco920.o +extra-y += u-boot.lds + diff --git a/board/eco920/eco920.c b/board/eco920/eco920.c index fcd7364f1d..91833c8d52 100644 --- a/board/eco920/eco920.c +++ b/board/eco920/eco920.c @@ -30,6 +30,7 @@ #include <s1d13706fb.h> #include <net.h> #include <cfi_flash.h> +#include <init.h> DECLARE_GLOBAL_DATA_PTR; @@ -38,11 +39,12 @@ DECLARE_GLOBAL_DATA_PTR; * Miscelaneous platform dependent initialisations */ -struct cfi_platform_data cfi_info = { +static struct cfi_platform_data cfi_info = { }; struct device_d cfi_dev = { - .name = "nor", + .name = "cfi_flash", + .id = "nor0", .map_base = 0x11000000, .size = 16 * 1024 * 1024, @@ -52,34 +54,32 @@ struct device_d cfi_dev = { struct device_d sdram_dev = { .name = "ram", + .id = "ram0", .map_base = 0x20000000, .size = 32 * 1024 * 1024, }; -int board_init (void) -{ - /* Enable Ctrlc */ - console_init_f (); - - - gd->bd->bi_arch_number = MACH_TYPE_ECO920; - gd->bd->bi_boot_params = PHYS_SDRAM + 0x100; +static struct device_d at91_ath_dev = { + .name = "at91_eth", + .id = "eth0", - return 0; -} + .type = DEVICE_TYPE_ETHER, +}; -int dram_init (void) +static int devices_init (void) { register_device(&cfi_dev); register_device(&sdram_dev); + register_device(&at91_ath_dev); gd->bd->bi_dram[0].start = PHYS_SDRAM; gd->bd->bi_dram[0].size = PHYS_SDRAM_SIZE; return 0; } -#ifdef CONFIG_DRIVER_NET_AT91_ETHER +device_initcall(devices_init); + static unsigned int phy_is_connected (AT91PS_EMAC p_mac) { return 1; @@ -163,7 +163,6 @@ void at91rm9200_GetPhyInterface(AT91PS_PhyOps p_phyops) /* ditto */ p_phyops->AutoNegotiate = NULL; } -#endif #ifdef CONFIG_DRIVER_VIDEO_S1D13706 static int efb_init(struct efb_info *efb) @@ -211,9 +210,6 @@ int misc_init_r(void) #ifdef CONFIG_CMD_SPLASH splash_set_fb_data(&efb.fbd); #endif -#ifdef CONFIG_DRIVER_NET_AT91_ETHER - eth_set_current(&at91rm9200_eth); -#endif return 0; } |