January 2012 - U-Boot

Re: [U-Boot] [PATCH] fw_env: use vars from the board config
by Marek Vasut 02 Jan '12

02 Jan '12

Cc u-boot ML please. > 2012/1/2 Marek Vasut <marek.vasut(a)gmail.com> > > > > it is quite odd that fw_printenv/fw_setenv does not > > > use the settings from include/configs but instead > > > redefines things. > > > > > > This patch uses the variables from the config file > > > The edit in fw_env.c is only needed to resolve a name clash > > > > > > Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks(a)gmail.com> > > > > > > --- > > > > > > Note: this is more intended to get some feedback. > > > (also to see if I am on the right track) > > > I did test the changes locally. > > > > > > (and yes, I know there are some more things that could be cleaned up). > > > --- > > > > > > tools/env/fw_env.c | 20 ++++++++++---------- > > > tools/env/fw_env.h | 36 ++++++++++++++++-------------------- > > > 2 files changed, 26 insertions(+), 30 deletions(-) > > > > > > diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c > > > index 996682e..6597fbf 100644 > > > --- a/tools/env/fw_env.c > > > +++ b/tools/env/fw_env.c > > > @@ -79,7 +79,7 @@ static int dev_current; > > > > > > #define ENVSECTORS(i) envdevices[(i)].env_sectors > > > #define DEVTYPE(i) envdevices[(i)].mtd_type > > > > > > -#define CONFIG_ENV_SIZE ENVSIZE(dev_current) > > > +#define CFG_ENV_SIZE ENVSIZE(dev_current) > > > > NAK, don't change it to CFG_... for no reason! Why did you change it ? > > Just use > > ENVSIZE(dev_current) instead. > > I agree with that. > As I wrote in the comment of the patch, this was mainly to get some > feedback that I am on the right track. > I've seen a number of places where the code of fw_env.c could be improved, > but opted for minimal change for now, as for now I am mostly solicitating > feedback on the changes in fw_env.h > (and the actual reason for the change is that CONFIG_ENV_SIZE is defined > here, but also in config.h, resulting in a naming config, a quick rename > was the simplest way forward for now) Let's see what the others think > > And actually I feel that lines like: > #define ENV1_SIZE CONFIG_ENV_SIZE > in fw_env.h are somewhat pointless and it would be better to eliminate > ENV1_SIZE completely. > > There are more cases like that. I'm happy to spent time on this, but only > if it is felt to be useful and has any chance on being accepted. > > Best regards, Frans M

1 0

[U-Boot] [PATCH] fw_env: use vars from the board config
by Frans Meulenbroeks 02 Jan '12

02 Jan '12

