Patch series derived from latest project

Patch series derived from latest project

[Wolfram Sang]

Hi,

Here are the patches (mainly) Uwe and I made during the last project.
I hope one series touching different "subsystems" is okay.

Please review.

Thanks,

   Wolfram (and Uwe)


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 6/7] wip: fix possible error on overflow in is_timeout

[Uwe Kleine-König]

Hello,

On Mon, Apr 19, 2010 at 10:28:17AM +0200, Wolfram Sang wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
I didn't signed-off that one, because I wanted to think about it.  Marc
thought it to be OK.

Now I think it is.  Can you please add my S-o-b and remove "wip:" from
the subject?

Thanks
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 6/7] clock: fix possible error on overflow in is_timeout

[Sascha Hauer]

On Tue, Apr 20, 2010 at 05:39:12AM +0200, Wolfram Sang wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
>  common/clock.c |    3 +--
>  1 files changed, 1 insertions(+), 2 deletions(-)

applied to master.

> 
> diff --git a/common/clock.c b/common/clock.c
> index 8eeb917..15df0ab 100644
> --- a/common/clock.c
> +++ b/common/clock.c
> @@ -84,8 +84,7 @@ uint32_t clocksource_hz2mult(uint32_t hz, uint32_t shift_constant)
>  
>  int is_timeout(uint64_t start_ns, uint64_t time_offset_ns)
>  {
> -
> -	if (start_ns + time_offset_ns < get_time_ns())
> +	if ((int64_t)(start_ns + time_offset_ns - get_time_ns()) < 0)
>  		return 1;
>  	else
>  		return 0;
> -- 
> 1.7.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/7] give nice output when generating barebox.bin and barebox.S

[Sascha Hauer]

On Mon, Apr 19, 2010 at 10:28:12AM +0200, Wolfram Sang wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> As a side effect don't build barebox.S when barebox.bin is updated.  I
> didn't manage to keep the old behaviour and I consider it cleaner this
> way.

I don't understand this completely. We only need barebox.S updated when
barebox is updated, not when barebox.bin is updated. Is this what you
mean?

Sascha

> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
> 
> Passing it through, ask Uwe for details if needed.
> 
>  Makefile |   17 ++++++++++++++---
>  1 files changed, 14 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile b/Makefile
> index c92c5dd..5b4f964 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -641,9 +641,16 @@ define rule_barebox-modpost
>  	$(Q)echo 'cmd_$@ := $(cmd_barebox-modpost)' > $(dot-target).cmd
>  endef
>  
> -barebox.bin: barebox
> -	$(Q)$(OBJCOPY) -O binary barebox barebox.bin
> +quiet_cmd_objcopy = OBJCOPY $@
> +      cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
> +
> +OBJCOPYFLAGS_barebox.bin = -O binary
> +
> +barebox.bin: barebox FORCE
> +	$(call if_changed,objcopy)
> +
>  ifdef CONFIG_X86
> +barebox.S: barebox
>  ifdef CONFIG_X86_HDBOOT
>  	@echo "-------------------------------------------------" > barebox.S
>  	@echo " * MBR content" >> barebox.S
> @@ -665,7 +672,11 @@ endif
>  	@echo " * Init Calls content" >> barebox.S
>  	$(Q)$(OBJDUMP) -j .barebox_initcalls -d barebox >> barebox.S
>  else
> -	$(Q)$(OBJDUMP) -d barebox > barebox.S
> +quiet_cmd_disasm = DISASM  $@
> +      cmd_disasm = $(OBJDUMP) -d $< > $@
> +
> +barebox.S: barebox FORCE
> +	$(call if_changed,disasm)
>  endif
>  
>  # barebox image
> -- 
> 1.7.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/7] give nice output when generating barebox.bin and barebox.S

[Wolfram Sang]

[-- Attachment #1.1: Type: text/plain, Size: 2746 bytes --]

On Thu, Apr 22, 2010 at 01:10:01PM +0200, Sascha Hauer wrote:
> On Mon, Apr 19, 2010 at 10:28:12AM +0200, Wolfram Sang wrote:
> > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > 
> > As a side effect don't build barebox.S when barebox.bin is updated.  I
> > didn't manage to keep the old behaviour and I consider it cleaner this
> > way.
> 
> I don't understand this completely. We only need barebox.S updated when
> barebox is updated, not when barebox.bin is updated. Is this what you
> mean?
> 

Uwe dropped off the cc...

> Sascha
> 
> > 
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> > ---
> > 
> > Passing it through, ask Uwe for details if needed.
> > 
> >  Makefile |   17 ++++++++++++++---
> >  1 files changed, 14 insertions(+), 3 deletions(-)
> > 
> > diff --git a/Makefile b/Makefile
> > index c92c5dd..5b4f964 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -641,9 +641,16 @@ define rule_barebox-modpost
> >  	$(Q)echo 'cmd_$@ := $(cmd_barebox-modpost)' > $(dot-target).cmd
> >  endef
> >  
> > -barebox.bin: barebox
> > -	$(Q)$(OBJCOPY) -O binary barebox barebox.bin
> > +quiet_cmd_objcopy = OBJCOPY $@
> > +      cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@
> > +
> > +OBJCOPYFLAGS_barebox.bin = -O binary
> > +
> > +barebox.bin: barebox FORCE
> > +	$(call if_changed,objcopy)
> > +
> >  ifdef CONFIG_X86
> > +barebox.S: barebox
> >  ifdef CONFIG_X86_HDBOOT
> >  	@echo "-------------------------------------------------" > barebox.S
> >  	@echo " * MBR content" >> barebox.S
> > @@ -665,7 +672,11 @@ endif
> >  	@echo " * Init Calls content" >> barebox.S
> >  	$(Q)$(OBJDUMP) -j .barebox_initcalls -d barebox >> barebox.S
> >  else
> > -	$(Q)$(OBJDUMP) -d barebox > barebox.S
> > +quiet_cmd_disasm = DISASM  $@
> > +      cmd_disasm = $(OBJDUMP) -d $< > $@
> > +
> > +barebox.S: barebox FORCE
> > +	$(call if_changed,disasm)
> >  endif
> >  
> >  # barebox image
> > -- 
> > 1.7.0
> > 
> > 
> > _______________________________________________
> > barebox mailing list
> > barebox@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/barebox
> 
> -- 
> Pengutronix e.K.                           |                             |
> Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

[-- Attachment #2: Type: text/plain, Size: 149 bytes --]

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 1/7] give nice output when generating barebox.bin and barebox.S

[Uwe Kleine-König]

Hey Sascha,

On Thu, Apr 22, 2010 at 01:10:01PM +0200, Sascha Hauer wrote:
> On Mon, Apr 19, 2010 at 10:28:12AM +0200, Wolfram Sang wrote:
> > From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > 
> > As a side effect don't build barebox.S when barebox.bin is updated.  I
> > didn't manage to keep the old behaviour and I consider it cleaner this
> > way.
> 
> I don't understand this completely. We only need barebox.S updated when
> barebox is updated, not when barebox.bin is updated. Is this what you
> mean?
The status quo in your master branch is that barebox.S is
created/updated in the barebox.bin target.  After my patch it's a
seperate target depending on barebox.

Does this help?

Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/7] imx/gpio: make gpio_get_value actually work

