May 2008 - U-Boot

[U-Boot-Users] [PATCH] Fix config files for out-of-tree building
by Wolfgang Denk 14 May '08

14 May '08

Several board/<...>/config.mk files include dynamically built (by the Makefile) config files but used the wrong file name of $(TOPDIR)/board/$(BOARDDIR)/config.tmp instead if the correct $(OBJTREE)/board/$(BOARDDIR)/config.tmp The bug is nasty because the build result is correct for the (normal) in-tree builds, and because 'sinclude' is used no errors get raised even for out-of-tree build tests. But out-of-tree builds use an incomplete and thus usually incorrect configuration... Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/BuS/EB+MCF-EV123/config.mk | 2 +- board/amcc/canyonlands/config.mk | 2 +- board/esd/mecp5200/config.mk | 2 +- board/linkstation/config.mk | 2 +- board/munices/config.mk | 2 +- board/v38b/config.mk | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/BuS/EB+MCF-EV123/config.mk b/board/BuS/EB+MCF-EV123/config.mk index 9fe2fc5..f03e396 100644 --- a/board/BuS/EB+MCF-EV123/config.mk +++ b/board/BuS/EB+MCF-EV123/config.mk @@ -22,7 +22,7 @@ # MA 02111-1307 USA # -sinclude $(TOPDIR)/board/$(BOARDDIR)/textbase.mk +sinclude $(OBJTREE)/board/$(BOARDDIR)/textbase.mk ifndef TEXT_BASE TEXT_BASE = 0xFE000000 endif diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk index 1e4bbc4..7e79536 100644 --- a/board/amcc/canyonlands/config.mk +++ b/board/amcc/canyonlands/config.mk @@ -24,7 +24,7 @@ # AMCC 460EX/460GT Evaluation Board (Canyonlands) board # -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE TEXT_BASE = 0xFFFA0000 diff --git a/board/esd/mecp5200/config.mk b/board/esd/mecp5200/config.mk index 07b5de1..170779d 100644 --- a/board/esd/mecp5200/config.mk +++ b/board/esd/mecp5200/config.mk @@ -32,7 +32,7 @@ # 0x00100000 boot from RAM (for testing only) # -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE ## Standard: boot high diff --git a/board/linkstation/config.mk b/board/linkstation/config.mk index bdf611d..d048290 100644 --- a/board/linkstation/config.mk +++ b/board/linkstation/config.mk @@ -35,7 +35,7 @@ # 0x07F00000 boot from RAM # -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE # For flash image - all models diff --git a/board/munices/config.mk b/board/munices/config.mk index d226244..1b573bc 100644 --- a/board/munices/config.mk +++ b/board/munices/config.mk @@ -29,7 +29,7 @@ # 0xFFF00000 boot high (standard configuration) # -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE TEXT_BASE = 0xFFF00000 diff --git a/board/v38b/config.mk b/board/v38b/config.mk index 75577fc..bc55fc7 100644 --- a/board/v38b/config.mk +++ b/board/v38b/config.mk @@ -25,7 +25,7 @@ # MarelV38B board # -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp TEXT_BASE = 0xFF000000 -- 1.5.4.2

1 0

[U-Boot-Users] [PATCH] ppc4xx: Fix bogus Canyonlands config.mk
by Stefan Roese 14 May '08

14 May '08

This patch fixes the canyonlands config.mk file to enable correct out-of-tree builds. Thanks to Wolfgang Denk for spotting this. Signed-off-by: Stefan Roese <sr(a)denx.de> --- board/amcc/canyonlands/config.mk | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk index 1e4bbc4..2330cae 100644 --- a/board/amcc/canyonlands/config.mk +++ b/board/amcc/canyonlands/config.mk @@ -24,20 +24,12 @@ # AMCC 460EX/460GT Evaluation Board (Canyonlands) board # -sinclude $(TOPDIR)/board/$(BOARDDIR)/config.tmp +sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp ifndef TEXT_BASE TEXT_BASE = 0xFFFA0000 endif -ifeq ($(CONFIG_NAND_U_BOOT),y) -LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds -endif - -ifeq ($(CONFIG_PCIBOOT_U_BOOT),y) -LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds -endif - PLATFORM_CPPFLAGS += -DCONFIG_440=1 ifeq ($(debug),1) -- 1.5.5.1

1 0

[U-Boot-Users] old code compiled with new gcc. error: lvalue required
by 甜瓜 14 May '08

14 May '08

