Prepare v2009.06-rc2

Update CHANGELOG.

Signed-off-by: Wolfgang Denk <wd@denx.de>

CHANGELOG

@@ -1,9 +1,305 @@
-commit d45bb538e8898ff0f2dcfed6b95e97c7b9afed9d
+commit f4317ea91942f44cc1c433277927b61618e9b0a5
+Author: Daniel Mack <daniel@caiaq.de>
+Date:	Tue May 5 12:48:29 2009 +0200
+
+    ARM: fix PXA build by defining UP2OCR
+
+    U-Boot does not currently build for PXA platforms with USB support
+    enabled:
+
+    usb.c:46: error: 'UP2OCR' undeclared (first use in this function)
+
+    Signed-off-by: Daniel Mack <daniel@caiaq.de>
+    Cc: Markus Klotzbuecher <mk@denx.de>
+
+    Edited commit message.
+    Signed-off-by: Wolfgang Denk <wd@denx.de>
+
+commit e26ad0eabd10a8cda51920fbcfe4da5b4ccf0c98
+Author: Wolfgang Denk <wd@denx.de>
+Date:	Fri May 15 22:32:57 2009 +0200
+
+    Minor Coding Style fix; update CHANGELOG.
+
+    Signed-off-by: Wolfgang Denk <wd@denx.de>
+
+commit af75a45d23b72a59ac5cc0427696c7f634fdc94b
+Author: Wolfgang Denk <wd@denx.de>
+Date:	Fri May 15 09:27:58 2009 +0200
+
+    IDE: bail out of dev_print() for unknown device types
+
+    Commit 574b319512 introduced a subtle bug by mixing a list of tests
+    for "dev_desc->type" and "dev_desc->if_type" into one switch(), which
+    then mostly did not work because "dev_desc->type" cannot take any
+    "IF_*" type values. A later fix in commit 8ec6e332ea changed the
+    switch() into testing "dev_desc->if_type", but at this point the
+    initial test for unknown device types was completely lost, which
+    resulted in output like that for IDE ports without device attached:
+
+      Device 1: Model:	Firm:  Ser#:
+		Type: # 1F #
+		Capacity: not available
+
+    This patch re-introduces the missing test for unknown device types.
+
+    Signed-off-by: Wolfgang Denk <wd@denx.de>
+    Cc: Stefan Roese <sr@denx.de>
+    Cc: Detlev Zundel <dzu@denx.de>
+    Tested-by: Stefan Roese <sr@denx.de>
+
+commit c21f62d8483fbab44cd98d93ff2e9355a330d225
+Author: Stefan Roese <sr@denx.de>
+Date:	Thu May 14 07:25:13 2009 +0200
+
+    74xx_7xx: Fix rounding problem in CPU frequency calculation
+
+    This patch fixes a problem in the CPU frequency calculation. Without it
+    a 798MHz CPU is displayed as 368.503 MHz. And with it it's 798 MHz.
+
+    Signed-off-by: Stefan Roese <sr@denx.de>
+
+commit 3ad8a0517b724782ab36f2b554a94de4c00c1adb
+Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Date:	Wed May 13 22:24:12 2009 +0200
+
+    console.h: remove unused prototype 'console_realloc'
+
+    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
+commit 84bf7ca522e94ec402a1264b01971b924b7e268f
+Author: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+Date:	Wed May 13 22:16:31 2009 +0200
+
+    api: remove un-needed ifdef CONFIG_API already handle by the Makefile
+
+    Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+
+commit 792a09eb9d5d8c4f74b7e9f2e887316d511a4e80
+Author: Detlev Zundel <dzu@denx.de>
+Date:	Wed May 13 10:54:10 2009 +0200
+
+    Fix e-mail address of Gary Jennejohn.
+
+    Signed-off-by: Detlev Zundel <dzu@denx.de>
+
+commit 5e2c08c3ac90808e9be64856916bfd6df984823c
+Author: Emil Medve <Emilian.Medve@Freescale.com>
+Date:	Tue May 12 13:48:32 2009 -0500
+
+    Remove inline qualifier from show_boot_progress()
+
+    The 'inline' is conflicting with the semantic of 'weak' attribute and with the
+    way the show_boot_progress() function is used.
+
+    Also gcc 4.4 is complaining about it:
+
+    main.c:51: error: inline function 'show_boot_progress' cannot be declared weak
+
+    Signed-off-by: Emil Medve <Emilian.Medve@Freescale.com>
+
+commit fe6da4837308aa33d537ac3e7f36c2d66e3d9a36
+Author: Wolfgang Denk <wd@denx.de>
+Date:	Tue May 12 15:17:35 2009 +0200
+
+    MPC8260: fixup device tree by property instead of path
+
+    cpu/mpc8260/cpu.c used to use do_fixup_by_path_u32() to update the
+    clock frequencies in the device tree, using a CPU path
+    "/cpus/OF_CPU", with OF_CPU beind defined in the board config file.
+
+    However, this does not work when one board config file (here:
+    MPC8260ADS.h) is intended to be used for several diffrent CPUs and
+    therefor contains a generic definition like "cpu@0", as the device
+    trees that will then be loaded will contain specific names like
+    "PowerPC,8272@0".
+
+    We switch to using do_fixup_by_prop_u32() instead, so we can search
+    for device_type="cpu", as it is done in other architectures, too.
+
+    Signed-off-by: Wolfgang Denk <wd@denx.de>
+    Cc: Heiko Schocher <hs@denx.de>
+    Acked-by: Heiko Schocher <hs@denx.de>
+    Tested-by: Heiko Schocher <hs@denx.de>
+
+commit 12a6753155716e5c3c181a8f40e8b2d3d669aefd
+Author: Rohit Hagargundgi <h.rohit@samsung.com>
+Date:	Mon Mar 9 19:45:46 2009 +0530
+
+    Fix OneNAND ipl to read CONFIG_SYS_MONITOR_LEN
+
+    Add CONFIG_SYS_MONITOR_LEN macro to apollon board config.
+    CONFIG_SYS_MONITOR_LEN defines the U-Boot image size.
+    and is used by OneNAND ipl when reading U-Boot image.
+
+    Signed-off-by: Rohit Hagargundgi <h.rohit at samsung.com>
+    Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
+
+commit c404cc5884b0c82fd82d751dbd8e8b3f8919a23a
+Author: Ben Warren <biggerbadderben@gmail.com>
+Date:	Tue Apr 28 17:04:51 2009 -0700
+
+    Schedule removal of non-CONFIG_NET_MULTI net driver API
+
+    This will make CONFIG_NET_MULTI the only net driver configuration and
+    we'll be able to remove this option.
+
+    Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
+
+commit 60bbcf0cc6e55095dd186e59a557d584b9b56eb1
+Author: Detlev Zundel <dzu@denx.de>
+Date:	Tue May 5 16:04:06 2009 +0200
+
+    powerpc/inka4x0: Remove left-over ide reset code.
+
+    The pin which was used in preliminary versions of the board for ide
+    reset is really connected to the rtc clock.
+
+    Signed-off-by: Detlev Zundel <dzu@denx.de>
+
+commit f578a2da6770951239ad91ee9a1875fdc71dbe48
+Author: Marco Stornelli <marco.stornelli@gmail.com>
+Date:	Tue Apr 28 19:04:02 2009 +0200
+
+    Add imls utility command
+
+    This patch adds, under tools folder, a new command called imls. Its
+    goal is the same of UBoot's imls but it can be used as Linux shell
+    command. It reads from raw mtd partition and prints the list of the
+    stored images.
+
+    Signed-off-by: Marco Stornelli <marco.stornelli@gmail.com>
+
+commit da95427ce431908714ae5e9f663ee6e2bc3bcc33
+Author: Heiko Schocher <hs@denx.de>
+Date:	Tue Apr 28 08:36:11 2009 +0200
+
+    netloop: updates for NetLoop
+
+    Fix some issues introduced from commit:
+    2f70c49e5b9813635ad73666aa30f304c7fdeda9
+    suggested by Mike Frysinger.
+
+    - added some comment for the env_id variable in common_cmd_nvedit.c
+    - moved some variables in fn scope instead of file scope
+    - NetInitLoop now static void
+
+    Signed-off-by: Heiko Schocher <hs@denx.de>
+    Acked-by: Ben Warren <biggerbadderben@gmail.com>
+
+commit 3c1d89545de11822f8b5afb5646a57757620bd95
+Author: Heiko Schocher <hs@denx.de>
+Date:	Tue Apr 28 07:48:39 2009 +0200
+
+    82xx, ids8247: added ids8247 board to MAKEALL script
+
+    Signed-off-by: Heiko Schocher <hs@denx.de>
+
+commit 890a017a8a995c921d1e889d360e8d6538ceecfe
+Author: Detlev Zundel <dzu@denx.de>
+Date:	Thu May 7 13:08:55 2009 +0200
+
+    arm/imx31_phycore: Fix bi_arch_number
+
+    Signed-off-by: Detlev Zundel <dzu@denx.de>
+    Cc: Sascha Hauer <s.hauer@pengutronix.de>
+
+commit ee47bfabefeb25bdfc83f49ef3bae0f325d3e69e
+Author: Sascha Hauer <s.hauer@pengutronix.de>
+Date:	Fri May 15 10:21:33 2009 +0200
+
+    remove myself as phycore/litekit Maintainer
+
+    I never acked a patch that adds me as phycore i.MX31 maintainer nor was
+    it me who pushed the patches, so remove myself from the maintainer list
+    so that other people do not longer wait for my ack.
+
+    Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
+
+commit c63254ef5628efe1c77cb2fdba20753f9666f55d
+Author: Sergey Lapin <slapin@ossfans.org>
+Date:	Tue May 12 12:25:14 2009 +0400
+
+    AFEB9260 network fix
+
+    AFEB9260 uses PA10, PA11 for ETX2 and ETX3.
+    Also, due to extarnal pull-up on IRQ line, Micrel PHY ID is 1 after reset sequence,
+    not 0.
+
+    Signed-off-by: Sergey Lapin <slapin@ossfans.org>
+
+commit f8ddcd58221cab63dd25c2324dd2032487f748b1
+Author: Graf Yang <graf.yang@analog.com>
+Date:	Tue May 5 02:26:27 2009 -0400
+
+    Blackfin: bf518f-ezbrd: reset ethernet PHY during init
+
+    We don't know what state the ethernet PHY is in when starting up, so make
+    sure we set it to a sane state.  This fixes troubles seen when Linux boots
+    up, configures the PHY is a non-default state, and then the system reboots
+    into U-Boot which previously expected a reset state only.
+
+    Signed-off-by: Graf Yang <graf.yang@analog.com>
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+commit 53310b88eaa27fb5cb83144d0b22389190ad87a1
+Author: Mike Frysinger <vapier@gentoo.org>
+Date:	Tue May 5 01:35:41 2009 -0400
+
+    Blackfin: bf527-ezkit: fix SPI flash env params
+
+    The BF527-EZKIT settings for storing the environment in SPI flash wasn't
+    using the correct sector settings for the SPI flash part that is actually
+    on the board.
+
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+commit f58bf804a14324c6c9186a7a664fa23281780e8b
+Author: Mike Frysinger <vapier@gentoo.org>
+Date:	Fri Apr 24 23:54:19 2009 -0400
+
+    Blackfin: avoid get_sclk() with early serial debug
+
+    When the clock functions were changed to use cached values (and thereby
+    avoiding expensive math functions), early serial debug broke because the
+    baud programming is called before external memory is available.
+
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+commit 02778f2f1b4b1a28b492367477db27c58d45ae35
+Author: Mike Frysinger <vapier@gentoo.org>
+Date:	Fri Apr 24 23:39:41 2009 -0400
+
+    Blackfin: fix booting with older bootroms (no EVT1)
+
+    When dropping jump block support, the assumption was that all bootroms
+    supported entry point redirection via the EVT1 register.  Unfortunately,
+    this turned out to be incorrect for the oldest Blackfin parts (BF533-0.2
+    and older and BF561).  No one really noticed earlier because these parts
+    usually are booted by bypassing the bootrom entirely, and older BF533
+    parts are not supported at all (too many anomalies).
+
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+commit af2c37378f203857d5e6c957e77a14c2da5b59d2
+Author: Mike Frysinger <vapier@gentoo.org>
+Date:	Fri Apr 24 23:22:48 2009 -0400
+
+    Blackfin: recurse with early serial initcode
+
+    Make sure we recurse through serial_putc() rather than bang on the UART
+    transmit register directly to avoid hardware overflows when using \n.
+
+    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+
+commit 6b8edfde22acc574b5532e9f086e6a7287a9bc78
 Author: Wolfgang Denk <wd@denx.de>
 Date:	Fri May 1 21:59:12 2009 +0200
 
     Prepare v2009.06-rc1
 