[Uwe Kleine-König]

Hello,

On Mon, Apr 19, 2010 at 10:28:13AM +0200, Wolfram Sang wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Newer i.MX-variants can route the content of the Sample Status Register to the
> Data Register, but older ones can't. So, use the Sample Register to be generic.
> As a drawback, the ability to read back the values of output GPIOs is lost.
AFAIK the last sentence (that was authored by Wolfram, though the patch
is mine) is wrong.  I checked mx27 and mx35 specs and both the overview
and the actual description suggest that reading output values works
(using PSR aka SSR) when the iomuxer is configured for GPIO.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/7] imx/gpio: make gpio_get_value actually work

[Sascha Hauer]

On Mon, Apr 19, 2010 at 10:28:13AM +0200, Wolfram Sang wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Newer i.MX-variants can route the content of the Sample Status Register to the
> Data Register, but older ones can't. So, use the Sample Register to be generic.
> As a drawback, the ability to read back the values of output GPIOs is lost.

I never heard of this. Anyway, output gpios are not supposed to be able
to read back in the GPIO API, so I suggest we use Uwes original commit
message.

Sascha


> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
>  arch/arm/mach-imx/gpio.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c
> index 6157bd1..c6a59a6 100644
> --- a/arch/arm/mach-imx/gpio.c
> +++ b/arch/arm/mach-imx/gpio.c
> @@ -121,7 +121,7 @@ int gpio_get_value(unsigned gpio)
>  	if (!base)
>  		return -EINVAL;
>  
> -	val = readl(base + GPIO_DR);
> +	val = readl(base + GPIO_PSR);
>  
>  	return val & (1 << shift) ? 1 : 0;
>  }
> -- 
> 1.7.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 2/7] imx/gpio: make gpio_get_value actually work

[Sascha Hauer]

On Fri, Apr 23, 2010 at 08:22:40AM +0200, Wolfram Sang wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> The value read at the pin is provided by Sample Status Register, not the
> Data Register.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>

ok, applied to -next

Sascha

> ---
>  arch/arm/mach-imx/gpio.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/gpio.c b/arch/arm/mach-imx/gpio.c
> index 6157bd1..c6a59a6 100644
> --- a/arch/arm/mach-imx/gpio.c
> +++ b/arch/arm/mach-imx/gpio.c
> @@ -121,7 +121,7 @@ int gpio_get_value(unsigned gpio)
>  	if (!base)
>  		return -EINVAL;
>  
> -	val = readl(base + GPIO_DR);
> +	val = readl(base + GPIO_PSR);
>  
>  	return val & (1 << shift) ? 1 : 0;
>  }
> -- 
> 1.7.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 3/7] arm: update mach-types

[Sascha Hauer]

On Mon, Apr 19, 2010 at 10:28:14AM +0200, Wolfram Sang wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
>  arch/arm/tools/mach-types |  325 ++++++++++++++++++++++++++++++++++++++++++++-
>  1 files changed, 320 insertions(+), 5 deletions(-)

applied to master.


