Просмотр исходного кода

Coding Style cleanup; update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Wolfgang Denk 15 лет назад
Родитель
Сommit
28958b8bea

+ 57 - 0
CHANGELOG

@@ -1,3 +1,60 @@
+commit 2632c008e2c2cd61fefb622ed671ea3e6bd2e2a6
+Author: Mike Frysinger <vapier@gentoo.org>
+Date:	Tue Jul 21 22:59:36 2009 -0400
+
+    autoconf.mk: include before config.mk for top level files
+
+    By including autoconf.mk before config.mk, all top level files can use any
+    config options it sets up (like <arch>_config.mk) or the Makefile itself
+    without being forced to use lazy evaluation.
+
+commit c01171eaecc963d2c1f56a0984a0cbcdd8a3ab3c
+Author: Mark Jackson <mpfj-list@mimc.co.uk>
+Date:	Tue Jul 21 11:30:53 2009 +0100
+
+    Remove static declaration from gunzip_bmp()
+
+    This patch removes the static declaration from gunzip_bmp()
+
+    Without it, the gunzip_bmp() function is not visible to
+    common/lcd.c and fails to compile with an error.
+
+    Signed-off-by: Mark Jackson <mpfj@mimc.co.uk>
+
+commit 2d4a43e230a3c8bfd03b9beaa0eb2a95e779c03b
+Author: Peter Tyser <ptyser@gmail.com>
+Date:	Mon Jul 20 21:51:38 2009 -0500
+
+    cmd_tsi148: General cleanup
+
+    - Fix command help message
+    - Disable DEBUG by default
+    - Fix whitespace issues
+    - Fix lines > 80 characters
+
+    Signed-off-by: Peter Tyser <ptyser@gmail.com>
+    Acked-by: Stefan Roese <sr@denx.de>
+
+commit 9aef73888509d10193615ee5cd9cf439ca44e937
+Author: Mike Frysinger <vapier@gentoo.org>
+Date:	Sun Jul 19 15:17:03 2009 -0400
+
+    unify HOST_CFLAGS and HOSTCFLAGS
+
+    The top build system sets up HOSTCFLAGS a bit and exports it, but other
+    places use HOST_CFLAGS instead.  Unify the two as HOSTCFLAGS so that the
+    values stay in sync.
+
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+commit 2e9393f500065f940e5e4ac7fe375e4c0b77b936
+Author: Wolfgang Denk <wd@denx.de>
+Date:	Thu Jul 23 21:16:59 2009 +0200
+
+    Update CHANGELOG
+
+    Signed-off-by: Wolfgang Denk <wd@denx.de>
+
 commit e3b39f84e974df70065fa248f0f63993b1708c9d
 commit e3b39f84e974df70065fa248f0f63993b1708c9d
 Author: André Schwarz <andre.schwarz@matrix-vision.de>
 Author: André Schwarz <andre.schwarz@matrix-vision.de>
 Date:	Fri Jul 17 14:50:24 2009 +0200
 Date:	Fri Jul 17 14:50:24 2009 +0200

+ 1 - 1
MAINTAINERS

@@ -552,7 +552,7 @@ Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
 	meesc		ARM926EJS (AT91SAM9263 SoC)
 	meesc		ARM926EJS (AT91SAM9263 SoC)
 
 
 Sedji Gaouaou<sedji.gaouaou@atmel.com>
 Sedji Gaouaou<sedji.gaouaou@atmel.com>
-	at91sam9g10ek		ARM926EJS (AT91SAM9G10 SoC)	
+	at91sam9g10ek		ARM926EJS (AT91SAM9G10 SoC)
 	at91sam9m10g45ek	ARM926EJS (AT91SAM9G45 SoC)
 	at91sam9m10g45ek	ARM926EJS (AT91SAM9G45 SoC)
 
 
 Marius Gröger <mag@sysgo.de>
 Marius Gröger <mag@sysgo.de>

+ 0 - 1
board/phytec/pcm030/pcm030.c

@@ -217,4 +217,3 @@ void ide_set_reset(int idereset)
 		setbits_be32(&wu_gpio->dvo, GPIO_PSC2_4);
 		setbits_be32(&wu_gpio->dvo, GPIO_PSC2_4);
 }
 }
 #endif /* defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET) */
 #endif /* defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET) */
-

+ 0 - 1
common/cmd_net.c

@@ -401,4 +401,3 @@ U_BOOT_CMD(
 );
 );
 
 
 #endif	/* CONFIG_CMD_DNS */
 #endif	/* CONFIG_CMD_DNS */
-

+ 16 - 18
doc/README.dns

