July 2008 - U-Boot

[U-Boot-Users] [PATCH] Cleanup: replace hard-wired $(AR) 'crv' settings by $(ARFLAGS)
by Wolfgang Denk 06 Jul '08

06 Jul '08

Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/MigoR/Makefile | 2 +- board/freescale/m5275evb/Makefile | 2 +- board/linkstation/Makefile | 2 +- board/lpc2292sodimm/Makefile | 2 +- board/m501sk/Makefile | 2 +- board/mpr2/Makefile | 2 +- board/ms7720se/Makefile | 2 +- board/ms7722se/Makefile | 2 +- board/ms7750se/Makefile | 2 +- board/r2dplus/Makefile | 2 +- board/r7780mp/Makefile | 2 +- board/sh7763rdp/Makefile | 2 +- board/siemens/SMN42/Makefile | 2 +- cpu/sh3/Makefile | 2 +- cpu/sh4/Makefile | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/board/MigoR/Makefile b/board/MigoR/Makefile index 5a9d651..f1e2856 100644 --- a/board/MigoR/Makefile +++ b/board/MigoR/Makefile @@ -30,7 +30,7 @@ OBJS := migo_r.o SOBJS := lowlevel_init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/freescale/m5275evb/Makefile b/board/freescale/m5275evb/Makefile index 9a0fa80..5d09afe 100644 --- a/board/freescale/m5275evb/Makefile +++ b/board/freescale/m5275evb/Makefile @@ -28,7 +28,7 @@ LIB = lib$(BOARD).a OBJS = $(BOARD).o mii.o $(LIB): .depend $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### diff --git a/board/linkstation/Makefile b/board/linkstation/Makefile index 8d92d8a..8f4da0c 100644 --- a/board/linkstation/Makefile +++ b/board/linkstation/Makefile @@ -31,7 +31,7 @@ SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(OBJS)) $(LIB): $(obj).depend $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### diff --git a/board/lpc2292sodimm/Makefile b/board/lpc2292sodimm/Makefile index 18a95d7..4eeb032 100644 --- a/board/lpc2292sodimm/Makefile +++ b/board/lpc2292sodimm/Makefile @@ -33,7 +33,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJTS)) $(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/m501sk/Makefile b/board/m501sk/Makefile index b403095..0fd7452 100644 --- a/board/m501sk/Makefile +++ b/board/m501sk/Makefile @@ -34,7 +34,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJS)) $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/mpr2/Makefile b/board/mpr2/Makefile index 17ca17e..a10ec77 100644 --- a/board/mpr2/Makefile +++ b/board/mpr2/Makefile @@ -36,7 +36,7 @@ OBJS := mpr2.o SOBJS := lowlevel_init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/ms7720se/Makefile b/board/ms7720se/Makefile index d1af937..236959c 100644 --- a/board/ms7720se/Makefile +++ b/board/ms7720se/Makefile @@ -33,7 +33,7 @@ OBJS := ms7720se.o SOBJS := lowlevel_init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/ms7722se/Makefile b/board/ms7722se/Makefile index 6dec013..b384687 100644 --- a/board/ms7722se/Makefile +++ b/board/ms7722se/Makefile @@ -30,7 +30,7 @@ OBJS := ms7722se.o SOBJS := lowlevel_init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/ms7750se/Makefile b/board/ms7750se/Makefile index f81d56c..f02ad0a 100644 --- a/board/ms7750se/Makefile +++ b/board/ms7750se/Makefile @@ -25,7 +25,7 @@ OBJS := ms7750se.o SOBJS := lowlevel_init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/r2dplus/Makefile b/board/r2dplus/Makefile index ed609ea..2909d46 100644 --- a/board/r2dplus/Makefile +++ b/board/r2dplus/Makefile @@ -25,7 +25,7 @@ OBJS := r2dplus.o SOBJS := lowlevel_init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/r7780mp/Makefile b/board/r7780mp/Makefile index 554dca1..f0f1c97 100644 --- a/board/r7780mp/Makefile +++ b/board/r7780mp/Makefile @@ -26,7 +26,7 @@ OBJS := r7780mp.o SOBJS := lowlevel_init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/sh7763rdp/Makefile b/board/sh7763rdp/Makefile index 9e63ea7..eef25d9 100644 --- a/board/sh7763rdp/Makefile +++ b/board/sh7763rdp/Makefile @@ -29,7 +29,7 @@ OBJS := sh7763rdp.o SOBJS := lowlevel_init.o $(LIB): $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/board/siemens/SMN42/Makefile b/board/siemens/SMN42/Makefile index 2c7b54b..4e75b6f 100644 --- a/board/siemens/SMN42/Makefile +++ b/board/siemens/SMN42/Makefile @@ -33,7 +33,7 @@ OBJS := $(addprefix $(obj),$(COBJS)) SOBJS := $(addprefix $(obj),$(SOBJTS)) $(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(AR) crv $@ $(OBJS) $(SOBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS) clean: rm -f $(SOBJS) $(OBJS) diff --git a/cpu/sh3/Makefile b/cpu/sh3/Makefile index 7679248..1fdeb3c 100644 --- a/cpu/sh3/Makefile +++ b/cpu/sh3/Makefile @@ -37,7 +37,7 @@ OBJS = cpu.o interrupts.o watchdog.o time.o cache.o all: .depend $(START) $(LIB) $(LIB): $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### diff --git a/cpu/sh4/Makefile b/cpu/sh4/Makefile index 1bb8bd7..aaaaf1f 100644 --- a/cpu/sh4/Makefile +++ b/cpu/sh4/Makefile @@ -34,7 +34,7 @@ OBJS = cpu.o interrupts.o watchdog.o time.o cache.o all: .depend $(START) $(LIB) $(LIB): $(OBJS) - $(AR) crv $@ $(OBJS) + $(AR) $(ARFLAGS) $@ $(OBJS) ######################################################################### -- 1.5.5.1

