phone-side
/
uboot-mt623x
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Marek Vasut 2010-07-22 16:51:52 +02:00 committed by Wolfgang Denk
parent 6375dadab3
commit f905432c04
7 changed files with 88 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -813,6 +813,7 @@ Marek Vasut <marek.vasut@gmail.com>
palmld xscale palmld xscale
palmtc xscale palmtc xscale
vpac270 xscale
Hugo Villeneuve <hugo.villeneuve@lyrtech.com> Hugo Villeneuve <hugo.villeneuve@lyrtech.com>

3
MAKEALL
View File

@ -471,7 +471,8 @@ LIST_at91=" \
LIST_pxa="$(boards_by_cpu pxa) LIST_pxa="$(boards_by_cpu pxa)
polaris \ polaris \
trizepsiv \ trizepsiv \
vpac270_nor \ vpac270_nor_128M\
vpac270_nor_256M\
vpac270_onenand \ vpac270_onenand \
" "

7
Makefile
View File

@ -1018,13 +1018,18 @@ trizepsiv_config : unconfig
fi; fi;
@$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv @$(MKCONFIG) -n $@ -a trizepsiv arm pxa trizepsiv
vpac270_nor_config \ vpac270_nor_256M_config \
vpac270_nor_128M_config \
vpac270_onenand_config : unconfig vpac270_onenand_config : unconfig
@mkdir -p $(obj)include @mkdir -p $(obj)include
@if [ "$(findstring onenand,$@)" ] ; then \ @if [ "$(findstring onenand,$@)" ] ; then \
echo "#define CONFIG_ONENAND_U_BOOT" \ echo "#define CONFIG_ONENAND_U_BOOT" \
>>$(obj)include/config.h ; \ >>$(obj)include/config.h ; \
fi; fi;
@if [ "$(findstring 256M,$@)" ] ; then \
echo "#define CONFIG_256M_U_BOOT" \
>>$(obj)include/config.h ; \
fi;
@$(MKCONFIG) -n $@ -a vpac270 arm pxa vpac270 @$(MKCONFIG) -n $@ -a vpac270 arm pxa vpac270
######################################################################### #########################################################################

7
board/vpac270/Makefile
View File

@ -1,10 +1,7 @@
# #
# (C) Copyright 2000 # Voipac PXA270 Support
# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
# #
# See file CREDITS for list of people who contributed to this # Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
# project.
# #
# This program is free software; you can redistribute it and/or # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as # modify it under the terms of the GNU General Public License as

1
board/vpac270/lowlevel_init.S
View File

@ -3,7 +3,6 @@
* *
* Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com> * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
* *
*
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
* project. * project.
* *

44
board/vpac270/vpac270.c
View File

@ -1,16 +1,7 @@
/* /*
* (C) Copyright 2004 * Voipac PXA270 Support
* Robert Whaley, Applied Data Systems, Inc. rwhaley@applieddata.net
* *
* (C) Copyright 2002 * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
* 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.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
@ -36,26 +27,15 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
/* ------------------------------------------------------------------------- */
/* /*
* Miscelaneous platform dependent initialisations * Miscelaneous platform dependent initialisations
*/ */
extern struct serial_device serial_ffuart_device; int board_init(void)
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)
{ {
/* memory and cpu-speed are setup before relocation */ /* memory and cpu-speed are setup before relocation */
/* so we do _nothing_ here */ /* so we do _nothing_ here */
/* arch number of vpac270 */ /* Arch number of vpac270 */
gd->bd->bi_arch_number = MACH_TYPE_VPAC270; gd->bd->bi_arch_number = MACH_TYPE_VPAC270;
/* adress of boot parameters */ /* adress of boot parameters */
@ -64,17 +44,24 @@ int board_init (void)
return 0; return 0;
} }
int dram_init (void) struct serial_device *default_serial_console(void)
{
return &serial_ffuart_device;
}
int dram_init(void)
{ {
gd->bd->bi_dram[0].start = PHYS_SDRAM_1; gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE; 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; return 0;
} }
#ifdef CONFIG_CMD_USB
int usb_board_init(void) int usb_board_init(void)
{ {
writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) & writel((UHCHR | UHCHR_PCPL | UHCHR_PSPL) &
@ -124,6 +111,7 @@ void usb_board_stop(void)
return; return;
} }
#endif
#ifdef CONFIG_DRIVER_DM9000 #ifdef CONFIG_DRIVER_DM9000
int board_eth_init(bd_t *bis) int board_eth_init(bd_t *bis)

106
include/configs/vpac270.h
View File

