August 2012 - U-Boot

[U-Boot] [PATCH/RFC] global_data: unify global flag defines
by Mike Frysinger 09 Aug '12

09 Aug '12

All the global flag defines are the same across all arches (ignoring two unique x86 ones). So unify them in one place, and add a simple way for arches to extend for their needs. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- note: this depends on Graeme's x86 boot flag clean up arch/arm/include/asm/global_data.h | 14 +----------- arch/avr32/include/asm/global_data.h | 14 +----------- arch/blackfin/include/asm/global_data.h | 14 +----------- arch/m68k/include/asm/global_data.h | 14 +----------- arch/microblaze/include/asm/global_data.h | 14 +----------- arch/mips/include/asm/global_data.h | 14 +----------- arch/nds32/include/asm/global_data.h | 14 +----------- arch/nios2/include/asm/global_data.h | 10 +-------- arch/powerpc/include/asm/global_data.h | 14 +----------- arch/sandbox/include/asm/global_data.h | 14 +----------- arch/sh/include/asm/global_data.h | 9 +------- arch/sparc/include/asm/global_data.h | 14 +----------- arch/x86/include/asm/global_data.h | 16 +------------- include/asm-generic/global_data_flags.h | 33 +++++++++++++++++++++++++++++ 14 files changed, 46 insertions(+), 162 deletions(-) create mode 100644 include/asm-generic/global_data_flags.h diff --git a/arch/arm/include/asm/global_data.h b/arch/arm/include/asm/global_data.h index c3ff789..f8088fe 100644 --- a/arch/arm/include/asm/global_data.h +++ b/arch/arm/include/asm/global_data.h @@ -29,8 +29,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -86,17 +84,7 @@ typedef struct global_data { #endif } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r8") diff --git a/arch/avr32/include/asm/global_data.h b/arch/avr32/include/asm/global_data.h index 5c654bd..7878bb1 100644 --- a/arch/avr32/include/asm/global_data.h +++ b/arch/avr32/include/asm/global_data.h @@ -28,8 +28,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -52,17 +50,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm("r5") diff --git a/arch/blackfin/include/asm/global_data.h b/arch/blackfin/include/asm/global_data.h index 67aa30f..ad42e91 100644 --- a/arch/blackfin/include/asm/global_data.h +++ b/arch/blackfin/include/asm/global_data.h @@ -36,8 +36,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { bd_t *bd; @@ -61,17 +59,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register gd_t * volatile gd asm ("P3") diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h index 0ba2b43..cd55b83 100644 --- a/arch/m68k/include/asm/global_data.h +++ b/arch/m68k/include/asm/global_data.h @@ -29,8 +29,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -70,17 +68,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #if 0 extern gd_t *global_data; diff --git a/arch/microblaze/include/asm/global_data.h b/arch/microblaze/include/asm/global_data.h index 6e8537c..0dc4ce9 100644 --- a/arch/microblaze/include/asm/global_data.h +++ b/arch/microblaze/include/asm/global_data.h @@ -30,8 +30,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -49,17 +47,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r31") diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index f6cf9fe..6e2cdc7 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -32,8 +32,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -63,17 +61,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("k0") diff --git a/arch/nds32/include/asm/global_data.h b/arch/nds32/include/asm/global_data.h index de20a0a..94bd4c2 100644 --- a/arch/nds32/include/asm/global_data.h +++ b/arch/nds32/include/asm/global_data.h @@ -39,8 +39,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set CONFIG_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -67,17 +65,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Envs imported into hash table */ +#include <asm-generic/global_data_flags.h> #ifdef CONFIG_GLOBAL_DATA_NOT_REG10 extern volatile gd_t g_gd; diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h index 4b86fbd..3b0d9e6 100644 --- a/arch/nios2/include/asm/global_data.h +++ b/arch/nios2/include/asm/global_data.h @@ -44,15 +44,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* flags */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("gp") diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 01f1d4a..5a5877f 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -33,8 +33,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -186,17 +184,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #if 1 #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("r2") diff --git a/arch/sandbox/include/asm/global_data.h b/arch/sandbox/include/asm/global_data.h index 8d47191..64d6ddc 100644 --- a/arch/sandbox/include/asm/global_data.h +++ b/arch/sandbox/include/asm/global_data.h @@ -31,8 +31,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -49,17 +47,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Env. imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR extern gd_t *gd diff --git a/arch/sh/include/asm/global_data.h b/arch/sh/include/asm/global_data.h index 1b782fc..6e534ad 100644 --- a/arch/sh/include/asm/global_data.h +++ b/arch/sh/include/asm/global_data.h @@ -44,14 +44,7 @@ typedef struct global_data char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("r13") diff --git a/arch/sparc/include/asm/global_data.h b/arch/sparc/include/asm/global_data.h index 613e2d8..93d3cc0 100644 --- a/arch/sparc/include/asm/global_data.h +++ b/arch/sparc/include/asm/global_data.h @@ -35,8 +35,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ typedef struct global_data { @@ -78,17 +76,7 @@ typedef struct global_data { char env_buf[32]; /* buffer for getenv() before reloc. */ } gd_t; -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ +#include <asm-generic/global_data_flags.h> #define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("%g7") diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index f177a4f..2b8a2ed 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -29,8 +29,6 @@ * some locked parts of the data cache) to allow for a minimum set of * global variables during system initialization (until we have set * up the memory controller so that we can use RAM). - * - * Keep it *SMALL* and remember to set GENERATED_GBL_DATA_SIZE > sizeof(gd_t) */ #ifndef __ASSEMBLY__ @@ -80,19 +78,7 @@ extern gd_t *gd; #define GD_SIZE 15 -/* - * Global Data Flags - */ -#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ -#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ -#define GD_FLG_SILENT 0x00004 /* Silent mode */ -#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ -#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ -#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ -#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ -#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ -#define GD_FLG_COLD_BOOT 0x00100 /* Cold Boot */ -#define GD_FLG_WARM_BOOT 0x00200 /* Warm Boot */ +#include <asm-generic/global_data_flags.h> #if 0 #define DECLARE_GLOBAL_DATA_PTR diff --git a/include/asm-generic/global_data_flags.h b/include/asm-generic/global_data_flags.h new file mode 100644 index 0000000..ee4ddb7 --- /dev/null +++ b/include/asm-generic/global_data_flags.h @@ -0,0 +1,33 @@ +/* + * transitional header until we merge global_data.h + * + * (C) Copyright 2000-2010 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * Licensed under the GPL-2 or later. + */ + +#ifndef __ASM_GENERIC_GLOBAL_DATA_FLAGS_H +#define __ASM_GENERIC_GLOBAL_DATA_FLAGS_H + +/* + * Global Data Flags + */ +#define GD_FLG_RELOC 0x00001 /* Code was relocated to RAM */ +#define GD_FLG_DEVINIT 0x00002 /* Devices have been initialized */ +#define GD_FLG_SILENT 0x00004 /* Silent mode */ +#define GD_FLG_POSTFAIL 0x00008 /* Critical POST test failed */ +#define GD_FLG_POSTSTOP 0x00010 /* POST seqeunce aborted */ +#define GD_FLG_LOGINIT 0x00020 /* Log Buffer has been initialized */ +#define GD_FLG_DISABLE_CONSOLE 0x00040 /* Disable console (in & out) */ +#define GD_FLG_ENV_READY 0x00080 /* Environment imported into hash table */ + +/* + * Base for arches to start adding their own: + * #define GD_FLG_FOO (GD_FLG_ARCH_BASE << 0) + * #define GD_FLG_BAR (GD_FLG_ARCH_BASE << 1) + * #define GD_FLG_COW (GD_FLG_ARCH_BASE << 2) + */ +#define GD_FLG_ARCH_BASE 0x00100 + +#endif -- 1.7.6.1