> 
> diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
> index 94be7bb..cc5275b 100644
> --- a/arch/arm/tools/mach-types
> +++ b/arch/arm/tools/mach-types
> @@ -12,7 +12,7 @@
>  #
>  #   http://www.arm.linux.org.uk/developer/machines/?action=new
>  #
> -# Last update: Fri Sep 18 21:42:00 2009
> +# Last update: Mon Mar 15 15:32:14 2010
>  #
>  # machine_is_xxx	CONFIG_xxxx		MACH_TYPE_xxx		number
>  #
> @@ -928,7 +928,7 @@ palmt5			MACH_PALMT5		PALMT5			917
>  palmtc			MACH_PALMTC		PALMTC			918
>  omap_apollon		MACH_OMAP_APOLLON	OMAP_APOLLON		919
>  mxc30030evb		MACH_MXC30030EVB	MXC30030EVB		920
> -rea_2d			MACH_REA_2D		REA_2D			921
> +rea_cpu2		MACH_REA_2D		REA_2D			921
>  eti3e524		MACH_TI3E524		TI3E524			922
>  ateb9200		MACH_ATEB9200		ATEB9200		923
>  auckland		MACH_AUCKLAND		AUCKLAND		924
> @@ -1319,7 +1319,7 @@ mistral			MACH_MISTRAL		MISTRAL			1315
>  msm			MACH_MSM		MSM			1316
>  ct5910			MACH_CT5910		CT5910			1317
>  ct5912			MACH_CT5912		CT5912			1318
> -hynet_ine		MACH_HYNET_INE		HYNET_INE		1319
> +argonst_foundation	MACH_HYNET_INE		HYNET_INE		1319
>  hynet_app		MACH_HYNET_APP		HYNET_APP		1320
>  msm7200			MACH_MSM7200		MSM7200			1321
>  msm7600			MACH_MSM7600		MSM7600			1322
> @@ -1776,6 +1776,7 @@ cybook3			MACH_CYBOOK3		CYBOOK3			1784
>  wdg002			MACH_WDG002		WDG002			1785
>  sg560adsl		MACH_SG560ADSL		SG560ADSL		1786
>  nextio_n2800_ica	MACH_NEXTIO_N2800_ICA	NEXTIO_N2800_ICA	1787
> +dove_db			MACH_DOVE_DB		DOVE_DB			1788
>  marvell_newdb		MACH_MARVELL_NEWDB	MARVELL_NEWDB		1789
>  vandihud		MACH_VANDIHUD		VANDIHUD		1790
>  magx_e8			MACH_MAGX_E8		MAGX_E8			1791
> @@ -2256,7 +2257,7 @@ oratisalog		MACH_ORATISALOG		ORATISALOG		2268
>  oratismadi		MACH_ORATISMADI		ORATISMADI		2269
>  oratisot16		MACH_ORATISOT16		ORATISOT16		2270
>  oratisdesk		MACH_ORATISDESK		ORATISDESK		2271
> -v2_ca9			MACH_V2P_CA9		V2P_CA9			2272
> +vexpress		MACH_VEXPRESS		VEXPRESS		2272
>  sintexo			MACH_SINTEXO		SINTEXO			2273
>  cm3389			MACH_CM3389		CM3389			2274
>  omap3_cio		MACH_OMAP3_CIO		OMAP3_CIO		2275
> @@ -2373,7 +2374,7 @@ sch_m490		MACH_SCH_M490		SCH_M490		2386
>  rbl01			MACH_RBL01		RBL01			2387
>  omnifi			MACH_OMNIFI		OMNIFI			2388
>  otavalo			MACH_OTAVALO		OTAVALO			2389
> -sienna			MACH_SIENNA		SIENNA			2390
> +siena			MACH_SIENNA		SIENNA			2390
>  htc_excalibur_s620	MACH_HTC_EXCALIBUR_S620	HTC_EXCALIBUR_S620	2391
>  htc_opal		MACH_HTC_OPAL		HTC_OPAL		2392
>  touchbook		MACH_TOUCHBOOK		TOUCHBOOK		2393
> @@ -2421,3 +2422,317 @@ liberty			MACH_LIBERTY		LIBERTY			2434
>  mh355			MACH_MH355		MH355			2435
>  pc7802			MACH_PC7802		PC7802			2436
>  gnet_sgc		MACH_GNET_SGC		GNET_SGC		2437
> +einstein15		MACH_EINSTEIN15		EINSTEIN15		2438
> +cmpd			MACH_CMPD		CMPD			2439
> +davinci_hase1		MACH_DAVINCI_HASE1	DAVINCI_HASE1		2440
> +lgeincitephone		MACH_LGEINCITEPHONE	LGEINCITEPHONE		2441
> +ea313x			MACH_EA313X		EA313X			2442
> +fwbd_39064		MACH_FWBD_39064		FWBD_39064		2443
> +fwbd_390128		MACH_FWBD_390128	FWBD_390128		2444
> +pelco_moe		MACH_PELCO_MOE		PELCO_MOE		2445
> +minimix27		MACH_MINIMIX27		MINIMIX27		2446
> +omap3_thunder		MACH_OMAP3_THUNDER	OMAP3_THUNDER		2447
> +passionc		MACH_PASSIONC		PASSIONC		2448
> +mx27amata		MACH_MX27AMATA		MX27AMATA		2449
> +bgat1			MACH_BGAT1		BGAT1			2450
> +buzz			MACH_BUZZ		BUZZ			2451
> +mb9g20			MACH_MB9G20		MB9G20			2452
> +yushan			MACH_YUSHAN		YUSHAN			2453
> +lizard			MACH_LIZARD		LIZARD			2454
> +omap3polycom		MACH_OMAP3POLYCOM	OMAP3POLYCOM		2455
> +smdkv210		MACH_SMDKV210		SMDKV210		2456
> +bravo			MACH_BRAVO		BRAVO			2457
> +siogentoo1		MACH_SIOGENTOO1		SIOGENTOO1		2458
> +siogentoo2		MACH_SIOGENTOO2		SIOGENTOO2		2459
> +sm3k			MACH_SM3K		SM3K			2460
> +acer_tempo_f900		MACH_ACER_TEMPO_F900	ACER_TEMPO_F900		2461
> +sst61vc010_dev		MACH_SST61VC010_DEV	SST61VC010_DEV		2462
> +glittertind		MACH_GLITTERTIND	GLITTERTIND		2463
> +omap_zoom3		MACH_OMAP_ZOOM3		OMAP_ZOOM3		2464
> +omap_3630sdp		MACH_OMAP_3630SDP	OMAP_3630SDP		2465
> +cybook2440		MACH_CYBOOK2440		CYBOOK2440		2466
> +torino_s		MACH_TORINO_S		TORINO_S		2467
> +havana			MACH_HAVANA		HAVANA			2468
> +beaumont_11		MACH_BEAUMONT_11	BEAUMONT_11		2469
> +vanguard		MACH_VANGUARD		VANGUARD		2470
> +s5pc110_draco		MACH_S5PC110_DRACO	S5PC110_DRACO		2471
> +cartesio_two		MACH_CARTESIO_TWO	CARTESIO_TWO		2472
> +aster			MACH_ASTER		ASTER			2473
> +voguesv210		MACH_VOGUESV210		VOGUESV210		2474
> +acm500x			MACH_ACM500X		ACM500X			2475
> +km9260			MACH_KM9260		KM9260			2476
> +nideflexg1		MACH_NIDEFLEXG1		NIDEFLEXG1		2477
> +ctera_plug_io		MACH_CTERA_PLUG_IO	CTERA_PLUG_IO		2478
> +smartq7			MACH_SMARTQ7		SMARTQ7			2479
> +at91sam9g10ek2		MACH_AT91SAM9G10EK2	AT91SAM9G10EK2		2480
> +asusp527		MACH_ASUSP527		ASUSP527		2481
> +at91sam9g20mpm2		MACH_AT91SAM9G20MPM2	AT91SAM9G20MPM2		2482
> +topasa900		MACH_TOPASA900		TOPASA900		2483
> +electrum_100		MACH_ELECTRUM_100	ELECTRUM_100		2484
> +mx51grb			MACH_MX51GRB		MX51GRB			2485
> +xea300			MACH_XEA300		XEA300			2486
> +htcstartrek		MACH_HTCSTARTREK	HTCSTARTREK		2487
> +lima			MACH_LIMA		LIMA			2488
> +csb740			MACH_CSB740		CSB740			2489
> +usb_s8815		MACH_USB_S8815		USB_S8815		2490
> +watson_efm_plugin	MACH_WATSON_EFM_PLUGIN	WATSON_EFM_PLUGIN	2491
> +milkyway		MACH_MILKYWAY		MILKYWAY		2492
> +g4evm			MACH_G4EVM		G4EVM			2493
> +picomod6		MACH_PICOMOD6		PICOMOD6		2494
> +omapl138_hawkboard	MACH_OMAPL138_HAWKBOARD	OMAPL138_HAWKBOARD	2495
> +ip6000			MACH_IP6000		IP6000			2496
> +ip6010			MACH_IP6010		IP6010			2497
> +utm400			MACH_UTM400		UTM400			2498
> +omap3_zybex		MACH_OMAP3_ZYBEX	OMAP3_ZYBEX		2499
> +wireless_space		MACH_WIRELESS_SPACE	WIRELESS_SPACE		2500
> +sx560			MACH_SX560		SX560			2501
> +ts41x			MACH_TS41X		TS41X			2502
> +elphel10373		MACH_ELPHEL10373	ELPHEL10373		2503
> +rhobot			MACH_RHOBOT		RHOBOT			2504
> +mx51_refresh		MACH_MX51_REFRESH	MX51_REFRESH		2505
> +ls9260			MACH_LS9260		LS9260			2506
> +shank			MACH_SHANK		SHANK			2507
> +qsd8x50_st1		MACH_QSD8X50_ST1	QSD8X50_ST1		2508
> +at91sam9m10ekes		MACH_AT91SAM9M10EKES	AT91SAM9M10EKES		2509
> +hiram			MACH_HIRAM		HIRAM			2510
> +phy3250			MACH_PHY3250		PHY3250			2511
> +ea3250			MACH_EA3250		EA3250			2512
> +fdi3250			MACH_FDI3250		FDI3250			2513
> +whitestone		MACH_WHITESTONE		WHITESTONE		2514
> +at91sam9263nit		MACH_AT91SAM9263NIT	AT91SAM9263NIT		2515
> +ccmx51			MACH_CCMX51		CCMX51			2516
> +ccmx51js		MACH_CCMX51JS		CCMX51JS		2517
> +ccwmx51			MACH_CCWMX51		CCWMX51			2518
> +ccwmx51js		MACH_CCWMX51JS		CCWMX51JS		2519
> +mini6410		MACH_MINI6410		MINI6410		2520
> +tiny6410		MACH_TINY6410		TINY6410		2521
> +nano6410		MACH_NANO6410		NANO6410		2522
> +at572d940hfnldb		MACH_AT572D940HFNLDB	AT572D940HFNLDB		2523
> +htcleo			MACH_HTCLEO		HTCLEO			2524
> +avp13			MACH_AVP13		AVP13			2525
> +xxsvideod		MACH_XXSVIDEOD		XXSVIDEOD		2526
> +vpnext			MACH_VPNEXT		VPNEXT			2527
> +swarco_itc3		MACH_SWARCO_ITC3	SWARCO_ITC3		2528
> +tx51			MACH_TX51		TX51			2529
> +dolby_cat1021		MACH_DOLBY_CAT1021	DOLBY_CAT1021		2530
> +mx28evk			MACH_MX28EVK		MX28EVK			2531
> +phoenix260		MACH_PHOENIX260		PHOENIX260		2532
> +uvaca_stork		MACH_UVACA_STORK	UVACA_STORK		2533
> +smartq5			MACH_SMARTQ5		SMARTQ5			2534
> +all3078			MACH_ALL3078		ALL3078			2535
> +ctera_2bay_ds		MACH_CTERA_2BAY_DS	CTERA_2BAY_DS		2536
> +siogentoo3		MACH_SIOGENTOO3		SIOGENTOO3		2537
> +epb5000			MACH_EPB5000		EPB5000			2538
> +hy9263			MACH_HY9263		HY9263			2539
> +acer_tempo_m900		MACH_ACER_TEMPO_M900	ACER_TEMPO_M900		2540
> +acer_tempo_dx650	MACH_ACER_TEMPO_DX900	ACER_TEMPO_DX900	2541
> +acer_tempo_x960		MACH_ACER_TEMPO_X960	ACER_TEMPO_X960		2542
> +acer_eten_v900		MACH_ACER_ETEN_V900	ACER_ETEN_V900		2543
> +acer_eten_x900		MACH_ACER_ETEN_X900	ACER_ETEN_X900		2544
> +bonnell			MACH_BONNELL		BONNELL			2545
> +oht_mx27		MACH_OHT_MX27		OHT_MX27		2546
> +htcquartz		MACH_HTCQUARTZ		HTCQUARTZ		2547
> +davinci_dm6467tevm	MACH_DAVINCI_DM6467TEVM	DAVINCI_DM6467TEVM	2548
> +c3ax03			MACH_C3AX03		C3AX03			2549
> +mxt_td60		MACH_MXT_TD60		MXT_TD60		2550
> +esyx			MACH_ESYX		ESYX			2551
> +dove_db2		MACH_DOVE_DB2		DOVE_DB2		2552
> +bulldog			MACH_BULLDOG		BULLDOG			2553
> +derell_me2000		MACH_DERELL_ME2000	DERELL_ME2000		2554
> +bcmring_base		MACH_BCMRING_BASE	BCMRING_BASE		2555
> +bcmring_evm		MACH_BCMRING_EVM	BCMRING_EVM		2556
> +bcmring_evm_jazz	MACH_BCMRING_EVM_JAZZ	BCMRING_EVM_JAZZ	2557
> +bcmring_sp		MACH_BCMRING_SP		BCMRING_SP		2558
> +bcmring_sv		MACH_BCMRING_SV		BCMRING_SV		2559
> +bcmring_sv_jazz		MACH_BCMRING_SV_JAZZ	BCMRING_SV_JAZZ		2560
> +bcmring_tablet		MACH_BCMRING_TABLET	BCMRING_TABLET		2561
> +bcmring_vp		MACH_BCMRING_VP		BCMRING_VP		2562
> +bcmring_evm_seikor	MACH_BCMRING_EVM_SEIKOR	BCMRING_EVM_SEIKOR	2563
> +bcmring_sp_wqvga	MACH_BCMRING_SP_WQVGA	BCMRING_SP_WQVGA	2564
> +bcmring_custom		MACH_BCMRING_CUSTOM	BCMRING_CUSTOM		2565
> +acer_s200		MACH_ACER_S200		ACER_S200		2566
> +bt270			MACH_BT270		BT270			2567
> +iseo			MACH_ISEO		ISEO			2568
> +cezanne			MACH_CEZANNE		CEZANNE			2569
> +lucca			MACH_LUCCA		LUCCA			2570
> +supersmart		MACH_SUPERSMART		SUPERSMART		2571
> +arm11_board		MACH_CS_MISANO		CS_MISANO		2572
> +magnolia2		MACH_MAGNOLIA2		MAGNOLIA2		2573
> +emxx			MACH_EMXX		EMXX			2574
> +outlaw			MACH_OUTLAW		OUTLAW			2575
> +riot_bei2		MACH_RIOT_BEI2		RIOT_BEI2		2576
> +riot_vox		MACH_RIOT_VOX		RIOT_VOX		2577
> +riot_x37		MACH_RIOT_X37		RIOT_X37		2578
> +mega25mx		MACH_MEGA25MX		MEGA25MX		2579
> +benzina2		MACH_BENZINA2		BENZINA2		2580
> +ignite			MACH_IGNITE		IGNITE			2581
> +foggia			MACH_FOGGIA		FOGGIA			2582
> +arezzo			MACH_AREZZO		AREZZO			2583
> +leica_skywalker		MACH_LEICA_SKYWALKER	LEICA_SKYWALKER		2584
> +jacinto2_jamr		MACH_JACINTO2_JAMR	JACINTO2_JAMR		2585
> +gts_nova		MACH_GTS_NOVA		GTS_NOVA		2586
> +p3600			MACH_P3600		P3600			2587
> +dlt2			MACH_DLT2		DLT2			2588
> +df3120			MACH_DF3120		DF3120			2589
> +ecucore_9g20		MACH_ECUCORE_9G20	ECUCORE_9G20		2590
> +nautel_lpc3240		MACH_NAUTEL_LPC3240	NAUTEL_LPC3240		2591
> +glacier			MACH_GLACIER		GLACIER			2592
> +phrazer_bulldog		MACH_PHRAZER_BULLDOG	PHRAZER_BULLDOG		2593
> +omap3_bulldog		MACH_OMAP3_BULLDOG	OMAP3_BULLDOG		2594
> +pca101			MACH_PCA101		PCA101			2595
> +buzzc			MACH_BUZZC		BUZZC			2596
> +sasie2			MACH_SASIE2		SASIE2			2597
> +davinci_cio		MACH_DAVINCI_CIO	DAVINCI_CIO		2598
> +smartmeter_dl		MACH_SMARTMETER_DL	SMARTMETER_DL		2599
> +wzl6410			MACH_WZL6410		WZL6410			2600
> +wzl6410m		MACH_WZL6410M		WZL6410M		2601
> +wzl6410f		MACH_WZL6410F		WZL6410F		2602
> +wzl6410i		MACH_WZL6410I		WZL6410I		2603
> +spacecom1		MACH_SPACECOM1		SPACECOM1		2604
> +pingu920		MACH_PINGU920		PINGU920		2605
> +bravoc			MACH_BRAVOC		BRAVOC			2606
> +cybo2440		MACH_CYBO2440		CYBO2440		2607
> +vdssw			MACH_VDSSW		VDSSW			2608
> +romulus			MACH_ROMULUS		ROMULUS			2609
> +omap_magic		MACH_OMAP_MAGIC		OMAP_MAGIC		2610
> +eltd100			MACH_ELTD100		ELTD100			2611
> +capc7117		MACH_CAPC7117		CAPC7117		2612
> +swan			MACH_SWAN		SWAN			2613
> +veu			MACH_VEU		VEU			2614
> +rm2			MACH_RM2		RM2			2615
> +tt2100			MACH_TT2100		TT2100			2616
> +venice			MACH_VENICE		VENICE			2617
> +pc7323			MACH_PC7323		PC7323			2618
> +masp			MACH_MASP		MASP			2619
> +fujitsu_tvstbsoc0	MACH_FUJITSU_TVSTBSOC	FUJITSU_TVSTBSOC	2620
> +fujitsu_tvstbsoc1	MACH_FUJITSU_TVSTBSOC1	FUJITSU_TVSTBSOC1	2621
> +lexikon			MACH_LEXIKON		LEXIKON			2622
> +mini2440v2		MACH_MINI2440V2		MINI2440V2		2623
> +icontrol		MACH_ICONTROL		ICONTROL		2624
> +sheevad			MACH_SHEEVAD		SHEEVAD			2625
> +qsd8x50a_st1_1		MACH_QSD8X50A_ST1_1	QSD8X50A_ST1_1		2626
> +qsd8x50a_st1_5		MACH_QSD8X50A_ST1_5	QSD8X50A_ST1_5		2627
> +bee			MACH_BEE		BEE			2628
> +mx23evk			MACH_MX23EVK		MX23EVK			2629
> +ap4evb			MACH_AP4EVB		AP4EVB			2630
> +stockholm		MACH_STOCKHOLM		STOCKHOLM		2631
> +lpc_h3131		MACH_LPC_H3131		LPC_H3131		2632
> +stingray		MACH_STINGRAY		STINGRAY		2633
> +kraken			MACH_KRAKEN		KRAKEN			2634
> +gw2388			MACH_GW2388		GW2388			2635
> +jadecpu			MACH_JADECPU		JADECPU			2636
> +carlisle		MACH_CARLISLE		CARLISLE		2637
> +lux_sf9			MACH_LUX_SFT9		LUX_SFT9		2638
> +nemid_tb		MACH_NEMID_TB		NEMID_TB		2639
> +terrier			MACH_TERRIER		TERRIER			2640
> +turbot			MACH_TURBOT		TURBOT			2641
> +sanddab			MACH_SANDDAB		SANDDAB			2642
> +mx35_cicada		MACH_MX35_CICADA	MX35_CICADA		2643
> +ghi2703d		MACH_GHI2703D		GHI2703D		2644
> +lux_sfx9		MACH_LUX_SFX9		LUX_SFX9		2645
> +lux_sf9g		MACH_LUX_SF9G		LUX_SF9G		2646
> +lux_edk9		MACH_LUX_EDK9		LUX_EDK9		2647
> +hw90240			MACH_HW90240		HW90240			2648
> +dm365_leopard		MACH_DM365_LEOPARD	DM365_LEOPARD		2649
> +mityomapl138		MACH_MITYOMAPL138	MITYOMAPL138		2650
> +scat110			MACH_SCAT110		SCAT110			2651
> +acer_a1			MACH_ACER_A1		ACER_A1			2652
> +cmcontrol		MACH_CMCONTROL		CMCONTROL		2653
> +pelco_lamar		MACH_PELCO_LAMAR	PELCO_LAMAR		2654
> +rfp43			MACH_RFP43		RFP43			2655
> +sk86r0301		MACH_SK86R0301		SK86R0301		2656
> +ctpxa			MACH_CTPXA		CTPXA			2657
> +epb_arm9_a		MACH_EPB_ARM9_A		EPB_ARM9_A		2658
> +guruplug		MACH_GURUPLUG		GURUPLUG		2659
> +spear310		MACH_SPEAR310		SPEAR310		2660
> +spear320		MACH_SPEAR320		SPEAR320		2661
> +robotx			MACH_ROBOTX		ROBOTX			2662
> +lsxhl			MACH_LSXHL		LSXHL			2663
> +smartlite		MACH_SMARTLITE		SMARTLITE		2664
> +cws2			MACH_CWS2		CWS2			2665
> +m619			MACH_M619		M619			2666
> +smartview		MACH_SMARTVIEW		SMARTVIEW		2667
> +lsa_salsa		MACH_LSA_SALSA		LSA_SALSA		2668
> +kizbox			MACH_KIZBOX		KIZBOX			2669
> +htccharmer		MACH_HTCCHARMER		HTCCHARMER		2670
> +guf_neso_lt		MACH_GUF_NESO_LT	GUF_NESO_LT		2671
> +pm9g45			MACH_PM9G45		PM9G45			2672
> +htcpanther		MACH_HTCPANTHER		HTCPANTHER		2673
> +htcpanther_cdma		MACH_HTCPANTHER_CDMA	HTCPANTHER_CDMA		2674
> +reb01			MACH_REB01		REB01			2675
> +aquila			MACH_AQUILA		AQUILA			2676
> +spark_sls_hw2		MACH_SPARK_SLS_HW2	SPARK_SLS_HW2		2677
> +sheeva_esata		MACH_ESATA_SHEEVAPLUG	ESATA_SHEEVAPLUG	2678
> +msm7x30_surf		MACH_MSM7X30_SURF	MSM7X30_SURF		2679
> +micro2440		MACH_MICRO2440		MICRO2440		2680
> +am2440			MACH_AM2440		AM2440			2681
> +tq2440			MACH_TQ2440		TQ2440			2682
> +lpc2478oem		MACH_LPC2478OEM		LPC2478OEM		2683
> +ak880x			MACH_AK880X		AK880X			2684
> +cobra3530		MACH_COBRA3530		COBRA3530		2685
> +pmppb			MACH_PMPPB		PMPPB			2686
> +u6715			MACH_U6715		U6715			2687
> +axar1500_sender		MACH_AXAR1500_SENDER	AXAR1500_SENDER		2688
> +g30_dvb			MACH_G30_DVB		G30_DVB			2689
> +vc088x			MACH_VC088X		VC088X			2690
> +mioa702			MACH_MIOA702		MIOA702			2691
> +hpmin			MACH_HPMIN		HPMIN			2692
> +ak880xak		MACH_AK880XAK		AK880XAK		2693
> +arm926tomap850		MACH_ARM926TOMAP850	ARM926TOMAP850		2694
> +lkevm			MACH_LKEVM		LKEVM			2695
> +mw6410			MACH_MW6410		MW6410			2696
> +terastation_wxl		MACH_TERASTATION_WXL	TERASTATION_WXL		2697
> +cpu8000e		MACH_CPU8000E		CPU8000E		2698
> +catania			MACH_CATANIA		CATANIA			2699
> +tokyo			MACH_TOKYO		TOKYO			2700
> +msm7201a_surf		MACH_MSM7201A_SURF	MSM7201A_SURF		2701
> +msm7201a_ffa		MACH_MSM7201A_FFA	MSM7201A_FFA		2702
> +msm7x25_surf		MACH_MSM7X25_SURF	MSM7X25_SURF		2703
> +msm7x25_ffa		MACH_MSM7X25_FFA	MSM7X25_FFA		2704
> +msm7x27_surf		MACH_MSM7X27_SURF	MSM7X27_SURF		2705
> +msm7x27_ffa		MACH_MSM7X27_FFA	MSM7X27_FFA		2706
> +msm7x30_ffa		MACH_MSM7X30_FFA	MSM7X30_FFA		2707
> +qsd8x50_surf		MACH_QSD8X50_SURF	QSD8X50_SURF		2708
> +qsd8x50_comet		MACH_QSD8X50_COMET	QSD8X50_COMET		2709
> +qsd8x50_ffa		MACH_QSD8X50_FFA	QSD8X50_FFA		2710
> +qsd8x50a_surf		MACH_QSD8X50A_SURF	QSD8X50A_SURF		2711
> +qsd8x50a_ffa		MACH_QSD8X50A_FFA	QSD8X50A_FFA		2712
> +adx_xgcp10		MACH_ADX_XGCP10		ADX_XGCP10		2713
> +mcgwumts2a		MACH_MCGWUMTS2A		MCGWUMTS2A		2714
> +mobikt			MACH_MOBIKT		MOBIKT			2715
> +mx53_evk		MACH_MX53_EVK		MX53_EVK		2716
> +igep0030		MACH_IGEP0030		IGEP0030		2717
> +axell_h40_h50_ctrl	MACH_AXELL_H40_H50_CTRL	AXELL_H40_H50_CTRL	2718
> +dtcommod		MACH_DTCOMMOD		DTCOMMOD		2719
> +gould			MACH_GOULD		GOULD			2720
> +siberia			MACH_SIBERIA		SIBERIA			2721
> +sbc3530			MACH_SBC3530		SBC3530			2722
> +qarm			MACH_QARM		QARM			2723
> +mips			MACH_MIPS		MIPS			2724
> +mx27grb			MACH_MX27GRB		MX27GRB			2725
> +sbc8100			MACH_SBC8100		SBC8100			2726
> +saarb			MACH_SAARB		SAARB			2727
> +omap3mini		MACH_OMAP3MINI		OMAP3MINI		2728
> +cnmbook7se		MACH_CNMBOOK7SE		CNMBOOK7SE		2729
> +catan			MACH_CATAN		CATAN			2730
> +harmony			MACH_HARMONY		HARMONY			2731
> +tonga			MACH_TONGA		TONGA			2732
> +cybook_orizon		MACH_CYBOOK_ORIZON	CYBOOK_ORIZON		2733
> +htcrhodiumcdma		MACH_HTCRHODIUMCDMA	HTCRHODIUMCDMA		2734
> +epc_g45			MACH_EPC_G45		EPC_G45			2735
> +epc_lpc3250		MACH_EPC_LPC3250	EPC_LPC3250		2736
> +mxc91341evb		MACH_MXC91341EVB	MXC91341EVB		2737
> +rtw1000			MACH_RTW1000		RTW1000			2738
> +bobcat			MACH_BOBCAT		BOBCAT			2739
> +trizeps6		MACH_TRIZEPS6		TRIZEPS6		2740
> +msm7x30_fluid		MACH_MSM7X30_FLUID	MSM7X30_FLUID		2741
> +nedap9263		MACH_NEDAP9263		NEDAP9263		2742
> +netgear_ms2110		MACH_NETGEAR_MS2110	NETGEAR_MS2110		2743
> +bmx			MACH_BMX		BMX			2744
> +netstream		MACH_NETSTREAM		NETSTREAM		2745
> +vpnext_rcu		MACH_VPNEXT_RCU		VPNEXT_RCU		2746
> +vpnext_mpu		MACH_VPNEXT_MPU		VPNEXT_MPU		2747
> +bcmring_tablet_v1	MACH_BCMRING_TABLET_V1	BCMRING_TABLET_V1	2748
> +sgarm10			MACH_SGARM10		SGARM10			2749
> +cm_t3517		MACH_CM_T3517		CM_T3517		2750
> +omap3_cps		MACH_OMAP3_CPS		OMAP3_CPS		2751
> -- 
> 1.7.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 4/7] cfi_flash: use flash_write_word instead of reimplementing it again

