May 2012 - U-Boot

[U-Boot] [PATCH 1/2] Add env vars describing U-Boot target board
by Stephen Warren 21 May '12

21 May '12

From: Stephen Warren <swarren(a)nvidia.com> This can be useful for generic scripts. For example, rather than hard- coding a script to ext2load tegra-harmony.dtb, it could load ${board_soc}-${board_name}.dtb and hence not need adjustments to run on multiple boards. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Wolfgang, does this seem like a reasonable feature? If so, can we merge it through the Tegra tree, since the next patch enables this for Tegra. Thanks! common/Makefile | 9 +++++++++ common/env_common.c | 15 +++++++++++++++ common/env_embedded.c | 15 +++++++++++++++ 3 files changed, 39 insertions(+), 0 deletions(-) diff --git a/common/Makefile b/common/Makefile index 6e23baa..e9fcd6a 100644 --- a/common/Makefile +++ b/common/Makefile @@ -44,6 +44,15 @@ COBJS-y += cmd_nvedit.o COBJS-y += cmd_version.o # environment +board_config_vars := \ + '-DBOARD_ARCH="$(ARCH)"' \ + '-DBOARD_CPU="$(CPU)"' \ + '-DBOARD_NAME="$(BOARD)"' \ + '-DBOARD_VENDOR="$(VENDOR)"' \ + '-DBOARD_SOC="$(SOC)"' +CFLAGS_common/env_common.o += $(board_config_vars) +CFLAGS_common/env_embedded.o += $(board_config_vars) + COBJS-y += env_common.o COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o diff --git a/common/env_common.c b/common/env_common.c index c33d22d..4020ab9 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -116,6 +116,21 @@ const uchar default_environment[] = { #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0) "pcidelay=" MK_STR(CONFIG_PCI_BOOTDELAY) "\0" #endif +#ifdef CONFIG_ENV_VAR_BOARD_ARCH + "board_arch=" BOARD_ARCH "\0" +#endif +#ifdef CONFIG_ENV_VAR_BOARD_CPU + "board_cpu=" BOARD_CPU "\0" +#endif +#ifdef CONFIG_ENV_VAR_BOARD_NAME + "board_name=" BOARD_NAME "\0" +#endif +#ifdef CONFIG_ENV_VAR_BOARD_VENDOR + "board_vendor=" BOARD_VENDOR "\0" +#endif +#ifdef CONFIG_ENV_VAR_BOARD_SOC + "board_soc=" BOARD_SOC "\0" +#endif #ifdef CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_SETTINGS #endif diff --git a/common/env_embedded.c b/common/env_embedded.c index 80fb29d..9ce2fc6 100644 --- a/common/env_embedded.c +++ b/common/env_embedded.c @@ -179,6 +179,21 @@ env_t environment __PPCENV__ = { #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0) "pcidelay=" MK_STR(CONFIG_PCI_BOOTDELAY) "\0" #endif +#ifdef CONFIG_ENV_VAR_BOARD_ARCH + "board_arch=" BOARD_ARCH "\0" +#endif +#ifdef CONFIG_ENV_VAR_BOARD_CPU + "board_cpu=" BOARD_CPU "\0" +#endif +#ifdef CONFIG_ENV_VAR_BOARD_NAME + "board_name=" BOARD_NAME "\0" +#endif +#ifdef CONFIG_ENV_VAR_BOARD_VENDOR + "board_vendor=" BOARD_VENDOR "\0" +#endif +#ifdef CONFIG_ENV_VAR_BOARD_SOC + "board_soc=" BOARD_SOC "\0" +#endif #ifdef CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_SETTINGS #endif -- 1.7.0.4

3 5

[U-Boot] [PATCH 1/4] OMAP3 Beagle: Set BOOTDELAY to 3
by Tom Rini 21 May '12

21 May '12

We change the bootdelay to give users a little bit longer to break in if needed. Signed-off-by: Tom Rini <trini(a)ti.com> --- include/configs/omap3_beagle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index b891ee4..2715211 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -213,7 +213,7 @@ /* partition */ /* Environment information */ -#define CONFIG_BOOTDELAY 2 +#define CONFIG_BOOTDELAY 3 #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ -- 1.7.9.5

1 3

[U-Boot] [PATCH] ppc: Fix warning in TSEC Ethernet driver
by Joe Hershberger 21 May '12

21 May '12