3 11

[U-Boot] [PATCH] MAKEALL: Allow empty ERR directory
by Andy Fleming 09 Aug '12

09 Aug '12

If we build everything correctly with multiple builds, and an ERR directory had been previously created, we failed to report that everything was fine because grep failed to find anything in the ERR directory. Use grep -r, which doesn't complain if there are no input files. Signed-off-by: Andy Fleming <afleming(a)freescale.com> --- MAKEALL | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MAKEALL b/MAKEALL index 2e8b997..6b9ff30 100755 --- a/MAKEALL +++ b/MAKEALL @@ -754,10 +754,10 @@ print_stats() { rm -f ${donep}* ${skipp}* if [ $BUILD_MANY == 1 ] && [ -e "${OUTPUT_PREFIX}/ERR" ] ; then - ERR_LIST=`grep -iwl error ${OUTPUT_PREFIX}/ERR/*` + ERR_LIST=`grep -riwl error ${OUTPUT_PREFIX}/ERR/` ERR_LIST=`for f in $ERR_LIST ; do echo -n " $(basename $f)" ; done` ERR_CNT=`echo $ERR_LIST | wc -w | awk '{print $1}'` - WRN_LIST=`grep -iwL error ${OUTPUT_PREFIX}/ERR/*` + WRN_LIST=`grep -riwL error ${OUTPUT_PREFIX}/ERR/` WRN_LIST=`for f in $WRN_LIST ; do echo -n " $(basename $f)" ; done` WRN_CNT=`echo $WRN_LIST | wc -w | awk '{print $1}'` fi -- 1.7.9.7