+    Update CHANGELOG.
+
     Signed-off-by: Wolfgang Denk <wd@denx.de>
 
 commit 6b2beb5626a143ca5347e7d2c6005be9936c1fbb

CREDITS

@@ -222,7 +222,7 @@ E: mpfj@mimc.co.uk
 D: Port to MIMC200 board
 
 N: Gary Jennejohn
-E: garyj@jennejohn.org, gj@denx.de
+E: garyj@jennejohn.org
 D: Support for Samsung ARM920T S3C2400X, ARM920T "TRAB"
 W: www.denx.de
 

MAINTAINERS

@@ -539,16 +539,11 @@ Kshitij Gupta <kshitij@ti.com>
 	omap1510inn	ARM925T
 	omap1610inn	ARM926EJS
 
-Sascha Hauer <s.hauer@pengutronix.de>
-
-	imx31_litekit	i.MX31
-	imx31_phycore	i.MX31
-
 Grazvydas Ignotas <notasas@gmail.com>
 
 	omap3_pandora	ARM CORTEX-A8 (OMAP3xx SoC)
 
-Gary Jennejohn <gj@denx.de>
+Gary Jennejohn <garyj@denx.de>
 
 	smdk2400	ARM920T
 	trab		ARM920T

MAKEALL

@@ -284,6 +284,7 @@ LIST_824x="		\
 	debris		\
 	eXalion		\
 	HIDDEN_DRAGON	\
+	IDS8247		\
 	linkstation_HGLAN	\
 	MOUSSE		\
 	MUSENKI		\

