September 2009 - U-Boot

[U-Boot] [PATCH] mxc_nand: Remove Freescale's "All Rights Reserved."
by Scott Wood 04 Sep '09

04 Sep '09

Signed-off-by: Scott Wood <scottwood(a)freescale.com> --- drivers/mtd/nand/mxc_nand.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/mxc_nand.c b/drivers/mtd/nand/mxc_nand.c index 647be0b..eb0323f 100644 --- a/drivers/mtd/nand/mxc_nand.c +++ b/drivers/mtd/nand/mxc_nand.c @@ -1,5 +1,5 @@ /* - * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2004-2007 Freescale Semiconductor, Inc. * Copyright 2008 Sascha Hauer, kernel(a)pengutronix.de * Copyright 2009 Ilya Yanok, <yanok(a)emcraft.com> * -- 1.6.4.1.184.g2e117

2 1

[U-Boot] [PATCH 0/2] License cleanup: get serious
by Wolfgang Denk 04 Sep '09

04 Sep '09

As announced a long time ago (and obviously mostly ignored by lots of developers and maintainers) we now take the gloves off and actually implement the license cleanup. As U-Boot is released under GPL (some parts v2 only, other parts v2 or later) the task is to get rid of all parts of code that are incompatible with the GPL. In this first step I'm focussing on files that have a "All Rights Reserved" entry which is incompatible with the GPL. This step consists of three patches; two of these are posted now, the last one about one week later: PATCH 1/2 License cleanup: remove unintended "All Rights Reserved" notices This patch removes unintended "All Rights Reserved" notices from some source files written by myself. That's the harmless part. [PATCH 2/2] License cleanup: remove all files with "All Rights Reserved" notices. This patch is strong meat. It removes some 250+ source files with conflicting "All Rights Reserved" notices from the U-Boot source tree. I am well aware that in the result _many_ boards and features will break. This is why I will wait some time (about a week) before submitting the last part of the patch. This time should be used by developers and maintainers to fix the conflicts for any files they consider important enough to care. After that grace period, the remaining conflicting files will be removed. This will probably still break a few things. After about a week the third patch will be posted, which will remove all boards and features from the U-Boot source tree that are broken because of missing files. NOTE: This is not a joke. I'm serious about it. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de I have the simplest tastes. I am always satisfied with the best. -- Oscar Wilde

9 25

[U-Boot] [PATCH] cmd_mtdparts.c: fix compiler warning in debug code
by Wolfgang Denk 04 Sep '09

04 Sep '09

Fix warning messages: cmd_mtdparts.c:1429: warning: format '%08lx' expects type 'long unsigned int', but argument 6 has type 'u32' cmd_mtdparts.c:1429: warning: format '%08lx' expects type 'long unsigned int', but argument 7 has type 'u32' Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- common/cmd_mtdparts.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_mtdparts.c b/common/cmd_mtdparts.c index 665995d..b375fea 100644 --- a/common/cmd_mtdparts.c +++ b/common/cmd_mtdparts.c @@ -1336,7 +1336,7 @@ static int delete_partition(const char *id) if (find_dev_and_part(id, &dev, &pnum, &part) == 0) { - DEBUGF("delete_partition: device = %s%d, partition %d = (%s) 0x%08lx@0x%08lx\n", + DEBUGF("delete_partition: device = %s%d, partition %d = (%s) 0x%08x@0x%08x\n", MTD_DEV_TYPE(dev->id->type), dev->id->num, pnum, part->name, part->size, part->offset); -- 1.6.0.6

1 1

[U-Boot] [PATCH 2/2] fsl: sys_eeprom: Fix 'may be used uninitialized' warning
by Anton Vorontsov 04 Sep '09

04 Sep '09

The warning is bogus, so silence it with uninitialized_var(). Signed-off-by: Anton Vorontsov <avorontsov(a)ru.mvista.com> --- board/freescale/common/sys_eeprom.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/board/freescale/common/sys_eeprom.c b/board/freescale/common/sys_eeprom.c index c0fff68..a765b39 100644 --- a/board/freescale/common/sys_eeprom.c +++ b/board/freescale/common/sys_eeprom.c @@ -24,6 +24,7 @@ */ #include <common.h> +#include <compiler.h> #include <command.h> #include <i2c.h> #include <linux/ctype.h> @@ -204,7 +205,8 @@ static void update_crc(void) */ static int prog_eeprom(void) { - int ret, i; + int uninitialized_var(ret); + int i; void *p; #ifdef CONFIG_SYS_EEPROM_BUS_NUM unsigned int bus; -- 1.6.3.3

5 12