3 2

[U-Boot] Pull request v2 : u-boot-sh/master
by Nobuhiro Iwamatsu 09 Aug '12

09 Aug '12

Dear Wolfgang Denk. Please pull from git://git.denx.de/u-boot-sh master. Best regards, Nobuhiro The following changes since commit 6d36121b878a3ccbbff7f60a02109e8c8d81dd0f: Merge branch 'master' of git://git.denx.de/u-boot-onenand (2012-08-07 23:42:55 +0200) are available in the git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to d764c5043d6d72e012f3e50092344ebd57a0c242: sh: Add support pin function control using GPIO (2012-08-08 10:24:41 +0900) ---------------------------------------------------------------- Hideyuki Sano (1): serial: sh: Add support Renesas R8A7740 Nobuhiro Iwamatsu (2): serial: sh: Add support Renesas SH73A0 sh: Add support pin function control using GPIO Yoshihiro Shimoda (1): sh: modify checkcpu() for SH-4A arch/sh/cpu/sh4/cpu.c | 4 ++ drivers/gpio/Makefile | 1 + drivers/gpio/sh_pfc.c | 629 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/serial/serial_sh.h | 32 ++++++--- include/sh_pfc.h | 192 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 849 insertions(+), 9 deletions(-) create mode 100644 drivers/gpio/sh_pfc.c create mode 100644 include/sh_pfc.h -- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6

2 1

[U-Boot] Please pull u-boot-mpc85xx.git
by Andy Fleming 09 Aug '12

09 Aug '12

