Prepare v2010.03-rc1

Coding style cleanup, update CHANGELOG. Signed-off-by: Wolfgang Denk <wd@denx.de>
14 years ago · 93910edb59
parent 4e72fb15c9
commit 93910edb59
18 changed files with 6417 additions and 659 deletions
--- a/7013
+++ b/7013
--- a/6
+++ b/6
@ -21,10 +21,10 @@
 # MA 02111-1307 USA
 #

-VERSION = 2009
-PATCHLEVEL = 11
+VERSION = 2010
+PATCHLEVEL = 03
 SUBLEVEL =
-EXTRAVERSION =
+EXTRAVERSION = -rc1
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else
--- a/board/freescale/mx51evk/mx51evk.c
+++ b/board/freescale/mx51evk/mx51evk.c
@ -394,4 +394,3 @@ int checkboard(void)
 	puts("]\n");
 	return 0;
 }
-
--- a/board/karo/tx25/Makefile
+++ b/board/karo/tx25/Makefile
@ -48,4 +48,3 @@ include $(SRCTREE)/rules.mk
 sinclude $(obj).depend

 #########################################################################
-
--- a/common/env_eeprom.c
+++ b/common/env_eeprom.c
@ -281,4 +281,3 @@ int env_init(void)
 	return (0);
 }
 #endif
-
--- a/cpu/arm920t/ep93xx/Makefile
+++ b/cpu/arm920t/ep93xx/Makefile
@ -53,4 +53,3 @@ include $(SRCTREE)/rules.mk
 sinclude $(obj).depend

 #########################################################################
-
--- a/drivers/mtd/nand/mxc_nand.c
+++ b/drivers/mtd/nand/mxc_nand.c
@ -22,7 +22,7 @@
 #include <nand.h>
 #include <linux/err.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>
 #endif

@ -857,8 +857,6 @@ static int mxc_nand_correct_data(struct mtd_info *mtd, u_char *dat,
 }
 #endif

-
-
 static int mxc_nand_calculate_ecc(struct mtd_info *mtd, const u_char *dat,
 				  u_char *ecc_code)
 {
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@ -220,4 +220,3 @@ void spi_cs_deactivate(struct spi_slave *slave)
 {
 	/* do nothing */
 }
-
--- a/drivers/usb/musb/da8xx.h
+++ b/drivers/usb/musb/da8xx.h
@ -100,4 +100,3 @@ struct da8xx_usb_regs {

 #define DA8XX_USB_VBUS_GPIO	(1 << 15)
 #endif	/* __DA8XX_MUSB_H__ */
-
--- a/drivers/usb/musb/omap3.h
+++ b/drivers/usb/musb/omap3.h
@ -45,4 +45,3 @@
 int musb_platform_init(void);

 #endif /* _MUSB_OMAP3_H */
-
--- a/include/asm-arm/arch-a320/a320.h
+++ b/include/asm-arm/arch-a320/a320.h
@ -32,4 +32,3 @@
 #define CONFIG_FTRTC010_BASE	0x98600000	/* Real Time Clock*/

 #endif	/* __A320_H */
-
--- a/include/configs/ipek01.h
+++ b/include/configs/ipek01.h
@ -267,8 +267,6 @@
 /* End of used area in DPRAM */
 #define CONFIG_SYS_INIT_RAM_END		MPC5XXX_SRAM_SIZE

-
-
 /* size in bytes reserved for initial data */
 #define CONFIG_SYS_GBL_DATA_SIZE	128

@ -315,7 +313,6 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE

-
 #define CONFIG_SYS_MEMTEST_START	0x00100000	/* memtest works on */
 #define CONFIG_SYS_MEMTEST_END		0x00f00000	/* 1...15 MB in DRAM */

--- a/include/pca9564.h
+++ b/include/pca9564.h
@ -47,4 +47,3 @@
 #define PCA_CON_CR          0x07 /* Clock Rate (MASK) */

 #endif
-
--- a/include/usb/musb_udc.h
+++ b/include/usb/musb_udc.h
@ -51,4 +51,3 @@ int udc_init(void);
 #endif /* CONFIG_USB_TTY */

 #endif /* __MUSB_UDC_H__ */
-