[U-Boot] [PATCH 1/2] Move uninitialized_var() macro from ubi_uboot.h to compiler.h
by Anton Vorontsov 04 Sep '09

04 Sep '09

This is needed so that we could use this macro for non-UBI code. Signed-off-by: Anton Vorontsov <avorontsov(a)ru.mvista.com> --- include/compiler.h | 3 +++ include/ubi_uboot.h | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/compiler.h b/include/compiler.h index 272fd3c..e602cce 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -122,4 +122,7 @@ typedef unsigned int uintptr_t; #endif +/* compiler options */ +#define uninitialized_var(x) x = x + #endif diff --git a/include/ubi_uboot.h b/include/ubi_uboot.h index 74312ab..60f6a5f 100644 --- a/include/ubi_uboot.h +++ b/include/ubi_uboot.h @@ -15,6 +15,7 @@ #define __UBOOT_UBI_H #include <common.h> +#include <compiler.h> #include <malloc.h> #include <div64.h> #include <linux/crc32.h> @@ -51,9 +52,6 @@ do { \ #undef CONFIG_MTD_UBI_DEBUG_MSG_BLD #define CONFIG_MTD_UBI_DEBUG_DISABLE_BGT -/* compiler options */ -#define uninitialized_var(x) x = x - /* build.c */ #define get_device(...) #define put_device(...) -- 1.6.3.3

6 10

[U-Boot] [PATCH 1/2] ppc: Remove -fno-strict-aliasing
by Kumar Gala 04 Sep '09

04 Sep '09

-fno-strict-aliasing is hidding warnings. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- board/tqc/tqm5200/Makefile | 2 +- cpu/74xx_7xx/config.mk | 2 +- cpu/mpc824x/config.mk | 2 +- cpu/mpc8xx/config.mk | 2 +- cpu/ppc4xx/config.mk | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/board/tqc/tqm5200/Makefile b/board/tqc/tqm5200/Makefile index ce125e2..55c4d99 100644 --- a/board/tqc/tqm5200/Makefile +++ b/board/tqc/tqm5200/Makefile @@ -41,7 +41,7 @@ distclean: clean rm -f $(LIB) core *.bak $(obj).depend cam5200_flash.o: cam5200_flash.c - $(CC) $(CFLAGS) -fno-strict-aliasing -c -o $@ $< + $(CC) $(CFLAGS) -c -o $@ $< ######################################################################### diff --git a/cpu/74xx_7xx/config.mk b/cpu/74xx_7xx/config.mk index 324f62b..d589210 100644 --- a/cpu/74xx_7xx/config.mk +++ b/cpu/74xx_7xx/config.mk @@ -21,6 +21,6 @@ # MA 02111-1307 USA # -PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing +PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi PLATFORM_CPPFLAGS += -DCONFIG_74xx_7xx -ffixed-r2 -mstring diff --git a/cpu/mpc824x/config.mk b/cpu/mpc824x/config.mk index 1bb0487..b607fee 100644 --- a/cpu/mpc824x/config.mk +++ b/cpu/mpc824x/config.mk @@ -21,7 +21,7 @@ # MA 02111-1307 USA # -PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing +PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi PLATFORM_CPPFLAGS += -DCONFIG_MPC824X -ffixed-r2 -mstring -mcpu=603e -msoft-float diff --git a/cpu/mpc8xx/config.mk b/cpu/mpc8xx/config.mk index 6031e7f..2b3d545 100644 --- a/cpu/mpc8xx/config.mk +++ b/cpu/mpc8xx/config.mk @@ -21,6 +21,6 @@ # MA 02111-1307 USA # -PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing +PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi PLATFORM_CPPFLAGS += -DCONFIG_8xx -ffixed-r2 -mstring -mcpu=860 -msoft-float diff --git a/cpu/ppc4xx/config.mk b/cpu/ppc4xx/config.mk index baa97a4..00ad39b 100644 --- a/cpu/ppc4xx/config.mk +++ b/cpu/ppc4xx/config.mk @@ -21,7 +21,7 @@ # MA 02111-1307 USA # -PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi -fno-strict-aliasing +PLATFORM_RELFLAGS += -fPIC -ffixed-r14 -meabi PLATFORM_CPPFLAGS += -DCONFIG_4xx -ffixed-r2 -mstring -msoft-float cfg=$(shell grep configs $(OBJTREE)/include/config.h | sed 's/.*<$configs.*$>/\1/') -- 1.6.0.6

2 3

[U-Boot] [PATCH v2] Add chip select region to galaxy5200
by Eric Millbrandt 04 Sep '09

04 Sep '09