Makefile

@@ -24,7 +24,7 @@
 VERSION = 2009
 PATCHLEVEL = 06
 SUBLEVEL =
-EXTRAVERSION = -rc1
+EXTRAVERSION = -rc2
 ifneq "$(SUBLEVEL)" ""
 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 else

api/api.c

@@ -24,9 +24,6 @@
  */
 
 #include <config.h>
-
-#if defined(CONFIG_API)
-
 #include <command.h>
 #include <common.h>
 #include <malloc.h>
@@ -665,5 +662,3 @@ void platform_set_mr(struct sys_info *si, unsigned long start, unsigned long siz
 			return;
 		}
 }
-
-#endif /* CONFIG_API */

api/api_net.c

@@ -24,9 +24,6 @@
  */
 
 #include <config.h>
-
-#if defined(CONFIG_API)
-
 #include <common.h>
 #include <net.h>
 #include <linux/types.h>
@@ -109,5 +106,3 @@ int dev_read_net(void *cookie, void *buf, int len)
 
 	return eth_receive(buf, len);
 }
-
-#endif /* CONFIG_API */

api/api_platform-arm.c

@@ -28,9 +28,6 @@
  */
 
 #include <config.h>
-
-#if defined(CONFIG_API)
-
 #include <linux/types.h>
 #include <api_public.h>
 

