random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-11-04 05:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

PXA: Cleanup Colibri PXA270

Browse Source 
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
This commit is contained in:
Marek Vasut 2011-11-26 07:15:36 +01:00 committed by Albert ARIBAUD
parent d1bb9443f0
commit f9f5486c74
2 changed files with 51 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
board/colibri_pxa270/colibri_pxa270.c
View File

@ -21,20 +21,13 @@
#include <common.h> #include <common.h>
#include <asm/arch/hardware.h> #include <asm/arch/hardware.h>
#include <asm/arch/regs-mmc.h>
#include <netdev.h> #include <netdev.h>
#include <asm/io.h> #include <asm/io.h>
#include <serial.h>
DECLARE_GLOBAL_DATA_PTR; 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) struct serial_device *default_serial_console(void)
{ {
return &serial_ffuart_device; return &serial_ffuart_device;
@ -63,12 +56,6 @@ int dram_init(void)
return 0; return 0;
} }
void dram_init_banksize(void)
{
gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
}
#ifdef CONFIG_CMD_USB #ifdef CONFIG_CMD_USB
int usb_board_init(void) int usb_board_init(void)
{ {
@ -78,7 +65,8 @@ int usb_board_init(void)
writel(readl(UHCHR) | UHCHR_FSBIR, UHCHR); writel(readl(UHCHR) | UHCHR_FSBIR, UHCHR);
while (UHCHR & UHCHR_FSBIR); while (UHCHR & UHCHR_FSBIR)
;
writel(readl(UHCHR) & ~UHCHR_SSE, UHCHR); writel(readl(UHCHR) & ~UHCHR_SSE, UHCHR);
writel((UHCHIE_UPRIE | UHCHIE_RWIE), UHCHIE); writel((UHCHIE_UPRIE | UHCHIE_RWIE), UHCHIE);
@ -126,3 +114,11 @@ int board_eth_init(bd_t *bis)
return dm9000_initialize(bis); return dm9000_initialize(bis);
} }
#endif #endif
#ifdef CONFIG_CMD_MMC
int board_mmc_init(bd_t *bis)
{
pxa_mmc_register(0);
return 0;
}
#endif

55
include/configs/colibri_pxa270.h
View File

@ -26,20 +26,16 @@
* High Level Board Configuration Options * High Level Board Configuration Options
*/ */
#define CONFIG_CPU_PXA27X 1 /* Marvell PXA270 CPU */ #define CONFIG_CPU_PXA27X 1 /* Marvell PXA270 CPU */
#define CONFIG_VPAC270 1 /* Toradex Colibri PXA270 board */ #define CONFIG_SYS_TEXT_BASE 0x0
#undef CONFIG_BOARD_LATE_INIT #define CONFIG_DISPLAY_CPUINFO
#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_TEXT_BASE 0x0 #define CONFIG_ARCH_CPU_INIT
#define CONFIG_ENV_OVERWRITE /* override default environment */
#define CONFIG_BOOTCOMMAND \ #define CONFIG_BOOTCOMMAND \
"if mmc init && fatload mmc 0 0xa0000000 uImage; then " \ "if mmc init && fatload mmc 0 0xa0000000 uImage; then " \
"bootm 0xa0000000; " \ "bootm 0xa0000000; " \
@ -53,8 +49,8 @@
#define CONFIG_BOOTDELAY 2 /* Autoboot delay */ #define CONFIG_BOOTDELAY 2 /* Autoboot delay */
#define CONFIG_CMDLINE_TAG #define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_LZMA /* LZMA compression support */ #define CONFIG_LZMA /* LZMA compression support */
#define CONFIG_OF_LIBFDT
/* /*
* Serial Console Configuration * Serial Console Configuration
@ -101,9 +97,11 @@
*/ */
#ifdef CONFIG_CMD_MMC #ifdef CONFIG_CMD_MMC
#define CONFIG_MMC #define CONFIG_MMC
#define CONFIG_PXA_MMC #define CONFIG_GENERIC_MMC
#define CONFIG_PXA_MMC_GENERIC
#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
@ -121,23 +119,26 @@
#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
#define CONFIG_CMDLINE_EDITING 1
#define CONFIG_AUTO_COMPLETE 1
/* /*
* Clock Configuration * Clock Configuration
*/ */
#undef CONFIG_SYS_CLKS_IN_HZ #define CONFIG_SYS_HZ 1000 /* Timer @ 3250000 Hz */
#define CONFIG_SYS_HZ 3250000 /* Timer @ 3250000 Hz */
#define CONFIG_SYS_CPUSPEED 0x290 /* 520MHz */ #define CONFIG_SYS_CPUSPEED 0x290 /* 520MHz */
/* /*
@ -164,10 +165,9 @@
#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 (0xa1000000) #define CONFIG_SYS_LOAD_ADDR PHYS_SDRAM_1
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_INIT_SP_ADDR (GENERATED_GBL_DATA_SIZE + PHYS_SDRAM_1) #define CONFIG_SYS_INIT_SP_ADDR 0x5c010000
/* /*
* NOR FLASH * NOR FLASH
@ -195,15 +195,16 @@
#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 0x80000
#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_LEN) #define CONFIG_ENV_ADDR \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_ENV_SIZE 0x40000
#define CONFIG_ENV_SECT_SIZE 0x40000 #define CONFIG_ENV_SECT_SIZE 0x40000
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE) #define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE)
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE) #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
/* /*
* GPIO settings * GPIO settings
*/ */