Prepare v2010.03-rc1
Coding style cleanup, update CHANGELOG. Signed-off-by: Wolfgang Denk <wd@denx.de>
This commit is contained in:
parent
4e72fb15c9
commit
93910edb59
6
Makefile
6
Makefile
|
@ -21,10 +21,10 @@
|
||||||
# MA 02111-1307 USA
|
# MA 02111-1307 USA
|
||||||
#
|
#
|
||||||
|
|
||||||
VERSION = 2009
|
VERSION = 2010
|
||||||
PATCHLEVEL = 11
|
PATCHLEVEL = 03
|
||||||
SUBLEVEL =
|
SUBLEVEL =
|
||||||
EXTRAVERSION =
|
EXTRAVERSION = -rc1
|
||||||
ifneq "$(SUBLEVEL)" ""
|
ifneq "$(SUBLEVEL)" ""
|
||||||
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
|
||||||
else
|
else
|
||||||
|
|
|
@ -394,4 +394,3 @@ int checkboard(void)
|
||||||
puts("]\n");
|
puts("]\n");
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,8 +92,8 @@ static void sdram_start (int hi_addr)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ATTENTION: Although partially referenced initdram does NOT make real
|
* ATTENTION: Although partially referenced initdram does NOT make real
|
||||||
* use of CONFIG_SYS_SDRAM_BASE. The code does not work if
|
* use of CONFIG_SYS_SDRAM_BASE. The code does not work if
|
||||||
* CONFIG_SYS_SDRAM_BASE is something else than 0x00000000.
|
* CONFIG_SYS_SDRAM_BASE is something else than 0x00000000.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
phys_size_t initdram (int board_type)
|
phys_size_t initdram (int board_type)
|
||||||
|
@ -221,8 +221,8 @@ void ft_board_setup (void *blob, bd_t * bd)
|
||||||
|
|
||||||
int board_eth_init(bd_t *bis)
|
int board_eth_init(bd_t *bis)
|
||||||
{
|
{
|
||||||
cpu_eth_init(bis); /* Built in FEC comes first */
|
cpu_eth_init(bis); /* Built in FEC comes first */
|
||||||
return pci_eth_init(bis);
|
return pci_eth_init(bis);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_VIDEO
|
#ifdef CONFIG_VIDEO
|
||||||
|
|
|
@ -48,4 +48,3 @@ include $(SRCTREE)/rules.mk
|
||||||
sinclude $(obj).depend
|
sinclude $(obj).depend
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
|
|
|
@ -230,7 +230,7 @@ do_imgextract(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||||
|
|
||||||
printf (" Uncompressing part %d ... ", part);
|
printf (" Uncompressing part %d ... ", part);
|
||||||
/*
|
/*
|
||||||
* If we've got less than 4 MB of malloc()
|
* If we've got less than 4 MB of malloc()
|
||||||
* space, use slower decompression algorithm
|
* space, use slower decompression algorithm
|
||||||
* which requires at most 2300 KB of memory.
|
* which requires at most 2300 KB of memory.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -281,4 +281,3 @@ int env_init(void)
|
||||||
return (0);
|
return (0);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -53,4 +53,3 @@ include $(SRCTREE)/rules.mk
|
||||||
sinclude $(obj).depend
|
sinclude $(obj).depend
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
|
|
|
@ -33,11 +33,11 @@
|
||||||
mcr 15, 0, r0, c1, c0, 1
|
mcr 15, 0, r0, c1, c0, 1
|
||||||
|
|
||||||
/* reconfigure L2 cache aux control reg */
|
/* reconfigure L2 cache aux control reg */
|
||||||
mov r0, #0xC0 /* tag RAM */
|
mov r0, #0xC0 /* tag RAM */
|
||||||
add r0, r0, #0x4 /* data RAM */
|
add r0, r0, #0x4 /* data RAM */
|
||||||
orr r0, r0, #(1 << 24) /* disable write allocate delay */
|
orr r0, r0, #(1 << 24) /* disable write allocate delay */
|
||||||
orr r0, r0, #(1 << 23) /* disable write allocate combine */
|
orr r0, r0, #(1 << 23) /* disable write allocate combine */
|
||||||
orr r0, r0, #(1 << 22) /* disable write allocate */
|
orr r0, r0, #(1 << 22) /* disable write allocate */
|
||||||
|
|
||||||
cmp r3, #0x10 /* r3 contains the silicon rev */
|
cmp r3, #0x10 /* r3 contains the silicon rev */
|
||||||
|
|
||||||
|
@ -157,7 +157,7 @@
|
||||||
|
|
||||||
/* Switch peripheral to PLL 3 */
|
/* Switch peripheral to PLL 3 */
|
||||||
ldr r0, =CCM_BASE_ADDR
|
ldr r0, =CCM_BASE_ADDR
|
||||||
ldr r1, =0x000010C0
|
ldr r1, =0x000010C0
|
||||||
str r1, [r0, #CLKCTL_CBCMR]
|
str r1, [r0, #CLKCTL_CBCMR]
|
||||||
ldr r1, =0x13239145
|
ldr r1, =0x13239145
|
||||||
str r1, [r0, #CLKCTL_CBCDR]
|
str r1, [r0, #CLKCTL_CBCDR]
|
||||||
|
@ -255,17 +255,17 @@ lowlevel_init:
|
||||||
str r1, [r0, #0x4]
|
str r1, [r0, #0x4]
|
||||||
|
|
||||||
#ifdef ENABLE_IMPRECISE_ABORT
|
#ifdef ENABLE_IMPRECISE_ABORT
|
||||||
mrs r1, spsr /* save old spsr */
|
mrs r1, spsr /* save old spsr */
|
||||||
mrs r0, cpsr /* read out the cpsr */
|
mrs r0, cpsr /* read out the cpsr */
|
||||||
bic r0, r0, #0x100 /* clear the A bit */
|
bic r0, r0, #0x100 /* clear the A bit */
|
||||||
msr spsr, r0 /* update spsr */
|
msr spsr, r0 /* update spsr */
|
||||||
add lr, pc, #0x8 /* update lr */
|
add lr, pc, #0x8 /* update lr */
|
||||||
movs pc, lr /* update cpsr */
|
movs pc, lr /* update cpsr */
|
||||||
nop
|
nop
|
||||||
nop
|
nop
|
||||||
nop
|
nop
|
||||||
nop
|
nop
|
||||||
msr spsr, r1 /* restore old spsr */
|
msr spsr, r1 /* restore old spsr */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
init_l2cc
|
init_l2cc
|
||||||
|
|
|
@ -159,8 +159,8 @@ Disk /dev/mmcblk0: 1967 MB, 1967128576 bytes
|
||||||
Units = cylinders of 16065 * 512 = 8225280 bytes
|
Units = cylinders of 16065 * 512 = 8225280 bytes
|
||||||
Disk identifier: 0xb712a870
|
Disk identifier: 0xb712a870
|
||||||
|
|
||||||
Device Boot Start End Blocks Id System
|
Device Boot Start End Blocks Id System
|
||||||
/dev/mmcblk0p1 3 16 112455 83 Linux
|
/dev/mmcblk0p1 3 16 112455 83 Linux
|
||||||
|
|
||||||
I have set 100MB, leaving the first 2 sectors free. I will copy u-boot
|
I have set 100MB, leaving the first 2 sectors free. I will copy u-boot
|
||||||
there.
|
there.
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include <nand.h>
|
#include <nand.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <asm/io.h>
|
#include <asm/io.h>
|
||||||
#if defined(CONFIG_MX27) || defined(CONFIG_MX25)
|
#if defined(CONFIG_MX25) || defined(CONFIG_MX27)
|
||||||
#include <asm/arch/imx-regs.h>
|
#include <asm/arch/imx-regs.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -857,8 +857,6 @@ static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static int mxc_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
|
static int mxc_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
|
||||||
u_char *ecc_code)
|
u_char *ecc_code)
|
||||||
{
|
{
|
||||||
|
|
|
@ -220,4 +220,3 @@ void spi_cs_deactivate(struct spi_slave *slave)
|
||||||
{
|
{
|
||||||
/* do nothing */
|
/* do nothing */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -100,4 +100,3 @@ struct da8xx_usb_regs {
|
||||||
|
|
||||||
#define DA8XX_USB_VBUS_GPIO (1 << 15)
|
#define DA8XX_USB_VBUS_GPIO (1 << 15)
|
||||||
#endif /* __DA8XX_MUSB_H__ */
|
#endif /* __DA8XX_MUSB_H__ */
|
||||||
|
|
||||||
|
|
|
@ -45,4 +45,3 @@
|
||||||
int musb_platform_init(void);
|
int musb_platform_init(void);
|
||||||
|
|
||||||
#endif /* _MUSB_OMAP3_H */
|
#endif /* _MUSB_OMAP3_H */
|
||||||
|
|
||||||
|
|
|
@ -32,4 +32,3 @@
|
||||||
#define CONFIG_FTRTC010_BASE 0x98600000 /* Real Time Clock*/
|
#define CONFIG_FTRTC010_BASE 0x98600000 /* Real Time Clock*/
|
||||||
|
|
||||||
#endif /* __A320_H */
|
#endif /* __A320_H */
|
||||||
|
|
||||||
|
|
|
@ -267,8 +267,6 @@
|
||||||
/* End of used area in DPRAM */
|
/* End of used area in DPRAM */
|
||||||
#define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE
|
#define CONFIG_SYS_INIT_RAM_END MPC5XXX_SRAM_SIZE
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* size in bytes reserved for initial data */
|
/* size in bytes reserved for initial data */
|
||||||
#define CONFIG_SYS_GBL_DATA_SIZE 128
|
#define CONFIG_SYS_GBL_DATA_SIZE 128
|
||||||
|
|
||||||
|
@ -315,7 +313,6 @@
|
||||||
/* Boot Argument Buffer Size */
|
/* Boot Argument Buffer Size */
|
||||||
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
|
||||||
|
|
||||||
|
|
||||||
#define CONFIG_SYS_MEMTEST_START 0x00100000 /* memtest works on */
|
#define CONFIG_SYS_MEMTEST_START 0x00100000 /* memtest works on */
|
||||||
#define CONFIG_SYS_MEMTEST_END 0x00f00000 /* 1...15 MB in DRAM */
|
#define CONFIG_SYS_MEMTEST_END 0x00f00000 /* 1...15 MB in DRAM */
|
||||||
|
|
||||||
|
|
|
@ -47,4 +47,3 @@
|
||||||
#define PCA_CON_CR 0x07 /* Clock Rate (MASK) */
|
#define PCA_CON_CR 0x07 /* Clock Rate (MASK) */
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -51,4 +51,3 @@ int udc_init(void);
|
||||||
#endif /* CONFIG_USB_TTY */
|
#endif /* CONFIG_USB_TTY */
|
||||||
|
|
||||||
#endif /* __MUSB_UDC_H__ */
|
#endif /* __MUSB_UDC_H__ */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue