January 2011 - U-Boot

Re: [U-Boot] "b reset" does not work in u-boot_v2010.12-rc3 with eldk4.2
by Wolfgang Denk 12 Jan '11

12 Jan '11

Dear "MrGates", please always keep the mailing list on cc: In message <D9D3B66C8A5547E0BA21713B70C8E8A8@Microsoft> you wrote: > >> These indicate that in start.S,first instruction:b reset not jump success > > > > What do you mean by that statement? > I am sorry that i have no clear. > I mean that "b reset"statement does not jump to the lable reset at line 104 of start.S correctly. If you want to execute machine instructions one by one you should use "stepi" instead of "step". > >> The process just go from one instruction to the next. > > > > You are running series of "step" commands - you are asking the > > debugger to "go from one instruction to the next", and this is what it > > does. What else would you expect? > Maybe i misunderstand the use of "step" command of arm-linux-gdb. > I want gdb to simulate the execution sequence of my u-boot. gdb does not simulate, it actually runs the code. And the "step" command runs the code until it reaches a new source line. If you want to step on machine instruction level you should use "stepi" instead. You may also want to read the documentation, for example this section of the DULG: http://www.denx.de/wiki/view/DULG/DebuggingTricks > >> What may be the problem?any suggestions is appreciate. > > > > Where exactly do you see a problem? > compile success.But when i burn u-boot.bin into my NOR flash(sst39vf3201).Nothing happened. > So i would like to use arm-linux-gdb(eldk-4.2) with simulating. Debugging is indeed a good idea in such a situation. Note that gdb does not "simulate". You will need a JTAG adapter to debug on the real hardware. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de The only way to learn a new programming language is by writing pro- grams in it. - Brian Kernighan

2 3

[U-Boot] Problem booting linux with device tree table
by 张扬 12 Jan '11

12 Jan '11

Hi all I am trying to boot mpc8313erdb with linux-2.6.35.4, i am using the last verion of u-boot from denx i use dtc compiler with following command: dtc -R 8 -b 0 -O dtb -I dts -S 0x3000 -o my.dtb my.dts Booting process gives following error and reset the board. WARNING: could not create /chosen FDT_ERR_NOSPACE. ERROR: /chosen node create failed - must RESET the board to recover. somebody advises me to add a chosen node in my DTS file，but The issue is not solved. Regards.

2 2

[U-Boot] U-Boot on IMX.51 EVK
by Thomas Besemer 12 Jan '11

12 Jan '11

Hi Group - I am working with the imx.51 on the Freescale EVK. Up to this point, have been working with the version of U-Boot (and Kernel) from the Freescale web site; the SDK which is LTIB based. Pretty stale stuff; U-Boot is rather old (8/2009), as with Kernel (2.6.31). I pulled U-Boot before Christmas, got this version: [tbesemer@t4linux1 u-boot]$ git describe v2010.12-82-gcdc51c2 Main interest being the IPU code, so I can do a Splash Screen. Compiles fine, boots fine on EVK, but I can't get it to boot my old Kernel; I put my own command line stuff in place, which is pulling kernel from a known offset in SD card: mmc read 0 ${loadaddr} 0x800 0x1800;bootm Kernel loads, but hangs on start (shows that U-Boot found it, parsed header). Passes CRC. Have not looked into issue further. My Kernel command line all the same; what I did was take the default boot parameters from existing U-Boot and put them into current U-Boot, re-compile. ${loadaddr} same from before, same as what is in current U-Boot. A couple of comments/questions: - Is above version of U-Boot known to work on EVK? It appears that this version supports DOS partitions on SD card, and default command line is to load from those. But, I can't find any documentation on how to partition the SD card to try this. Help on how to set up the SD card appreciated. - Should above "raw" load from SD work? Probably my preference, but have an open mind. My Root FS is on two partitions that U-Boot does not need to know about; one is primary/recovery, one is working copy on release. - The Freescale supplied SDK applies over 100 patches to the 8/09 release of U-Boot; wondering how many made it into current version of U-Boot, and how much I should care. - I pulled the 2.6.37 Kernel from kernel.org to maybe try that with current U-Boot, but it doesn't seem to have IPU support, so not viable on my end. Might be willing to pull IPU code into Kernel from 2.6.31->2.6.37 to get it current, but outside scope of this mailing list. End game: - Get the Splash Screen working on imx.51 EVK. I will provide patch set back to mailing list once I do. I will derive from vision2 board. - Get it to boot old 2.6.31 SDK supplied Kernel (which also has a bunch of Freescale patches that don't seem to have made it into kernel.org). Any help on this appreciated; I will be more than happy to provide patch set work for anything I do for EVK back to this list for evaluation and incorporation. Thanks, tom