powerpc/82xx: adapt SDRAM settings for mgcoge3ne (2012-07-31 22:36:38 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-mpc85xx.git master for you to fetch changes up to 5c5befda58e4a3f198a033e8a9952b2b309acc86: powerpc/85xx: use CONFIG_SYS_FSL_PCIE_COMPAT macro when setting the PCI LIODNs (2012-08-08 18:32:16 -0500) ---------------------------------------------------------------- Hongtao Jia (1): powerpc/sgmii: To support PHY link state auto detect in SGMII mode Matthew McClintock (1): powerpc/p1022ds: add support for SPI and SD boot Shaohui Xie (3): powerpc/corenet: fix compile error when CONFIG_SYS_NO_FLASH is defined powerpc/ddr: fix fsl_ddr_get_dimm_params compile error powerpc/p2041: configure the CPLD lane_mux according to RCW Timur Tabi (3): powerpc/p1022ds: fix DIU/LBC switching with NAND enabled powerpc/85xx: improve definition of BR_PHYS_ADDR macro powerpc/85xx: use CONFIG_SYS_FSL_PCIE_COMPAT macro when setting the PCI LIODNs York Sun (2): powerpc/mpc8xxx: fix workaround for errata DDR111 and DDR134 for DDR over 4GB powerpc/mpc85xx: Ignore E bit for BSC9130/1 arch/powerpc/cpu/mpc85xx/ddr-gen3.c | 13 +++++- arch/powerpc/cpu/mpc85xx/p2041_ids.c | 6 +-- arch/powerpc/cpu/mpc85xx/p3041_ids.c | 8 ++-- arch/powerpc/cpu/mpc85xx/p4080_ids.c | 6 +-- arch/powerpc/cpu/mpc85xx/p5020_ids.c | 8 ++-- arch/powerpc/cpu/mpc8xxx/ddr/main.c | 2 +- arch/powerpc/include/asm/fsl_lbc.h | 6 +-- arch/powerpc/include/asm/processor.h | 2 - board/freescale/common/sgmii_riser.c | 57 +++++++++++++++++++---- board/freescale/p1022ds/diu.c | 82 ++++++++++++++++++++++++++++++---- board/freescale/p1022ds/p1022ds.c | 4 ++ board/freescale/p1022ds/tlb.c | 14 ++++++ board/freescale/p2041rdb/eth.c | 39 ++++++++++++++++ boards.cfg | 4 ++ include/configs/MPC8536DS.h | 9 ++-- include/configs/MPC8548CDS.h | 3 +- include/configs/MPC8572DS.h | 9 ++-- include/configs/P1022DS.h | 53 ++++++++++++++++++++-- include/configs/P2020DS.h | 9 ++-- include/configs/P2041RDB.h | 5 +++ include/configs/corenet_ds.h | 4 +- include/configs/p1_p2_rdb_pc.h | 4 +- 22 files changed, 285 insertions(+), 62 deletions(-)

2 1

[U-Boot] Pull request: u-boot-sh/master
by Nobuhiro Iwamatsu 09 Aug '12

09 Aug '12

Dear Wolfgang Denk. Please pull from git://git.denx.de/u-boot-sh master. Best regards, Nobuhiro The following changes since commit 6d36121b878a3ccbbff7f60a02109e8c8d81dd0f: Merge branch 'master' of git://git.denx.de/u-boot-onenand (2012-08-07 23:42:55 +0200) are available in the git repository at: git://git.denx.de/u-boot-sh.git master for you to fetch changes up to d61678e096bbb15d46bb297f98abbd903589c118: serial: sh: Add support Renesas R8A7740 (2012-08-08 09:52:06 +0900) ---------------------------------------------------------------- Hideyuki Sano (1): serial: sh: Add support Renesas R8A7740 Nobuhiro Iwamatsu (1): serial: sh: Add support Renesas SH73A0 Yoshihiro Shimoda (1): sh: modify checkcpu() for SH-4A arch/sh/cpu/sh4/cpu.c | 4 ++++ drivers/serial/serial_sh.h | 32 +++++++++++++++++++++++--------- 2 files changed, 27 insertions(+), 9 deletions(-) -- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6

2 2

[U-Boot] [PATCH 1/5] am335x evm: Initial support for AM335x GP EVM Profiles
by Tom Rini 09 Aug '12

09 Aug '12

The AM335x GP EVM can have one of 8 different profiles selected. Each profile has a different set of peripherals and requires different pinmux configurations that conflict with other profiles. i2c1 is an example of a conflicted mux currently. Signed-off-by: Tom Rini <trini(a)ti.com> --- board/ti/am335x/mux.c | 46 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index c7460eb..5e902ab 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -17,6 +17,7 @@ #include <asm/arch/sys_proto.h> #include <asm/arch/hardware.h> #include <asm/io.h> +#include <i2c.h> #define MUX_CFG(value, offset) \ __raw_writel(value, (CTRL_BASE + offset)); @@ -364,22 +365,59 @@ void enable_i2c0_pin_mux(void) configure_module_pin_mux(i2c0_pin_mux); } -void enable_board_pin_mux(struct am335x_baseboard_id *header) +/* + * The AM335x GP EVM, if daughter card(s) are connected, can have 8 + * different profiles. These profiles determine what peripherals are + * valid and need pinmux to be configured. + */ +#define PROFILE_NONE 0x0 +#define PROFILE_0 (1 << 0) +#define PROFILE_1 (1 << 1) +#define PROFILE_2 (1 << 2) +#define PROFILE_3 (1 << 3) +#define PROFILE_4 (1 << 4) +#define PROFILE_5 (1 << 5) +#define PROFILE_6 (1 << 6) +#define PROFILE_7 (1 << 7) +#define PROFILE_MASK 0x7 +#define PROFILE_ALL 0xFF + +/* CPLD registers */ +#define I2C_CPLD_ADDR 0x35 +#define CFG_REG 0x10 + +static unsigned short detect_daughter_board_profile(void) { - /* Enable pinmux that is common to all TI boards. */ - configure_module_pin_mux(i2c1_pin_mux); + unsigned short val; + + if (i2c_probe(I2C_CPLD_ADDR)) + return PROFILE_NONE; - /* Now do board-specific muxes. */ + if (i2c_read(I2C_CPLD_ADDR, CFG_REG, 1, (unsigned char *)(&val), 2)) + return PROFILE_NONE; + + return (1 << (val & PROFILE_MASK)); +} + +void enable_board_pin_mux(struct am335x_baseboard_id *header) +{ + /* Do board-specific muxes. */ if (!strncmp(header->name, "A335BONE", HDR_NAME_LEN)) { /* Beaglebone pinmux */ + configure_module_pin_mux(i2c1_pin_mux); configure_module_pin_mux(mii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux); } else if (!strncmp(header->config, "SKU#01", 6)) { /* General Purpose EVM */ + unsigned short profile = detect_daughter_board_profile(); configure_module_pin_mux(rgmii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux); + /* In profile #2 i2c1 and spi0 conflict. */ + if (profile & ~PROFILE_2) + configure_module_pin_mux(i2c1_pin_mux); } else if (!strncmp(header->name, "A335X_SK", HDR_NAME_LEN)) { /* Starter Kit EVM */ + configure_module_pin_mux(i2c1_pin_mux); configure_module_pin_mux(gpio0_7_pin_mux); configure_module_pin_mux(rgmii1_pin_mux); configure_module_pin_mux(mmc0_pin_mux_sk_evm); -- 1.7.9.5

1 4

[U-Boot] Question about getting the length of u-boot binary.
by shawn xy Bai 09 Aug '12

09 Aug '12

Hi, everyone, how long no see. Recently, I'm about to port U-boot to our board with MIPS cpu. When I look at the function "board_init_f" in arch/mips/lib/board.c, it's found that "ulong addr, addr_sp, len = (ulong)&uboot_end - CONFIG_SYS_MONITOR_BASE;" And I know "uboot_end" is assigned in u-boot.lds, which is also stored as a word at offset -8 in front of "in_ram" label. What I want to know is why use the address of "uboot_end" in that equation, rather than using the value of "uboot_end" what I mean is why not go like this "len = (ulong)uboot_end - CONFIG_SYS_MONITOR_BASE". Also, there is one more question about the usage of CONFIG_SYS_TEXT_BASE In our <board.h>, #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE To my knowledge, -fPIC option is used to build u-boot.bin. Doesn't it mean where u-boot runs is irrelevant to where it is linked? If yes, why CONFIG_SYS_TEXT_BASE is needed to indicate where U-boot is linked to, rather than the default linked address 0x0000_0000. I find CONFIG_SYS_TEXT_BASE is used with -Ttext linker option when generating u-boot.bin, if it is assigned. Could you help me explain the necessity of CONFIG_SYS_TEXT_BASE existence? Or, even if CONFIG_SYS_TEXT_BASE is not assigned with a exlicit value, building u-boot.bin will actually be successful without any problems too. Does it just exist for the flexbility? If it have to be configured, how shoud I configure it to coordinate with our memory layout ? What's the relationship between CONFIG_SYS_TEXT_BASE and CONFIG_SYS_SDRAM_BASE ？ Even with NOR FLASH or NAND FLASH address space? By the way, when I want to use hotmail to send this mail, there comes the error: "Message rejected. No base64 encoded MIME text parts allowed." Do you have any ideas? Thanks in advance.

2 1

[U-Boot] [PATCH 1/6 v2] powerpc/corenet_ds: Update README.srio-boot-corenet
by Liu Gang 09 Aug '12

09 Aug '12

Update some descriptions due to the implementation changes: For master: Get rid of the SRIOBOOT_MASTER build target, and to support for serving as a SRIO boot master via environment variable. For slave: 1. When compile the slave image for boot from SRIO, no longer need to specify which SRIO port it will boot from. 2. All slave's cores should be in hold off. Signed-off-by: Liu Gang <Gang.Liu(a)freescale.com> --- Changes in v2: - No. doc/README.srio-boot-corenet | 70 ++++++++++++++++++++---------------------- 1 files changed, 33 insertions(+), 37 deletions(-) diff --git a/doc/README.srio-boot-corenet b/doc/README.srio-boot-corenet index 56b094c..6a13e9c 100644 --- a/doc/README.srio-boot-corenet +++ b/doc/README.srio-boot-corenet @@ -18,7 +18,7 @@ Environment of the SRIO boot: U-Boot images, UCodes will be stored in this flash. d) Slave has its own EEPROM for RCW and PBI. e) Slave's RCW should configure the SerDes for SRIO boot port, set the boot - location to SRIO, and holdoff all the cores if needed. + location to SRIO, and holdoff all the cores. ---------- ----------- ----------- | | | | | | @@ -30,63 +30,55 @@ Environment of the SRIO boot: The example based on P4080DS platform: Two P4080DS platforms can be used to implement the boot from SRIO. Their SRIO - ports 0 will be connected directly and will be used for the boot from SRIO. + ports 1 will be connected directly and will be used for the boot from SRIO. - 1. Slave's RCW example for boot from SRIO port 0 and core 0 not in holdoff. - 00000000: aa55 aa55 010e 0100 0c58 0000 0000 0000 - 00000010: 1818 1818 0000 8888 7440 4000 0000 2000 - 00000020: f400 0000 0100 0000 0000 0000 0000 0000 - 00000030: 0000 0000 0083 0000 0000 0000 0000 0000 - 00000040: 0000 0000 0000 0000 0813 8040 698b 93fe - - 2. Slave's RCW example for boot from SRIO port 0 and all cores in holdoff. + 1. Slave's RCW example for boot from SRIO port 1 and all cores in holdoff. 00000000: aa55 aa55 010e 0100 0c58 0000 0000 0000 00000010: 1818 1818 0000 8888 7440 4000 0000 2000 00000020: f440 0000 0100 0000 0000 0000 0000 0000 00000030: 0000 0000 0083 0000 0000 0000 0000 0000 00000040: 0000 0000 0000 0000 0813 8040 063c 778f - 3. Sequence in Step by Step. - a) Update RCW for slave with boot from SRIO port 0 configuration. + 2. Sequence in Step by Step. + a) Update RCW for slave with boot from SRIO port 1 configuration. b) Program slave's U-Boot image, UCode, and ENV parameters into master's NorFlash. - c) Start up master and it will boot up normally from its NorFlash. + c) Set environment variable "bootmaster" to "SRIO1" and save environment + for master. + setenv bootmaster SRIO1 + saveenv + d) Restart up master and it will boot up normally from its NorFlash. Then, it will finish necessary configurations for slave's boot from - SRIO port 0. - d) Master will set inbound SRIO windows covered slave's U-Boot image stored + SRIO port 1. + e) Master will set inbound SRIO windows covered slave's U-Boot image stored in master's NorFlash. - e) Master will set an inbound SRIO window covered slave's UCode stored in - master's NorFlash. - f) Master will set an inbound SRIO window covered slave's ENV stored in - master's NorFlash. - g) If need to release slave's core, master will set outbound SRIO windows - in order to configure slave's registers for the core's releasing. - h) If all cores of slave in holdoff, slave should be powered on before all - the above master's steps, and wait to be released by master. If not all - cores in holdoff, that means core 0 will start up normally, slave should - be powered on after all the above master's steps. In the startup phase - of the slave from SRIO, it will finish some necessary configurations. + f) Master will set an inbound SRIO window covered slave's UCode and ENV + stored in master's NorFlash. + g) Master will set outbound SRIO windows in order to configure slave's + registers for the core's releasing. + h) Since all cores of slave in holdoff, slave should be powered on before all + the above master's steps, and wait to be released by master. In the + startup phase of the slave from SRIO, it will finish some necessary + configurations. i) Slave will set a specific TLB entry for the boot process. - j) Slave will set a LAW entry with the TargetID SRIO port 0 for the boot. + j) Slave will set a LAW entry with the TargetID SRIO port 1 for the boot. k) Slave will set a specific TLB entry in order to fetch UCode and ENV from master. - l) Slave will set a LAW entry with the TargetID SRIO port 0 for UCode and ENV. + l) Slave will set a LAW entry with the TargetID SRIO port 1 for UCode and ENV. How to use this feature: - To use this feature, you need to focus three points. + To use this feature, you need to focus those points. 1. Slave's RCW with SRIO boot configurations, and all cores in holdoff - configurations if needed. + configurations. Please refer to the examples given above. 2. U-Boot image's compilation. - For master, U-Boot image should be generated specifically by - - make xxxx_SRIOBOOT_MASTER_config. + For master, U-Boot image should be generated normally. For example, master U-Boot image used on P4080DS should be compiled with - make P4080DS_SRIOBOOT_MASTER_config. + make P4080DS_config. For slave, U-Boot image should be generated specifically by @@ -97,7 +89,11 @@ How to use this feature: make P4080DS_SRIOBOOT_SLAVE_config. 3. Necessary modifications based on a specific environment. - For a specific environment, the SRIO port for boot, the addresses of the - slave's U-Boot image, UCode, ENV stored in master's NorFlash, and any other - configurations can be modified in the file: + For a specific environment, the addresses of the slave's U-Boot image, + UCode, ENV stored in master's NorFlash, and any other configurations + can be modified in the file: include/configs/corenet_ds.h. + + 4. Set and save the environment variable "bootmaster" with "SRIO1" or "SRIO2" + for master, and then restart it in order to perform the role as a master + for boot from SRIO. -- 1.7.1