Fixes: tsec.c: In function 'tsec_initialize': tsec.c:638:12: warning: assignment from incompatible pointer type Tested on MPC8313e-RDB Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> --- drivers/net/tsec.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c index 160bc05..3c1c8f0 100644 --- a/drivers/net/tsec.c +++ b/drivers/net/tsec.c @@ -44,8 +44,7 @@ static RTXBD rtx __attribute__ ((aligned(8))); #error "rtx must be 64-bit aligned" #endif -static int tsec_send(struct eth_device *dev, - volatile void *packet, int length); +static int tsec_send(struct eth_device *dev, void *packet, int length); /* Default initializations for TSEC controllers. */ @@ -377,7 +376,7 @@ static void startup_tsec(struct eth_device *dev) * do the same. Presumably, this would be zero if there were no * errors */ -static int tsec_send(struct eth_device *dev, volatile void *packet, int length) +static int tsec_send(struct eth_device *dev, void *packet, int length) { int i; int result = 0; -- 1.6.0.2

2 1

[U-Boot] [PATCH v4 0/3] net: helper functions
by Michael Walle 21 May '12

21 May '12

This patchset is a split-off from my patch series "Kirkwood: add lschlv2 and lsxhl board support". Changes: v4: - typo fixes (thanks Mike) - seed all 46bits of the generated ethernet address (suggested by Mike) v3, v2: [contained only lsxhl board changes] Michael Walle (3): lib: add rand() function net: add helper to generate random mac address net: add eth_setenv_enetaddr_by_index() include/common.h | 4 ++++ include/net.h | 27 +++++++++++++++++++++++++++ lib/Makefile | 1 + lib/rand.c | 43 +++++++++++++++++++++++++++++++++++++++++++ net/eth.c | 28 ++++++++++++++++++++++++++++ 5 files changed, 103 insertions(+), 0 deletions(-) create mode 100644 lib/rand.c -- 1.7.2.5

5 26

[U-Boot] [PATCH] drivers/net/mpc512x_fec.c: Fix build warning
by Anatolij Gustschin 21 May '12

21 May '12