it is quite odd that fw_printenv/fw_setenv does not use the settings from include/configs but instead redefines things. This patch uses the variables from the config file The edit in fw_env.c is only needed to resolve a name clash Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks(a)gmail.com> --- Note: this is more intended to get some feedback. (also to see if I am on the right track) I did test the changes locally. (and yes, I know there are some more things that could be cleaned up). --- tools/env/fw_env.c | 20 ++++++++++---------- tools/env/fw_env.h | 36 ++++++++++++++++-------------------- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 996682e..6597fbf 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -79,7 +79,7 @@ static int dev_current; #define ENVSECTORS(i) envdevices[(i)].env_sectors #define DEVTYPE(i) envdevices[(i)].mtd_type -#define CONFIG_ENV_SIZE ENVSIZE(dev_current) +#define CFG_ENV_SIZE ENVSIZE(dev_current) #define ENV_SIZE getenvsize() @@ -216,7 +216,7 @@ static int get_config (char *); #endif static inline ulong getenvsize (void) { - ulong rc = CONFIG_ENV_SIZE - sizeof (long); + ulong rc = CFG_ENV_SIZE - sizeof (long); if (HaveRedundEnv) rc -= sizeof (char); @@ -425,7 +425,7 @@ int fw_env_write(char *name, char *value) ++env; /* * Overflow when: - * "name" + "=" + "val" +"\0\0" > CONFIG_ENV_SIZE - (env-environment) + * "name" + "=" + "val" +"\0\0" > CFG_ENV_SIZE - (env-environment) */ len = strlen (name) + 2; /* add '=' for first arg, ' ' for all others */ @@ -941,7 +941,7 @@ static int flash_write (int fd_current, int fd_target, int dev_target) DEVOFFSET (dev_target), DEVNAME (dev_target)); #endif rc = flash_write_buf (dev_target, fd_target, environment.image, - CONFIG_ENV_SIZE, DEVOFFSET (dev_target), + CFG_ENV_SIZE, DEVOFFSET (dev_target), DEVTYPE(dev_target)); if (rc < 0) return rc; @@ -980,10 +980,10 @@ static int flash_read (int fd) DEVTYPE(dev_current) = mtdinfo.type; - rc = flash_read_buf (dev_current, fd, environment.image, CONFIG_ENV_SIZE, + rc = flash_read_buf (dev_current, fd, environment.image, CFG_ENV_SIZE, DEVOFFSET (dev_current), mtdinfo.type); - return (rc != CONFIG_ENV_SIZE) ? -1 : 0; + return (rc != CFG_ENV_SIZE) ? -1 : 0; } static int flash_io (int mode) @@ -1080,11 +1080,11 @@ int fw_env_open(void) if (parse_config ()) /* should fill envdevices */ return -1; - addr0 = calloc (1, CONFIG_ENV_SIZE); + addr0 = calloc (1, CFG_ENV_SIZE); if (addr0 == NULL) { fprintf (stderr, "Not enough memory for environment (%ld bytes)\n", - CONFIG_ENV_SIZE); + CFG_ENV_SIZE); return -1; } @@ -1119,11 +1119,11 @@ int fw_env_open(void) flag0 = *environment.flags; dev_current = 1; - addr1 = calloc (1, CONFIG_ENV_SIZE); + addr1 = calloc (1, CFG_ENV_SIZE); if (addr1 == NULL) { fprintf (stderr, "Not enough memory for environment (%ld bytes)\n", - CONFIG_ENV_SIZE); + CFG_ENV_SIZE); return -1; } redundant = addr1; diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index 2dcb373..8fcc5bd 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -24,30 +24,26 @@ /* * To build the utility with the run-time configuration * uncomment the next line. - * See included "fw_env.config" sample file + * See included "fw_env.config" sample file (TRAB board) * for notes on configuration. */ -#define CONFIG_FILE "/etc/fw_env.config" +//#define CONFIG_FILE "/etc/fw_env.config" -#define HAVE_REDUND /* For systems with 2 env sectors */ -#define DEVICE1_NAME "/dev/mtd1" -#define DEVICE2_NAME "/dev/mtd2" -#define DEVICE1_OFFSET 0x0000 -#define ENV1_SIZE 0x4000 -#define DEVICE1_ESIZE 0x4000 -#define DEVICE1_ENVSECTORS 2 -#define DEVICE2_OFFSET 0x0000 -#define ENV2_SIZE 0x4000 -#define DEVICE2_ESIZE 0x4000 -#define DEVICE2_ENVSECTORS 2 +#include "config.h" -#define CONFIG_BAUDRATE 115200 -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#define CONFIG_BOOTCOMMAND \ - "bootp; " \ - "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ - "bootm" +#define DEVICE1_NAME "/dev/mtd0" +#define DEVICE2_NAME "/dev/mtd0" +#define DEVICE1_OFFSET CONFIG_ENV_ADDR_REDUND +#define ENV1_SIZE CONFIG_ENV_SIZE +#define DEVICE1_ESIZE CONFIG_ENV_SECT_SIZE +#define DEVICE1_ENVSECTORS 1 +#ifdef CONFIG_ENV_ADDR_REDUND +#define HAVE_REDUND /* For systems with 2 env sectors */ +#define DEVICE2_OFFSET CONFIG_ENV_ADDR_REDUND +#define ENV2_SIZE CONFIG_ENV_SIZE_REDUND +#define DEVICE2_ESIZE CONFIG_ENV_SECT_SIZE +#define DEVICE2_ENVSECTORS 1 +#endif extern int fw_printenv(int argc, char *argv[]); extern char *fw_getenv (char *name); -- 1.7.0.4

2 1

[U-Boot] CONFIG_ENV_SIZE_REDUND
by Frans Meulenbroeks 02 Jan '12

02 Jan '12