1 5

[U-Boot] Write ENV to File and flash it with openocd (problem) !!!
by Franz Skale 09 Aug '12

09 Aug '12

Hi, i hope this is the place to solve my problem. Shortdesc: I am using opencd and fw_setenv (2008) from the sheeva plug installer to flash uboot and the env. The boards/sheevaplug.cfg is reflecting two functions for flashing uboot and the env. The sheevapluginstaller version is patched to use the file uboot-env.bin to write the env to a file and flash it. With the uboot version 2012.04.1 i am able to flash the uboot loader but not the env. There's no error but the env is default. Could it be, that the Offset in the file of the patched sheevapluginstaller for a flat file is wrong ? The fw_env.h of the patched sheevapluginstaller (20080520) #undef HAVE_REDUND /* For systems with 2 env sectors */ #define DEVICE1_NAME "uboot-env.bin" #define DEVICE2_NAME "/dev/mtd2" #define DEVICE1_OFFSET 0x0000 #define ENV1_SIZE 0x00020000 /* 64 KB */ #define DEVICE1_ESIZE 0x00020000 /* 64 KB */ The 2012 version: #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 What has to be done, that the flash to the NAND via openocd will wor properly ? I must be able to write to an env file which should work with the openocd command reflash_env. I am running out of ideas yet. Thanks in advance Franz