Add chip select region for an Epson S1D15313. Signed-off-by: Eric Millbrandt <emillbrandt(a)dekaresearch.com> --- changes since v1: - Changed CONFIG_SYS_CS3_SIZE to the correct value. include/configs/galaxy5200.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/include/configs/galaxy5200.h b/include/configs/galaxy5200.h index 2ba5f0f..f4b520d 100644 --- a/include/configs/galaxy5200.h +++ b/include/configs/galaxy5200.h @@ -212,6 +212,11 @@ #define CONFIG_SYS_CS1_SIZE 0x90000 #define CONFIG_SYS_CS1_CFG 0x0002d900 +/* Chip Select configuration for Epson S1D13513 */ +#define CONFIG_SYS_CS3_START 0x10000000 +#define CONFIG_SYS_CS3_SIZE 0x400000 +#define CONFIG_SYS_CS3_CFG 0xffff3d10 + /* * Ethernet configuration */ -- 1.6.3.1 http://openwebmail.org - eem

2 1

[U-Boot] [PATCH v2] Add ability for arch code to make changes before we boot
by Kumar Gala 04 Sep '09

04 Sep '09

Added a arch_preboot_os() function that cpu specific code can implement to allow for various modifications to the state of the machine right before we boot. This can be useful to setup register state to a specific configuration. Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- * Just renamed arch_preboot to arch_preboot_os common/cmd_bootm.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 86c8122..365ceeb 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -166,6 +166,13 @@ void __arch_lmb_reserve(struct lmb *lmb) } void arch_lmb_reserve(struct lmb *lmb) __attribute__((weak, alias("__arch_lmb_reserve"))); +/* Allow for arch specific config before we boot */ +void __arch_preboot_os(void) +{ + /* please define platform specific arch_preboot_os() */ +} +void arch_preboot_os(void) __attribute__((weak, alias("__arch_preboot_os"))); + #if defined(__ARM__) #define IH_INITRD_ARCH IH_ARCH_ARM #elif defined(__avr32__) @@ -543,6 +550,7 @@ int do_bootm_subcommand (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) break; case BOOTM_STATE_OS_GO: disable_interrupts(); + arch_preboot_os(); boot_fn(BOOTM_STATE_OS_GO, argc, argv, &images); break; } @@ -673,6 +681,8 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 1; } + arch_preboot_os(); + boot_fn(0, argc, argv, &images); show_boot_progress (-9); -- 1.6.0.6

2 1

[U-Boot] [PATCH] Use different PBA value for E1000 PCI and PCIe cards
by Roy Zang 04 Sep '09

04 Sep '09

From: Roy Zang <tie-fei.zang(a)freescale.com> Use different PBA value for E1000 PCI and PCIe cards. Signed-off-by: Roy Zang <tie-fei.zang(a)freescale.com> --- Andre, please help to verify it on your board. Thanks. Roy drivers/net/e1000.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 777783a..57123dd 100644 --- a/drivers/net/e1000.c +++ b/drivers/net/e1000.c @@ -51,7 +51,8 @@ tested on both gig copper and gig fiber boards #define bus_to_phys(devno, a) pci_mem_to_phys(devno, a) #define mdelay(n) udelay((n)*1000) -#define E1000_DEFAULT_PBA 0x000a0026 +#define E1000_DEFAULT_PCI_PBA 0x00000030 +#define E1000_DEFAULT_PCIE_PBA 0x000a0026 /* NIC specific static variables go here */ @@ -1350,9 +1351,16 @@ e1000_reset_hw(struct e1000_hw *hw) uint32_t ctrl_ext; uint32_t icr; uint32_t manc; + uint32_t pba = 0; DEBUGFUNC(); + /* get the correct pba value for both PCI and PCIe*/ + if (hw->mac_type < e1000_82571) + pba = E1000_DEFAULT_PCI_PBA; + else + pba = E1000_DEFAULT_PCIE_PBA; + /* For 82542 (rev 2.0), disable MWI before issuing a device reset */ if (hw->mac_type == e1000_82542_rev2_0) { DEBUGOUT("Disabling MWI on 82542 rev 2.0\n"); @@ -1420,7 +1428,7 @@ e1000_reset_hw(struct e1000_hw *hw) if (hw->mac_type == e1000_82542_rev2_0) { pci_write_config_word(hw->pdev, PCI_COMMAND, hw->pci_cmd_word); } - E1000_WRITE_REG(hw, PBA, E1000_DEFAULT_PBA); + E1000_WRITE_REG(hw, PBA, pba); } /****************************************************************************** -- 1.5.6.5

4 3

[U-Boot] [RFC][PATCH] Ethernet Support for eNET Board
by Graeme Russ 04 Sep '09