Hi all, Let me first start off to wish all of you a prosperous 2012. While browsing through the sources I noticed CONFIG_ENV_SIZE_REDUND and I am wondering if it carries any use at all. Why would the redundant env be any different in size than the original one? Seems odd to me. A quick grep through the sources revealed that most of the boards define it to be CONFIG_ENV_SIZE (sometimes with and sometimes without parenthesis around CONFIG_ENV_SIZE) 8 boards define it to be CONFIG_ENV_SECT_SIZE, but 7 of these also define CONFIG_ENV_SIZE to be equal to CONFIG_ENV_SECT_SIZE the weird one is quad100hd.h (whatever that may be) which says: #define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SECT_SIZE) but does not define CONFIG_ENV_SIZE. Fortunately the default seems to be CONFIG_ENV_SECT_SIZE. and 5 boards define CONFIG_ENV_SIZE_REDUND as a numerical value (e.g. 0x2000) but all identical to CONFIG_ENV_SIZE This is as far as the configs go In the sources there exist three places where things are referenced: tools/envcrc.c says: # if !defined(CONFIG_ENV_ADDR_REDUND) && defined(CONFIG_ENV_OFFSET_REDUND) # define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET_REDUND) # endif common/env_flash.c says: #if defined(CONFIG_ENV_SIZE_REDUND) && \ (CONFIG_ENV_SIZE_REDUND < CONFIG_ENV_SIZE) #error CONFIG_ENV_SIZE_REDUND should not be less then CONFIG_ENV_SIZE #endif and common/env_nand.c says: #if defined(CONFIG_ENV_SIZE_REDUND) && \ (CONFIG_ENV_SIZE_REDUND != CONFIG_ENV_SIZE) #error CONFIG_ENV_SIZE_REDUND should be the same as CONFIG_ENV_SIZE #endif and finally there is ./include/environment.h which says # if defined(CONFIG_ENV_ADDR_REDUND) && !defined(CONFIG_ENV_SIZE_REDUND) # define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE # endif I could not find any place where the value is actually used! Is it meaningful to keep this around? Shouldn't we just remove it ? Best regards, Frans.

1 0

[U-Boot] [PATCH] Change kernel address in dataflash to match u-boot's size
by Alexandre Belloni 02 Jan '12

02 Jan '12

On at91sam platforms, u-boot grew larger than the allocated size in dataflash, the layout was: bootstrap 0x00000000 ubootenv 0x00004200 uboot 0x00008400 kernel 0x00042000 u-boot with the defconfig doesn't seem to fit in 0x42000 - 0x8400 = 0x39C00 bytes anymore. Loading the kernel from 0x44000 will make the process easier for users using the default configuration but they'll have to remember to flash the kernel at 0x44000. Signed-off-by: Alexandre Belloni <alexandre.belloni(a)piout.net> --- include/configs/at91sam9260ek.h | 4 ++-- include/configs/at91sam9261ek.h | 4 ++-- include/configs/at91sam9263ek.h | 2 +- include/configs/at91sam9rlek.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index db52ee6..7f99975 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -188,7 +188,7 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" +#define CONFIG_BOOTCOMMAND "cp.b 0xC0044000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ "mtdparts=atmel_nand:-(root) " \ @@ -202,7 +202,7 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS1 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" +#define CONFIG_BOOTCOMMAND "cp.b 0xD0044000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ "mtdparts=atmel_nand:-(root) " \ diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 5140b26..1aa6373 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -190,7 +190,7 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" +#define CONFIG_BOOTCOMMAND "cp.b 0xC0044000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ "mtdparts=atmel_nand:-(root) " \ @@ -204,7 +204,7 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS3 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND "cp.b 0xD0042000 0x22000000 0x210000; bootm" +#define CONFIG_BOOTCOMMAND "cp.b 0xD0044000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ "mtdparts=atmel_nand:-(root) " \ diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 8399246..658ae73 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -317,7 +317,7 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" +#define CONFIG_BOOTCOMMAND "cp.b 0xC0044000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ "mtdparts=atmel_nand:-(root) "\ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 79ea1f2..dc6e007 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -156,7 +156,7 @@ #define CONFIG_ENV_OFFSET 0x4200 #define CONFIG_ENV_ADDR (CONFIG_SYS_DATAFLASH_LOGIC_ADDR_CS0 + CONFIG_ENV_OFFSET) #define CONFIG_ENV_SIZE 0x4200 -#define CONFIG_BOOTCOMMAND "cp.b 0xC0042000 0x22000000 0x210000; bootm" +#define CONFIG_BOOTCOMMAND "cp.b 0xC0044000 0x22000000 0x210000; bootm" #define CONFIG_BOOTARGS "console=ttyS0,115200 " \ "root=/dev/mtdblock0 " \ "mtdparts=atmel_nand:-(root) "\ -- 1.7.5.4

2 2

[U-Boot] NAND boot looks broken on P1020RDB
by Felix Radensky 02 Jan '12

02 Jan '12

Hi, NAND boot implementation for P2020RDB/P1020RDB first copies u-boot to L2 SRAM, and then to DDR. This works for P2020, where L2 size is 512K, but breaks on P1020, where L2 size is 256K. Looks like NAND SPL for these platforms should not rely on L2 cache, and copy u-boot directly into DDR. Felix.

2 1