1 0

[U-Boot] Porting u-boot for MPC8280 based Board by taking MPC8260ads reference, Its hanging at some point
by Thirumalesha N 09 Aug '12

09 Aug '12

Dear sir, I'm porting u-boot for mpc8280 based CPU board by taking mpc8260ads reference, its hanging at some some point. i enabled debug mode. U-Boot 1.3.1 (Aug 8 2012 - 09:19:16) MPC8260 Reset Status: Check Stop, External Soft, External Hard MPC8260 Clock Configuration - Bus-to-Core Mult 2.5x, VCO Div 4, 60x Bus Freq 20-60 , Core Freq 50-120 - dfbrg 1, corecnf 0x11, busdf 3, cpmdf 1, plldf 0, pllmf 3, pcidf 3 - vco_out 400000000, scc_clk 100000000, brg_clk 25000000 - cpu_clk 250000000, cpm_clk 200000000, bus_clk 100000000 CPU: MPC8260 (HiP7 Rev 14, Mask 1.0 1K49M) at 250 MHz Board: MPC8280 Based Remote IO CARD.Testing By Thiru N............... I2C: ready DRAM: 512 MB Top of RAM usable for U-Boot at: 20000000 Reserving 187k for U-Boot at: 1ffd1000 Reserving 192k for malloc() at: 1ffa1000 Reserving 76 Bytes for Board Info at: 1ffa0fb4 Reserving 72 Bytes for Global Data at: 1ffa0f6c Stack Pointer at: 1ffa0f48 New Stack Pointer is: 1ffa0f48 please can you suggest me to fix this issue. for your reference Clock frequency 100MHz Boot flash 512KB userflash 512MB SDRAM 512MB Thanks & Regards Thiru N

3 2