Howdy, I want to compile ppcboot 1.1.6 by ELDK 4.1. Well, ppcboot is very ancient code, but for some reason, I have to compile it. There are many exact same compile-time errors reported: error: lvalue required as increment/decrement operand. xsum += *((ushort *)ptr)++; *((ulong *)addr_sp)-- = 0; ... There are about 20 errors. Is there any walkaround? eg, compile options to gcc that can use old C standard. Again, a very obscure code: viod some_func(ushort* ptr,...) { ... switch(SWAP16(*((ushort *)ptr)++) // @_@ how to deal with the side-effect of ++? { case ...: ptr2 = ptr; // ptr is ++-ed of to-be ++ ? CallSomeOtherFunction(); // When calling, how about ptr.... ... } } Thank you for your attention. --- ShenLei

2 1

[U-Boot-Users] i.MX31: question about CFG_HZ and CKIL
by Jens Gehrlein 14 May '08

14 May '08

Hi all, in the i.MX31 processor reference manual they mention a 32 kHz clock as input for several timers and controllers. Sometimes it's called ipg_clk_32k. But the documentation does not clearly state, that this clock actually is the CKIL. As far as I could derive from the ADS schematics the CKIL is feeded with 32768 Hz instead of 32000 Hz. On our board we use 32768 Hz either. If CKIL is the above mentioned 32 kHz clock, the resulting deviation in the timers is "only" about 2.4% as long as CFG_HZ in mx31ads.h is 32000 Hz. Although it works with the current definition, I'd like to know your opinions, whether it is necessary to adjust this value. Thank you for comments. Best Regards, Jens

3 4

[U-Boot-Users] [PATCH] environment: cleanup prototype declarations of env functions.
by Wolfgang Denk 14 May '08

14 May '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- api/api.c | 3 +-- common/cmd_nvedit.c | 13 ------------- common/env_eeprom.c | 4 ---- common/env_nvram.c | 3 --- common/ft_build.c | 3 --- include/environment.h | 10 ++++++++++ 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/api/api.c b/api/api.c index 1ee7c68..19c7154 100644 --- a/api/api.c +++ b/api/api.c @@ -30,6 +30,7 @@ #include <command.h> #include <common.h> #include <malloc.h> +#include <environment.h> #include <linux/types.h> #include <api_public.h> @@ -40,8 +41,6 @@ /* U-Boot routines needed */ extern int do_reset (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]); -extern uchar (*env_get_char)(int); -extern uchar *env_get_addr(int); /***************************************************************************** * diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c index cab727f..9c5d1fc 100644 --- a/common/cmd_nvedit.c +++ b/common/cmd_nvedit.c @@ -68,19 +68,6 @@ DECLARE_GLOBAL_DATA_PTR; /************************************************************************ ************************************************************************/ -/* Function that returns a character from the environment */ -extern uchar (*env_get_char)(int); - -/* Function that returns a pointer to a value from the environment */ -/* (Only memory version supported / needed). */ -extern uchar *env_get_addr(int); - -/* Function that updates CRC of the enironment */ -extern void env_crc_update (void); - -/************************************************************************ -************************************************************************/ - /* * Table with supported baudrates (defined in config_xyz.h) */ diff --git a/common/env_eeprom.c b/common/env_eeprom.c index 2adc129..9e1a201 100644 --- a/common/env_eeprom.c +++ b/common/env_eeprom.c @@ -38,10 +38,6 @@ env_t *env_ptr = NULL; char * env_name_spec = "EEPROM"; -extern uchar (*env_get_char)(int); -extern uchar env_get_char_memory (int index); - - uchar env_get_char_spec (int index) { uchar c; diff --git a/common/env_nvram.c b/common/env_nvram.c index 7c18896..fa77719 100644 --- a/common/env_nvram.c +++ b/common/env_nvram.c @@ -63,9 +63,6 @@ char * env_name_spec = "NVRAM"; extern uchar default_environment[]; extern int default_environment_size; -extern uchar (*env_get_char)(int); -extern uchar env_get_char_memory (int index); - #ifdef CONFIG_AMIGAONEG3SE uchar env_get_char_spec (int index) { diff --git a/common/ft_build.c b/common/ft_build.c index 0e5699a..b951178 100644 --- a/common/ft_build.c +++ b/common/ft_build.c @@ -396,9 +396,6 @@ void *ft_get_prop(void *bphp, const char *propname, int *szp) /********************************************************************/ -/* Function that returns a character from the environment */ -extern uchar(*env_get_char) (int); - void ft_setup(void *blob, bd_t * bd, ulong initrd_start, ulong initrd_end) { u32 *p; diff --git a/include/environment.h b/include/environment.h index c4f7c33..946a393 100644 --- a/include/environment.h +++ b/include/environment.h @@ -107,4 +107,14 @@ typedef struct environment_s { unsigned char data[ENV_SIZE]; /* Environment data */ } env_t; +/* Function that returns a character from the environment */ +unsigned char (*env_get_char)(int); + +/* Function that returns a pointer to a value from the environment */ +unsigned char *env_get_addr(int); +unsigned char env_get_char_memory (int index); + +/* Function that updates CRC of the enironment */ +void env_crc_update (void); + #endif /* _ENVIRONMENT_H_ */ -- 1.5.4.2

1 0

[U-Boot-Users] [PATCH] linkstation_HGLAN: Fix out of tree building.
by Wolfgang Denk 14 May '08

14 May '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/linkstation/Makefile | 15 +++++++++------ 1 files changed, 9 insertions(+), 6 deletions(-) diff --git a/board/linkstation/Makefile b/board/linkstation/Makefile index 57c84de..8d92d8a 100644 --- a/board/linkstation/Makefile +++ b/board/linkstation/Makefile @@ -23,18 +23,21 @@ include $(TOPDIR)/config.mk -LIB = lib$(BOARD).a +LIB = $(obj)lib$(BOARD).a OBJS = $(BOARD).o ide.o hwctl.o avr.o -$(LIB): .depend $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(OBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(AR) crv $@ $(OBJS) ######################################################################### -.depend: Makefile $(SOBJS:.o=.S) $(OBJS:.o=.c) - $(CC) -M $(CFLAGS) $(SOBJS:.o=.S) $(OBJS:.o=.c) > $@ +# defines $(obj).depend target +include $(SRCTREE)/rules.mk -sinclude .depend +sinclude $(obj).depend ######################################################################### -- 1.5.4.2

1 0

[U-Boot-Users] [PATCH] ppc4xx: Individual handling of ddr2_fixed.c for canyonlands_nand build
by Stefan Roese 14 May '08

14 May '08

Canyonlands has a file ddr2_fixed.c which needs special treatment when building in separate directory. It has to be linked to build directory otherwise it is not seen. Signed-off-by: Stefan Roese <sr(a)denx.de> --- nand_spl/board/amcc/canyonlands/Makefile | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile index 1ec1112..47c7d02 100644 --- a/nand_spl/board/amcc/canyonlands/Makefile +++ b/nand_spl/board/amcc/canyonlands/Makefile @@ -30,7 +30,7 @@ AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL SOBJS := start.o -SOBJS += init.o resetvec.o +SOBJS += init.o SOBJS += resetvec.o COBJS := ddr2_fixed.o COBJS += nand_boot.o @@ -89,6 +89,12 @@ $(obj)nand_ecc.c: @rm -f $(obj)nand_ecc.c ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $(obj)nand_ecc.c +ifneq ($(OBJTREE), $(SRCTREE)) +$(obj)ddr2_fixed.c: + @rm -f $(obj)ddr2_fixed.c + ln -s $(SRCTREE)/nand_spl/board/$(BOARDDIR)/ddr2_fixed.c $(obj)ddr2_fixed.c +endif + ######################################################################### $(obj)%.o: $(obj)%.S -- 1.5.5.1

1 0

[U-Boot-Users] [PATCH] ppc4xx: Add 405EX(r) revision C PVR definitions and detection code
by Stefan Roese 14 May '08

14 May '08

Signed-off-by: Stefan Roese <sr(a)denx.de> --- board/amcc/kilauea/kilauea.c | 19 ++++++++++++------- cpu/ppc4xx/cpu.c | 20 ++++++++++++++++++++ include/asm-ppc/processor.h | 12 ++++++++---- 3 files changed, 40 insertions(+), 11 deletions(-) diff --git a/board/amcc/kilauea/kilauea.c b/board/amcc/kilauea/kilauea.c index 37ef06e..d806a41 100644 --- a/board/amcc/kilauea/kilauea.c +++ b/board/amcc/kilauea/kilauea.c @@ -230,14 +230,22 @@ int misc_init_r(void) return 0; } -int board_emac_count(void) +static int is_405exr(void) { u32 pvr = get_pvr(); + if (pvr & 0x00000004) + return 0; /* bit 2 set -> 405EX */ + + return 1; /* bit 2 cleared -> 405EXr */ +} + +int board_emac_count(void) +{ /* * 405EXr only has one EMAC interface, 405EX has two */ - if ((pvr == PVR_405EXR1_RA) || (pvr == PVR_405EXR2_RA)) + if (is_405exr()) return 1; else return 2; @@ -245,12 +253,10 @@ int board_emac_count(void) static int board_pcie_count(void) { - u32 pvr = get_pvr(); - /* * 405EXr only has one EMAC interface, 405EX has two */ - if ((pvr == PVR_405EXR1_RA) || (pvr == PVR_405EXR2_RA)) + if (is_405exr()) return 1; else return 2; @@ -259,9 +265,8 @@ static int board_pcie_count(void) int checkboard (void) { char *s = getenv("serial#"); - u32 pvr = get_pvr(); - if ((pvr == PVR_405EXR1_RA) || (pvr == PVR_405EXR2_RA)) + if (is_405exr()) printf("Board: Haleakala - AMCC PPC405EXr Evaluation Board"); else printf("Board: Kilauea - AMCC PPC405EX Evaluation Board"); diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index 54cc256..39f439d 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -346,6 +346,26 @@ int checkcpu (void) strcpy(addstr, "No Security support"); break; + case PVR_405EX1_RC: + puts("EX Rev. C"); + strcpy(addstr, "Security support"); + break; + + case PVR_405EX2_RC: + puts("EX Rev. C"); + strcpy(addstr, "No Security support"); + break; + + case PVR_405EXR1_RC: + puts("EXr Rev. C"); + strcpy(addstr, "Security support"); + break; + + case PVR_405EXR2_RC: + puts("EXr Rev. C"); + strcpy(addstr, "No Security support"); + break; + #if defined(CONFIG_440) case PVR_440GP_RB: puts("GP Rev. B"); diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h index 4c049a5..8bdfb9d 100644 --- a/include/asm-ppc/processor.h +++ b/include/asm-ppc/processor.h @@ -772,10 +772,14 @@ #define PVR_405EP_RA 0x51210950 #define PVR_405GPR_RB 0x50910951 #define PVR_405EZ_RA 0x41511460 -#define PVR_405EXR1_RA 0x12911473 /* 405EXr rev A with Security */ -#define PVR_405EXR2_RA 0x12911471 /* 405EXr rev A without Security */ -#define PVR_405EX1_RA 0x12911477 /* 405EX rev A with Security */ -#define PVR_405EX2_RA 0x12911475 /* 405EX rev A without Security */ +#define PVR_405EXR1_RA 0x12911473 /* 405EXr rev A/B with Security */ +#define PVR_405EXR2_RA 0x12911471 /* 405EXr rev A/B without Security */ +#define PVR_405EX1_RA 0x12911477 /* 405EX rev A/B with Security */ +#define PVR_405EX2_RA 0x12911475 /* 405EX rev A/B without Security */ +#define PVR_405EXR1_RC 0x1291147B /* 405EXr rev C with Security */ +#define PVR_405EXR2_RC 0x12911479 /* 405EXr rev C without Security */ +#define PVR_405EX1_RC 0x1291147F /* 405EX rev C with Security */ +#define PVR_405EX2_RC 0x1291147D /* 405EX rev C without Security */ #define PVR_440GP_RB 0x40120440 #define PVR_440GP_RC 0x40120481 #define PVR_440EP_RA 0x42221850 -- 1.5.5.1

1 0

[U-Boot-Users] U-BOOT V2 MX27 boot problem
by yanjun.luo 14 May '08

14 May '08

Hi, I check out the last U-BOOT V2 code from git yesterday, and start to debug with my new MX27 board, just like MX27ADS. I config the U-BOOT V2 with pcm038 configuration. I use ADSToolKit Standard V1.3 from freescale to program the bootloader. When I download redboot's binary file, it works. But the U-BOOT binary, it can't work at all. I checked the code and find that redboot TEXT BASE is 0xa7f00000, but U-BOOT is 0xa0000000. I changed U-BOOT to use 0xa7f00000, it can start some steps. I found it crashed at get_mtab-entry_by_path at fs.c It seems that mtab is not correct, so e-path never equal with path. what's wrong with this? I still try to find what's wrong with mtab. Any kind of hints are welcome. Regards, Yanjun Luo. Below is boot message. U-Boot 2.0.0-rc5-git (May 14 2008 - 15:01:09) Board: Phytec phyCORE-i.MX27 cfi_probe: cfi_flash base: 0xc0000000 size: 0x02000000 mpll: 199499695 Hz spll: 239999725 Hz arm: 199499695 Hz perclk1: 14777755 Hz perclk2: 13299979 Hz perclk3: 33249949 Hz perclk4: 13299979 Hz clkin26: 26000000 Hz ahb: 66499898 Hz ipg: 33249949 Hz Malloc Space: 0xa7b00000 -> 0xa7f00000 (size 4 MB)

1 0

Re: [U-Boot-Users] MIPS: question about start.S
by Andrew Dyer 14 May '08

14 May '08

2008/5/13 <wangjiankun820624(a)163.com>: > I am sorry for my three times of posting the same question! It is the first > time for me to post question here, so I don't know some rules! > Sorry! > > It is the define of RVECENT whiche has two arguments f and n, but only f is > used in the code, n is not used. > I want to know the function of the argument n, since it is not used in the > code. > Thank you very much! > #define RVECENT(f,n) \ > b f; nop You answered your own question, it has no function. Assuming each jump vector is x words long, it could be used to generate an address to locate the code in the case where you didn't want to explicitly fill each jump vector. -- Hardware, n.: The parts of a computer system that can be kicked.

1 0