V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master

This commit is contained in:
Wolfgang Denk 2010-06-23 00:40:03 +02:00
parent 1a27f7d9c2 47ea6edfb3
commit eb77c9bdea
6 changed files with 22 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
MAINTAINERS
View File

@ -677,12 +677,6 @@ Sergey Lapin <slapin@ossfans.org>
afeb9260 ARM926EJS (AT91SAM9260 SoC) afeb9260 ARM926EJS (AT91SAM9260 SoC)
Guennadi Liakhovetski <g.liakhovetski@gmx.de>
imx31_phycore_eet i.MX31
mx31ads i.MX31
SMDK6400 S3C6400
Nishanth Menon <nm@ti.com> Nishanth Menon <nm@ti.com>
omap3_sdp3430 ARM CORTEX-A8 (OMAP3xx SoC) omap3_sdp3430 ARM CORTEX-A8 (OMAP3xx SoC)
@ -825,6 +819,10 @@ Unknown / orphaned boards:
ixdp425 xscale Kyle Harris <kharris@nexus-tech.net> / dead address ixdp425 xscale Kyle Harris <kharris@nexus-tech.net> / dead address
lubbock xscale Kyle Harris <kharris@nexus-tech.net> / dead address lubbock xscale Kyle Harris <kharris@nexus-tech.net> / dead address
imx31_phycore_eet i.MX31 Guennadi Liakhovetski <g.liakhovetski@gmx.de> / resigned
mx31ads i.MX31 Guennadi Liakhovetski <g.liakhovetski@gmx.de> / resigned
SMDK6400 S3C6400 Guennadi Liakhovetski <g.liakhovetski@gmx.de> / resigned
######################################################################### #########################################################################
# x86 Systems: # # x86 Systems: #
# # # #

6
Makefile
View File

