eaw/u-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master' into next

Browse Source
This commit is contained in:
Wolfgang Denk
2010-03-21 22:45:36 +01:00
parent 3c950e2ebf daa989b472
commit b46b353b90
43 changed files with 65 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/asm-arm/arch-at91/at91_matrix.h
View File

@@ -80,7 +80,7 @@ typedef struct at91_matrix {
u32 mrcr; /* 0x100 Master Remap Control */
u32 reserve4[3];
#if defined(CONFIG_AT91SAM9G45)
u32 ccr[52] /* 0x110 - 0x1E0 Chip Configuration */
u32 ccr[52]; /* 0x110 - 0x1E0 Chip Configuration */
u32 womr; /* 0x1E4 Write Protect Mode */
u32 wpsr; /* 0x1E8 Write Protect Status */
u32 resg45_1[10];

0
include/asm-arm/arch-spear/spr_gpt.h Executable file → Normal file
View File

0
include/asm-arm/arch-spear/spr_i2c.h Executable file → Normal file
View File

0
include/asm-arm/arch-spear/spr_smi.h Executable file → Normal file
View File

0
include/asm-arm/arch-spear/spr_xloader_table.h Executable file → Normal file
View File

0
include/configs/spear3xx.h Executable file → Normal file
View File

0
include/configs/spear6xx.h Executable file → Normal file
View File

0
include/usb/spr_udc.h Executable file → Normal file
View File