3 4

[U-Boot] Olá
by tracy fugar 12 Jan '11

12 Jan '11

Olá Meu nome é Fugar Tracy, eu vi hoje o seu perfil e se interessou em você, eu também gostaria de saber o que você mais, e eu quero que você envie um e-mail para o meu endereço de e-mail para que eu possa dar-lhe a minha foto para você saber quem eu sou. Aqui está o meu endereço de e-mail (tracyfugar2011(a)yahoo.co.uk) Acredito que podemos passar daqui! Estou esperando por seu e-mail para o meu endereço de e-mail acima. (Lembre-se da distância, cor ou língua não importa, mas colocar as questões do amor na vida. (tracyfugar2011(a)yahoo.co.uk) Hello My name is Tracy fugar, i saw your profile today and became interested in you,i will also like to know you the more,and i want you to send an email to my email address so i can give you my picture for you to know whom i am. Here is my email address (tracyfugar2011(a)yahoo.co.uk) I believe we can move from here! I am waiting for your mail to my email address above.(Remember the distance, color or language does not matter but love matters allot in life.(tracyfugar2011(a)yahoo.co.uk)

1 0

[U-Boot] USB LUN support crashes
by Aaron Williams 12 Jan '11

12 Jan '11

Hi all, I applied the USB LUN support patch to u-boot and found that it crashes with the SanDisk Cruzer. From everything I can gather this looks like a broken device. It returns a maximum LUN of 1 rather than 0 which causes usb_stor_get_info to crash. This was applied to usb_storage.c on 10/5/2010. -Aaron Williams

1 0

[U-Boot] w90p710@gmail.com
by 张扬 12 Jan '11

12 Jan '11

Hi all I‘ve got some issues with load ftb to work with my board (mpc8313erdb) My serial print errors as follow: ERROR: /chosen node create failed I used the following command to generate my dtb。 dtc -f -b 0 -O dtb -I dts -R 8 -S 0x3000 -o my.dtb my.dts thanks

1 0

[U-Boot] [PATCH] boot cmds: convert to getenv_yesno() with autostart
by Mike Frysinger 11 Jan '11

11 Jan '11

Use the new helper func to clean up duplicate logic handling of the autostart env var. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- common/cmd_fdc.c | 3 +-- common/cmd_fdos.c | 2 +- common/cmd_ide.c | 2 +- common/cmd_nand.c | 4 ++-- common/cmd_net.c | 2 +- common/cmd_scsi.c | 2 +- common/cmd_usb.c | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c index 831a07f..1655bdc 100644 --- a/common/cmd_fdc.c +++ b/common/cmd_fdc.c @@ -721,7 +721,6 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) image_header_t *hdr; /* used for fdc boot */ unsigned char boot_drive; int i,nrofblk; - char *ep; int rcode = 0; #if defined(CONFIG_FIT) const void *fit_hdr = NULL; @@ -824,7 +823,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) load_addr = addr; /* Check if we should attempt an auto-start */ - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { + if (getenv_yesno("autostart")) { char *local_args[2]; extern int do_bootm (cmd_tbl_t *, int, int, char *[]); diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c index a8822d9..5bb5c64 100644 --- a/common/cmd_fdos.c +++ b/common/cmd_fdos.c @@ -99,7 +99,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) size, load_addr); /* Check if we should attempt an auto-start */ - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { + if (getenv_yesno("autostart")) { char *local_args[2]; extern int do_bootm (cmd_tbl_t *, int, int, char *[]); local_args[0] = argv[0]; diff --git a/common/cmd_ide.c b/common/cmd_ide.c index ea0f4a7..f684e78 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -496,7 +496,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) load_addr = addr; /* Check if we should attempt an auto-start */ - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { + if (getenv_yesno("autostart")) { char *local_args[2]; extern int do_bootm (cmd_tbl_t *, int, int, char *[]); diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 634d036..f79bd6d 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -711,7 +711,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, ulong offset, ulong addr, char *cmd) { int r; - char *ep, *s; + char *s; size_t cnt; image_header_t *hdr; #if defined(CONFIG_FIT) @@ -787,7 +787,7 @@ static int nand_load_image(cmd_tbl_t *cmdtp, nand_info_t *nand, load_addr = addr; /* Check if we should attempt an auto-start */ - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) { + if (getenv_yesno("autostart")) { char *local_args[2]; extern int do_bootm(cmd_tbl_t *, int, int, char *[]); diff --git a/common/cmd_net.c b/common/cmd_net.c index 44d17db..3320104 100644 --- a/common/cmd_net.c +++ b/common/cmd_net.c @@ -213,7 +213,7 @@ netboot_common (proto_t proto, cmd_tbl_t *cmdtp, int argc, char * const argv[]) flush_cache(load_addr, size); /* Loading ok, check if we should attempt an auto-start */ - if (((s = getenv("autostart")) != NULL) && (strcmp(s,"yes") == 0)) { + if (getenv_yesno("autostart")) { char *local_args[2]; local_args[0] = argv[0]; local_args[1] = NULL; diff --git a/common/cmd_scsi.c b/common/cmd_scsi.c index 6b937f9..0a3dd07 100644 --- a/common/cmd_scsi.c +++ b/common/cmd_scsi.c @@ -327,7 +327,7 @@ int do_scsiboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) flush_cache (addr, (cnt+1)*info.blksz); /* Check if we should attempt an auto-start */ - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { + if (getenv_yesno("autostart")) { char *local_args[2]; extern int do_bootm (cmd_tbl_t *, int, int, char *[]); local_args[0] = argv[0]; diff --git a/common/cmd_usb.c b/common/cmd_usb.c index 226ea0d..a7cffa5 100644 --- a/common/cmd_usb.c +++ b/common/cmd_usb.c @@ -488,7 +488,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) flush_cache(addr, (cnt+1)*info.blksz); /* Check if we should attempt an auto-start */ - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) { + if (getenv_yesno("autostart")) { char *local_args[2]; extern int do_bootm(cmd_tbl_t *, int, int, char *[]); local_args[0] = argv[0]; -- 1.7.3.1

2 8

[U-Boot] [PATCH 1/7] powerpc/8xxx: Refactor SRIO initialization into common code
by Kumar Gala 11 Jan '11

11 Jan '11

Moved the SRIO init out of corenet_ds and into common code for 8xxx/QorIQ processors that have SRIO. We mimic what we do with PCIe controllers for SRIO. We utilize the fact that SRIO is over serdes to determine if its configured or not and thus can setup the LAWs needed for it dynamically. We additionally update the device tree (to remove the SRIO nodes) if the board doesn't have SRIO enabled. Introduced the following standard defines for board config.h: CONFIG_SYS_HAS_SRIO - Chip has SRIO or not CONFIG_SRIO1 - Board has SRIO 1 port available CONFIG_SRIO2 - Board has SRIO 2 port available (where 'n' is the port #) CONFIG_SYS_SRIOn_MEM_VIRT - virtual address in u-boot CONFIG_SYS_SRIOn_MEM_PHYS - physical address (for law setup) CONFIG_SYS_SRIOn_MEM_SIZE - size of window (for law setup) [ These mimic what we have for PCI and PCIe controllers ] Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- arch/powerpc/cpu/mpc85xx/cpu_init.c | 8 +++ arch/powerpc/cpu/mpc85xx/fdt.c | 7 +++ arch/powerpc/cpu/mpc8xxx/Makefile | 1 + arch/powerpc/cpu/mpc8xxx/fdt.c | 21 ++++++++ arch/powerpc/cpu/mpc8xxx/srio.c | 86 +++++++++++++++++++++++++++++++ arch/powerpc/include/asm/fsl_law.h | 1 + board/freescale/corenet_ds/corenet_ds.c | 44 ---------------- include/configs/corenet_ds.h | 17 +++--- 8 files changed, 133 insertions(+), 52 deletions(-) create mode 100644 arch/powerpc/cpu/mpc8xxx/srio.c diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 4a6cc65..b2be1fc 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -40,6 +40,10 @@ DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_SYS_HAS_SRIO +extern void srio_init(void); +#endif + #ifdef CONFIG_QE extern qe_iop_conf_t qe_iop_conf_tab[]; extern void qe_config_iopin(u8 port, u8 pin, int dir, @@ -384,6 +388,10 @@ int cpu_init_r(void) /* needs to be in ram since code uses global static vars */ fsl_serdes_init(); +#ifdef CONFIG_SYS_HAS_SRIO + srio_init(); +#endif + #if defined(CONFIG_MP) setup_mp(); #endif diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 53e0596..5cfe497 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -38,6 +38,9 @@ DECLARE_GLOBAL_DATA_PTR; extern void ft_qe_setup(void *blob); extern void ft_fixup_num_cores(void *blob); +#ifdef CONFIG_SYS_HAS_SRIO +extern void ft_srio_setup(void *blob); +#endif #ifdef CONFIG_MP #include "mp.h" @@ -478,4 +481,8 @@ void ft_cpu_setup(void *blob, bd_t *bd) fdt_fixup_qportals(blob); #endif + +#ifdef CONFIG_SYS_HAS_SRIO + ft_srio_setup(blob); +#endif } diff --git a/arch/powerpc/cpu/mpc8xxx/Makefile b/arch/powerpc/cpu/mpc8xxx/Makefile index 95c73be..99332e6 100644 --- a/arch/powerpc/cpu/mpc8xxx/Makefile +++ b/arch/powerpc/cpu/mpc8xxx/Makefile @@ -16,6 +16,7 @@ endif COBJS-$(CONFIG_OF_LIBFDT) += fdt.o COBJS-$(CONFIG_FSL_LBC) += fsl_lbc.o +COBJS-$(CONFIG_SYS_HAS_SRIO) += srio.o SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) diff --git a/arch/powerpc/cpu/mpc8xxx/fdt.c b/arch/powerpc/cpu/mpc8xxx/fdt.c index 54e60bb..e9dbdc2 100644 --- a/arch/powerpc/cpu/mpc8xxx/fdt.c +++ b/arch/powerpc/cpu/mpc8xxx/fdt.c @@ -28,6 +28,7 @@ #include <fdt_support.h> #include <asm/mp.h> #include <asm/fsl_enet.h> +#include <asm/fsl_serdes.h> #if defined(CONFIG_MP) && (defined(CONFIG_MPC85xx) || defined(CONFIG_MPC86xx)) static int ft_del_cpuhandle(void *blob, int cpuhandle) @@ -239,3 +240,23 @@ int fdt_fixup_phy_connection(void *blob, int offset, enum fsl_phy_enet_if phyc) return fdt_setprop_string(blob, offset, "phy-connection-type", fsl_phy_enet_if_str[phyc]); } + +#ifdef CONFIG_SYS_HAS_SRIO +void ft_srio_setup(void *blob) +{ +#ifdef CONFIG_SRIO1 + if (!is_serdes_configured(SRIO1)) { + fdt_del_node_and_alias(blob, "rio0"); + } +#else + fdt_del_node_and_alias(blob, "rio0"); +#endif +#ifdef CONFIG_SRIO2 + if (!is_serdes_configured(SRIO2)) { + fdt_del_node_and_alias(blob, "rio1"); + } +#else + fdt_del_node_and_alias(blob, "rio1"); +#endif +} +#endif diff --git a/arch/powerpc/cpu/mpc8xxx/srio.c b/arch/powerpc/cpu/mpc8xxx/srio.c new file mode 100644 index 0000000..e46d328 --- /dev/null +++ b/arch/powerpc/cpu/mpc8xxx/srio.c @@ -0,0 +1,86 @@ +/* + * Copyright 2011 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the Free + * Software Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <config.h> +#include <asm/fsl_law.h> +#include <asm/fsl_serdes.h> + +#if defined(CONFIG_FSL_CORENET) + #define _DEVDISR_SRIO1 FSL_CORENET_DEVDISR_SRIO1 + #define _DEVDISR_SRIO2 FSL_CORENET_DEVDISR_SRIO2 + #define _DEVDISR_RMU FSL_CORENET_DEVDISR_RMU + #define CONFIG_SYS_MPC8xxx_GUTS_ADDR CONFIG_SYS_MPC85xx_GUTS_ADDR +#elif defined(CONFIG_MPC85xx) + #define _DEVDISR_SRIO1 MPC85xx_DEVDISR_SRIO + #define _DEVDISR_SRIO2 MPC85xx_DEVDISR_SRIO + #define _DEVDISR_RMU MPC85xx_DEVDISR_RMSG + #define CONFIG_SYS_MPC8xxx_GUTS_ADDR CONFIG_SYS_MPC85xx_GUTS_ADDR +#elif defined(CONFIG_MPC86xx) + #define _DEVDISR_SRIO1 MPC86xx_DEVDISR_SRIO + #define _DEVDISR_SRIO2 MPC86xx_DEVDISR_SRIO + #define _DEVDISR_RMU MPC86xx_DEVDISR_RMSG + #define CONFIG_SYS_MPC8xxx_GUTS_ADDR \ + (&((immap_t *)CONFIG_SYS_IMMR)->im_gur) +#else +#error "No defines for DEVDISR_SRIO" +#endif + +void srio_init(void) +{ + ccsr_gur_t *gur = (void *)CONFIG_SYS_MPC8xxx_GUTS_ADDR; + int srio1_used = 0, srio2_used = 0; + + if (is_serdes_configured(SRIO1)) { + set_next_law(CONFIG_SYS_SRIO1_MEM_PHYS, + law_size_bits(CONFIG_SYS_SRIO1_MEM_SIZE), + LAW_TRGT_IF_RIO_1); + srio1_used = 1; + printf("SRIO1: enabled\n"); + } else { + printf("SRIO1: disabled\n"); + } + +#ifdef CONFIG_SRIO2 + if (is_serdes_configured(SRIO2)) { + set_next_law(CONFIG_SYS_SRIO2_MEM_PHYS, + law_size_bits(CONFIG_SYS_SRIO2_MEM_SIZE), + LAW_TRGT_IF_RIO_2); + srio2_used = 1; + printf("SRIO2: enabled\n"); + } else { + printf("SRIO2: disabled\n"); + } +#endif + +#ifdef CONFIG_FSL_CORENET + /* On FSL_CORENET devices we can disable individual ports */ + if (!srio1_used) + setbits_be32(&gur->devdisr, FSL_CORENET_DEVDISR_SRIO1); + if (!srio2_used) + setbits_be32(&gur->devdisr, FSL_CORENET_DEVDISR_SRIO2); +#endif + + /* neither port is used - disable everything */ + if (!srio1_used && !srio2_used) { + setbits_be32(&gur->devdisr, _DEVDISR_SRIO1); + setbits_be32(&gur->devdisr, _DEVDISR_SRIO2); + setbits_be32(&gur->devdisr, _DEVDISR_RMU); + } +} diff --git a/arch/powerpc/include/asm/fsl_law.h b/arch/powerpc/include/asm/fsl_law.h index 0e255ff..6a4279c 100644 --- a/arch/powerpc/include/asm/fsl_law.h +++ b/arch/powerpc/include/asm/fsl_law.h @@ -90,6 +90,7 @@ enum law_trgt_if { #define LAW_TRGT_IF_PCI_1 LAW_TRGT_IF_PCI #define LAW_TRGT_IF_PCIX LAW_TRGT_IF_PCI #define LAW_TRGT_IF_PCIE_2 LAW_TRGT_IF_PCI_2 +#define LAW_TRGT_IF_RIO_1 LAW_TRGT_IF_RIO #ifdef CONFIG_MPC8641 #define LAW_TRGT_IF_PCIE_1 LAW_TRGT_IF_PCI diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c index f183cf6..232dc72 100644 --- a/board/freescale/corenet_ds/corenet_ds.c +++ b/board/freescale/corenet_ds/corenet_ds.c @@ -157,34 +157,10 @@ static const char *serdes_clock_to_string(u32 clock) int misc_init_r(void) { serdes_corenet_t *srds_regs = (void *)CONFIG_SYS_FSL_CORENET_SERDES_ADDR; - __maybe_unused ccsr_gur_t *gur; u32 actual[NUM_SRDS_BANKS]; unsigned int i; u8 sw3; - gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); -#ifdef CONFIG_SRIO1 - if (is_serdes_configured(SRIO1)) { - set_next_law(CONFIG_SYS_RIO1_MEM_PHYS, LAW_SIZE_256M, - LAW_TRGT_IF_RIO_1); - } else { - printf (" SRIO1: disabled\n"); - } -#else - setbits_be32(&gur->devdisr, FSL_CORENET_DEVDISR_SRIO1); /* disable */ -#endif - -#ifdef CONFIG_SRIO2 - if (is_serdes_configured(SRIO2)) { - set_next_law(CONFIG_SYS_RIO2_MEM_PHYS, LAW_SIZE_256M, - LAW_TRGT_IF_RIO_2); - } else { - printf (" SRIO2: disabled\n"); - } -#else - setbits_be32(&gur->devdisr, FSL_CORENET_DEVDISR_SRIO2); /* disable */ -#endif - /* Warn if the expected SERDES reference clocks don't match the * actual reference clocks. This needs to be done after calling * p4080_erratum_serdes8(), since that function may modify the clocks. @@ -217,24 +193,6 @@ void board_lmb_reserve(struct lmb *lmb) } #endif -void ft_srio_setup(void *blob) -{ -#ifdef CONFIG_SRIO1 - if (!is_serdes_configured(SRIO1)) { - fdt_del_node_and_alias(blob, "rio0"); - } -#else - fdt_del_node_and_alias(blob, "rio0"); -#endif -#ifdef CONFIG_SRIO2 - if (!is_serdes_configured(SRIO2)) { - fdt_del_node_and_alias(blob, "rio1"); - } -#else - fdt_del_node_and_alias(blob, "rio1"); -#endif -} - void ft_board_setup(void *blob, bd_t *bd) { phys_addr_t base; @@ -242,8 +200,6 @@ void ft_board_setup(void *blob, bd_t *bd) ft_cpu_setup(blob, bd); - ft_srio_setup(blob); - base = getenv_bootm_low(); size = getenv_bootm_size(); diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index e1cd1b0..477ca09 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -51,6 +51,7 @@ #define CONFIG_FSL_PCI_INIT /* Use common FSL init code */ #define CONFIG_SYS_PCI_64BIT /* enable 64-bit PCI resources */ +#define CONFIG_SYS_HAS_SRIO #define CONFIG_SRIO1 /* SRIO port 1 */ #define CONFIG_SRIO2 /* SRIO port 2 */ @@ -265,21 +266,21 @@ /* * RapidIO */ -#define CONFIG_SYS_RIO1_MEM_VIRT 0xa0000000 +#define CONFIG_SYS_SRIO1_MEM_VIRT 0xa0000000 #ifdef CONFIG_PHYS_64BIT -#define CONFIG_SYS_RIO1_MEM_PHYS 0xc20000000ull +#define CONFIG_SYS_SRIO1_MEM_PHYS 0xc20000000ull #else -#define CONFIG_SYS_RIO1_MEM_PHYS 0xa0000000 +#define CONFIG_SYS_SRIO1_MEM_PHYS 0xa0000000 #endif -#define CONFIG_SYS_RIO1_MEM_SIZE 0x10000000 /* 256M */ +#define CONFIG_SYS_SRIO1_MEM_SIZE 0x10000000 /* 256M */ -#define CONFIG_SYS_RIO2_MEM_VIRT 0xb0000000 +#define CONFIG_SYS_SRIO2_MEM_VIRT 0xb0000000 #ifdef CONFIG_PHYS_64BIT -#define CONFIG_SYS_RIO2_MEM_PHYS 0xc30000000ull +#define CONFIG_SYS_SRIO2_MEM_PHYS 0xc30000000ull #else -#define CONFIG_SYS_RIO2_MEM_PHYS 0xb0000000 +#define CONFIG_SYS_SRIO2_MEM_PHYS 0xb0000000 #endif -#define CONFIG_SYS_RIO2_MEM_SIZE 0x10000000 /* 256M */ +#define CONFIG_SYS_SRIO2_MEM_SIZE 0x10000000 /* 256M */ /* * General PCI -- 1.7.2.3