@ -385,8 +385,8 @@ $(VERSION_FILE):
@cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@ @cmp -s $@ $@.tmp && rm -f $@.tmp || mv -f $@.tmp $@
$(TIMESTAMP_FILE): $(TIMESTAMP_FILE):
@date +'#define U_BOOT_DATE "%b %d %C%y"' > $@ @LC_ALL=C date +'#define U_BOOT_DATE "%b %d %C%y"' > $@
@date +'#define U_BOOT_TIME "%T"' >> $@ @LC_ALL=C date +'#define U_BOOT_TIME "%T"' >> $@
gdbtools: gdbtools:
$(MAKE) -C tools/gdb all || exit 1 $(MAKE) -C tools/gdb all || exit 1
@ -3751,6 +3751,6 @@ endif
backup: backup:
F=`basename $(TOPDIR)` ; cd .. ; \ F=`basename $(TOPDIR)` ; cd .. ; \
gtar --force-local -zcvf `date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F gtar --force-local -zcvf `LC_ALL=C date "+$$F-%Y-%m-%d-%T.tar.gz"` $$F
######################################################################### #########################################################################

8
arch/arm/cpu/arm926ejs/orion5x/cpu.c
View File

@ -260,10 +260,10 @@ int arch_misc_init(void)
/* Set CPIOs and MPPs - values provided by board /* Set CPIOs and MPPs - values provided by board
include file */ include file */
writel(ORION5X_MPP_BASE+0x00, ORION5X_MPP0_7); writel(ORION5X_MPP0_7, ORION5X_MPP_BASE+0x00);
writel(ORION5X_MPP_BASE+0x04, ORION5X_MPP8_15); writel(ORION5X_MPP8_15, ORION5X_MPP_BASE+0x04);
writel(ORION5X_MPP_BASE+0x50, ORION5X_MPP16_23); writel(ORION5X_MPP16_23, ORION5X_MPP_BASE+0x50);
writel(ORION5X_GPIO_BASE+0x04, ORION5X_GPIO_OUT_ENABLE); writel(ORION5X_GPIO_OUT_ENABLE, ORION5X_GPIO_BASE+0x04);
return 0; return 0;
} }

2
arch/arm/include/asm/io.h
View File

@ -253,7 +253,7 @@ extern void __iounmap(void *addr);
unsigned long _off = (off), _size = (sz); \ unsigned long _off = (off), _size = (sz); \
void *_ret = (void *)0; \ void *_ret = (void *)0; \
if (iomem_valid_addr(_off, _size)) \ if (iomem_valid_addr(_off, _size)) \
_ret = __ioremap(iomem_to_phys(_off),_size,0); \ _ret = __ioremap(iomem_to_phys(_off),_size,nocache); \
_ret; \ _ret; \
}) })

43
arch/arm/lib/bootm.c
View File

@ -33,9 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;
defined (CONFIG_CMDLINE_TAG) || \ defined (CONFIG_CMDLINE_TAG) || \
defined (CONFIG_INITRD_TAG) || \ defined (CONFIG_INITRD_TAG) || \
defined (CONFIG_SERIAL_TAG) || \ defined (CONFIG_SERIAL_TAG) || \
defined (CONFIG_REVISION_TAG) || \ defined (CONFIG_REVISION_TAG)
defined (CONFIG_VFD) || \
defined (CONFIG_LCD)
static void setup_start_tag (bd_t *bd); static void setup_start_tag (bd_t *bd);
# ifdef CONFIG_SETUP_MEMORY_TAGS # ifdef CONFIG_SETUP_MEMORY_TAGS
@ -49,10 +47,6 @@ static void setup_initrd_tag (bd_t *bd, ulong initrd_start,
# endif # endif
static void setup_end_tag (bd_t *bd); static void setup_end_tag (bd_t *bd);
# if defined (CONFIG_VFD) || defined (CONFIG_LCD)
static void setup_videolfb_tag (gd_t *gd);
# endif
static struct tag *params; static struct tag *params;
#endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */ #endif /* CONFIG_SETUP_MEMORY_TAGS || CONFIG_CMDLINE_TAG || CONFIG_INITRD_TAG */
@ -87,9 +81,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
defined (CONFIG_CMDLINE_TAG) || \ defined (CONFIG_CMDLINE_TAG) || \
defined (CONFIG_INITRD_TAG) || \ defined (CONFIG_INITRD_TAG) || \
defined (CONFIG_SERIAL_TAG) || \ defined (CONFIG_SERIAL_TAG) || \
defined (CONFIG_REVISION_TAG) || \ defined (CONFIG_REVISION_TAG)
defined (CONFIG_LCD) || \
defined (CONFIG_VFD)
setup_start_tag (bd); setup_start_tag (bd);
#ifdef CONFIG_SERIAL_TAG #ifdef CONFIG_SERIAL_TAG
setup_serial_tag (&params); setup_serial_tag (&params);
@ -106,9 +98,6 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
#ifdef CONFIG_INITRD_TAG #ifdef CONFIG_INITRD_TAG
if (images->rd_start && images->rd_end) if (images->rd_start && images->rd_end)
setup_initrd_tag (bd, images->rd_start, images->rd_end); setup_initrd_tag (bd, images->rd_start, images->rd_end);
#endif
#if defined (CONFIG_VFD) || defined (CONFIG_LCD)
setup_videolfb_tag ((gd_t *) gd);
#endif #endif
setup_end_tag (bd); setup_end_tag (bd);
#endif #endif
@ -136,9 +125,7 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
defined (CONFIG_CMDLINE_TAG) || \ defined (CONFIG_CMDLINE_TAG) || \
defined (CONFIG_INITRD_TAG) || \ defined (CONFIG_INITRD_TAG) || \
defined (CONFIG_SERIAL_TAG) || \ defined (CONFIG_SERIAL_TAG) || \
defined (CONFIG_REVISION_TAG) || \ defined (CONFIG_REVISION_TAG)
defined (CONFIG_LCD) || \
defined (CONFIG_VFD)
static void setup_start_tag (bd_t *bd) static void setup_start_tag (bd_t *bd)
{ {
params = (struct tag *) bd->bi_boot_params; params = (struct tag *) bd->bi_boot_params;
@ -214,30 +201,6 @@ static void setup_initrd_tag (bd_t *bd, ulong initrd_start, ulong initrd_end)
} }
#endif /* CONFIG_INITRD_TAG */ #endif /* CONFIG_INITRD_TAG */
#if defined (CONFIG_VFD) || defined (CONFIG_LCD)
extern ulong calc_fbsize (void);
static void setup_videolfb_tag (gd_t *gd)
{
/* An ATAG_VIDEOLFB node tells the kernel where and how large
* the framebuffer for video was allocated (among other things).
* Note that a _physical_ address is passed !
*
* We only use it to pass the address and size, the other entries
* in the tag_videolfb are not of interest.
*/
params->hdr.tag = ATAG_VIDEOLFB;
params->hdr.size = tag_size (tag_videolfb);
params->u.videolfb.lfb_base = (u32) gd->fb_base;
/* Fb size is calculated according to parameters for our panel
*/
params->u.videolfb.lfb_size = calc_fbsize();
params = tag_next (params);
}
#endif /* CONFIG_VFD || CONFIG_LCD */
#ifdef CONFIG_SERIAL_TAG #ifdef CONFIG_SERIAL_TAG
void setup_serial_tag (struct tag **tmp) void setup_serial_tag (struct tag **tmp)
{ {

1
drivers/mtd/ubi/vtbl.c
View File

@ -520,6 +520,7 @@ static int init_volumes(struct ubi_device *ubi, const struct ubi_scan_info *si,
vol->reserved_pebs = be32_to_cpu(vtbl[i].reserved_pebs); vol->reserved_pebs = be32_to_cpu(vtbl[i].reserved_pebs);
vol->alignment = be32_to_cpu(vtbl[i].alignment); vol->alignment = be32_to_cpu(vtbl[i].alignment);
vol->data_pad = be32_to_cpu(vtbl[i].data_pad); vol->data_pad = be32_to_cpu(vtbl[i].data_pad);
vol->upd_marker = vtbl[i].upd_marker;
vol->vol_type = vtbl[i].vol_type == UBI_VID_DYNAMIC ? vol->vol_type = vtbl[i].vol_type == UBI_VID_DYNAMIC ?
UBI_DYNAMIC_VOLUME : UBI_STATIC_VOLUME; UBI_DYNAMIC_VOLUME : UBI_STATIC_VOLUME;
vol->name_len = be16_to_cpu(vtbl[i].name_len); vol->name_len = be16_to_cpu(vtbl[i].name_len);