[Sascha Hauer]

On Mon, Apr 19, 2010 at 10:28:15AM +0200, Wolfram Sang wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> While at it remove some unused code and an unbalanced
> enable_interrupts().
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
>  drivers/nor/cfi_flash.c |   19 +------------------
>  1 files changed, 1 insertions(+), 18 deletions(-)

applied to next.

> 
> diff --git a/drivers/nor/cfi_flash.c b/drivers/nor/cfi_flash.c
> index 0f7a483..dbfb004 100644
> --- a/drivers/nor/cfi_flash.c
> +++ b/drivers/nor/cfi_flash.c
> @@ -116,11 +116,9 @@ static void flash_add_byte (flash_info_t * info, cfiword_t * cword, uchar c)
>  static int flash_write_cfiword (flash_info_t * info, ulong dest,
>  				cfiword_t cword)
>  {
> -	cfiptr_t ctladdr;
>  	cfiptr_t cptr;
>  	int flag;
>  
> -	ctladdr.cp = flash_make_addr (info, 0, 0);
>  	cptr.cp = (uchar *) dest;
>  
>  	/* Check if Flash is (sufficiently) erased */
> @@ -138,24 +136,9 @@ static int flash_write_cfiword (flash_info_t * info, ulong dest,
>  	if (!flag)
>  		return 2;
>  
> -	/* Disable interrupts which might cause a timeout here */
> -//	flag = disable_interrupts ();
> -
>  	info->cfi_cmd_set->flash_prepare_write(info);
>  
> -	if (bankwidth_is_1(info)) {
> -		cptr.cp[0] = cword.c;
> -	} else if (bankwidth_is_2(info)) {
> -		cptr.wp[0] = cword.w;
> -	} else if (bankwidth_is_4(info)) {
> -		cptr.lp[0] = cword.l;
> -	} else if (bankwidth_is_8(info)) {
> -		cptr.llp[0] = cword.ll;
> -	}
> -
> -	/* re-enable interrupts if necessary */
> -	if (flag)
> -		enable_interrupts ();
> +	flash_write_word(info, cword, (void *)dest);
>  
>  	return flash_status_check (info, find_sector (info, dest),
>  					info->write_tout, "write");
> -- 
> 1.7.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 5/7] board/pcm038: document value written to ESDCFG0

[Sascha Hauer]

On Mon, Apr 19, 2010 at 10:28:16AM +0200, Wolfram Sang wrote:
> From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
>  board/pcm038/lowlevel_init.S |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)