@@ -13,16 +13,14 @@ For example, www.example.com translates to 208.77.188.166.
 
 
 For more information on DNS - http://en.wikipedia.org/wiki/Domain_Name_System
 For more information on DNS - http://en.wikipedia.org/wiki/Domain_Name_System
 
 
-
-
 U-Boot and DNS
 U-Boot and DNS
 ------------------------------------------
 ------------------------------------------
 
 
 CONFIG_CMD_DNS - controls if the 'dns' command is compiled in. If it is, it
 CONFIG_CMD_DNS - controls if the 'dns' command is compiled in. If it is, it
-                 will send name lookups to the dns server (env var 'dnsip')
-                 Turning this option on will about abou 1k to U-Boot's size.
+		 will send name lookups to the dns server (env var 'dnsip')
+		 Turning this option on will about abou 1k to U-Boot's size.
 
 
-                 Example:
+		 Example:
 
 
 bfin> print dnsip
 bfin> print dnsip
 dnsip=192.168.0.1
 dnsip=192.168.0.1
@@ -30,12 +28,12 @@ dnsip=192.168.0.1
 bfin> dns www.google.com
 bfin> dns www.google.com
 66.102.1.104
 66.102.1.104
 
 
-                 By default, dns does nothing except print the IP number on
-                 the default console - which by itself, would be pretty
-                 useless. Adding a third argument to the dns command will
-                 use that as the environment variable to be set.
+		 By default, dns does nothing except print the IP number on
+		 the default console - which by itself, would be pretty
+		 useless. Adding a third argument to the dns command will
+		 use that as the environment variable to be set.
 
 
-                 Example:
+		 Example:
 
 
 bfin> print googleip
 bfin> print googleip
 ## Error: "googleip" not defined
 ## Error: "googleip" not defined
@@ -47,18 +45,18 @@ bfin> ping ${googleip}
 Using Blackfin EMAC device
 Using Blackfin EMAC device
 host 64.233.161.104 is alive
 host 64.233.161.104 is alive
 
 
-                 In this way, you can lookup, and set many more meaningful
-                 things.
+		 In this way, you can lookup, and set many more meaningful
+		 things.
 
 
 bfin> sntp
 bfin> sntp
 ntpserverip not set
 ntpserverip not set
 bfin> dns pool.ntp.org ntpserverip
 bfin> dns pool.ntp.org ntpserverip
 72.18.205.156
 72.18.205.156
 bfin> sntp
 bfin> sntp
-Date: 2009-07-18 Time:  4:06:57
+Date: 2009-07-18 Time:	4:06:57
 
 
-                 For some helpful things that can be related to DNS in U-Boot,
-                 look at the top level README for these config options:
-                    CONFIG_CMD_DHCP
-                    CONFIG_BOOTP_DNS
-                    CONFIG_BOOTP_DNS2
+		 For some helpful things that can be related to DNS in U-Boot,
+		 look at the top level README for these config options:
+		    CONFIG_CMD_DHCP
+		    CONFIG_BOOTP_DNS
+		    CONFIG_BOOTP_DNS2

+ 0 - 4
doc/README.phytec.pcm030

@@ -18,7 +18,6 @@ pcm030_LOWBOOT_config:	unconfig
 	@$(MKCONFIG) -a pcm030 ppc mpc5xxx pcm030 phytec
 	@$(MKCONFIG) -a pcm030 ppc mpc5xxx pcm030 phytec
 	@ echo "remember to set pcm030_REV to 0 for rev 1245.0 rev or to 1 for rev 1245.1"
 	@ echo "remember to set pcm030_REV to 0 for rev 1245.0 rev or to 1 for rev 1245.1"
 
 
-
 Alternative SDRAM settings:
 Alternative SDRAM settings:
 
 
 #define SDRAM_MODE	0x018D0000
 #define SDRAM_MODE	0x018D0000
@@ -41,6 +40,3 @@ Moving the environment to flash can be more reliable
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + 0xfe0000)
 #define CONFIG_ENV_ADDR		(CONFIG_SYS_FLASH_BASE + 0xfe0000)
 #define CONFIG_ENV_SIZE		0x20000
 #define CONFIG_ENV_SIZE		0x20000
 #define CONFIG_ENV_SECT_SIZE	0x20000
 #define CONFIG_ENV_SECT_SIZE	0x20000
-
-
-

+ 0 - 1
drivers/net/fec_mxc.c

@@ -739,4 +739,3 @@ int fecmxc_initialize(bd_t *bd)
 
 
 	return lout;
 	return lout;
 }
 }
-

+ 0 - 1
drivers/usb/host/ehci-kirkwood.c

@@ -105,4 +105,3 @@ int ehci_hcd_stop(void)
 {
 {
 	return 0;
 	return 0;
 }
 }
