May 2012 - U-Boot

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

22 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 ${soc}-${board}.dtb and hence not need adjustments to run on multiple boards. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v2: * Pass values via config.h instead of command-line * Use a single CONFIG option to enable this feature * Simplify names of the environment variables * add README entry describing CONFIG_ENV_VARS_UBOOT_CONFIG --- README | 6 ++++++ common/env_common.c | 11 +++++++++++ common/env_embedded.c | 11 +++++++++++ mkconfig | 8 ++++++++ 4 files changed, 36 insertions(+), 0 deletions(-) diff --git a/README b/README index 6919392..27221bd 100644 --- a/README +++ b/README @@ -2203,6 +2203,12 @@ The following options need to be configured: the environment like the "source" command or the boot command first. + CONFIG_ENV_VARS_UBOOT_CONFIG + + Define this in order to add variables describing the + U-Boot build configuration to the default environment. + These will be named arch, cpu, board, vendor, and soc. + - DataFlash Support: CONFIG_HAS_DATAFLASH diff --git a/common/env_common.c b/common/env_common.c index c33d22d..81c7395 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -116,6 +116,17 @@ const uchar default_environment[] = { #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0) "pcidelay=" MK_STR(CONFIG_PCI_BOOTDELAY) "\0" #endif +#ifdef CONFIG_ENV_VARS_UBOOT_CONFIG + "arch=" ARCH "\0" + "cpu=" CPU "\0" + "board=" BOARD "\0" +#ifdef VENDOR + "vendor=" VENDOR "\0" +#endif +#ifdef SOC + "soc=" SOC "\0" +#endif +#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..1a63894 100644 --- a/common/env_embedded.c +++ b/common/env_embedded.c @@ -179,6 +179,17 @@ env_t environment __PPCENV__ = { #if defined(CONFIG_PCI_BOOTDELAY) && (CONFIG_PCI_BOOTDELAY > 0) "pcidelay=" MK_STR(CONFIG_PCI_BOOTDELAY) "\0" #endif +#ifdef CONFIG_ENV_VARS_UBOOT_CONFIG + "arch=" ARCH "\0" + "cpu=" CPU "\0" + "board=" BOARD "\0" +#ifdef VENDOR + "vendor=" VENDOR "\0" +#endif +#ifdef SOC + "soc=" SOC "\0" +#endif +#endif #ifdef CONFIG_EXTRA_ENV_SETTINGS CONFIG_EXTRA_ENV_SETTINGS #endif diff --git a/mkconfig b/mkconfig index 438530b..e74ad79 100755 --- a/mkconfig +++ b/mkconfig @@ -161,6 +161,14 @@ for i in ${TARGETS} ; do echo "#define CONFIG_${i}" >>config.h ; done +echo "#define ARCH \"${arch}\"" >> config.h +echo "#define CPU \"${cpu}\"" >> config.h +echo "#define BOARD \"${board}\"" >> config.h + +[ "${vendor}" ] && echo "#define VENDOR \"${vendor}\"" >> config.h + +[ "${soc}" ] && echo "#define SOC \"${soc}\"" >> config.h + cat << EOF >> config.h #define CONFIG_BOARDDIR board/$BOARDDIR #include <config_cmd_defaults.h> -- 1.7.0.4

2 4

[U-Boot] [PATCH] arch/powerpc/cpu/mpc8220/fec.c: Fix compile warning
by Joe Hershberger 22 May '12

22 May '12

Fix this: fec.c: In function 'mpc8220_fec_recv': fec.c:791:9: warning: passing argument 1 of 'NetReceive' discards qualifiers from pointer target type include/net.h:438:13: note: expected 'uchar *' but argument is of type 'volatile uchar *' fec.c: In function 'mpc8220_fec_initialize': fec.c:839:12: warning: assignment from incompatible pointer type Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> --- arch/powerpc/cpu/mpc8220/fec.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/cpu/mpc8220/fec.c b/arch/powerpc/cpu/mpc8220/fec.c index 2053fea..aaf9be1 100644 --- a/arch/powerpc/cpu/mpc8220/fec.c +++ b/arch/powerpc/cpu/mpc8220/fec.c @@ -624,7 +624,7 @@ static void rfifo_print (char *devname, mpc8220_fec_priv * fec) /********************************************************************/ -static int mpc8220_fec_send (struct eth_device *dev, volatile void *eth_data, +static int mpc8220_fec_send(struct eth_device *dev, void *eth_data, int data_length) { /* @@ -787,8 +787,7 @@ static int mpc8220_fec_recv (struct eth_device *dev) */ /* memcpy(buff, frame->head, 14); memcpy(buff + 14, frame->data, frame_length);*/ - NetReceive ((volatile uchar *) pRbd->dataPointer, - frame_length); + NetReceive((uchar *)pRbd->dataPointer, frame_length); len = frame_length; } /* -- 1.6.0.2

1 11

[U-Boot] [PATCH v3] patman: Handle creation of patman config
by Vikram Narayanan 22 May '12

22 May '12

patman shouts when it couldn't find a $(HOME)/.config/patman file. Handle it in a sane way by creating a new one for the user. It looks for a user.name and user.email in the global .gitconfig file, waits for the user input if it can't find those. Signed-off-by: Vikram Narayanan <vikram186(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- tools/patman/gitutil.py | 18 ++++++++++++++++++ tools/patman/settings.py | 37 ++++++++++++++++++++++++++++++++++--- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 48ca998..59eca99 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -357,6 +357,24 @@ def GetAliasFile(): fname = os.path.join(GetTopLevel(), fname.strip()) return fname +def GetDefaultUserName(): + """Gets the user.name from .gitconfig file. + + Returns: + User name found in .gitconfig file, or None if none + """ + uname = command.OutputOneLine('git', 'config', '--global', 'user.name') + return uname + +def GetDefaultUserEmail(): + """Gets the user.email from the global .gitconfig file. + + Returns: + User's email found in .gitconfig file, or None if none + """ + uemail = command.OutputOneLine('git', 'config', '--global', 'user.email') + return uemail + def Setup(): """Set up git utils, by reading the alias files.""" settings.Setup('') diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 049c709..9b7e75d 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -24,7 +24,7 @@ import os import re import command - +import gitutil def ReadGitAliases(fname): """Read a git alias file. This is in the form used by git: @@ -61,6 +61,33 @@ def ReadGitAliases(fname): fd.close() +def CreatePatmanConfigFile(config_fname): + """Creates a config file under $(HOME)/.config/ if it can't find one. + + Args: + config_fname: Default config filename i.e., $(HOME)/.config/patman + + Returns: + None + """ + name = gitutil.GetDefaultUserName() + if name == None: + name = raw_input("Enter name: ") + + email = gitutil.GetDefaultUserEmail() + + if email == None: + email = raw_input("Enter email: ") + + try: + f = open(config_fname, 'w') + except IOError: + print "Couldn't create patman config file\n" + raise + + print >>f, "[alias]\nme: %s <%s>" % (name, email) + f.close(); + def Setup(config_fname=''): """Set up the settings module by reading config files. @@ -70,8 +97,12 @@ def Setup(config_fname=''): settings = ConfigParser.SafeConfigParser() if config_fname == '': config_fname = '%s/.config/patman' % os.getenv('HOME') - if config_fname: - settings.read(config_fname) + + if not os.path.exists(config_fname): + print "No config file found under ~/.config/\nCreating one...\n" + CreatePatmanConfigFile(config_fname) + + settings.read(config_fname) for name, value in settings.items('alias'): alias[name] = value.split(',') -- 1.7.4.1

3 4

[U-Boot] [PATCH 2/2] patman: Update README
by Vikram Narayanan 22 May '12

22 May '12

Make changes in the README file with the new location of patman config file. Also update the creation of config file. Signed-off-by: Vikram Narayanan <vikram186(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- tools/patman/README | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/patman/README b/tools/patman/README index 7ba9e80..86ede78 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -68,7 +68,10 @@ How to configure it For most cases patman will locate and use the file 'doc/git-mailrc' in your U-Boot directory. This contains most of the aliases you will need. -To add your own, create a file ~/.config/patman directory like this: +During the first run patman creates a config file for you by taking the default +user name and email address from the global .gitconfig file. + +To add your own, create a file ~/.patman like this: >>>> # patman alias file -- 1.7.4.1

3 2

[U-Boot] [PATCH 1/2] patman: Change the location of the config file
by Vikram Narayanan 22 May '12

22 May '12

Move the config file from ~/.config/patman to ~/.patman as it is more appropriate to have it there. Signed-off-by: Vikram Narayanan <vikram186(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- tools/patman/settings.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/patman/settings.py b/tools/patman/settings.py index 9b7e75d..4dda17b 100644 --- a/tools/patman/settings.py +++ b/tools/patman/settings.py @@ -62,10 +62,10 @@ def ReadGitAliases(fname): fd.close() def CreatePatmanConfigFile(config_fname): - """Creates a config file under $(HOME)/.config/ if it can't find one. + """Creates a config file under $(HOME)/.patman if it can't find one. Args: - config_fname: Default config filename i.e., $(HOME)/.config/patman + config_fname: Default config filename i.e., $(HOME)/.patman Returns: None @@ -96,10 +96,10 @@ def Setup(config_fname=''): """ settings = ConfigParser.SafeConfigParser() if config_fname == '': - config_fname = '%s/.config/patman' % os.getenv('HOME') + config_fname = '%s/.patman' % os.getenv('HOME') if not os.path.exists(config_fname): - print "No config file found under ~/.config/\nCreating one...\n" + print "No config file found ~/.patman\nCreating one...\n" CreatePatmanConfigFile(config_fname) settings.read(config_fname) -- 1.7.4.1

3 2

[U-Boot] [PATCH 0/5]: Correct i2c support on am33xx
by Tom Rini 22 May '12

22 May '12

Hey all, The following series corrects i2c support for the am33xx family of devices (including beaglebone) and has been tested on a beagleboard xM and pandaboard. I would like to take these changes in via the u-boot-ti tree as it's mostly changes to arch and board files but I've cc'd Heiko on the i2c related parts. The biggest change here is to revert a previous change to the omap24xx_i2c.c driver for the i2c probe function. In short, the change made before violated the TRM constraints but did no harm on the IP block found in omap3/related boards. Moving forward to the IP block found on omap4 and am33xx (and others) it still voilates the TRM and now leaves the bus in an unboundedly defined state like the TRM states. We must revert this change for both correctness and functionality. The rest of the series is minor corrections to structs/defines and adding CONFIG_AM33XX to the block of !CONFIG_OMAP2430. I've thought of, but think it should be separate to change omap24xx_i2c.c to test for CONFIG_OMAP2430 rather than every other present and future user in a few areas. -- Tom

2 11

[U-Boot] [PATCH] EXT4
by Jorgen Lundman 22 May '12

22 May '12

Slowly getting the hang of github and u-boot. I took a fork of u-boot 20120520, and merged in the EXT4 patched. In addition to Samsung's work; * Fix minor string ext2->ext4 * 'unsigned' sectors for volumes over 1TB * changed to fit with current u-boot compile env https://github.com/lundman/u-boot/compare/upstream...upstream-ext4 There is a new limit of 2TB with 512 byte blocks. To go beyond that would require "disk_partition_t" to go bigger than 32bit. I think that is outside of my access permissions. -- Jorgen Lundman | <lundman(a)lundman.net> Unix Administrator | +81 (0)3 -5456-2687 ext 1017 (work) Shibuya-ku, Tokyo | +81 (0)90-5578-8500 (cell) Japan | +81 (0)3 -3375-1767 (home)

4 10

[U-Boot] [PATCH 1/2] MAKEALL: Fix error reporting for BUILD_NBUILDS==1
by Joe Hershberger 22 May '12

22 May '12

This was broken by f588bb034d5d3a0417f45965f1aba4d4cf8a2893 Signed-off-by: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Andy Fleming <afleming(a)freescale.com> --- MAKEALL | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/MAKEALL b/MAKEALL index 05e2d90..b7fcae4 100755 --- a/MAKEALL +++ b/MAKEALL @@ -709,7 +709,11 @@ build_targets() { : $((CURRENT_CNT += 1)) rm -f "${donep}${TOTAL_CNT}" rm -f "${skipp}${TOTAL_CNT}" - build_target ${t} ${TOTAL_CNT} & + if [ $BUILD_MANY == 1 ] ; then + build_target ${t} ${TOTAL_CNT} & + else + build_target ${t} ${TOTAL_CNT} + fi fi # We maintain a running count of all the builds we have done. @@ -745,8 +749,6 @@ print_stats() { if [ $BUILD_MANY == 1 ] && [ -e "${OUTPUT_PREFIX}/ERR" ] ; then ERR_LIST=$(ls ${OUTPUT_PREFIX}/ERR/) ERR_CNT=`ls -1 ${OUTPUT_PREFIX}/ERR/ | wc | awk '{print $1}'` - else - ERR_CNT=0 fi echo "" -- 1.6.0.2

2 3

[U-Boot] [PATCH] common/cmd_nand.c: Fix GCC 4.6 warning
by Anatolij Gustschin 22 May '12

22 May '12

cmd_nand.c: In function 'raw_access': cmd_nand.c:397:9: warning: variable 'rwsize' set but not used [-Wunused-but-set-variable] Signed-off-by: Anatolij Gustschin <agust(a)denx.de> Cc: Scott Wood <scottwood(a)freescale.com> --- common/cmd_nand.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/common/cmd_nand.c b/common/cmd_nand.c index f060a31..fa44295 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -394,7 +394,6 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, int read) { int ret = 0; - size_t rwsize; while (count--) { /* Raw access */ @@ -406,7 +405,6 @@ static int raw_access(nand_info_t *nand, ulong addr, loff_t off, ulong count, .mode = MTD_OOB_RAW }; - rwsize = nand->writesize + nand->oobsize; if (read) ret = nand->read_oob(nand, off, &ops); else -- 1.7.1

2 1

[U-Boot] [PATCH] common/cmd_nvedit.c: Fix GCC 4.6 warning
by Anatolij Gustschin 22 May '12

22 May '12

cmd_nvedit.c: In function '_do_env_set': cmd_nvedit.c:207:9: warning: unused variable 'bd' [-Wunused-variable] Signed-off-by: Anatolij Gustschin <agust(a)denx.de> --- common/cmd_nvedit.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index 5999cb8..2712002 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -204,7 +204,6 @@ static int do_env_grep(cmd_tbl_t *cmdtp, int flag, */ int _do_env_set(int flag, int argc, char * const argv[]) { - bd_t *bd = gd->bd; int i, len; int console = -1; char *name, *value, *s; -- 1.7.1

2 1