diff options
author | Marek Vasut <marek.vasut@gmail.com> | 2010-07-22 16:51:52 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2010-10-19 22:47:13 +0200 |
commit | f905432c04c54ef169b4ffe6dd310ddf72a67c86 (patch) | |
tree | a3a7fed67205d3b2b0f32ffa0d0a58877ca76fbf /board/vpac270/vpac270.c | |
parent | 6375dadab39991cca679b186f2949ccde5dac174 (diff) | |
download | u-boot-imx-f905432c04c54ef169b4ffe6dd310ddf72a67c86.zip u-boot-imx-f905432c04c54ef169b4ffe6dd310ddf72a67c86.tar.gz u-boot-imx-f905432c04c54ef169b4ffe6dd310ddf72a67c86.tar.bz2 |
PXA: Voipac270 improvements
128MB NOR module support.
Define __io to get harddrive working.
Fix saving of environment into OneNAND.
Boot from harddrive when possible.
Add missing MAINTAINERS entry.
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Diffstat (limited to 'board/vpac270/vpac270.c')
-rw-r--r-- | board/vpac270/vpac270.c | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/board/vpac270/vpac270.c b/board/vpac270/vpac270.c index f792298..1557d1b 100644 --- a/board/vpac270/vpac270.c +++ b/board/vpac270/vpac270.c @@ -1,16 +1,7 @@ /* - * (C) Copyright 2004 - * Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net + * Voipac PXA270 Support * - * (C) Copyright 2002 - * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net - * - * (C) Copyright 2002 - * Sysgo Real-Time Solutions, GmbH <www.elinos.com> - * Marius Groeger <mgroeger@sysgo.de> - * - * See file CREDITS for list of people who contributed to this - * project. + * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com> * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -36,26 +27,15 @@ DECLARE_GLOBAL_DATA_PTR; -/* ------------------------------------------------------------------------- */ - /* * Miscelaneous platform dependent initialisations */ -extern struct serial_device serial_ffuart_device; -extern struct serial_device serial_btuart_device; -extern struct serial_device serial_stuart_device; - -struct serial_device *default_serial_console (void) -{ - return &serial_ffuart_device; -} - -int board_init (void) +int board_init(void) { /* memory and cpu-speed are setup before relocation */ /* so we do _nothing_ here */ - /* arch number of vpac270 */ + /* Arch number of vpac270 */ gd->bd->bi_arch_number = MACH_TYPE_VPAC270; /* adress of boot parameters */ @@ -64,17 +44,24 @@ int board_init (void) return 0; } -int dram_init (void) +struct serial_device *default_serial_console(void) { - gd->bd->bi_dram[0].start = PHYS_SDRAM_1; - gd->bd->bi_dram[1].start = PHYS_SDRAM_2; + return &serial_ffuart_device; +} +int dram_init(void) +{ + gd->bd->bi_dram[0].start = PHYS_SDRAM_1; gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; - gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; +#ifdef CONFIG_256M_U_BOOT + gd->bd->bi_dram[1].start = PHYS_SDRAM_2; + gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; +#endif return 0; } +#ifdef CONFIG_CMD_USB int usb_board_init(void) { writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) & @@ -124,6 +111,7 @@ void usb_board_stop(void) return; } +#endif #ifdef CONFIG_DRIVER_DM9000 int board_eth_init(bd_t *bis) |