api/api_platform-ppc.c

@@ -28,9 +28,6 @@
  */
 
 #include <config.h>
-
-#if defined(CONFIG_API)
-
 #include <linux/types.h>
 #include <api_public.h>
 
@@ -75,5 +72,3 @@ int platform_sys_info(struct sys_info *si)
 
 	return 1;
 }
-
-#endif /* CONFIG_API */

api/api_storage.c

@@ -24,9 +24,6 @@
  */
 
 #include <config.h>
-
-#if defined(CONFIG_API)
-
 #include <common.h>
 #include <api_public.h>
 
@@ -391,5 +388,3 @@ lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start
 
 	return (dd->block_read(dev_stor_index(dd), start, len, buf));
 }
-
-#endif /* CONFIG_API */

blackfin_config.mk

@@ -36,7 +36,9 @@ endif
 
 SYM_PREFIX = _
 
-LDR_FLAGS += -J
+LDR_FLAGS-y :=
+LDR_FLAGS-$(CONFIG_BFIN_BOOTROM_USES_EVT1) += -J
+
 LDR_FLAGS += --bmode $(subst BFIN_BOOT_,,$(CONFIG_BFIN_BOOT_MODE))
 LDR_FLAGS += --use-vmas
 ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
@@ -45,3 +47,5 @@ endif
 ifneq (,$(findstring s,$(MAKEFLAGS)))
 LDR_FLAGS += --quiet
 endif