applied to master.

> 
> diff --git a/board/pcm038/lowlevel_init.S b/board/pcm038/lowlevel_init.S
> index a5ceb26..0001e4f 100644
> --- a/board/pcm038/lowlevel_init.S
> +++ b/board/pcm038/lowlevel_init.S
> @@ -28,6 +28,11 @@
>  	writel(0x15555555, DSCR(8))
>  
>  	writel(0x00000004, ESDMISC) /* Initial reset */
> +
> +	/*
> +	 * tXP=3, tWTR=0, tRP=2, tMRD=2, tWR=1,
> +	 * tRAS=4, tRRD=1, tCAS=3, tRCD=3, tRC=10
> +	 */
>  	writel(0x006ac73a, ESDCFG0)
>  
>  	writel(ESDCTL0_VAL | ESDCTL0_SMODE_PRECHARGE, ESDCTL0) /* precharge CSD0 all banks */
> -- 
> 1.7.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH 7/7] nor: Don't use the sector for the unlock sequence

[Sascha Hauer]

On Mon, Apr 19, 2010 at 10:28:18AM +0200, Wolfram Sang wrote:
> Copy the behaviour from Linux which does:
> 
> cfi_send_gen_cmd(0xAA, cfi->addr_unlock1, chip->start, map, cfi, cfi->device_type, NULL);
> ...
> 
> (Notice the third parameter which is simply chip->start).
> 
> Solves erase problems with SST flashes.
> 
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
> ---
> 
> This should be tested on some other boards!
> 
>  drivers/nor/cfi_flash_amd.c |   16 ++++++++--------
>  1 files changed, 8 insertions(+), 8 deletions(-)