4 36

[U-Boot] printf in u-boot cannot support %f
by ITechnology 11 Jan '11

11 Jan '11

Hi, The codes below: ... double result1 = 3.14; printf("result1:%f\n", result1);// error .... turn out: result1:%f How can I get the correct result? Thanks a lot! The U-boot version is: => ver U-Boot 2008.10 (Jul 15 2009 - 21:56:05) MPC512X I wan to a little more complex program in standalone mode in u-boot. Is it possilbe to port g-libc to u-boot standalone mode? Tanks. Best regards, Michael Franklin

2 1

[U-Boot] [PATCH RFC] armv7: fixloop: don't fixup if location is NULL
by Minkyu Kang 11 Jan '11

11 Jan '11

There is possibility that pointers set to NULL before relocation. In this case, system is hang, because of r0 is invalid location in RAM. Signed-off-by: Minkyu Kang <mk7.kang(a)samsung.com> --- arch/arm/cpu/armv7/start.S | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S index 684f2d2..4eeb12a 100644 --- a/arch/arm/cpu/armv7/start.S +++ b/arch/arm/cpu/armv7/start.S @@ -195,6 +195,8 @@ copy_loop: add r3, r3, r0 /* r3 <- rel dyn end in FLASH */ fixloop: ldr r0, [r2] /* r0 <- location to fix up, IN FLASH! */ + cmp r0, #0 + beq fixskip add r0, r0, r9 /* r0 <- location to fix up in RAM */ ldr r1, [r2, #4] and r7, r1, #0xff @@ -217,6 +219,7 @@ fixrel: add r1, r1, r9 fixnext: str r1, [r0] +fixskip: add r2, r2, #8 /* each rel.dyn entry is 8 bytes */ cmp r2, r3 blo fixloop -- 1.7.1

6 19