+
+LDR_FLAGS += $(LDR_FLAGS-y)

board/afeb9260/afeb9260.c

@@ -177,7 +177,7 @@ int board_eth_init(bd_t *bis)
 {
 	int rc = 0;
 #ifdef CONFIG_MACB
-	rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00);
+	rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x01);
 #endif
 	return rc;
 }

board/apollon/u-boot.lds

@@ -7,7 +7,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/armltd/integratorap/u-boot.lds.template

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/armltd/integratorcp/u-boot.lds.template

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/armltd/versatile/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/atmel/at91rm9200dk/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/atmel/at91rm9200ek/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/bf518f-ezbrd/bf518f-ezbrd.c

@@ -62,18 +62,65 @@ static void board_init_enetaddr(uchar *mac_addr)
 	eth_setenv_enetaddr("ethaddr", mac_addr);
 }
 
+#define KSZ_MAX_HZ    5000000
+
+#define KSZ_WRITE     0x02
+#define KSZ_READ      0x03
+
+#define KSZ_REG_STPID 0x01	/* Register 1: Chip ID1 / Start Switch */
+#define KSZ_REG_GC9   0x0b	/* Register 11: Global Control 9 */
+#define KSZ_REG_P3C0  0x30	/* Register 48: Port 3 Control 0 */
+
+static int ksz8893m_transfer(struct spi_slave *slave, uchar dir, uchar reg,
+			     uchar data, uchar result[3])
+{
+	unsigned char dout[3] = { dir, reg, data, };
+	return spi_xfer(slave, sizeof(dout) * 8, dout, result, SPI_XFER_BEGIN | SPI_XFER_END);
+}
+
+static int ksz8893m_reg_set(struct spi_slave *slave, uchar reg, uchar data)
+{
+	unsigned char din[3];
+	return ksz8893m_transfer(slave, KSZ_WRITE, reg, data, din);
+}
+
+static int ksz8893m_reg_clear(struct spi_slave *slave, uchar reg, uchar mask)
+{
+	int ret = 0;
+	unsigned char din[3];
+
+	ret |= ksz8893m_transfer(slave, KSZ_READ, reg, 0, din);
+	ret |= ksz8893m_reg_set(slave, reg, din[2] & mask);
+
+	return ret;
+}
+
+static int ksz8893m_reset(struct spi_slave *slave)
+{
+	int ret = 0;
+
+	/* Disable STPID mode */
+	ret |= ksz8893m_reg_clear(slave, KSZ_REG_GC9, 0x01);
+
+	/* Disable VLAN tag insert on Port3 */
+	ret |= ksz8893m_reg_clear(slave, KSZ_REG_P3C0, 0x04);
+
+	/* Start switch */
+	ret |= ksz8893m_reg_set(slave, KSZ_REG_STPID, 0x01);
+
+	return ret;
+}
+
 int board_eth_init(bd_t *bis)
 {
 	static bool switch_is_alive = false;
 	int ret;
 
 	if (!switch_is_alive) {
-		struct spi_slave *slave = spi_setup_slave(0, 1, 5000000, SPI_MODE_3);
+		struct spi_slave *slave = spi_setup_slave(0, 1, KSZ_MAX_HZ, SPI_MODE_3);
 		if (slave) {
 			if (!spi_claim_bus(slave)) {
-				unsigned char dout[3] = { 2, 1, 1, };
-				unsigned char din[3];
-				ret = spi_xfer(slave, sizeof(dout) * 8, dout, din, SPI_XFER_BEGIN | SPI_XFER_END);
+				ret = ksz8893m_reset(slave);
 				if (!ret)
 					switch_is_alive = true;
 				spi_release_bus(slave);

board/bf561-ezkit/u-boot.lds.S

@@ -42,12 +42,19 @@
 # define L1_DATA_B_SRAM_SIZE 0
 #endif
 
+/* The 0xC offset is so we don't clobber the tiny LDR jump block. */
+#ifdef CONFIG_BFIN_BOOTROM_USES_EVT1
+# define L1_CODE_ORIGIN L1_INST_SRAM
+#else
+# define L1_CODE_ORIGIN L1_INST_SRAM + 0xC
+#endif
+
 OUTPUT_ARCH(bfin)
 
 MEMORY
 {
 	ram     : ORIGIN = CONFIG_SYS_MONITOR_BASE, LENGTH = CONFIG_SYS_MONITOR_LEN
-	l1_code : ORIGIN = L1_INST_SRAM,            LENGTH = L1_INST_SRAM_SIZE
+	l1_code : ORIGIN = L1_CODE_ORIGIN,          LENGTH = L1_INST_SRAM_SIZE
 	l1_data : ORIGIN = L1_DATA_B_SRAM,          LENGTH = L1_DATA_B_SRAM_SIZE
 }
 

board/cmc_pu2/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/csb637/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/davedenx/qong/u-boot.lds

@@ -2,7 +2,7 @@
  * (C) Copyright 2009
  * Ilya Yanok, Emcraft Systems Ltd, <yanok@emcraft.com>
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/davinci/dvevm/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # (C) Copyright 2003

board/davinci/dvevm/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/davinci/schmoogie/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # (C) Copyright 2003

board/davinci/schmoogie/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/davinci/sffsdr/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # Copyright (C) 2008 Lyrtech <www.lyrtech.com>

board/davinci/sffsdr/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/davinci/sonata/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # (C) Copyright 2003

board/davinci/sonata/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/esd/common/auto_update.c

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2003-2004
- * Gary Jennejohn, DENX Software Engineering, gj@denx.de.
+ * Gary Jennejohn, DENX Software Engineering, garyj@denx.de.
  * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com
  *
  * See file CREDITS for list of people who contributed to this

board/freescale/mx31ads/u-boot.lds

@@ -3,7 +3,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/imx31_litekit/u-boot.lds

@@ -3,7 +3,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/imx31_phycore/imx31_phycore.c

@@ -61,8 +61,8 @@ int board_init (void)
 	mx31_gpio_mux(MUX_CSPI2_MOSI__I2C2_SCL);
 	mx31_gpio_mux(MUX_CSPI2_MISO__I2C2_SDA);
 
-	gd->bd->bi_arch_number = 447;		/* board id for linux */
-	gd->bd->bi_boot_params = (0x80000100);	/* adress of boot parameters */
+	gd->bd->bi_arch_number = MACH_TYPE_PCM037;	/* board id for linux */
+	gd->bd->bi_boot_params = (0x80000100);		/* adress of boot parameters */
 
 	return 0;
 }

board/imx31_phycore/u-boot.lds

@@ -3,7 +3,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/inka4x0/inka4x0.c

@@ -274,36 +274,3 @@ void pci_init_board(void)
 	pci_mpc5xxx_init(&hose);
 }
 #endif
-
-#if defined(CONFIG_CMD_IDE) && defined(CONFIG_IDE_RESET)
-
-void init_ide_reset (void)
-{
-	volatile struct mpc5xxx_wu_gpio	*wu_gpio =
-		(struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
-
-	debug ("init_ide_reset\n");
-
-	/* Configure PSC1_4 as GPIO output for ATA reset */
-	setbits_8(&wu_gpio->enable, MPC5XXX_GPIO_WKUP_PSC1_4);
-	setbits_8(&wu_gpio->ddr,    MPC5XXX_GPIO_WKUP_PSC1_4);
-	/* Deassert reset */
-	setbits_8(&wu_gpio->dvo,    MPC5XXX_GPIO_WKUP_PSC1_4);
-}
-
-void ide_set_reset (int idereset)
-{
-	volatile struct mpc5xxx_wu_gpio	*wu_gpio =
-		(struct mpc5xxx_wu_gpio *)MPC5XXX_WU_GPIO;
-
-	debug ("ide_reset(%d)\n", idereset);
-
-	if (idereset) {
-		clrbits_8(&wu_gpio->dvo, MPC5XXX_GPIO_WKUP_PSC1_4);
-		/* Make a delay. MPC5200 spec says 25 usec min */
-		udelay(500000);
-	} else {
-		setbits_8(&wu_gpio->dvo, MPC5XXX_GPIO_WKUP_PSC1_4);
-	}
-}
-#endif

board/kb9202/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/lpd7a40x/flash.c

@@ -4,7 +4,7 @@
  * Marius Groeger <mgroeger@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/lpd7a40x/lpd7a40x.c

@@ -4,7 +4,7 @@
  * Marius Groeger <mgroeger@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/lpd7a40x/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/m501sk/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/mp2usb/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/mpl/vcma9/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/netstar/eeprom.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  * (C) Copyright 2005
  * Ladislav Michl, 2N Telekomunikace, <michl@2n.cz>
  *

board/netstar/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/ns9750dev/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap1510inn/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # (C) Copyright 2003

board/omap1510inn/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap1610inn/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # (C) Copyright 2003

board/omap1610inn/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap2420h4/u-boot.lds

@@ -3,7 +3,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap3/beagle/u-boot.lds

@@ -3,7 +3,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap3/evm/u-boot.lds

@@ -3,7 +3,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap3/overo/u-boot.lds

@@ -3,7 +3,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap3/pandora/u-boot.lds

@@ -3,7 +3,7 @@
  * Copyright (c) 2004 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap3/zoom1/u-boot.lds

@@ -3,7 +3,7 @@
  * Copyright (c) 2004-2008 Texas Instruments
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap5912osk/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002-2004
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # (C) Copyright 2003

board/omap5912osk/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002-2004
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/omap730p2/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # (C) Copyright 2003

board/omap730p2/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/samsung/smdk2400/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 #
 # SAMSUNG board with S3C2400X (ARM920T) CPU
 #

board/samsung/smdk2400/flash.c

@@ -4,7 +4,7 @@
  * Marius Groeger <mgroeger@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/samsung/smdk2400/lowlevel_init.S

@@ -6,7 +6,7 @@
  *
  * Modified for the Samsung development board by
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/samsung/smdk2400/smdk2400.c

@@ -4,7 +4,7 @@
  * Marius Groeger <mgroeger@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/samsung/smdk2400/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/samsung/smdk2410/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # SAMSUNG SMDK2410 board with S3C2410X (ARM920T) cpu

board/samsung/smdk2410/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/samsung/smdk6400/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # (C) Copyright 2008

board/samsung/smdk6400/u-boot-nand.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * (C) Copyright 2008
  * Guennadi Liakhovetki, DENX Software Engineering, <lg@denx.de>

board/sbc2410x/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 # David Mueller, ELSOFT AG, <d.mueller@elsoft.ch>
 #
 # SAMSUNG SMDK2410 board with S3C2410X (ARM920T) cpu

board/sbc2410x/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/st/nmdk8815/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/trab/auto_update.c

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2003
- * Gary Jennejohn, DENX Software Engineering, gj@denx.de.
+ * Gary Jennejohn, DENX Software Engineering, garyj@denx.de.
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/trab/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 #
 # TRAB board with S3C2400X (arm920t) cpu
 #

board/trab/flash.c

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/trab/lowlevel_init.S

@@ -6,7 +6,7 @@
  *
  * Modified for the TRAB board by
  * (C) Copyright 2002-2003
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/trab/rs485.c

@@ -3,7 +3,7 @@
  * Martin Krause, TQ-Systems GmbH, <martin.krause@tqs.de>
  *
  * Based on cpu/arm920t/serial.c, by Gary Jennejohn
- * (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

board/trab/rs485.h

@@ -3,7 +3,7 @@
  * Martin Krause, TQ-Systems GmbH, <martin.krause@tqs.de>
  *
  * Based on cpu/arm920t/serial.c, by Gary Jennejohn
- * (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * (C) Copyright 2002 Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

board/trab/trab.c

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/trab/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

board/voiceblue/eeprom.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  * (C) Copyright 2005
  * Ladislav Michl, 2N Telekomunikace, <michl@2n.cz>
  *

board/voiceblue/u-boot.lds

@@ -1,6 +1,6 @@
 /*
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

common/cmd_nvedit.c

@@ -77,6 +77,13 @@ SPI_FLASH|MG_DISK|NVRAM|NOWHERE}
 static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE;
 #define	N_BAUDRATES (sizeof(baudrate_table) / sizeof(baudrate_table[0]))
 
+/*
+ * This variable is incremented on each do_setenv (), so it can
+ * be used via get_env_id() as an indication, if the environment
+ * has changed or not. So it is possible to reread an environment
+ * variable only if the environment was changed ... done so for
+ * example in NetInitLoop()
+ */
 static int env_id = 1;
 
 int get_env_id (void)

common/main.c

@@ -48,7 +48,7 @@ DECLARE_GLOBAL_DATA_PTR;
  * Board-specific Platform code can reimplement show_boot_progress () if needed
  */
 void inline __show_boot_progress (int val) {}
-void inline show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
+void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
 
 #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)
 extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]);		/* for do_reset() prototype */

common/usb_storage.c

@@ -11,7 +11,7 @@
  *   (C) Copyright 2001 Denis Peter, MPL AG Switzerland
  *
  * For BBB support (C) Copyright 2003
- * Gary Jennejohn, DENX Software Engineering <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering <garyj@denx.de>
  *
  * BBB support based on /sys/dev/usb/umass.c from
  * FreeBSD.

cpu/74xx_7xx/speed.c

@@ -149,8 +149,8 @@ int get_clocks (void)
 
 	case CPU_750GX:
 	case CPU_750FX:
-		clock = gd->bus_clk *
-			hid1_fx_multipliers_x_10[get_hid1 () >> 27] / 10;
+		clock = (gd->bus_clk / 10) *
+			hid1_fx_multipliers_x_10[get_hid1 () >> 27];
 		break;
 
 	case CPU_7450:

cpu/arm1136/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 #
 # See file CREDITS for list of people who contributed to this
 # project.

cpu/arm1136/cpu.c

@@ -6,7 +6,7 @@
  * Marius Groeger <mgroeger@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

cpu/arm1136/omap24xx/interrupts.c

@@ -9,7 +9,7 @@
  * Alex Zuepke <azu@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

cpu/arm1136/omap24xx/start.S

@@ -5,7 +5,7 @@
  *
  *  Copyright (c) 2001	Marius Gröger <mag@sysgo.de>
  *  Copyright (c) 2002	Alex Züpke <azu@sysgo.de>
- *  Copyright (c) 2002	Gary Jennejohn <gj@denx.de>
+ *  Copyright (c) 2002	Gary Jennejohn <garyj@denx.de>
  *  Copyright (c) 2003	Richard Woodruff <r-woodruff2@ti.com>
  *  Copyright (c) 2003	Kshitij <kshitij@ti.com>
  *

cpu/arm1136/start.S

@@ -5,7 +5,7 @@
  *
  *  Copyright (c) 2001	Marius Gröger <mag@sysgo.de>
  *  Copyright (c) 2002	Alex Züpke <azu@sysgo.de>
- *  Copyright (c) 2002	Gary Jennejohn <gj@denx.de>
+ *  Copyright (c) 2002	Gary Jennejohn <garyj@denx.de>
  *  Copyright (c) 2003	Richard Woodruff <r-woodruff2@ti.com>
  *  Copyright (c) 2003	Kshitij <kshitij@ti.com>
  *

cpu/arm1176/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 #
 # See file CREDITS for list of people who contributed to this
 # project.

cpu/arm1176/cpu.c

@@ -6,7 +6,7 @@
  * Marius Groeger <mgroeger@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

cpu/arm1176/s3c64xx/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 #
 # See file CREDITS for list of people who contributed to this
 # project.

cpu/arm1176/s3c64xx/interrupts.c

@@ -11,7 +11,7 @@
  * Alex Zuepke <azu@sysgo.de>
  *
  * (C) Copyright 2002-2004
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * (C) Copyright 2004
  * Philippe Robin, ARM Ltd. <philippe.robin@arm.com>

cpu/arm920t/config.mk

@@ -1,6 +1,6 @@
 #
 # (C) Copyright 2002
-# Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+# Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
 #
 # See file CREDITS for list of people who contributed to this
 # project.

cpu/arm920t/cpu.c

@@ -4,7 +4,7 @@
  * Marius Groeger <mgroeger@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

cpu/arm920t/imx/interrupts.c

@@ -8,7 +8,7 @@
  * Alex Zuepke <azu@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.

cpu/arm920t/interrupts.c

@@ -8,7 +8,7 @@
  * Alex Zuepke <azu@sysgo.de>
  *
  * (C) Copyright 2002
- * Gary Jennejohn, DENX Software Engineering, <gj@denx.de>
+ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de>
  *
  * See file CREDITS for list of people who contributed to this
  * project.