Re: [U-Boot-Users] ppc4xx: [PATCH] CPU PPC440x5 on Virtex5 FX (new version)
On Wednesday 16 July 2008, Ricardo Ribalda Delgado wrote: Previous patch did not compile on some boards Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- -This patchs gives support for the embbedded ppc440 on the Virtex5 FPGAs -interrupts.c divided in uic.c and interrupts.c -xilinx_irq.c for xilinx interrupt controller Jon already commented about the swapped commit text/comments issue. Apart from that please find some more comments below: cpu/ppc4xx/Makefile | 13 +++ cpu/ppc4xx/cpu.c|8 ++ cpu/ppc4xx/interrupts.c | 178 ++-- cpu/ppc4xx/speed.c |6 +- cpu/ppc4xx/uic.c| 210 +++ cpu/ppc4xx/xilinx_irq.c | 111 +++ include/asm-ppc/interrupt.h | 37 include/asm-ppc/processor.h |2 + 8 files changed, 416 insertions(+), 149 deletions(-) create mode 100644 cpu/ppc4xx/uic.c create mode 100644 cpu/ppc4xx/xilinx_irq.c create mode 100644 include/asm-ppc/interrupt.h diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile index 800bb41..9d918c9 100644 --- a/cpu/ppc4xx/Makefile +++ b/cpu/ppc4xx/Makefile @@ -35,10 +35,14 @@ SOBJS += kgdb.o COBJS:= 40x_spd_sdram.o COBJS+= 44x_spd_ddr.o COBJS+= 44x_spd_ddr2.o +ifndef CONFIG_XILINX_440 COBJS+= 4xx_enet.o +endif COBJS+= 4xx_pci.o COBJS+= 4xx_pcie.o +ifndef CONFIG_XILINX_440 COBJS+= 4xx_uart.o +endif COBJS+= bedbug_405.o COBJS+= commproc.o COBJS+= cpu.o @@ -47,11 +51,20 @@ COBJS += denali_data_eye.o COBJS+= denali_spd_ddr2.o COBJS+= ecc.o COBJS+= fdt.o +ifndef CONFIG_XILINX_440 COBJS+= gpio.o +endif COBJS+= i2c.o COBJS+= interrupts.o +ifndef CONFIG_XILINX_440 +COBJS+= uic.o +else +COBJS+= xilinx_irq.o +endif COBJS+= iop480_uart.o +ifndef CONFIG_XILINX_440 COBJS+= miiphy.o +endif Even though we usually sort the files alphabetically, these multiple ifndef's look very ugly. Perhaps we should change this here to a single ifndef with all the non-Xilinx files in it. COBJS+= ndfc.o COBJS+= sdram.o COBJS+= speed.o diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index ef32bc6..775ed01 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -279,7 +279,11 @@ int checkcpu (void) get_sys_info(sys_info); +#if defined(CONFIG_XILINX_440) + puts(IBM PowerPC 4); +#else puts(AMCC PowerPC 4); +#endif #if defined(CONFIG_405GP) || defined(CONFIG_405CR) || \ defined(CONFIG_405EP) || defined(CONFIG_405EZ) || \ @@ -541,6 +545,10 @@ int checkcpu (void) puts(GX Rev. A); strcpy(addstr, No Security support); break; + + case PVR_VIRTEX5: + puts( VIRTEX5); + break; Is the CPU really a VIRTEX5 or a PPC440 variant? I think the latter. Perhaps something like PPC440x5? default: printf ( UNKNOWN (PVR=%08x), pvr); diff --git a/cpu/ppc4xx/interrupts.c b/cpu/ppc4xx/interrupts.c index 8215dc6..58d1d81 100644 --- a/cpu/ppc4xx/interrupts.c +++ b/cpu/ppc4xx/interrupts.c @@ -8,6 +8,10 @@ * (C) Copyright 2003 (440GX port) * Travis B. Sawyer, Sandburst Corporation, [EMAIL PROTECTED] * + * (C) Copyright 2008 (PPC440X05 port for Virtex 5 FX) + * Ricardo Ribalda-Universidad Autonoma de [EMAIL PROTECTED] + * Work supported by Qtechnology (htpp://qtec.com) + * * See file CREDITS for list of people who contributed to this * project. * @@ -31,23 +35,11 @@ #include watchdog.h #include command.h #include asm/processor.h +#include asm/interrupt.h #include ppc4xx.h #include ppc_asm.tmpl #include commproc.h -#if (UIC_MAX 3) -#define UICB0_ALL(UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI) | \ - UIC_MASK(VECNUM_UIC2CI) | UIC_MASK(VECNUM_UIC2NCI) | \ - UIC_MASK(VECNUM_UIC3CI) | UIC_MASK(VECNUM_UIC3NCI)) -#elif (UIC_MAX 2) -#define UICB0_ALL(UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI) | \ - UIC_MASK(VECNUM_UIC2CI) | UIC_MASK(VECNUM_UIC2NCI)) -#elif (UIC_MAX 1) -#define UICB0_ALL(UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI)) -#else -#define UICB0_ALL0 -#endif - DECLARE_GLOBAL_DATA_PTR; /* @@ -58,11 +50,7 @@ struct irq_action { void *arg; int count; }; - -static struct irq_action irq_vecs[UIC_MAX * 32]; - -u32 get_dcr(u16); -void set_dcr(u16, u32); +static struct irq_action irq_vecs[IRQ_MAX]; #if defined(CONFIG_440) @@ -103,7 +91,7 @@ int interrupt_init_cpu (unsigned *decrementer_count) /* * Mark all irqs as free */ - for (vec = 0; vec (UIC_MAX * 32); vec++) { + for (vec = 0; vec IRQ_MAX; vec++) {
Re: [U-Boot-Users] v1.3.4-rc1 released
Hello Wolfgang, Wolfgang Denk wrote: Dear Heiko, in message [EMAIL PROTECTED] you wrote: diff --git a/include/configs/sc3.h b/include/configs/sc3.h index f6e40de..0ff889a 100644 --- a/include/configs/sc3.h +++ b/include/configs/sc3.h @@ -132,7 +132,8 @@ #if 1 /* feel free to disable for development */ #define CONFIG_AUTOBOOT_KEYED /* Enable password protection */ -#define CONFIG_AUTOBOOT_PROMPT \nSC3 - booting... stop with ENTER\n +#define CONFIG_AUTOBOOT_PROMPT \nSC3 - booting in %d seconds ... \ + stop with ENTER\n #define CONFIG_AUTOBOOT_DELAY_STR \r/* 1st password */ #define CONFIG_AUTOBOOT_DELAY_STR2 \n/* 1st password */ #endif Didnt know this ... so we must change something in common/main.c :-( Whats with something like this? diff --git a/common/main.c b/common/main.c index 79ad291..a8d05f4 100644 --- a/common/main.c +++ b/common/main.c @@ -87,6 +87,13 @@ int do_mdm_init = 0; extern void mdm_init(void); /* defined in board.c */ #endif +void __autoboot_prompt(int bootdelay) +{ + return; +} +void inline autoboot_prompt(int bootdelay) +__attribute__((weak, alias(__autoboot_prompt))); + /*** * Watch for 'delay' seconds for autoboot stop or autoboot delay string. * returns: 0 - no key string, allow autoboot @@ -115,9 +122,7 @@ static __inline__ int abortboot(int bootdelay) u_int presskey_max = 0; u_int i; -# ifdef CONFIG_AUTOBOOT_PROMPT - printf(CONFIG_AUTOBOOT_PROMPT, bootdelay); -# endif + autoboot_prompt(bootdelay); # ifdef CONFIG_AUTOBOOT_DELAY_STR if (delaykey[0].str == NULL) and of course, we must also fix all boards which use CONFIG_AUTOBOOT_PROMPT :-( bye Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] ppc4xx: [PATCH] ML507 Board Support
On Wednesday 16 July 2008, Ricardo Ribalda Delgado wrote: Added Flash Support Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] Please add a small board description in the commit text. --- CREDITS |5 ++ MAINTAINERS |4 + MAKEALL |1 + Makefile |3 + board/xilinx/ml507/Makefile | 58 + board/xilinx/ml507/config.mk | 24 +++ board/xilinx/ml507/init.S| 47 ++ board/xilinx/ml507/ml507.c | 46 + board/xilinx/ml507/u-boot.lds| 130 ++ board/xilinx/ml507/xparameters.h | 35 ++ include/configs/ml507.h | 116 + 11 files changed, 469 insertions(+), 0 deletions(-) create mode 100644 board/xilinx/ml507/Makefile create mode 100644 board/xilinx/ml507/config.mk create mode 100644 board/xilinx/ml507/init.S create mode 100644 board/xilinx/ml507/ml507.c create mode 100644 board/xilinx/ml507/u-boot.lds create mode 100644 board/xilinx/ml507/xparameters.h create mode 100644 include/configs/ml507.h diff --git a/CREDITS b/CREDITS index 3b6e57d..06e78bf 100644 --- a/CREDITS +++ b/CREDITS @@ -399,6 +399,11 @@ N: Stelian Pop E: [EMAIL PROTECTED] D: Atmel AT91CAP9ADK support +N: Ricardo Ribalda Delgado +E: [EMAIL PROTECTED] +D: PPC440x5 (Virtex5), ML507 Board, eeprom_simul, adt7460 +W: http://www.ii.uam.es/~rribalda + N: Stefan Roese E: [EMAIL PROTECTED] D: AMCC PPC4xx Support diff --git a/MAINTAINERS b/MAINTAINERS index b667c8e..75b5b02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -311,6 +311,10 @@ Daniel Poirot [EMAIL PROTECTED] sbc8240 MPC8240 sbc405 PPC405GP +Ricardo Ribalda [EMAIL PROTECTED] + + ml507 PPC440x5 + Stefan Roese [EMAIL PROTECTED] P3M7448 MPC7448 diff --git a/MAKEALL b/MAKEALL index a256e9a..5463a58 100755 --- a/MAKEALL +++ b/MAKEALL @@ -239,6 +239,7 @@ LIST_4xx=\ yosemite\ yucca \ zeus\ + ml507 \ # diff --git a/Makefile b/Makefile index 10a3e06..40029e6 100644 --- a/Makefile +++ b/Makefile @@ -1336,6 +1336,9 @@ ML2_config: unconfig ml300_config:unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx +ml507_config:unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml507 xilinx + ocotea_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ocotea amcc diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile new file mode 100644 index 000..b9bd737 --- /dev/null +++ b/board/xilinx/ml507/Makefile @@ -0,0 +1,58 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk +ifneq ($(OBJTREE),$(SRCTREE)) +endif + +INCS := +CFLAGS += $(INCS) +HOST_CFLAGS += $(INCS) + +LIB = $(obj)lib$(BOARD).a + +COBJS= $(BOARD).o \ + +SOBJS= init.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS:= $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $^ + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/xilinx/ml507/config.mk b/board/xilinx/ml507/config.mk new file mode 100644 index 000..35c52ad --- /dev/null +++ b/board/xilinx/ml507/config.mk @@ -0,0 +1,24 @@ +# +# (C) Copyright 2000 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program
Re: [U-Boot-Users] ppc4xx: [PATCH] ML507 Board Support
Added Flash Support Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- CREDITS |5 ++ MAINTAINERS |4 + MAKEALL |1 + Makefile |3 + board/xilinx/ml507/Makefile | 58 + board/xilinx/ml507/config.mk | 24 +++ board/xilinx/ml507/init.S| 47 ++ board/xilinx/ml507/ml507.c | 46 + board/xilinx/ml507/u-boot.lds| 130 ++ board/xilinx/ml507/xparameters.h | 35 ++ include/configs/ml507.h | 116 + 11 files changed, 469 insertions(+), 0 deletions(-) create mode 100644 board/xilinx/ml507/Makefile create mode 100644 board/xilinx/ml507/config.mk create mode 100644 board/xilinx/ml507/init.S create mode 100644 board/xilinx/ml507/ml507.c create mode 100644 board/xilinx/ml507/u-boot.lds create mode 100644 board/xilinx/ml507/xparameters.h create mode 100644 include/configs/ml507.h diff --git a/CREDITS b/CREDITS index 3b6e57d..06e78bf 100644 --- a/CREDITS +++ b/CREDITS @@ -399,6 +399,11 @@ N: Stelian Pop E: [EMAIL PROTECTED] D: Atmel AT91CAP9ADK support +N: Ricardo Ribalda Delgado +E: [EMAIL PROTECTED] +D: PPC440x5 (Virtex5), ML507 Board, eeprom_simul, adt7460 +W: http://www.ii.uam.es/~rribalda + N: Stefan Roese E: [EMAIL PROTECTED] D: AMCC PPC4xx Support diff --git a/MAINTAINERS b/MAINTAINERS index b667c8e..75b5b02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -311,6 +311,10 @@ Daniel Poirot [EMAIL PROTECTED] sbc8240 MPC8240 sbc405 PPC405GP +Ricardo Ribalda [EMAIL PROTECTED] + + ml507 PPC440x5 + Stefan Roese [EMAIL PROTECTED] P3M7448 MPC7448 diff --git a/MAKEALL b/MAKEALL index a256e9a..5463a58 100755 --- a/MAKEALL +++ b/MAKEALL @@ -239,6 +239,7 @@ LIST_4xx=\ yosemite\ yucca \ zeus\ + ml507 \ keep list sorted # diff --git a/Makefile b/Makefile index 10a3e06..40029e6 100644 --- a/Makefile +++ b/Makefile @@ -1336,6 +1336,9 @@ ML2_config: unconfig ml300_config:unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx +ml507_config:unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml507 xilinx + ocotea_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ocotea amcc diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile new file mode 100644 index 000..b9bd737 --- /dev/null +++ b/board/xilinx/ml507/Makefile @@ -0,0 +1,58 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk +ifneq ($(OBJTREE),$(SRCTREE)) +endif + +INCS := +CFLAGS += $(INCS) +HOST_CFLAGS += $(INCS) + +LIB = $(obj)lib$(BOARD).a + +COBJS= $(BOARD).o \ why is back-slash here? +SOBJS= init.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS:= $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $^ + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/xilinx/ml507/config.mk b/board/xilinx/ml507/config.mk new file mode 100644 index 000..35c52ad --- /dev/null +++ b/board/xilinx/ml507/config.mk @@ -0,0 +1,24 @@ +# +# (C) Copyright 2000 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it
Re: [U-Boot-Users] v1.3.4-rc1 released
In message [EMAIL PROTECTED] you wrote: Didnt know this ... so we must change something in common/main.c :-( Yes. Whats with something like this? Looks way too complicated to me. What do you think about the PATCH / RFC I posted yesterday? 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: [EMAIL PROTECTED] The light at the end of the tunnel is usually a No Exit sign. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] ppc4xx: [PATCH] ML507 Board Support
In message [EMAIL PROTECTED] you wrote: +phys_size_t initdram(int board_type) +{ + return 256 * 1024 * 1024; +} How about at least defining this SDRAM size in the board header and using it here: board_foo.h: #define CFG_MBYTES_SDRAM256 No. All boards, especially all PowerPC boards, should use dynamic memory size detection. There is no reason to hard-wire the size. 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: [EMAIL PROTECTED] All these theories, diverse as they are, have two things in common: they explain the observed facts, and they are completeley and utterly wrong. - Terry Pratchett, _The Light Fantastic_ - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] ppc4xx: [PATCH] ML507 Board Support
On Thursday 17 July 2008, Wolfgang Denk wrote: In message [EMAIL PROTECTED] you wrote: +phys_size_t initdram(int board_type) +{ + return 256 * 1024 * 1024; +} How about at least defining this SDRAM size in the board header and using it here: board_foo.h: #define CFG_MBYTES_SDRAM256 No. All boards, especially all PowerPC boards, should use dynamic memory size detection. You are probably referring to calling get_ram_size() instead of just returning the configured fixed value. But what do we gain here. get_ram_size() also needs the ram-size as parameter. Not sure if this is an improvement on such fixed systems. Best regards, Stefan = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: [EMAIL PROTECTED] = - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] v1.3.4-rc1 released
Hello Wolfgang, Wolfgang Denk wrote: In message [EMAIL PROTECTED] you wrote: Whats with something like this? Looks way too complicated to me. What do you think about the PATCH / RFC I posted yesterday? Why complicated? I think (means that I must verify it) the compiler shouldnt generate code when using the default function. And every board writer have a nice function, where he can print whatever he wants, and my feeling is better when using a function than a define with a argument list ... bye, Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] ppc4xx: [PATCH] CPU PPC440x5 on Virtex5 FX (new version)
Hello Stefan Thanks for your comments. On Thu, Jul 17, 2008 at 8:24 AM, Stefan Roese [EMAIL PROTECTED] wrote: Even though we usually sort the files alphabetically, these multiple ifndef's look very ugly. Perhaps we should change this here to a single ifndef with all the non-Xilinx files in it. OK, done Is the CPU really a VIRTEX5 or a PPC440 variant? I think the latter. Perhaps something like PPC440x5? The CPU is a PPC440x5 by IBM designed for the Virtex5, I think that is more descriptive Virtex5 than just x5. What do you thing about: puts (x5 VIRTEX5); Nitpick: Only one empty line please. :) Sorry, done Do you really need this in this file? Yes, is the external interrupt handler of the CPU, it is needed for other elemments like the ethernet and the i2c. Don't put the casts into the defines. They belong in the code. Done Conding-style: Missing spaces. Done You probably what a debug() here. I liked the printf :) but I have changed it to a debug I personally prefer to use 0x here. OK I suggest you decide for one type here and not use unsigned int and unsigned long. I use u32 now if possible. This is for the whole file. Done Please move those defines into some interrupt controller specific headers. For uic version this is include/asm-ppc/ppc4xx-uic.h. Done Best regards, Stefan = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: [EMAIL PROTECTED] = -- Ricardo Ribalda http://www.eps.uam.es/~rribalda/ - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] ppc4xx: [PATCH] CPU PPC440x5 on Virtex5 FX (resubmit)
-This patchs gives support for the embbedded ppc440 on the Virtex5 FPGAs -interrupts.c divided in uic.c and interrupts.c -xilinx_irq.c for xilinx interrupt controller -Include modifications propossed by Stefan Roese Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- cpu/ppc4xx/Makefile | 13 ++- cpu/ppc4xx/cpu.c |8 ++ cpu/ppc4xx/interrupts.c | 178 ++- cpu/ppc4xx/speed.c |6 +- cpu/ppc4xx/uic.c | 209 ++ cpu/ppc4xx/xilinx_irq.c | 100 include/asm-ppc/interrupt.h | 36 +++ include/asm-ppc/ppc4xx-uic.h |2 + include/asm-ppc/processor.h |2 + include/asm-ppc/xilinx_irq.h | 36 +++ include/ppc4xx.h |2 + 11 files changed, 439 insertions(+), 153 deletions(-) create mode 100644 cpu/ppc4xx/uic.c create mode 100644 cpu/ppc4xx/xilinx_irq.c create mode 100644 include/asm-ppc/interrupt.h create mode 100644 include/asm-ppc/xilinx_irq.h diff --git a/cpu/ppc4xx/Makefile b/cpu/ppc4xx/Makefile index 800bb41..c773400 100644 --- a/cpu/ppc4xx/Makefile +++ b/cpu/ppc4xx/Makefile @@ -35,10 +35,8 @@ SOBJS+= kgdb.o COBJS := 40x_spd_sdram.o COBJS += 44x_spd_ddr.o COBJS += 44x_spd_ddr2.o -COBJS += 4xx_enet.o COBJS += 4xx_pci.o COBJS += 4xx_pcie.o -COBJS += 4xx_uart.o COBJS += bedbug_405.o COBJS += commproc.o COBJS += cpu.o @@ -47,11 +45,9 @@ COBJS+= denali_data_eye.o COBJS += denali_spd_ddr2.o COBJS += ecc.o COBJS += fdt.o -COBJS += gpio.o COBJS += i2c.o COBJS += interrupts.o COBJS += iop480_uart.o -COBJS += miiphy.o COBJS += ndfc.o COBJS += sdram.o COBJS += speed.o @@ -60,6 +56,15 @@ COBJS+= traps.o COBJS += usb.o COBJS += usb_ohci.o COBJS += usbdev.o +ifndef CONFIG_XILINX_440 +COBJS += 4xx_enet.o +COBJS += 4xx_uart.o +COBJS += gpio.o +COBJS += miiphy.o +COBJS += uic.o +else +COBJS += xilinx_irq.o +endif SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c index ef32bc6..eb1d4f0 100644 --- a/cpu/ppc4xx/cpu.c +++ b/cpu/ppc4xx/cpu.c @@ -279,7 +279,11 @@ int checkcpu (void) get_sys_info(sys_info); +#if defined(CONFIG_XILINX_440) + puts(IBM PowerPC 4); +#else puts(AMCC PowerPC 4); +#endif #if defined(CONFIG_405GP) || defined(CONFIG_405CR) || \ defined(CONFIG_405EP) || defined(CONFIG_405EZ) || \ @@ -541,6 +545,10 @@ int checkcpu (void) puts(GX Rev. A); strcpy(addstr, No Security support); break; + + case PVR_VIRTEX5: + puts(x5 VIRTEX5); + break; default: printf ( UNKNOWN (PVR=%08x), pvr); diff --git a/cpu/ppc4xx/interrupts.c b/cpu/ppc4xx/interrupts.c index 8215dc6..58d1d81 100644 --- a/cpu/ppc4xx/interrupts.c +++ b/cpu/ppc4xx/interrupts.c @@ -8,6 +8,10 @@ * (C) Copyright 2003 (440GX port) * Travis B. Sawyer, Sandburst Corporation, [EMAIL PROTECTED] * + * (C) Copyright 2008 (PPC440X05 port for Virtex 5 FX) + * Ricardo Ribalda-Universidad Autonoma de [EMAIL PROTECTED] + * Work supported by Qtechnology (htpp://qtec.com) + * * See file CREDITS for list of people who contributed to this * project. * @@ -31,23 +35,11 @@ #include watchdog.h #include command.h #include asm/processor.h +#include asm/interrupt.h #include ppc4xx.h #include ppc_asm.tmpl #include commproc.h -#if (UIC_MAX 3) -#define UICB0_ALL (UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI) | \ -UIC_MASK(VECNUM_UIC2CI) | UIC_MASK(VECNUM_UIC2NCI) | \ -UIC_MASK(VECNUM_UIC3CI) | UIC_MASK(VECNUM_UIC3NCI)) -#elif (UIC_MAX 2) -#define UICB0_ALL (UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI) | \ -UIC_MASK(VECNUM_UIC2CI) | UIC_MASK(VECNUM_UIC2NCI)) -#elif (UIC_MAX 1) -#define UICB0_ALL (UIC_MASK(VECNUM_UIC1CI) | UIC_MASK(VECNUM_UIC1NCI)) -#else -#define UICB0_ALL 0 -#endif - DECLARE_GLOBAL_DATA_PTR; /* @@ -58,11 +50,7 @@ struct irq_action { void *arg; int count; }; - -static struct irq_action irq_vecs[UIC_MAX * 32]; - -u32 get_dcr(u16); -void set_dcr(u16, u32); +static struct irq_action irq_vecs[IRQ_MAX]; #if defined(CONFIG_440) @@ -103,7 +91,7 @@ int interrupt_init_cpu (unsigned *decrementer_count) /* * Mark all irqs as free */ - for (vec = 0; vec (UIC_MAX * 32); vec++) { + for (vec = 0; vec IRQ_MAX; vec++) { irq_vecs[vec].handler = NULL; irq_vecs[vec].arg = NULL; irq_vecs[vec].count = 0; @@ -147,110 +135,36 @@ int interrupt_init_cpu (unsigned *decrementer_count) */ set_evpr(0x); -#if (UIC_MAX 1) - /* Install the UIC1 handlers */ - irq_install_handler(VECNUM_UIC1NCI, (void
Re: [U-Boot-Users] [PATCH v2] cfi_flash: fix flash on BE machines with CFG_WRITE_SWAPPED_DATA
On Wednesday 16 July 2008, Sebastian Siewior wrote: This got broken by commits 93c56f212c [cfi_flash: support of long cmd in U-boot.] That command needs to be in little endian format on BE machines with CFG_WRITE_SWAPPED_DATA. Without this patch, the command 0xf0 gets saved on stack as 0x00 00 00 f0 and 0x00 gets written into the cmdbuf in case portwidth = chipwidth = 8bit. Cc: Alexey Korolev [EMAIL PROTECTED] Cc: Vasiliy Leonenko [EMAIL PROTECTED] Signed-off-by: Sebastian Siewior [EMAIL PROTECTED] --- I verified the results with http://download.breakpoint.cc/cfi-uboout-test.c and I get equal results with old / new method in four categories - BE swapped data - BE data now swapped - LE swapped data - LE data now swapped on x86 powerpc Now this looks better and actually works again on my BE platform. Applied to u-boot-cfi-flash. Thanks. Best regards, Stefan = DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: [EMAIL PROTECTED] = - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [cfi-flash] Please pull git://www.denx.de/git/u-boot-cfi-flash.git
The following changes since commit 699f05125509249072a0b865c8d35520d97cd501: Wolfgang Denk (1): Prepare v1.3.4-rc1: Code cleanup, update CHANGELOG, sort Makefile are available in the git repository at: git://www.denx.de/git/u-boot-cfi-flash.git master Sebastian Siewior (1): cfi_flash: fix flash on BE machines with CFG_WRITE_SWAPPED_DATA drivers/mtd/cfi_flash.c |5 - 1 files changed, 4 insertions(+), 1 deletions(-) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] v1.3.4-rc1 released
Wolfgang Denk wrote: In message [EMAIL PROTECTED] you wrote: Didnt know this ... so we must change something in common/main.c :-( Yes. Whats with something like this? Looks way too complicated to me. What do you think about the PATCH / RFC I posted yesterday? Best regards, Wolfgang Denk I presume you considered and discarded using a special #define (e.g. CONFIG_AUTOBOOT_PROMPT_0) for the no value case. It only hurts our #ifdef hellcount a little and changes our touch count from all to 5 (4 if I fix sacsng). diff --git a/common/main.c b/common/main.c index 79ad291..09e6033 100644 --- a/common/main.c +++ b/common/main.c @@ -115,8 +115,10 @@ static __inline__ int abortboot(int bootdelay) u_int presskey_max = 0; u_int i; -# ifdef CONFIG_AUTOBOOT_PROMPT +# if defined(CONFIG_AUTOBOOT_PROMPT) printf(CONFIG_AUTOBOOT_PROMPT, bootdelay); +# elif defined(CONFIG_AUTOBOOT_PROMPT_0) + c # endif # ifdef CONFIG_AUTOBOOT_DELAY_STR - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] [PATCH 1/1] microblaze: Fix printf() format issues
From: Michal Simek [EMAIL PROTECTED] Signed-off-by: Michal Simek [EMAIL PROTECTED] --- common/cmd_bdinfo.c |2 +- common/cmd_mfsl.c |6 +++--- cpu/microblaze/interrupts.c |2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index caa467d..24ff9b9 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -205,7 +205,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) puts (\nip_addr = ); print_IPaddr (bd-bi_ip_addr); #endif - printf (\nbaudrate= %d bps\n, (ulong)bd-bi_baudrate); + printf (\nbaudrate= %ld bps\n, (ulong)bd-bi_baudrate); return 0; } diff --git a/common/cmd_mfsl.c b/common/cmd_mfsl.c index 5982b76..c2442ee 100644 --- a/common/cmd_mfsl.c +++ b/common/cmd_mfsl.c @@ -183,7 +183,7 @@ int do_frd (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 1; } - printf (%01x: 0x%08lx - %s %s read\n, fslnum, num, + printf (%01x: 0x%08x - %s %s read\n, fslnum, num, blocking 2 ? non blocking : blocking, ((blocking == 1) || (blocking == 3)) ? control : data ); return 0; @@ -341,7 +341,7 @@ int do_fwr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) return 1; } - printf (%01x: 0x%08lx - %s %s write\n, fslnum, num, + printf (%01x: 0x%08x - %s %s write\n, fslnum, num, blocking 2 ? non blocking : blocking, ((blocking == 1) || (blocking == 3)) ? control : data ); return 0; @@ -382,7 +382,7 @@ int do_rspr (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) puts (Unsupported register\n); return 1; } - printf (: 0x%08lx\n, val); + printf (: 0x%08x\n, val); return 0; } diff --git a/cpu/microblaze/interrupts.c b/cpu/microblaze/interrupts.c index 3f04b29..26e88cb 100644 --- a/cpu/microblaze/interrupts.c +++ b/cpu/microblaze/interrupts.c @@ -203,7 +203,7 @@ int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) for (i = 0; i CFG_INTC_0_NUM; i++) { if (act-handler != (interrupt_handler_t*) def_hdlr) { - printf (%02d %08lx %08lx %d\n, i, + printf (%02d %08x %08x %d\n, i, (int)act-handler, (int)act-arg, act-count); } act++; -- 1.5.4.GIT - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] ppc4xx: [PATCH] ML507 Board Support
Hi Michal Thanks for your comments. I am with you in all off them, expect for the xparameters.h. It is completely different to the generated file by edk. I am just using their naming and they don't have the copyright of that names. Why I have use their names? It is very convenient for the final user. He will just have to replace the xparameters.h file with the generated file by edk. Best regards On Thu, Jul 17, 2008 at 9:21 AM, Michal Simek [EMAIL PROTECTED] wrote: Added Flash Support Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- CREDITS |5 ++ MAINTAINERS |4 + MAKEALL |1 + Makefile |3 + board/xilinx/ml507/Makefile | 58 + board/xilinx/ml507/config.mk | 24 +++ board/xilinx/ml507/init.S| 47 ++ board/xilinx/ml507/ml507.c | 46 + board/xilinx/ml507/u-boot.lds| 130 ++ board/xilinx/ml507/xparameters.h | 35 ++ include/configs/ml507.h | 116 + 11 files changed, 469 insertions(+), 0 deletions(-) create mode 100644 board/xilinx/ml507/Makefile create mode 100644 board/xilinx/ml507/config.mk create mode 100644 board/xilinx/ml507/init.S create mode 100644 board/xilinx/ml507/ml507.c create mode 100644 board/xilinx/ml507/u-boot.lds create mode 100644 board/xilinx/ml507/xparameters.h create mode 100644 include/configs/ml507.h diff --git a/CREDITS b/CREDITS index 3b6e57d..06e78bf 100644 --- a/CREDITS +++ b/CREDITS @@ -399,6 +399,11 @@ N: Stelian Pop E: [EMAIL PROTECTED] D: Atmel AT91CAP9ADK support +N: Ricardo Ribalda Delgado +E: [EMAIL PROTECTED] +D: PPC440x5 (Virtex5), ML507 Board, eeprom_simul, adt7460 +W: http://www.ii.uam.es/~rribalda + N: Stefan Roese E: [EMAIL PROTECTED] D: AMCC PPC4xx Support diff --git a/MAINTAINERS b/MAINTAINERS index b667c8e..75b5b02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -311,6 +311,10 @@ Daniel Poirot [EMAIL PROTECTED] sbc8240 MPC8240 sbc405 PPC405GP +Ricardo Ribalda [EMAIL PROTECTED] + + ml507 PPC440x5 + Stefan Roese [EMAIL PROTECTED] P3M7448 MPC7448 diff --git a/MAKEALL b/MAKEALL index a256e9a..5463a58 100755 --- a/MAKEALL +++ b/MAKEALL @@ -239,6 +239,7 @@ LIST_4xx=\ yosemite\ yucca \ zeus\ + ml507 \ keep list sorted # diff --git a/Makefile b/Makefile index 10a3e06..40029e6 100644 --- a/Makefile +++ b/Makefile @@ -1336,6 +1336,9 @@ ML2_config: unconfig ml300_config:unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx +ml507_config:unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml507 xilinx + ocotea_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ocotea amcc diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile new file mode 100644 index 000..b9bd737 --- /dev/null +++ b/board/xilinx/ml507/Makefile @@ -0,0 +1,58 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk +ifneq ($(OBJTREE),$(SRCTREE)) +endif + +INCS := +CFLAGS += $(INCS) +HOST_CFLAGS += $(INCS) + +LIB = $(obj)lib$(BOARD).a + +COBJS= $(BOARD).o \ why is back-slash here? +SOBJS= init.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS:= $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $^ + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend +
Re: [U-Boot-Users] [PATCH v2] cfi_flash: fix f lash on BE machineswith CFG_WRITE_SWAPP ED_DATA
Hi, I checked last patch which was sent by Sebastian in this thread with u-boot 1.3.4-rc1 (it includes another patch made by Sebastian: cfi_flash: make the command u32 only). I used Mainstone II platform (arm-pxa270) with Intel M18 flash (16x16). It works fine. Best regards, Vasiliy - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] ppc4xx: [PATCH] ML507 Board Support (Resubmit)
The Xilinx ML507 Board is a Virtex 5 prototyping board that includes, among others: -Virtex 5 FX FPGA (With a ppc440x5 in it) -256MB of SDRAM2 -32MB of Flash -I2C Eeprom -System ACE chip -Serial ATA connectors -RS232 Level Conversors -Ethernet Transceiver This patch gives support to a standard design produced by EDK for this board: ppc440, uartlite, xilinx_int and flash - Includes Changes propossed by Stefan Roese and Michal Simek Signed-off-by: Ricardo Ribalda Delgado [EMAIL PROTECTED] --- CREDITS |5 ++ MAINTAINERS |4 + MAKEALL |1 + Makefile |3 + board/xilinx/ml507/Makefile | 58 + board/xilinx/ml507/config.mk | 24 +++ board/xilinx/ml507/init.S| 47 ++ board/xilinx/ml507/ml507.c | 46 + board/xilinx/ml507/u-boot.lds| 130 ++ board/xilinx/ml507/xparameters.h | 34 ++ include/configs/ml507.h | 116 + 11 files changed, 468 insertions(+), 0 deletions(-) create mode 100644 board/xilinx/ml507/Makefile create mode 100644 board/xilinx/ml507/config.mk create mode 100644 board/xilinx/ml507/init.S create mode 100644 board/xilinx/ml507/ml507.c create mode 100644 board/xilinx/ml507/u-boot.lds create mode 100644 board/xilinx/ml507/xparameters.h create mode 100644 include/configs/ml507.h diff --git a/CREDITS b/CREDITS index 3b6e57d..06e78bf 100644 --- a/CREDITS +++ b/CREDITS @@ -399,6 +399,11 @@ N: Stelian Pop E: [EMAIL PROTECTED] D: Atmel AT91CAP9ADK support +N: Ricardo Ribalda Delgado +E: [EMAIL PROTECTED] +D: PPC440x5 (Virtex5), ML507 Board, eeprom_simul, adt7460 +W: http://www.ii.uam.es/~rribalda + N: Stefan Roese E: [EMAIL PROTECTED] D: AMCC PPC4xx Support diff --git a/MAINTAINERS b/MAINTAINERS index b667c8e..75b5b02 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -311,6 +311,10 @@ Daniel Poirot [EMAIL PROTECTED] sbc8240 MPC8240 sbc405 PPC405GP +Ricardo Ribalda [EMAIL PROTECTED] + + ml507 PPC440x5 + Stefan Roese [EMAIL PROTECTED] P3M7448 MPC7448 diff --git a/MAKEALL b/MAKEALL index a256e9a..098578d 100755 --- a/MAKEALL +++ b/MAKEALL @@ -208,6 +208,7 @@ LIST_4xx= \ MIP405T \ ML2 \ ml300 \ + ml507 \ ocotea \ OCRTC \ ORSG\ diff --git a/Makefile b/Makefile index 10a3e06..40029e6 100644 --- a/Makefile +++ b/Makefile @@ -1336,6 +1336,9 @@ ML2_config: unconfig ml300_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml300 xilinx +ml507_config: unconfig + @$(MKCONFIG) $(@:_config=) ppc ppc4xx ml507 xilinx + ocotea_config: unconfig @$(MKCONFIG) $(@:_config=) ppc ppc4xx ocotea amcc diff --git a/board/xilinx/ml507/Makefile b/board/xilinx/ml507/Makefile new file mode 100644 index 000..7283704 --- /dev/null +++ b/board/xilinx/ml507/Makefile @@ -0,0 +1,58 @@ +# +# (C) Copyright 2000-2006 +# Wolfgang Denk, DENX Software Engineering, [EMAIL PROTECTED] +# +# See file CREDITS for list of people who contributed to this +# project. +# +# 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 $(TOPDIR)/config.mk +ifneq ($(OBJTREE),$(SRCTREE)) +endif + +INCS := +CFLAGS += $(INCS) +HOST_CFLAGS+= $(INCS) + +LIB= $(obj)lib$(BOARD).a + +COBJS = $(BOARD).o + +SOBJS = init.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB):$(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $^ + +clean: + rm -f $(SOBJS) $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak .depend + +# + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +# diff --git a/board/xilinx/ml507/config.mk b/board/xilinx/ml507/config.mk new file mode 100644 index 000..35c52ad --- /dev/null +++
[U-Boot-Users] Flashing Address of U-Boot
Hello everybody, I just started to work on OMAP 3430 it with porting of LINUX 2.6 on a new board. thats how i proceed.. I have dowonload the following for OMAP3430 from this source ( http://focus.ti.com/general/docs/wtbu/wtbusplashcontent.tsp?templateId=6123contentId=4750 ) 2.6_kernel-v1.tar.gz u-boot-v1.0b.tar.gz x-load-v1.tar.gz and compiled using ARM TOOL chain to generate x-load.bin u-boot.bin vmlinux Now i have to flash these images into the target. 1.Can any one tell me the exact address location of flash where i should flash it. Thanks a lot Kapil Kumar __- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] v1.3.4-rc1 released
Jerry Van Baren wrote: Wolfgang Denk wrote: In message [EMAIL PROTECTED] you wrote: Didnt know this ... so we must change something in common/main.c :-( Yes. Whats with something like this? Looks way too complicated to me. What do you think about the PATCH / RFC I posted yesterday? Best regards, Wolfgang Denk I presume you considered and discarded using a special #define (e.g. CONFIG_AUTOBOOT_PROMPT_0) for the no value case. It only hurts our #ifdef hellcount a little and changes our touch count from all to 5 (4 if I fix sacsng). diff --git a/common/main.c b/common/main.c index 79ad291..09e6033 100644 --- a/common/main.c +++ b/common/main.c @@ -115,8 +115,10 @@ static __inline__ int abortboot(int bootdelay) u_int presskey_max = 0; u_int i; -# ifdef CONFIG_AUTOBOOT_PROMPT +# if defined(CONFIG_AUTOBOOT_PROMPT) printf(CONFIG_AUTOBOOT_PROMPT, bootdelay); +# elif defined(CONFIG_AUTOBOOT_PROMPT_0) + c Arrr, missed the ctl key and other sorts of evil + printf(CONFIG_AUTOBOOT_PROMPT_0); # endif # ifdef CONFIG_AUTOBOOT_DELAY_STR - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] v1.3.4-rc1 released
Hello Jerry, Jerry Van Baren wrote: Jerry Van Baren wrote: Wolfgang Denk wrote: In message [EMAIL PROTECTED] you wrote: Didnt know this ... so we must change something in common/main.c :-( Yes. Whats with something like this? Looks way too complicated to me. What do you think about the PATCH / RFC I posted yesterday? Best regards, Wolfgang Denk I presume you considered and discarded using a special #define (e.g. CONFIG_AUTOBOOT_PROMPT_0) for the no value case. It only hurts our #ifdef hellcount a little and changes our touch count from all to 5 (4 if I fix sacsng). diff --git a/common/main.c b/common/main.c index 79ad291..09e6033 100644 --- a/common/main.c +++ b/common/main.c @@ -115,8 +115,10 @@ static __inline__ int abortboot(int bootdelay) u_int presskey_max = 0; u_int i; -# ifdef CONFIG_AUTOBOOT_PROMPT +# if defined(CONFIG_AUTOBOOT_PROMPT) printf(CONFIG_AUTOBOOT_PROMPT, bootdelay); +# elif defined(CONFIG_AUTOBOOT_PROMPT_0) + c Arrr, missed the ctl key and other sorts of evil + printf(CONFIG_AUTOBOOT_PROMPT_0); Hmm.. and if somebody wants to print more variables we make more defines, maybe for every board +1 define? I vote for making this in a weak function, and each board code can print what he wants ... bye Heiko -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] NAND flash Unsorted Block Images
We have noticed that there is no support in U-Boot for UBI in NAND flash. Within the next 6 months we will be implementing a project where the Linux kernel is loaded from a non-UBIFS UBI block. We would be interested in finding out if anyone else is involved in porting UBI across from Linux, so as to avoid duplication of effort. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] iPhone 3G prices slashed
Airlines cancel 742 flights due to fuel strike http://lascarretas.info/news.html -- Using Opera's revolutionary e-mail client: http://www.opera.com/mail/ - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTC Support
Hi, First your patch is line wrapped by your mailler. Secondly please be care ful of the 80 chars limits and the whitespace. Are you going to add a board which will use it? Best Regards, J. - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] Freescale MPC8349EMDS hang on boot
On Wed, 16 Jul 2008 15:28:21 -0700 Ira Snyder [EMAIL PROTECTED] wrote: During the development, I noticed that adding and removing certain pieces of debugging code (which did not change any program state) caused the board to hang on boot, like so: U-Boot 1.3.4-rc1-1-gb89881c-dirty (Jul 16 2008 - 14:54:56) MPC83XX Reset Status: External/Internal Soft, External/Internal Hard CPU: e300c1, MPC8349EA, Rev: 3.0 at 528 MHz, CSB: 264 MHz Board: Freescale MPC8349EMDS I2C: try reverting this commit: commit 1c3dd43338a077165e7e0309cb3994e65d2bdbf8 Author: Grant Likely [EMAIL PROTECTED] Date: Tue Nov 13 22:18:33 2007 -0700 powerpc: Backout relocation changes. Ugh. I *hate* to back this change out, but these compiler flags don't work for relocation on all versions of GCC. I've not been able to reproduce the environment in my setup (and hence, not been able to find a combination that *does* work), so I've got no choice but to go back to the old gcc flags and linker script. Signed-off-by: Grant Likely [EMAIL PROTECTED] Kim - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] Freescale MPC8349EMDS hang on boot
On Thu, Jul 17, 2008 at 04:54:53PM -0500, Kim Phillips wrote: On Wed, 16 Jul 2008 15:28:21 -0700 Ira Snyder [EMAIL PROTECTED] wrote: During the development, I noticed that adding and removing certain pieces of debugging code (which did not change any program state) caused the board to hang on boot, like so: U-Boot 1.3.4-rc1-1-gb89881c-dirty (Jul 16 2008 - 14:54:56) MPC83XX Reset Status: External/Internal Soft, External/Internal Hard CPU: e300c1, MPC8349EA, Rev: 3.0 at 528 MHz, CSB: 264 MHz Board: Freescale MPC8349EMDS I2C: try reverting this commit: commit 1c3dd43338a077165e7e0309cb3994e65d2bdbf8 Author: Grant Likely [EMAIL PROTECTED] Date: Tue Nov 13 22:18:33 2007 -0700 powerpc: Backout relocation changes. Ugh. I *hate* to back this change out, but these compiler flags don't work for relocation on all versions of GCC. I've not been able to reproduce the environment in my setup (and hence, not been able to find a combination that *does* work), so I've got no choice but to go back to the old gcc flags and linker script. Signed-off-by: Grant Likely [EMAIL PROTECTED] Kim Hello Kim, Thanks for looking at this problem so quickly. I'll try reverting the patch as soon as I'm done writing this email and post the results here. I spent this afternoon trying to narrow down the problem exhibited by the changes in my earlier email. I managed to narrow it down to the .data section's start address being a multiple of 32 bytes, and the bcsr code in checkboard(). I have attached a patch which causes my board to hang on boot in exactly the same way that the earlier patch does. Removing the line from the linker script makes the board boot perfectly, as long as the .data section's start address is not on a 32 byte boundary by coincidence. Ira diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c index 9a312c3..f4792a9 100644 --- a/board/freescale/mpc8349emds/mpc8349emds.c +++ b/board/freescale/mpc8349emds/mpc8349emds.c @@ -165,6 +165,13 @@ int fixed_sdram(void) int checkboard (void) { + volatile immap_t *immr = (immap_t *)CFG_IMMR; + volatile u8 *bcsr = (u8 *)CFG_BCSR; + int in_pci_slot; + + /* in a pci slot or standalone */ + in_pci_slot = (bcsr[10] 0x80) ? 1 : 0; + puts(Board: Freescale MPC8349EMDS\n); return 0; } diff --git a/cpu/mpc83xx/u-boot.lds b/cpu/mpc83xx/u-boot.lds index 99ad675..f605eab 100644 --- a/cpu/mpc83xx/u-boot.lds +++ b/cpu/mpc83xx/u-boot.lds @@ -79,6 +79,7 @@ SECTIONS __got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) 2; __fixup_entries = (. - _FIXUP_TABLE_) 2; + . = ALIGN(32); .data: { *(.data) - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] Freescale MPC8349EMDS hang on boot
On Thu, Jul 17, 2008 at 04:54:53PM -0500, Kim Phillips wrote: On Wed, 16 Jul 2008 15:28:21 -0700 Ira Snyder [EMAIL PROTECTED] wrote: During the development, I noticed that adding and removing certain pieces of debugging code (which did not change any program state) caused the board to hang on boot, like so: U-Boot 1.3.4-rc1-1-gb89881c-dirty (Jul 16 2008 - 14:54:56) MPC83XX Reset Status: External/Internal Soft, External/Internal Hard CPU: e300c1, MPC8349EA, Rev: 3.0 at 528 MHz, CSB: 264 MHz Board: Freescale MPC8349EMDS I2C: try reverting this commit: commit 1c3dd43338a077165e7e0309cb3994e65d2bdbf8 Author: Grant Likely [EMAIL PROTECTED] Date: Tue Nov 13 22:18:33 2007 -0700 powerpc: Backout relocation changes. Ugh. I *hate* to back this change out, but these compiler flags don't work for relocation on all versions of GCC. I've not been able to reproduce the environment in my setup (and hence, not been able to find a combination that *does* work), so I've got no choice but to go back to the old gcc flags and linker script. Signed-off-by: Grant Likely [EMAIL PROTECTED] Kim Ok, I have tried reverting this commit. With the patch from my previous email that aligns the .data section start address to a multiple of 32 bytes, the board still hangs on boot. I removed the . = ALIGN(32); from the mpc83xx linker script, and (by coincidence the .data section start address was still aligned to 32 bytes (the board still hung on boot). I added . = . + 4; in the same place as the ALIGN so I did not have to make any code changes. This moved the start address of .data off of the 32 byte boundary. The board booted up fine in this case. So the revert didn't seem to help. The board still breaks when .data starts on a 32 byte boundary. I hope this helps narrow down the problem. Thanks again for the help, Ira - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport
From: Jean-Christophe PLAGNIOL-VILLARD Subject: Re: [U-Boot-Users] [PATCH] (Resubmit) ADD ARM AMBA PL031 RTCSupport Hi, Hello First your patch is line wrapped by your mailler. That's why i had also attached the respective patch file. that i generated using git-diff command. Secondly please be care ful of the 80 chars limits and the whitespace. Regarding the white space, i am little confused abt this as i couldn't find it in my patch. can u please let me know where it exists. Are you going to add a board which will use it? Right now i am using it on arm Versatile board. Should i send a patch to that also Regards Gururaja - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
[U-Boot-Users] eth interface (motfec) is not woring with u-boot 1.1.3
Hi, I am using Denx u-boot 1.1.3 for MPC 870 board. I ported it for our board with mpc870 processor and I got the u-boot (-) prompt. UART interface is working finr but Ethernet interface (motfec) is not up yet. When I try from the u-boot prompt, I am getting following message. -- TX timeout TX timeout ping failed; host 10.10.10.4 is not alive -- Following board specific parameters are defined in the /include/configs/tc870.h file #defineCONFIG_NET_MULTI1 /* the only way to get the FEC in */ #defineFEC_ENET1/* eth.c needs it that way... */ #define CONFIG_FEC_ENET 1 #undef CFG_DISCOVER_PHY #define CONFIG_MII1 #define CONFIG_RMII1 /* use RMII interface */ #define CONFIG_BAUDRATE9600/* console baudrate = 115kbps*/ #define CONFIG_ETHADDROO:11:22:33:44:55/* board MAC addr*/ #define CONFIG_IPADDR10:10:10:2 /* board IP addr */ /*set allowable console baud rates*/ #define CFG_BAUDRATE_TABLE{ 9600, 19200, 38400, 57600, 115200 } #define CONFIG_OVERWRITE_ETHADDR_ONCE 1 #define CONFIG_XIN 1000 /*#define CONFIG_XIN 5000*/ /*#define MPC8XX_HZ */ #define MPC8XX_HZ 5000 #define CONFIG_8xx_GCLK_FREQMPC8XX_HZ /*#define CONFIG_8xx_CPUCLK_DEFAULT5000*/ #if 0 #define CONFIG_8xx_OSCLK5000/* 50 MHz - PLL input clock*/ #define CFG_8xx_CPUCLK_MIN1500/* 50 MHz - CPU minimum clock */ #define CFG_8xx_CPUCLK_MAX 7500/* 75 MHz - CPU maximum clock */ #endif Any suggestion what is going wrong here If any thing is missing please let me know Thanks Vijay Unlimited freedom, unlimited storage. Get it now, on http://help.yahoo.com/l/in/yahoo/mail/yahoomail/tools/tools-08.html/- This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
Re: [U-Boot-Users] HELP, trying to remove complier warnings
On Jul 10, 2008, at 1:43 PM, Scott Wood wrote: Wolfgang Denk wrote: In message [EMAIL PROTECTED] you wrote: Try adding -fno-strict-aliasing No, we don't want to hush up compiler warnings, we want to fix the problems instead. It's not silencing a warning (if it were, it'd be a -W flag); it's disabling an incompatible optimization. Did we come to any resolution on this? I'm with Scott in that trying to re-write the code isn't worth the pain and its reasonable to disable the optimization until someone is willing to update to a newer dlmalloc which might not have the issue. - k - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users