@ -10,7 +10,7 @@
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
@ -19,8 +19,8 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
#define __CONFIG_H #define __CONFIG_H
/* /*
* High Level Board Configuration Options * High Level Board Configuration Options
@ -28,20 +28,13 @@
#define CONFIG_PXA27X 1 /* Marvell PXA270 CPU */ #define CONFIG_PXA27X 1 /* Marvell PXA270 CPU */
#define CONFIG_VPAC270 1 /* Voipac PXA270 board */ #define CONFIG_VPAC270 1 /* Voipac PXA270 board */
#undef BOARD_LATE_INIT
#undef CONFIG_SKIP_RELOCATE_UBOOT
#undef CONFIG_USE_IRQ
#undef CONFIG_SKIP_LOWLEVEL_INIT
/* /*
* Environment settings * Environment settings
*/ */
#define CONFIG_ENV_SIZE 0x4000 #define CONFIG_ENV_OVERWRITE
#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024) #define CONFIG_SYS_MALLOC_LEN (128*1024)
#define CONFIG_SYS_GBL_DATA_SIZE 128 #define CONFIG_SYS_GBL_DATA_SIZE 128
#define CONFIG_ENV_OVERWRITE /* override default environment */
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"if mmc init && fatload mmc 0 0xa4000000 uImage; then " \ "if mmc init && fatload mmc 0 0xa4000000 uImage; then " \
"bootm 0xa4000000; " \ "bootm 0xa4000000; " \
@ -49,6 +42,9 @@
"if usb reset && fatload usb 0 0xa4000000 uImage; then " \ "if usb reset && fatload usb 0 0xa4000000 uImage; then " \
"bootm 0xa4000000; " \ "bootm 0xa4000000; " \
"fi; " \ "fi; " \
"if ide reset && fatload ide 0 0xa4000000 uImage; then " \
"bootm 0xa4000000; " \
"fi; " \
"bootm 0x40000;" "bootm 0x40000;"
#define CONFIG_BOOTARGS "console=tty0 console=ttyS0,115200" #define CONFIG_BOOTARGS "console=tty0 console=ttyS0,115200"
#define CONFIG_TIMESTAMP #define CONFIG_TIMESTAMP
@ -97,9 +93,9 @@
#define CONFIG_NET_MULTI 1 #define CONFIG_NET_MULTI 1
#define CONFIG_DRIVER_DM9000 1 #define CONFIG_DRIVER_DM9000 1
#define CONFIG_DM9000_BASE 0x08000300 /* CS2 */ #define CONFIG_DM9000_BASE 0x08000300 /* CS2 */
#define DM9000_IO (CONFIG_DM9000_BASE) #define DM9000_IO (CONFIG_DM9000_BASE)
#define DM9000_DATA (CONFIG_DM9000_BASE + 4) #define DM9000_DATA (CONFIG_DM9000_BASE + 4)
#define CONFIG_NET_RETRY_COUNT 10 #define CONFIG_NET_RETRY_COUNT 10
#define CONFIG_BOOTP_BOOTFILESIZE #define CONFIG_BOOTP_BOOTFILESIZE
@ -116,6 +112,7 @@
#define CONFIG_PXA_MMC #define CONFIG_PXA_MMC
#define CONFIG_SYS_MMC_BASE 0xF0000000 #define CONFIG_SYS_MMC_BASE 0xF0000000
#define CONFIG_CMD_FAT #define CONFIG_CMD_FAT
#define CONFIG_CMD_EXT2
#define CONFIG_DOS_PARTITION #define CONFIG_DOS_PARTITION
#endif #endif
@ -123,8 +120,8 @@
* KGDB * KGDB
*/ */
#ifdef CONFIG_CMD_KGDB #ifdef CONFIG_CMD_KGDB
#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port */ #define CONFIG_KGDB_BAUDRATE 230400 /* kgdb serial port speed */
#define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */ #define CONFIG_KGDB_SER_INDEX 2 /* which serial port to use */
#endif #endif
/* /*
@ -133,16 +130,17 @@
#define CONFIG_SYS_HUSH_PARSER 1 #define CONFIG_SYS_HUSH_PARSER 1
#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#define CONFIG_SYS_LONGHELP /* undef to save memory */ #define CONFIG_SYS_LONGHELP
#ifdef CONFIG_SYS_HUSH_PARSER #ifdef CONFIG_SYS_HUSH_PARSER
#define CONFIG_SYS_PROMPT "$ " /* Monitor Command Prompt */ #define CONFIG_SYS_PROMPT "$ "
#else #else
#define CONFIG_SYS_PROMPT "=> " /* Monitor Command Prompt */ #define CONFIG_SYS_PROMPT "=> "
#endif #endif
#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ #define CONFIG_SYS_CBSIZE 256
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16) /* Print Buffer Size */ #define CONFIG_SYS_PBSIZE \
#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ #define CONFIG_SYS_MAXARGS 16
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
#define CONFIG_SYS_DEVICE_NULLDEV 1 #define CONFIG_SYS_DEVICE_NULLDEV 1
/* /*
@ -150,12 +148,10 @@
*/ */
#undef CONFIG_SYS_CLKS_IN_HZ #undef CONFIG_SYS_CLKS_IN_HZ
#define CONFIG_SYS_HZ 3250000 /* Timer @ 3250000 Hz */ #define CONFIG_SYS_HZ 3250000 /* Timer @ 3250000 Hz */
#define CONFIG_SYS_CPUSPEED 0x190 /* standard setting for 312MHz; L=16, N=1.5, A=0, SDCLK!=SystemBus */ #define CONFIG_SYS_CPUSPEED 0x190 /* 312MHz */
/* /*
* Stack sizes * Stack sizes
*
* The stack sizes are set up in start.S using the settings below
*/ */
#define CONFIG_STACKSIZE (128*1024) /* regular stack */ #define CONFIG_STACKSIZE (128*1024) /* regular stack */
#ifdef CONFIG_USE_IRQ #ifdef CONFIG_USE_IRQ
@ -166,17 +162,24 @@
/* /*
* DRAM Map * DRAM Map
*/ */
#define CONFIG_NR_DRAM_BANKS 2 /* We have 2 banks of DRAM */ #define CONFIG_NR_DRAM_BANKS 2 /* 2 banks of DRAM */
#define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */ #define PHYS_SDRAM_1 0xa0000000 /* SDRAM Bank #1 */
#define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */ #define PHYS_SDRAM_1_SIZE 0x08000000 /* 128 MB */
#ifdef CONFIG_256M_U_BOOT
#define PHYS_SDRAM_2 0x80000000 /* SDRAM Bank #2 */ #define PHYS_SDRAM_2 0x80000000 /* SDRAM Bank #2 */
#define PHYS_SDRAM_2_SIZE 0x08000000 /* 128 MB */ #define PHYS_SDRAM_2_SIZE 0x08000000 /* 128 MB */
#endif
#define CONFIG_SYS_DRAM_BASE 0xa0000000 /* CS0 */ #define CONFIG_SYS_DRAM_BASE 0xa0000000 /* CS0 */
#ifdef CONFIG_256M_U_BOOT
#define CONFIG_SYS_DRAM_SIZE 0x10000000 /* 256 MB DRAM */ #define CONFIG_SYS_DRAM_SIZE 0x10000000 /* 256 MB DRAM */
#else
#define CONFIG_SYS_DRAM_SIZE 0x08000000 /* 128 MB DRAM */
#endif
#define CONFIG_SYS_MEMTEST_START 0xa0400000 /* memtest works on */ #define CONFIG_SYS_MEMTEST_START 0xa0400000 /* memtest works on */
#define CONFIG_SYS_MEMTEST_END 0xa0800000 /* 4 ... 8 MB in DRAM */ #define CONFIG_SYS_MEMTEST_END 0xa0800000 /* 4 ... 8 MB in DRAM */
#define CONFIG_SYS_LOAD_ADDR (0x5c000000) #define CONFIG_SYS_LOAD_ADDR (0x5c000000)
@ -185,14 +188,22 @@
*/ */
#if defined(CONFIG_CMD_FLASH) /* NOR */ #if defined(CONFIG_CMD_FLASH) /* NOR */
#define PHYS_FLASH_1 0x00000000 /* Flash Bank #1 */ #define PHYS_FLASH_1 0x00000000 /* Flash Bank #1 */
#ifdef CONFIG_256M_U_BOOT
#define PHYS_FLASH_2 0x02000000 /* Flash Bank #2 */ #define PHYS_FLASH_2 0x02000000 /* Flash Bank #2 */
#endif
#define CONFIG_SYS_FLASH_CFI #define CONFIG_SYS_FLASH_CFI
#define CONFIG_FLASH_CFI_DRIVER 1 #define CONFIG_FLASH_CFI_DRIVER 1
#define CONFIG_SYS_MAX_FLASH_SECT (4 + 255) #define CONFIG_SYS_MAX_FLASH_SECT (4 + 255)
#ifdef CONFIG_256M_U_BOOT
#define CONFIG_SYS_MAX_FLASH_BANKS 2 #define CONFIG_SYS_MAX_FLASH_BANKS 2
#define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, PHYS_FLASH_2 } #define CONFIG_SYS_FLASH_BANKS_LIST { PHYS_FLASH_1, PHYS_FLASH_2 }
#else
#define CONFIG_SYS_MAX_FLASH_BANKS 1
#define CONFIG_SYS_FLASH_BASE PHYS_FLASH_1
#endif
#define CONFIG_SYS_FLASH_ERASE_TOUT (25*CONFIG_SYS_HZ) #define CONFIG_SYS_FLASH_ERASE_TOUT (25*CONFIG_SYS_HZ)
#define CONFIG_SYS_FLASH_WRITE_TOUT (25*CONFIG_SYS_HZ) #define CONFIG_SYS_FLASH_WRITE_TOUT (25*CONFIG_SYS_HZ)
@ -200,25 +211,26 @@
#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1 #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE 1
#define CONFIG_SYS_FLASH_PROTECTION 1 #define CONFIG_SYS_FLASH_PROTECTION 1
#define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_IS_IN_FLASH 1
#define CONFIG_ENV_SECT_SIZE 0x4000
#elif defined(CONFIG_CMD_ONENAND) /* OneNAND */ #elif defined(CONFIG_CMD_ONENAND) /* OneNAND */
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_ONENAND_BASE 0x00000000 #define CONFIG_SYS_ONENAND_BASE 0x00000000
#define CONFIG_ENV_IS_IN_ONENAND 1 #define CONFIG_ENV_IS_IN_ONENAND 1
#define CONFIG_ENV_SECT_SIZE 0x20000
#else /* No flash */ #else /* No flash */
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_ENV_IS_NOWHERE #define CONFIG_SYS_ENV_IS_NOWHERE
#endif #endif
#define CONFIG_SYS_MONITOR_BASE 0x000000 #define CONFIG_SYS_MONITOR_BASE 0x0
#define CONFIG_SYS_MONITOR_LEN 0x40000 #define CONFIG_SYS_MONITOR_LEN 0x40000
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_ADDR 0x40000
#define CONFIG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_SIZE 0x4000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
/* /*
* IDE * IDE
@ -230,15 +242,15 @@
#define __io #define __io
#define CONFIG_SYS_IDE_MAXBUS 1 #define CONFIG_SYS_IDE_MAXBUS 1
#define CONFIG_SYS_IDE_MAXDEVICE 1 #define CONFIG_SYS_IDE_MAXDEVICE 1
#define CONFIG_SYS_ATA_BASE_ADDR 0x0c000000 #define CONFIG_SYS_ATA_BASE_ADDR 0x0c000000
#define CONFIG_SYS_ATA_IDE0_OFFSET 0x0 #define CONFIG_SYS_ATA_IDE0_OFFSET 0x0
#define CONFIG_SYS_ATA_DATA_OFFSET 0x120 #define CONFIG_SYS_ATA_DATA_OFFSET 0x120
#define CONFIG_SYS_ATA_REG_OFFSET 0x120 #define CONFIG_SYS_ATA_REG_OFFSET 0x120
#define CONFIG_SYS_ATA_ALT_OFFSET 0x120 #define CONFIG_SYS_ATA_ALT_OFFSET 0x120
#define CONFIG_SYS_ATA_STRIDE 2 #define CONFIG_SYS_ATA_STRIDE 2
#endif #endif
@ -284,7 +296,11 @@
#define CONFIG_SYS_MSC0_VAL 0x3ffc95fa #define CONFIG_SYS_MSC0_VAL 0x3ffc95fa
#define CONFIG_SYS_MSC1_VAL 0x02ccf974 #define CONFIG_SYS_MSC1_VAL 0x02ccf974
#define CONFIG_SYS_MSC2_VAL 0x00000000 #define CONFIG_SYS_MSC2_VAL 0x00000000
#ifdef CONFIG_256M_U_BOOT
#define CONFIG_SYS_MDCNFG_VAL 0x8ad30ad3 #define CONFIG_SYS_MDCNFG_VAL 0x8ad30ad3
#else
#define CONFIG_SYS_MDCNFG_VAL 0x88000ad3
#endif
#define CONFIG_SYS_MDREFR_VAL 0x201fe01e #define CONFIG_SYS_MDREFR_VAL 0x201fe01e
#define CONFIG_SYS_MDMRS_VAL 0x00000000 #define CONFIG_SYS_MDMRS_VAL 0x00000000
#define CONFIG_SYS_FLYCNFG_VAL 0x00000000 #define CONFIG_SYS_FLYCNFG_VAL 0x00000000
@ -306,13 +322,13 @@
* LCD * LCD
*/ */
#ifdef CONFIG_LCD #ifdef CONFIG_LCD
#define CONFIG_VOIPAC_LCD #define CONFIG_VOIPAC_LCD
#endif #endif
/* /*
* USB * USB
*/ */
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
#define CONFIG_USB_OHCI_NEW #define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_CPU_INIT #define CONFIG_SYS_USB_OHCI_CPU_INIT
#define CONFIG_SYS_USB_OHCI_BOARD_INIT #define CONFIG_SYS_USB_OHCI_BOARD_INIT