1 11

[U-Boot-Users] [PATCH] mpc8260: add fdt_fixup_ethernet support
by Esben Haabendal 06 Jul '08

06 Jul '08

Add support for updating mac-address and local-mac-address in fdt for all MPC8260 targets. Signed-off-by: Esben Haabendal <eha(a)doredevelopment.dk> --- cpu/mpc8260/cpu.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/cpu/mpc8260/cpu.c b/cpu/mpc8260/cpu.c index 414759e..4d5d141 100644 --- a/cpu/mpc8260/cpu.c +++ b/cpu/mpc8260/cpu.c @@ -305,6 +305,11 @@ void ft_cpu_setup (void *blob, bd_t *bd) { char * cpu_path = "/cpus/" OF_CPU; +#if defined(CONFIG_HAS_ETH0) || defined(CONFIG_HAS_ETH1) ||\ + defined(CONFIG_HAS_ETH2) || defined(CONFIG_HAS_ETH3) + fdt_fixup_ethernet(blob, bd); +#endif + do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1); do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1); do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);

2 1

[U-Boot-Users] [PATCH] Add another logo for RRvision.
by Gary Jennejohn 06 Jul '08

06 Jul '08

I wasn't sure how big this and the other logo would be, so I split up the commits. Signed-off-by: Gary Jennejohn <garyj(a)denx.de> --- tools/logos/linux_logo_ttcontrol_palfin.bmp | Bin 0 -> 20534 bytes 1 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tools/logos/linux_logo_ttcontrol_palfin.bmp diff --git a/tools/logos/linux_logo_ttcontrol_palfin.bmp b/tools/logos/linux_logo_ttcontrol_palfin.bmp new file mode 100644 index 0000000000000000000000000000000000000000..e3e38d1bf6423c7373b6e41530c24ec4d8f6da0c GIT binary patch literal 20534 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 D6B4ho literal 0 HcmV?d00001 -- 1.5.4.3 --- Gary Jennejohn ********************************************************************* 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: office(a)denx.de *********************************************************************

2 1

[U-Boot-Users] [PATCH] Add a logo for RRvision.
by Gary Jennejohn 06 Jul '08

06 Jul '08

I wasn't sure how big this and the other logo would be, so I split up the commits. Signed-off-by: Gary Jennejohn <garyj(a)denx.de> --- tools/logos/linux_logo_ttcontrol.bmp | Bin 0 -> 11830 bytes 1 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 tools/logos/linux_logo_ttcontrol.bmp diff --git a/tools/logos/linux_logo_ttcontrol.bmp b/tools/logos/linux_logo_ttcontrol.bmp new file mode 100644 index 0000000000000000000000000000000000000000..031d3a41ecd3c2d1a732af0a3c53b430545f61e8 GIT binary patch literal 11830 zcmeI0J#s8X5QKLZ8C-xX5I_V3){7UI_!u05`x_XzboI}dSv@to(n>^NXi)4_XJuwp z_4Lk@`2CMBzg+tD<>hkuA)@Q$@>9Qk+wrrHzrOx@`TMu;E`R>~{pFt@&sd-M=MH@C zz~>GWJ8-?d%<I-(In}ioC+SMEVb^|b;K}ltYHNa*_VTog$zIM{ze+hGQ_nCnEWZ-B z0`or9MMsy+DRLm&1K}4Eh7pq7Ou@ZJRF}i_jlVH*AV7XZE>)M%S`b>+7%3n}K<<c; zGS9R5H+)F3%z^o;S*J__kO{!pMvw>s<v1M9Wc4_B9{5-_LOi#Fj;NYn$t}XR9)Eqw zP>F9RYJ%#l(*vz^ftTYqa^!5=*x7;iPm>yIrHc7!;}|TDV`d_qz-ZnPlIg*E1c3rg z%DRE?!61MxzTZjaL1}S27fmWf5p5NZj7|WyPIip-2!aV@GKa|%bYfm*tvvJmXXoO6 zxmGDxeCgY#&76d)Be41HW<7%N1?olk06tdh2aG%l3rObqRcpg7!7JbAi|*yQ#Kwr) z5UNHF^FzYLzc(^lUwFMJ2ST;Od$T#?$@_AYL$pR%T_|Ch3~IGRHgc#Sct?O+12*hN z*@)^VpI%nxbkf*ESgo_$U6Z!4YEy*9XW<=fD!SHKDy}|lGYzCb7jMqSYavOi(_lGx zkEe9w8^<f9IxLK_WBb~BHJJt|!I-LW5|?D2U!sgd_oEwbmLOCW|3})%#@JQ++GSR} zIw$`4TxQh>DU;{aJPEI>g_#b_35P<hd1BfygL&Wz4$gKaE3CP?n%K6D!qzuf1c=i7 zHQI%w=qM>|gUsAZVlY6K)-{-PC)Hp^6D%ZCL^8Kq!!_E?*hqqG=#6?zCwLE};%t;4 zR<s>1WTQrWlFaRD3Oj5fJ1DOa;g}N+d%RdXwyztnfJ$tmR<c!9`aFM)<79^trxie2 zz_>f?@nV5ZZ`O-o^IQ3X76OMomf4I*zG?pd;Q4dnrZ<hL<?65(v=BJFJIk;|^2{?~ z;QIoYxyewaU70(=$0>lruIhTD1Q95=1l%YZaX9BsnBI%|`k#O&+-#_p5{|Z^Wk*g3 z<-T@Ey_Qy+xNwRB<02`~NXXYV_Jli~)(w^^&pNvEO~z*Vnuq<l0?n+98Dc1MQbaP( zFOlJ#NyFr{qS_HOXe`VK?ED3&`qCj2<ONc-v_+9=m-IO+eDE^auwz(Bb)JGRhPnou z$A+~P0Bga5g)PK>o9ryMEgi_kMxV356lwy%yjRO=-eFb8wA+bsK1bEH>!vw0{)dG3 zIc7q(HQJXXeb9Xi50h0+V6t4ELIz3e*|yFHI|2t^?LWC3Os2rCnw%8v<e9OC#MNdC zt0H+GqCr2v2HfoBYj6l{sn9wVIHRrFSmsY@UV)#Ho0L?GwNIck*k5jYzODTqA4^Af zrEiUPWoX)k%UI@5d1f5ZI>V7J!J#7+OPK=qV7+59npdfeQej&@>c`b23zPlICCJur zjW*F%LrW=IwA|UBBQLfnY1SgND@NadcBFi{DDA$gArnGMp2m-?Jl8`Dv~myJ5`F0a z8Z%nhk(bRDuiZUyvwA6E{G!@h=C=xSqJFai4j1ghqjf$uzR>}8(m}d1CR4@XOKJuu z)f{dor~OEHy|#7y7e9tiG{DrEdCA1K-7M@^fv&pVZtdqb$U17vF;YVNYEZkVX@j_W zSt9k|f3!pvtFH6WOtXdF{Fc&kmR_AiVs-QWJ6-#hK4(kEL(cL};4?Yx(Y`#_V5L$A zRrXC70}Pd%NgM;VKc^m?o;S7ifK1^ByvOO?iS?b}n>u&$>)9mFFWBRbUc;b)*O2dW zaQc83Kr4jZ9=!jX>SN&U;8QVYc{Ygio#1TBXy8Qlp-=z#+J0*EA)?{2WIw=<!5L>W zG~qk?E2Vl(mFc&DbU8$FCUFREC!|$&7ku!;k1~{4HJ`qJoRhbJ>;4Oelm2({zYT*^ A?f?J) literal 0 HcmV?d00001 -- 1.5.4.3 --- Gary Jennejohn ********************************************************************* 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: office(a)denx.de *********************************************************************

2 1

[U-Boot-Users] [PATCH] fdt: Fix typo in variable name.
by Detlev Zundel 06 Jul '08

06 Jul '08

Signed-off-by: Detlev Zundel <dzu(a)denx.de> --- common/fdt_support.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/fdt_support.c b/common/fdt_support.c index e58b294..3828228 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -63,7 +63,7 @@ int fdt_find_and_setprop(void *fdt, const char *node, const char *prop, } #ifdef CONFIG_OF_STDOUT_VIA_ALIAS -static int fdt_fixup_stdout(void *fdt, int choosenoff) +static int fdt_fixup_stdout(void *fdt, int chosenoff) { int err = 0; #ifdef CONFIG_CONS_INDEX @@ -82,7 +82,7 @@ static int fdt_fixup_stdout(void *fdt, int choosenoff) err = -FDT_ERR_NOSPACE; if (p) { memcpy(p, path, len); - err = fdt_setprop(fdt, choosenoff, + err = fdt_setprop(fdt, chosenoff, "linux,stdout-path", p, len); free(p); } -- 1.5.4.2

3 4

[U-Boot-Users] [PATCH] i.MX31: fixed CTRL-C detection
by Juergen Kilb 06 Jul '08

06 Jul '08

The Register URXD contains status information in bits [15..8]. With status bit 15 set, CTRL-C was reported as 0x8003 instead of 0x03. Therefore CTRL-C was not detected. To solve this, bits [15..8] were masked out now. Signed-off-by: Juergen Kilb <J.Kilb(a)gmx.de> --- cpu/arm1136/mx31/serial.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/cpu/arm1136/mx31/serial.c b/cpu/arm1136/mx31/serial.c index 1cad8f9..f498599 100644 --- a/cpu/arm1136/mx31/serial.c +++ b/cpu/arm1136/mx31/serial.c @@ -63,6 +63,7 @@ #define URXD_FRMERR (1<<12) #define URXD_BRK (1<<11) #define URXD_PRERR (1<<10) +#define URXD_RX_DATA (0xFF) #define UCR1_ADEN (1<<15) /* Auto dectect interrupt */ #define UCR1_ADBR (1<<14) /* Auto detect baud rate */ #define UCR1_TRDYEN (1<<13) /* Transmitter ready interrupt enable */ @@ -165,7 +166,7 @@ void serial_setbrg (void) int serial_getc (void) { while (__REG(UART_PHYS + UTS) & UTS_RXEMPTY); - return __REG(UART_PHYS + URXD); + return (__REG(UART_PHYS + URXD) & URXD_RX_DATA); /* mask out status from upper word */ } void serial_putc (const char c) -- 1.5.5.1

3 2

[U-Boot-Users] [PATCH] Some copy-n-paste fixes in printf usage
by Matvejchikov Ilya 06 Jul '08

06 Jul '08

>From 9bdd14533d7c6f0af336b59a2a026093be84eff9 Mon Sep 17 00:00:00 2001 From: Matvejchikov Ilya <ilya(a)westend.(none)> Date: Sat, 7 Jun 2008 17:01:42 +0400 Subject: [PATCH] Some copy-n-paste fixes in printf usage Signed-off-by: Matvejchikov Ilya <ilya(a)westend.(none)> --- board/cm5200/cm5200.c | 2 +- board/ids8247/ids8247.c | 2 +- board/mgcoge/mgcoge.c | 6 +++--- board/mgsuvd/mgsuvd.c | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/board/cm5200/cm5200.c b/board/cm5200/cm5200.c index 79fb71d..9548619 100644 --- a/board/cm5200/cm5200.c +++ b/board/cm5200/cm5200.c @@ -275,7 +275,7 @@ static void ft_blob_update(void *blob, bd_t *bd) ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); if (ret < 0) { - printf("ft_blob_update): cannot set /memory/reg " + printf("ft_blob_update(): cannot set /memory/reg " "property err:%s\n", fdt_strerror(ret)); } } diff --git a/board/ids8247/ids8247.c b/board/ids8247/ids8247.c index 7176770..c4eddfa 100644 --- a/board/ids8247/ids8247.c +++ b/board/ids8247/ids8247.c @@ -334,7 +334,7 @@ void ft_blob_update(void *blob, bd_t *bd) ret = fdt_fixup_memory(blob, (u64)bd->bi_memstart, (u64)bd->bi_memsize); if (ret < 0) { - printf("ft_blob_update): cannot set /memory/reg " + printf("ft_blob_update(): cannot set /memory/reg " "property err:%s\n", fdt_strerror(ret)); } } diff --git a/board/mgcoge/mgcoge.c b/board/mgcoge/mgcoge.c index e7c3fa0..4945a99 100644 --- a/board/mgcoge/mgcoge.c +++ b/board/mgcoge/mgcoge.c @@ -307,7 +307,7 @@ void ft_blob_update(void *blob, bd_t *bd) ret = fdt_setprop(blob, nodeoffset, "reg", memory_data, sizeof(memory_data)); if (ret < 0) - printf("ft_blob_update): cannot set /memory/reg " + printf("ft_blob_update(): cannot set /memory/reg " "property err:%s\n", fdt_strerror(ret)); } else { @@ -327,7 +327,7 @@ void ft_blob_update(void *blob, bd_t *bd) ret = fdt_setprop(blob, nodeoffset, "ranges", flash_data, sizeof(flash_data)); if (ret < 0) - printf("ft_blob_update): cannot set /localbus/ranges " + printf("ft_blob_update(): cannot set /localbus/ranges " "property err:%s\n", fdt_strerror(ret)); } else { @@ -341,7 +341,7 @@ void ft_blob_update(void *blob, bd_t *bd) ret = fdt_setprop(blob, nodeoffset, "mac-address", bd->bi_enetaddr, sizeof(uchar) * 6); if (ret < 0) - printf("ft_blob_update): cannot set /soc/cpm/ethernet/mac-address " + printf("ft_blob_update(): cannot set /soc/cpm/ethernet/mac-address " "property err:%s\n", fdt_strerror(ret)); } else { diff --git a/board/mgsuvd/mgsuvd.c b/board/mgsuvd/mgsuvd.c index e0123bf..944a5f8 100644 --- a/board/mgsuvd/mgsuvd.c +++ b/board/mgsuvd/mgsuvd.c @@ -164,7 +164,7 @@ void ft_blob_update(void *blob, bd_t *bd) ret = fdt_setprop(blob, nodeoffset, "reg", memory_data, sizeof(memory_data)); if (ret < 0) - printf("ft_blob_update): cannot set /memory/reg " + printf("ft_blob_update(): cannot set /memory/reg " "property err:%s\n", fdt_strerror(ret)); } else { @@ -180,7 +180,7 @@ void ft_blob_update(void *blob, bd_t *bd) ret = fdt_setprop(blob, nodeoffset, "ranges", flash_data, sizeof(flash_data)); if (ret < 0) - printf("ft_blob_update): cannot set /localbus/ranges " + printf("ft_blob_update(): cannot set /localbus/ranges " "property err:%s\n", fdt_strerror(ret)); } else { @@ -195,7 +195,7 @@ void ft_blob_update(void *blob, bd_t *bd) ret = fdt_setprop(blob, nodeoffset, "brg-frequency", brg_data, sizeof(brg_data)); if (ret < 0) - printf("ft_blob_update): cannot set /soc/cpm/brg-frequency " + printf("ft_blob_update(): cannot set /soc/cpm/brg-frequency " "property err:%s\n", fdt_strerror(ret)); } else { @@ -209,7 +209,7 @@ void ft_blob_update(void *blob, bd_t *bd) ret = fdt_setprop(blob, nodeoffset, "mac-address", bd->bi_enetaddr, sizeof(uchar) * 6); if (ret < 0) - printf("ft_blob_update): cannot set /soc/cpm/scc/mac-address " + printf("ft_blob_update(): cannot set /soc/cpm/scc/mac-address " "property err:%s\n", fdt_strerror(ret)); } else { -- 1.5.3.7

2 1

[U-Boot-Users] i.MX31: Cleanup comments in lowlevel_init.S.
by Magnus Lilja 06 Jul '08

06 Jul '08

Signed-off-by: Magnus Lilja <lilja.magnus(a)gmail.com> --- board/imx31_litekit/lowlevel_init.S | 4 ++-- board/imx31_phycore/lowlevel_init.S | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/board/imx31_litekit/lowlevel_init.S b/board/imx31_litekit/lowlevel_init.S index 9d96db8..0003a42 100644 --- a/board/imx31_litekit/lowlevel_init.S +++ b/board/imx31_litekit/lowlevel_init.S @@ -62,9 +62,9 @@ lowlevel_init: REG 0x43FAC26C, 0 /* SDCLK */ REG 0x43FAC270, 0 /* CAS */ REG 0x43FAC274, 0 /* RAS */ - REG 0x43FAC27C, 0x1000 /* CS2 CSD0) */ + REG 0x43FAC27C, 0x1000 /* CS2 (CSD0) */ REG 0x43FAC284, 0 /* DQM3 */ - REG 0x43FAC288, 0 /* DQM2, DQM1, DQM0, SD31-SD0, A25-A0, MA10 0x288..0x2DC) */ + REG 0x43FAC288, 0 /* DQM2, DQM1, DQM0, SD31-SD0, A25-A0, MA10 (0x288..0x2DC) */ REG 0x43FAC28C, 0 REG 0x43FAC290, 0 REG 0x43FAC294, 0 diff --git a/board/imx31_phycore/lowlevel_init.S b/board/imx31_phycore/lowlevel_init.S index 70f30c0..c5d6eb0 100644 --- a/board/imx31_phycore/lowlevel_init.S +++ b/board/imx31_phycore/lowlevel_init.S @@ -63,9 +63,9 @@ lowlevel_init: REG 0x43FAC26C, 0 /* SDCLK */ REG 0x43FAC270, 0 /* CAS */ REG 0x43FAC274, 0 /* RAS */ - REG 0x43FAC27C, 0x1000 /* CS2 CSD0) */ + REG 0x43FAC27C, 0x1000 /* CS2 (CSD0) */ REG 0x43FAC284, 0 /* DQM3 */ - REG 0x43FAC288, 0 /* DQM2, DQM1, DQM0, SD31-SD0, A25-A0, MA10 0x288..0x2DC) */ + REG 0x43FAC288, 0 /* DQM2, DQM1, DQM0, SD31-SD0, A25-A0, MA10 (0x288..0x2DC) */ REG 0x43FAC28C, 0 REG 0x43FAC290, 0 REG 0x43FAC294, 0

2 1

[U-Boot-Users] [PATCH v2] Move conditional compilation of MPC8XXX SPI driver to Makefile
by Ben Warren 06 Jul '08

06 Jul '08

Signed-off-by: Ben Warren <biggerbadderben(a)gmail.com> --- board/freescale/mpc8349emds/mpc8349emds.c | 2 +- drivers/spi/Makefile | 2 +- drivers/spi/mpc8xxx_spi.c | 2 -- include/configs/MPC8349EMDS.h | 1 - include/spi.h | 9 +++++++++ lib_ppc/board.c | 2 -- 6 files changed, 11 insertions(+), 7 deletions(-) diff --git a/board/freescale/mpc8349emds/mpc8349emds.c b/board/freescale/mpc8349emds/mpc8349emds.c index e18e68e..0acc17e 100644 --- a/board/freescale/mpc8349emds/mpc8349emds.c +++ b/board/freescale/mpc8349emds/mpc8349emds.c @@ -253,7 +253,7 @@ void sdram_init(void) /* * The following are used to control the SPI chip selects for the SPI command. */ -#ifdef CONFIG_HARD_SPI +#ifdef CONFIG_MPC8XXX_SPI #define SPI_CS_MASK 0x80000000 diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index e66e0ee..4f7b679 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libspi.a -COBJS-y += mpc8xxx_spi.o +COBJS-$(CONFIG_MPC8XXX_SPI) += mpc8xxx_spi.o COBJS-$(CONFIG_ATMEL_SPI) += atmel_spi.o COBJS-$(CONFIG_MXC_SPI) += mxc_spi.o diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 136fb50..9eaf986 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -22,7 +22,6 @@ */ #include <common.h> -#if defined(CONFIG_MPC8XXX_SPI) && defined(CONFIG_HARD_SPI) #include <malloc.h> #include <spi.h> @@ -180,4 +179,3 @@ int spi_xfer(struct spi_slave *slave, unsigned int bitlen, const void *dout, return 0; } -#endif /* CONFIG_HARD_SPI */ diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h index bd77540..af72538 100644 --- a/include/configs/MPC8349EMDS.h +++ b/include/configs/MPC8349EMDS.h @@ -355,7 +355,6 @@ /* SPI */ #define CONFIG_MPC8XXX_SPI -#define CONFIG_HARD_SPI /* SPI with hardware support */ #undef CONFIG_SOFT_SPI /* SPI bit-banged */ /* GPIOs. Used as SPI chip selects */ diff --git a/include/spi.h b/include/spi.h index 7744c2e..320e50e 100644 --- a/include/spi.h +++ b/include/spi.h @@ -24,6 +24,15 @@ #ifndef _SPI_H_ #define _SPI_H_ +/* Controller-specific definitions: */ + +/* CONFIG_HARD_SPI triggers SPI bus initialization in PowerPC */ +#ifdef CONFIG_MPC8XXX_SPI +# ifndef CONFIG_HARD_SPI +# define CONFIG_HARD_SPI +# endif +#endif + /* SPI mode flags */ #define SPI_CPHA 0x01 /* clock phase */ #define SPI_CPOL 0x02 /* clock polarity */ diff --git a/lib_ppc/board.c b/lib_ppc/board.c index a908831..afa0c74 100644 --- a/lib_ppc/board.c +++ b/lib_ppc/board.c @@ -90,9 +90,7 @@ void doc_init (void); defined(CONFIG_SOFT_I2C) #include <i2c.h> #endif -#if defined(CONFIG_HARD_SPI) #include <spi.h> -#endif #include <nand.h> static char *failed = "*** failed ***\n"; -- 1.5.4.3

3 2

[U-Boot-Users] [PATCH] ppc: Add u64 versions of fls64 and __ilog bitops
by Kumar Gala 06 Jul '08

06 Jul '08

Signed-off-by: Kumar Gala <galak(a)kernel.crashing.org> --- include/asm-ppc/bitops.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 58 insertions(+), 0 deletions(-) diff --git a/include/asm-ppc/bitops.h b/include/asm-ppc/bitops.h index 4e9c608..ea73027 100644 --- a/include/asm-ppc/bitops.h +++ b/include/asm-ppc/bitops.h @@ -167,6 +167,64 @@ extern __inline__ int ffz(unsigned int x) return __ilog2(x & -x); } +/* + * fls: find last (most-significant) bit set. + * Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32. + */ +static __inline__ int fls(unsigned int x) +{ + int lz; + + asm ("cntlzw %0,%1" : "=r" (lz) : "r" (x)); + return 32 - lz; +} + +static __inline__ unsigned long __fls(unsigned long x) +{ + return __ilog2(x); +} + +/** + * fls64 - find last set bit in a 64-bit word + * @x: the word to search + * + * This is defined in a similar way as the libc and compiler builtin + * ffsll, but returns the position of the most significant set bit. + * + * fls64(value) returns 0 if value is 0 or the position of the last + * set bit if value is nonzero. The last (most significant) bit is + * at position 64. + */ +#if BITS_PER_LONG == 32 +static inline int fls64(__u64 x) +{ + __u32 h = x >> 32; + if (h) + return fls(h) + 32; + return fls(x); +} +#elif BITS_PER_LONG == 64 +static inline int fls64(__u64 x) +{ + if (x == 0) + return 0; + return __fls(x) + 1; +} +#else +#error BITS_PER_LONG not 32 or 64 +#endif + +static inline +int __ilog2_u64(u64 n) +{ + return fls64(n) - 1; +} + +static inline int ffs64(u64 x) +{ + return __ilog2_u64(x & -x) + 1ull; +} + #ifdef __KERNEL__ /* -- 1.5.5.1

3 14