applied to next.

> 
> diff --git a/drivers/nor/cfi_flash_amd.c b/drivers/nor/cfi_flash_amd.c
> index 4f0ab57..411d8e6 100644
> --- a/drivers/nor/cfi_flash_amd.c
> +++ b/drivers/nor/cfi_flash_amd.c
> @@ -2,10 +2,10 @@
>  #include <stdio.h>
>  #include "cfi_flash.h"
>  
> -static void flash_unlock_seq (flash_info_t * info, flash_sect_t sect)
> +static void flash_unlock_seq (flash_info_t * info)
>  {
> -	flash_write_cmd (info, sect, AMD_ADDR_START, AMD_CMD_UNLOCK_START);
> -	flash_write_cmd (info, sect, AMD_ADDR_ACK, AMD_CMD_UNLOCK_ACK);
> +	flash_write_cmd (info, 0, AMD_ADDR_START, AMD_CMD_UNLOCK_START);
> +	flash_write_cmd (info, 0, AMD_ADDR_ACK, AMD_CMD_UNLOCK_ACK);
>  }
>  
>  /*
> @@ -21,7 +21,7 @@ static void amd_read_jedec_ids (flash_info_t * info)
>  	info->device_id2      = 0;
>  
>  	flash_write_cmd(info, 0, 0, AMD_CMD_RESET);
> -	flash_unlock_seq(info, 0);
> +	flash_unlock_seq(info);
>  	flash_write_cmd(info, 0, AMD_ADDR_START, FLASH_CMD_READ_ID);
>  	udelay(1000); /* some flash are slow to respond */
>  	info->manufacturer_id = flash_read_uchar (info,
> @@ -73,10 +73,10 @@ static int amd_flash_is_busy (flash_info_t * info, flash_sect_t sect)
>  
>  static int amd_flash_erase_one (flash_info_t * info, long sect)
>  {
> -	flash_unlock_seq (info, sect);
> +	flash_unlock_seq(info);
>  	flash_write_cmd (info, sect, AMD_ADDR_ERASE_START,
>  				AMD_CMD_ERASE_START);
> -	flash_unlock_seq (info, sect);
> +	flash_unlock_seq(info);
>  	flash_write_cmd (info, sect, 0, AMD_CMD_ERASE_SECTOR);
>  
>  	return flash_status_check(info, sect, info->erase_blk_tout, "erase");
> @@ -84,7 +84,7 @@ static int amd_flash_erase_one (flash_info_t * info, long sect)
>  
>  static void amd_flash_prepare_write(flash_info_t * info)
>  {
> -	flash_unlock_seq (info, 0);
> +	flash_unlock_seq(info);
>  	flash_write_cmd (info, 0, AMD_ADDR_START, AMD_CMD_WRITE);
>  }
>  
> @@ -103,7 +103,7 @@ static int amd_flash_write_cfibuffer (flash_info_t * info, ulong dest, const uch
>  	dst.cp = (uchar *) dest;
>  	sector = find_sector (info, dest);
>  
> -	flash_unlock_seq(info,0);
> +	flash_unlock_seq(info);
>  	flash_make_cmd (info, AMD_CMD_WRITE_TO_BUFFER, &cword);
>  	flash_write_word(info, cword, (void *)dest);
>  
> -- 
> 1.7.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox