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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -48,4 +48,3 @@ include $(SRCTREE)/rules.mk
|
||||||
sinclude $(obj).depend
|
sinclude $(obj).depend
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
#########################################################################
|
#########################################################################
|
||||||
|
|
||||||
|
|
|
@ -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