-

+ 1 - 1
include/configs/cm-bf561.h

@@ -65,7 +65,7 @@
 #define CONFIG_SMC91111_BASE	0x28000300
 #define CONFIG_SMC91111_BASE	0x28000300
 /* The next 3 lines are for use with EXT-BF5xx-USB-ETH2 */
 /* The next 3 lines are for use with EXT-BF5xx-USB-ETH2 */
 /* #define CONFIG_DRIVER_SMC911X 1 */
 /* #define CONFIG_DRIVER_SMC911X 1 */
-/* #define CONFIG_DRIVER_SMC911X_BASE 0x24080000 // AMS1 */
+/* #define CONFIG_DRIVER_SMC911X_BASE 0x24080000 /! AMS1 */
 /* #define CONFIG_DRIVER_SMC911X_32_BIT 1 */
 /* #define CONFIG_DRIVER_SMC911X_32_BIT 1 */
 #define CONFIG_HOSTNAME		cm-bf561
 #define CONFIG_HOSTNAME		cm-bf561
 /* Uncomment next line to use fixed MAC address */
 /* Uncomment next line to use fixed MAC address */

+ 7 - 7
include/u-boot/zlib.h

@@ -200,7 +200,7 @@ extern "C" {
 #endif
 #endif
 
 
 /* The memory requirements for deflate are (in bytes):
 /* The memory requirements for deflate are (in bytes):
-            (1 << (windowBits+2)) +  (1 << (memLevel+9))
+	    (1 << (windowBits+2)) +  (1 << (memLevel+9))
  that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
  that is: 128K for windowBits=15  +  128K for memLevel = 8  (default values)
  plus a few kilobytes for small objects. For example, if you want to reduce
  plus a few kilobytes for small objects. For example, if you want to reduce
  the default memory requirements from 256K to 128K, compile with
  the default memory requirements from 256K to 128K, compile with
@@ -212,7 +212,7 @@ extern "C" {
  for small objects.
  for small objects.
 */
 */
 
 
-                        /* Type declarations */
+			/* Type declarations */
 
 
 #ifndef OF /* function prototypes */
 #ifndef OF /* function prototypes */
 #  ifdef STDC
 #  ifdef STDC
@@ -461,7 +461,7 @@ typedef struct gz_header_s {
 
 
 typedef gz_header FAR *gz_headerp;
 typedef gz_header FAR *gz_headerp;
 
 
-                        /* constants */
+			/* constants */
 #define Z_NO_FLUSH      0
 #define Z_NO_FLUSH      0
 #define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
 #define Z_PARTIAL_FLUSH 1 /* will be removed, use Z_SYNC_FLUSH instead */
 #define Z_SYNC_FLUSH    2
 #define Z_SYNC_FLUSH    2
@@ -507,7 +507,7 @@ typedef gz_header FAR *gz_headerp;
 
 
 #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
 #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */
 
 
-                        /* basic functions */
+			/* basic functions */
 
 
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
 /* The application can compare zlibVersion and ZLIB_VERSION for consistency.
    If the first character differs, the library code actually used is
    If the first character differs, the library code actually used is
@@ -627,11 +627,11 @@ ZEXTERN int ZEXPORT inflateEnd OF((z_streamp strm));
    static string (which must not be deallocated).
    static string (which must not be deallocated).
 */
 */
 
 
-                        /* Advanced functions */
+			/* Advanced functions */
 
 
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 ZEXTERN int ZEXPORT inflateReset OF((z_streamp strm));
 
 
-                        /* utility functions */
+			/* utility functions */
 
 
 /*
 /*
      The following utility functions are implemented on top of the
      The following utility functions are implemented on top of the
@@ -681,7 +681,7 @@ ZEXTERN  uInt ZEXPORT crc32  OF((uInt crc, const Bytef *buf, uInt len));
 */
 */
 
 
 ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
 ZEXTERN int ZEXPORT inflateInit2_ OF((z_streamp strm, int  windowBits,
-                                      const char *version, int stream_size));
+				      const char *version, int stream_size));
 #define inflateInit(strm) \
 #define inflateInit(strm) \
 	inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream))
 	inflateInit_((strm), ZLIB_VERSION, sizeof(z_stream))
 #define inflateInit2(strm, windowBits) \
 #define inflateInit2(strm, windowBits) \

Разница между файлами не показана из-за своего большого размера
+ 900 - 900
lib_generic/zlib.c


+ 0 - 1
net/dns.c

@@ -208,4 +208,3 @@ DnsStart(void)
 
 
 	DnsSend();
 	DnsSend();
 }
 }
-

Некоторые файлы не были показаны из-за большого количества измененных файлов