Fix: mpc512x_fec.c: In function 'mpc512x_fec_initialize': mpc512x_fec.c:634: warning: assignment from incompatible pointer type Tested on mpc5121ads board using tftp and nfs commands. Signed-off-by: Anatolij Gustschin <agust(a)denx.de> Cc: Joe Hershberger <joe.hershberger(a)gmail.com> --- drivers/net/mpc512x_fec.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/mpc512x_fec.c b/drivers/net/mpc512x_fec.c index 0d5efd5..ad57d56 100644 --- a/drivers/net/mpc512x_fec.c +++ b/drivers/net/mpc512x_fec.c @@ -452,8 +452,8 @@ static void mpc512x_fec_halt (struct eth_device *dev) /********************************************************************/ -static int mpc512x_fec_send (struct eth_device *dev, volatile void *eth_data, - int data_length) +static int mpc512x_fec_send(struct eth_device *dev, void *eth_data, + int data_length) { /* * This routine transmits one frame. This routine only accepts -- 1.7.1

2 1

[U-Boot] [PATCH] drivers/net/smc911x.c: Fix GCC 4.6 warning
by Anatolij Gustschin 21 May '12

21 May '12

smc911x.c: In function 'smc911x_initialize': smc911x.c:288:12: warning: assignment from incompatible pointer type [enabled by default] Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- drivers/net/smc911x.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index e34b487..b2aed7e 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -161,8 +161,7 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd) return 0; } -static int smc911x_send(struct eth_device *dev, - volatile void *packet, int length) +static int smc911x_send(struct eth_device *dev, void *packet, int length) { u32 *data = (u32*)packet; u32 tmplen; -- 1.7.1

2 10

[U-Boot] [PATCH] davinci: Fix Ethernet driver interface warning
by Joe Hershberger 21 May '12

21 May '12

Fixes: davinci_emac.c: In function 'davinci_emac_initialize': davinci_emac.c:796:12: warning: assignment from incompatible pointer type [enabled by default] Tested on da850_am18xxevm Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Joe Hershberger <joe.hershberger(a)gmail.com> --- drivers/net/davinci_emac.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index fbd0f1b..e471d2c 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -637,7 +637,7 @@ static int tx_send_loop = 0; * positive number (number of bytes transmitted) or negative for error */ static int davinci_eth_send_packet (struct eth_device *dev, - volatile void *packet, int length) + void *packet, int length) { int ret_status = -1; int index; -- 1.6.0.2

3 3

[U-Boot] [PATCH] net: Fix smc911x Ethernet driver warning
by Joe Hershberger 21 May '12

21 May '12

Fix this warning: smc911x.c: In function 'smc911x_initialize': smc911x.c:288:12: warning: assignment from incompatible pointer type [enabled by default] Tested on omap3_overo Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Joe Hershberger <joe.hershberger(a)gmail.com> --- drivers/net/smc911x.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index e34b487..3911989 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -162,7 +162,7 @@ static int smc911x_init(struct eth_device *dev, bd_t * bd) } static int smc911x_send(struct eth_device *dev, - volatile void *packet, int length) + void *packet, int length) { u32 *data = (u32*)packet; u32 tmplen; -- 1.6.0.2

3 3

[U-Boot] [PATCH] tegra: harmony: add device tree support
by Stephen Warren 21 May '12

21 May '12

From: Stephen Warren <swarren(a)nvidia.com> ... to enable USB host support, which enables Ethernet support. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- board/nvidia/dts/tegra2-harmony.dts | 57 +++++++++++++++++++++++++++++++++++ include/configs/harmony.h | 22 +++++++++++++- 2 files changed, 78 insertions(+), 1 deletions(-) create mode 100644 board/nvidia/dts/tegra2-harmony.dts diff --git a/board/nvidia/dts/tegra2-harmony.dts b/board/nvidia/dts/tegra2-harmony.dts new file mode 100644 index 0000000..4f60a05 --- /dev/null +++ b/board/nvidia/dts/tegra2-harmony.dts @@ -0,0 +1,57 @@ +/dts-v1/; + +/include/ ARCH_CPU_DTS + +/ { + model = "NVIDIA Tegra2 Harmony evaluation board"; + compatible = "nvidia,harmony", "nvidia,tegra20"; + + aliases { + usb0 = "/usb@c5008000"; + }; + + memory { + reg = <0x00000000 0x40000000>; + }; + + clocks { + clk_32k: clk_32k { + clock-frequency = <32000>; + }; + osc { + clock-frequency = <12000000>; + }; + }; + + clock@60006000 { + clocks = <&clk_32k &osc>; + }; + + serial@70006300 { + clock-frequency = < 216000000 >; + }; + + i2c@7000c000 { + status = "disabled"; + }; + + i2c@7000c400 { + status = "disabled"; + }; + + i2c@7000c500 { + status = "disabled"; + }; + + i2c@7000d000 { + status = "disabled"; + }; + + usb@c5000000 { + status = "disabled"; + }; + + usb@c5004000 { + status = "disabled"; + }; +}; diff --git a/include/configs/harmony.h b/include/configs/harmony.h index 25d6ec7..88189be 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2010,2011 + * (C) Copyright 2010-2012 * NVIDIA Corporation <www.nvidia.com> * * See file CREDITS for list of people who contributed to this @@ -27,6 +27,11 @@ #include <asm/sizes.h> #include "tegra2-common.h" +/* Enable fdt support for Harmony. Flash the image in u-boot-dtb.bin */ +#define CONFIG_DEFAULT_DEVICE_TREE tegra2-harmony +#define CONFIG_OF_CONTROL +#define CONFIG_OF_SEPARATE + /* High-level configuration options */ #define V_PROMPT "Tegra2 (Harmony) # " #define CONFIG_TEGRA2_BOARD_STRING "NVIDIA Harmony" @@ -61,6 +66,21 @@ /* Environment not stored */ #define CONFIG_ENV_IS_NOWHERE +/* USB Host support */ +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_TEGRA +#define CONFIG_USB_STORAGE +#define CONFIG_CMD_USB + +/* USB networking support */ +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_SMSC95XX +#define CONFIG_USB_ETHER_ASIX + +/* General networking support */ +#define CONFIG_CMD_NET +#define CONFIG_CMD_DHCP + #include "tegra2-common-post.h" #endif /* __CONFIG_H */ -- 1.7.0.4

1 0

[U-Boot] silent console with nand
by Bishop, Mark 21 May '12

21 May '12

Is it possible to have a silent console with the 'silent' environment variable if the environment is stored in NAND? Essentially both: #define CONFIG_SILENT_CONSOLE #define CONFIG_ENV_IS_IN_NAND are defined, but I am not seeing a dark console with silent=1. I've seen the messages concerning the environment stored in SPI Flash and was probably thinking that it applies to NAND as well. I'm just looking for confirmation or another #define to get it to work. I realize that another option is to compile it into my default environment but I want to take advantage of the 'silent' switch. Thanks.

3 3