04 Sep '09

OK, after much wailing and gnashing of teeth, I have FINALLY got the Ethernet chips on my eNET board working. In the end, the critical mod was in drivers/net/rtl8139.c, line 217 where I needed to change PCI_BASE_ADDRESS_1 to PCI_BASE_ADDRESS_0 - The big question for me now is Why? I assume this driver is working for everyone else, and this change will probably break the driver for everyone else, so now I need to know what I can do so that Ethernet works on my board WITHOUT modifying rtl8139.c I also had to move SC520_PCI_IO_PHYS from 0x1000 to 0x2000 because I have LEDs, Hex Switches and a couple of other board specific I/O at 0x1000 Anyone got any ideas? diff --git a/board/eNET/eNET.c b/board/eNET/eNET.c index 29cf295..9359ea6 100644 --- a/board/eNET/eNET.c +++ b/board/eNET/eNET.c @@ -24,6 +24,8 @@ #include <common.h> #include <asm/io.h> #include <asm/ic/sc520.h> +#include <net.h> +#include <netdev.h> #ifdef CONFIG_HW_WATCHDOG #include <watchdog.h> @@ -165,3 +167,10 @@ ulong board_flash_get_legacy (ulong base, int banknum, flash_info_t * info) } else return 0; } + +int board_eth_init(bd_t *bis) +{ + printf("Initializing Ethernet\n"); + return pci_eth_init(bis); +} + diff --git a/drivers/net/rtl8139.c b/drivers/net/rtl8139.c index db8a727..a3df564 100644 --- a/drivers/net/rtl8139.c +++ b/drivers/net/rtl8139.c @@ -214,7 +214,7 @@ int rtl8139_initialize(bd_t *bis) if ((devno = pci_find_devices(supported, idx++)) < 0) break; - pci_read_config_dword(devno, PCI_BASE_ADDRESS_1, &iobase); + pci_read_config_dword(devno, PCI_BASE_ADDRESS_0, &iobase); iobase &= ~0xf; debug ("rtl8139: REALTEK RTL8139 @0x%x\n", iobase); diff --git a/include/asm-i386/ic/sc520.h b/include/asm-i386/ic/sc520.h index 57c9904..6e2375c 100644 --- a/include/asm-i386/ic/sc520.h +++ b/include/asm-i386/ic/sc520.h @@ -306,14 +306,14 @@ extern volatile sc520_mmcr_t *sc520_mmcr; /* PCI I/O space from 0x1000 to 0xdfff * (make 0xe000-0xfdff available for stuff like PCCard boot) */ -#define SC520_PCI_IO_PHYS 0x00001000 -#define SC520_PCI_IO_BUS 0x00001000 +#define SC520_PCI_IO_PHYS 0x00002000 +#define SC520_PCI_IO_BUS 0x00002000 #define SC520_PCI_IO_SIZE 0x0000d000 /* system memory from 0x00000000 to 0x0fffffff */ #define SC520_PCI_MEMORY_PHYS 0x00000000 #define SC520_PCI_MEMORY_BUS 0x00000000 -#define SC520_PCI_MEMORY_SIZE 0x10000000 +#define SC520_PCI_MEMORY_SIZE 0x08000000 /* PCI bus memory from 0x10000000 to 0x26ffffff * (make 0x27000000 - 0x27ffffff available for stuff like PCCard boot) */ diff --git a/include/configs/eNET.h b/include/configs/eNET.h index c4c38de..df0d586 100644 --- a/include/configs/eNET.h +++ b/include/configs/eNET.h @@ -86,9 +86,10 @@ #define CONFIG_CMD_LOADS /* loads */ #define CONFIG_CMD_MEMORY /* md mm nm mw cp cmp crc base loop mtest */ #define CONFIG_CMD_MISC /* Misc functions like sleep etc*/ -#undef CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ +#define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #undef CONFIG_CMD_NFS /* NFS support */ #define CONFIG_CMD_PCI /* PCI support */ +#define CONFIG_CMD_PING /* ICMP echo support */ #define CONFIG_CMD_RUN /* run command in env variable */ #define CONFIG_CMD_SAVEENV /* saveenv */ #define CONFIG_CMD_SETGETDCR /* DCR support on 4xx */ @@ -208,6 +209,12 @@ #define CONFIG_SYS_THIRD_PCI_IRQ 11 #define CONFIG_SYS_FORTH_PCI_IRQ 15 + /* + * Network device (TRL8100B) support + */ +#define CONFIG_NET_MULTI +#define CONFIG_RTL8139 + /*----------------------------------------------------------------------- * Hardware watchdog configuration */

2 1