[U-Boot] [PATCH] SMDK6400: fix the compiler error
This patch adds _end for fix following compiler error arch/arm/cpu/arm1176/start.o: In function `_end_ofs': arch/arm/cpu/arm1176/start.S:61: undefined reference to `_end' Signed-off-by: Minkyu Kang --- board/samsung/smdk6400/u-boot-nand.lds |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/board/samsung/smdk6400/u-boot-nand.lds b/board/samsung/smdk6400/u-boot-nand.lds index 21e1ed3..f162815 100644 --- a/board/samsung/smdk6400/u-boot-nand.lds +++ b/board/samsung/smdk6400/u-boot-nand.lds @@ -67,6 +67,8 @@ SECTIONS *(.dynsym) } + _end = .; + .bss __rel_dyn_start (OVERLAY) : { __bss_start = .; *(.bss) -- 1.7.4.1 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/86xx: display boot device and bank on the MPC8610 HPCD
On Apr 28, 2011, at 1:41 PM, Timur Tabi wrote: > Signed-off-by: Timur Tabi > --- > board/freescale/mpc8610hpcd/mpc8610hpcd.c | 25 +++-- > 1 files changed, 23 insertions(+), 2 deletions(-) applied to 85xx next - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/7] powerpc/mpc8xxx: Enable calculation for fixed DDR chips
On May 26, 2011, at 6:25 PM, York Sun wrote: > From: york > > We used to have fixed parameters for soldered DDR chips. This patch enables > calculation based on raw timing data, implemneted in board-specific file. > > Signed-off-by: York Sun > --- > arch/powerpc/cpu/mpc85xx/cpu.c|4 +++- > arch/powerpc/cpu/mpc8xxx/ddr/Makefile | 13 +++-- > arch/powerpc/cpu/mpc8xxx/ddr/ddr.h|5 + > arch/powerpc/cpu/mpc8xxx/ddr/main.c | 12 > 4 files changed, 31 insertions(+), 3 deletions(-) applied to 85xx next - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 2/7] powerpc/mpc8xxx: adjust DDR burst length and chop accroding to sdram width
On May 26, 2011, at 6:25 PM, York Sun wrote: > From: york > > If the bus width is 32-bit, burst chop should be disabled and burst length > should be 8. Read from SPD or other source to determine the width. > > Signed-off-by: York Sun > --- > arch/powerpc/cpu/mpc8xxx/ddr/options.c | 24 > 1 files changed, 20 insertions(+), 4 deletions(-) applied to 85xx next - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 4/7] powerpc/mpc8xxx: check SPD length before using part number
On May 26, 2011, at 6:25 PM, York Sun wrote: > From: york > > Only use DDR DIMM part number if SPD has valid length, to prevent from > display garbage in case SPD doesn't cover these fields. > > Signed-off-by: York Sun > --- > arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c |3 ++- > 1 files changed, 2 insertions(+), 1 deletions(-) applied to 85xx next - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/7] powerpc/mpc8xxx: Add 16-bit support for DDR3
On May 26, 2011, at 6:25 PM, York Sun wrote: > Add support for 16-bit DDR bus. Also deal with system using 64- and 32-bit > DDR devices. > > Signed-off-by: York Sun > --- > arch/powerpc/cpu/mpc8xxx/ddr/main.c | 14 +- > arch/powerpc/cpu/mpc8xxx/ddr/options.c |3 ++- > arch/powerpc/include/asm/fsl_ddr_sdram.h |3 +++ > 3 files changed, 18 insertions(+), 2 deletions(-) applied to 85xx next - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [Patch v3 1/2] Adding more SPD registers
On May 26, 2011, at 6:32 PM, York Sun wrote: > Adding byte 32 and 33 > > Signed-off-by: York Sun > --- > include/ddr_spd.h |4 +++- > 1 files changed, 3 insertions(+), 1 deletions(-) applied to 85xx next - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 6/7] powerpc/mpc8xxx: Adding fallback to raw timing on supported boards
On May 26, 2011, at 6:25 PM, York Sun wrote: > In case of empty SPD or checksum error, fallback to raw timing on > supported boards. > > Signed-off-by: York Sun > --- > arch/powerpc/cpu/mpc8xxx/ddr/main.c |8 > 1 files changed, 8 insertions(+), 0 deletions(-) > > diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c > b/arch/powerpc/cpu/mpc8xxx/ddr/main.c > index db7cf11..2e43da6 100644 > --- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c > +++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c > @@ -343,12 +343,20 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int > start_step, > &(pinfo->dimm_params[i][j]); > > retval = compute_dimm_parameters(spd, pdimm, i); > +#ifdef CONFIG_DDR_RAW_TIMING Should this be CONFIG_SYS_DDR_RAW_TIMING?? We need this added to README at a minimum for what DDR_RAW_TIMING means. > + if (retval != 0) { > + printf("SPD error! Trying fallback to " > + "raw timing calculation\n"); > + fsl_ddr_get_dimm_params(pdimm, i, j); > + } > +#else > if (retval == 2) { > printf("Error: compute_dimm_parameters" > " non-zero returned FATAL value " > "for memctl=%u dimm=%u\n", i, j); > return 0; > } > +#endif > if (retval) { > debug("Warning: compute_dimm_parameters" > " non-zero return value for memctl=%u " > -- > 1.7.0.4 > > > ___ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 3/7] powerpc/mpc8xxx: Enable calculation for fixed DDR chips
On Jun 3, 2011, at 2:42 AM, Kumar Gala wrote: > > On May 26, 2011, at 6:25 PM, York Sun wrote: > >> From: york >> >> We used to have fixed parameters for soldered DDR chips. This patch enables >> calculation based on raw timing data, implemneted in board-specific file. >> >> Signed-off-by: York Sun >> --- >> arch/powerpc/cpu/mpc85xx/cpu.c|4 +++- >> arch/powerpc/cpu/mpc8xxx/ddr/Makefile | 13 +++-- >> arch/powerpc/cpu/mpc8xxx/ddr/ddr.h|5 + >> arch/powerpc/cpu/mpc8xxx/ddr/main.c | 12 >> 4 files changed, 31 insertions(+), 3 deletions(-) > > applied to 85xx next After further review, I'm dropping this one for now. We need to add some docs about 'RAW TIMING' - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [STATUS] WARNING: huge ARM board removal pending
Dear Reinhard, In message <8a423d2d-b4ca-422a-813d-e808a0b84...@googlemail.com> Andreas Bießmann wrote: > > > At present, the following 112 boards are scheduled for removal: > > > > > Please submit fixes to prevent removal. > > http://patchwork.ozlabs.org/patch/83703/ is pending since february and will > fix at least: > > at91rm9200ek at91rm9200ek_ram eb_cpux9k2 > (maybe some other arm920t/at91 boards) > > > Note: countdown is T minus 10 days, and counting. > > Reinhard could you please schedule this patch? > Can you please comment why thi spatch has not been applied yet, and when we will see a pull request to include it? Would it be possible to have this in the next few days, so we cah have a -rc3 before the .06 release? Thanks. 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: w...@denx.de What was sliced bread the greatest thing since? ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 6/7] powerpc/mpc8xxx: Adding fallback to raw timing on supported boards
On Fri, 2011-06-03 at 02:46 -0500, Kumar Gala wrote: > On May 26, 2011, at 6:25 PM, York Sun wrote: > > > In case of empty SPD or checksum error, fallback to raw timing on > > supported boards. > > > > Signed-off-by: York Sun > > --- > > arch/powerpc/cpu/mpc8xxx/ddr/main.c |8 > > 1 files changed, 8 insertions(+), 0 deletions(-) > > > > diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c > > b/arch/powerpc/cpu/mpc8xxx/ddr/main.c > > index db7cf11..2e43da6 100644 > > --- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c > > +++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c > > @@ -343,12 +343,20 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int > > start_step, > > &(pinfo->dimm_params[i][j]); > > > > retval = compute_dimm_parameters(spd, pdimm, i); > > +#ifdef CONFIG_DDR_RAW_TIMING > > Should this be CONFIG_SYS_DDR_RAW_TIMING?? > > We need this added to README at a minimum for what DDR_RAW_TIMING means. > Will do. York ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 0/2] arm: cleanup board code
fix Coding Style for arch/arm/lib/board.c use gd->ram_size instead of bd->bi_memsize Heiko Schocher (2): arm, lib/board.c: Coding Style cleanup arm, lib/board.c: use gd->ram_size instead of bd->bi_memsize arch/arm/lib/board.c | 218 ++ 1 files changed, 113 insertions(+), 105 deletions(-) -- 1.7.4.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 2/2] arm, lib/board.c: use gd->ram_size instead of bd->bi_memsize
Signed-off-by: Heiko Schocher cc: Albert Aribaud --- arch/arm/lib/board.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 05ee71b..0acd23b 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -641,7 +641,7 @@ void board_init_r(gd_t *id, ulong dest_addr) pram += (LOGBUFF_LEN + LOGBUFF_OVERHEAD) / 1024; #endif #endif - sprintf((char *)memsz, "%ldk", (bd->bi_memsize / 1024) - pram); + sprintf((char *)memsz, "%ldk", (gd->ram_size / 1024) - pram); setenv("mem", (char *)memsz); } #endif -- 1.7.4.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH 1/2] arm, lib/board.c: Coding Style cleanup
Signed-off-by: Heiko Schocher cc: Albert Aribaud --- arch/arm/lib/board.c | 218 ++ 1 files changed, 113 insertions(+), 105 deletions(-) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 1a784a1..05ee71b 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -92,26 +92,28 @@ extern void rtl8019_get_enetaddr (uchar * addr); * May be supplied by boards if desired */ -void inline __coloured_LED_init (void) {} -void coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init"))); -void inline __red_LED_on (void) {} -void red_LED_on (void) __attribute__((weak, alias("__red_LED_on"))); -void inline __red_LED_off(void) {} +inline void __coloured_LED_init(void) {} +void coloured_LED_init(void) +__attribute__((weak, alias("__coloured_LED_init"))); +inline void __red_LED_on(void) {} +void red_LED_on(void) __attribute__((weak, alias("__red_LED_on"))); +inline void __red_LED_off(void) {} void red_LED_off(void) __attribute__((weak, alias("__red_LED_off"))); -void inline __green_LED_on(void) {} +inline void __green_LED_on(void) {} void green_LED_on(void) __attribute__((weak, alias("__green_LED_on"))); -void inline __green_LED_off(void) {} +inline void __green_LED_off(void) {} void green_LED_off(void) __attribute__((weak, alias("__green_LED_off"))); -void inline __yellow_LED_on(void) {} +inline void __yellow_LED_on(void) {} void yellow_LED_on(void) __attribute__((weak, alias("__yellow_LED_on"))); -void inline __yellow_LED_off(void) {} +inline void __yellow_LED_off(void) {} void yellow_LED_off(void) __attribute__((weak, alias("__yellow_LED_off"))); -void inline __blue_LED_on(void) {} +inline void __blue_LED_on(void) {} void blue_LED_on(void) __attribute__((weak, alias("__blue_LED_on"))); -void inline __blue_LED_off(void) {} +inline void __blue_LED_off(void) {} void blue_LED_off(void) __attribute__((weak, alias("__blue_LED_off"))); -/ +/* + * Init Utilities * * Some of this code should be moved into the core functions, @@ -122,30 +124,30 @@ void blue_LED_off(void) __attribute__((weak, alias("__blue_LED_off"))); #if defined(CONFIG_ARM_DCC) && !defined(CONFIG_BAUDRATE) #define CONFIG_BAUDRATE 115200 #endif -static int init_baudrate (void) +static int init_baudrate(void) { char tmp[64]; /* long enough for environment variables */ - int i = getenv_f("baudrate", tmp, sizeof (tmp)); + int i = getenv_f("baudrate", tmp, sizeof(tmp)); gd->baudrate = (i > 0) - ? (int) simple_strtoul (tmp, NULL, 10) + ? (int) simple_strtoul(tmp, NULL, 10) : CONFIG_BAUDRATE; return (0); } -static int display_banner (void) +static int display_banner(void) { - printf ("\n\n%s\n\n", version_string); - debug ("U-Boot code: %08lX -> %08lX BSS: -> %08lX\n", + printf("\n\n%s\n\n", version_string); + debug("U-Boot code: %08lX -> %08lX BSS: -> %08lX\n", _TEXT_BASE, - _bss_start_ofs+_TEXT_BASE, _bss_end_ofs+_TEXT_BASE); + _bss_start_ofs + _TEXT_BASE, _bss_end_ofs + _TEXT_BASE); #ifdef CONFIG_MODEM_SUPPORT - debug ("Modem Support enabled\n"); + debug("Modem Support enabled\n"); #endif #ifdef CONFIG_USE_IRQ - debug ("IRQ Stack: %08lx\n", IRQ_STACK_START); - debug ("FIQ Stack: %08lx\n", FIQ_STACK_START); + debug("IRQ Stack: %08lx\n", IRQ_STACK_START); + debug("FIQ Stack: %08lx\n", FIQ_STACK_START); #endif return (0); @@ -158,23 +160,23 @@ static int display_banner (void) * gives a simple yet clear indication which part of the * initialization if failing. */ -static int display_dram_config (void) +static int display_dram_config(void) { int i; #ifdef DEBUG - puts ("RAM Configuration:\n"); + puts("RAM Configuration:\n"); - for(i=0; ibd->bi_dram[i].start); - print_size (gd->bd->bi_dram[i].size, "\n"); + for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) { + printf("Bank #%d: %08lx ", i, gd->bd->bi_dram[i].start); + print_size(gd->bd->bi_dram[i].size, "\n"); } #else ulong size = 0; - for (i=0; ibd->bi_dram[i].size; - } + puts("DRAM: "); print_size(size, "\n"); #endif @@ -183,11 +185,11 @@ static int display_dram_config (void) } #if defined(CONFIG_HARD_I2C) || defined(CONFIG_SOFT_I2C) -static int init_func_i2c (void) +static int init_func_i2c(void) { - puts ("I2C: "); - i2c_init (CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE); - puts ("ready\n");
Re: [U-Boot] [PATCH] SMDK6400: fix the compiler error
Dear Albert ARIBAUD, On 3 June 2011 16:27, Minkyu Kang wrote: > This patch adds _end for fix following compiler error > > arch/arm/cpu/arm1176/start.o: In function `_end_ofs': > arch/arm/cpu/arm1176/start.S:61: undefined reference to `_end' > > Signed-off-by: Minkyu Kang > --- > board/samsung/smdk6400/u-boot-nand.lds | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) This patch is for bugfix. Please apply it to arm tree. Thanks Minkyu Kang -- from. prom. www.promsoft.net ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] sh: Add support for SH2A freestanding build
SH2A toolchains often only provide an fdpic version of libgcc. This can't be used with bare-metal software like U-Boot, so this patch provides the necessary functions extracted from libgcc. Signed-off-by: Phil Edworthy Cc: Nobuhiro Iwamatsu --- Changes for v2: - Removed changes to PLATFORM_CPPFLAGS. These are independent of the patch functionality. arch/sh/lib/Makefile | 22 + arch/sh/lib/ashiftlt.S | 192 ++ arch/sh/lib/ashiftrt.S | 149 ++ arch/sh/lib/ashldi3.c | 25 + arch/sh/lib/libgcc.h | 25 + arch/sh/lib/lshiftrt.S | 192 ++ arch/sh/lib/lshrdi3.c | 25 + arch/sh/lib/movmem.S | 238 8 files changed, 868 insertions(+), 0 deletions(-) create mode 100644 arch/sh/lib/ashiftlt.S create mode 100644 arch/sh/lib/ashiftrt.S create mode 100644 arch/sh/lib/ashldi3.c create mode 100644 arch/sh/lib/libgcc.h create mode 100644 arch/sh/lib/lshiftrt.S create mode 100644 arch/sh/lib/lshrdi3.c create mode 100644 arch/sh/lib/movmem.S diff --git a/arch/sh/lib/Makefile b/arch/sh/lib/Makefile index c0670cb..6aaf55a 100644 --- a/arch/sh/lib/Makefile +++ b/arch/sh/lib/Makefile @@ -21,8 +21,15 @@ include $(TOPDIR)/config.mk LIB= $(obj)lib$(ARCH).o +LIBGCC = $(obj)libgcc.o SOBJS-y+= +GLSOBJS+= ashiftrt.o +GLSOBJS+= ashiftlt.o +GLSOBJS+= lshiftrt.o +GLSOBJS+= ashldi3.o +GLSOBJS+= lshrdi3.o +GLSOBJS+= movmem.o COBJS-y+= board.o COBJS-y+= bootm.o @@ -37,10 +44,25 @@ endif SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c) OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y)) +LGOBJS := $(addprefix $(obj),$(GLSOBJS)) \ + $(addprefix $(obj),$(GLCOBJS)) + +# Always build libsh.o +TARGETS:= $(LIB) + +# Build private libgcc only when asked for +ifdef USE_PRIVATE_LIBGCC +TARGETS+= $(LIBGCC) +endif + +all: $(TARGETS) $(LIB):$(obj).depend $(OBJS) $(call cmd_link_o_target, $(OBJS)) +$(LIBGCC): $(obj).depend $(LGOBJS) + $(call cmd_link_o_target, $(LGOBJS)) + # # defines $(obj).depend target diff --git a/arch/sh/lib/ashiftlt.S b/arch/sh/lib/ashiftlt.S new file mode 100644 index 000..4940a87 --- /dev/null +++ b/arch/sh/lib/ashiftlt.S @@ -0,0 +1,192 @@ +/* Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, + 2004, 2005, 2006 + Free Software Foundation, Inc. + +This file 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, or (at your option) any +later version. + +In addition to the permissions in the GNU General Public License, the +Free Software Foundation gives you unlimited permission to link the +compiled version of this file into combinations with other programs, +and to distribute those combinations without any restriction coming +from the use of this file. (The General Public License restrictions +do apply in other respects; for example, they cover modification of +the file, and distribution when not linked into a combine +executable.) + +This file 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; see the file COPYING. If not, write to +the Free Software Foundation, 51 Franklin Street, Fifth Floor, +Boston, MA 02110-1301, USA. */ + +!! libgcc routines for the Renesas / SuperH SH CPUs. +!! Contributed by Steve Chamberlain. +!! s...@cygnus.com + +!! ashiftrt_r4_x, ___ashrsi3, ___ashlsi3, ___lshrsi3 routines +!! recoded in assembly by Toshiyasu Morita +!! t...@netcom.com + +/* SH2 optimizations for ___ashrsi3, ___ashlsi3, ___lshrsi3 and + ELF local label prefixes by J"orn Rennecke + amyl...@cygnus.com */ + +! +! GLOBAL(ashlsi3) +! +! Entry: +! +! r4: Value to shift +! r5: Shifts +! +! Exit: +! +! r0: Result +! +! Destroys: +! +! (none) +! + .global __ashlsi3 + .align 2 +__ashlsi3: + mov #31,r0 + and r0,r5 + mova__ashlsi3_table,r0 + mov.b @(r0,r5),r5 +#ifdef __sh1__ + add r5,r0 + jmp @r0 +#else + brafr5 +#endif + mov r4,r0 + + .align 2 +__ashlsi3_table: + .byte __ashlsi3_0-__ashlsi3_table + .byte __ashlsi3_1-__ashlsi3_table + .byte __ashlsi3_2-__ashlsi3_table + .byte __ashlsi3_3-__ashlsi3_table + .byte __ashlsi3_4-__ashlsi3_table + .byte __ashlsi3_5-__ashlsi3_table + .byte __ashlsi3_6-__ashlsi3_table + .byt
Re: [U-Boot] [STATUS] WARNING: huge ARM board removal pending
Hi Wolfgang, > this is a * W A R N I N G * message to maintainers / users / owners > of ARM boards. If your board fails to build in the current release, > it will be subject to a big cleanup action which is going to remove > all old, unmaintained and broken boards in the next merge window. > According to our current schedule, this is in 10 days from now. Although I'm not the board maintainer I do have an omap5912osk board sat on the shelf and am happy to do the necessary work to get the current code release to work but it would have to wait until some current project work is completed which may take the rest of June. Is that OK? Andy. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] NEW!!!!!!!!! LED down/ceiling/indoor light
<> ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [STATUS] WARNING: huge ARM board removal pending
On 03/06/11 07:51, Wolfgang Denk wrote: > > Hi, > > this is a * W A R N I N G * message to maintainers / users / owners > of ARM boards. If your board fails to build in the current release, > it will be subject to a big cleanup action which is going to remove > all old, unmaintained and broken boards in the next merge window. > According to our current schedule, this is in 10 days from now. > > > At present, the following 112 boards are scheduled for removal: > > B2at91sam9m10g45ekedb9307aomap2420h4 > CPU9260 at91sam9rlekedb9312 omap5912osk > CPU9G20 cmc_pu2 edb9315 omap730p2 > CPUAT91 cp1026 edb9315a > otc570_dataflash > SBC35_A9G20 cp1136 ep7312 pm9261 > SMN42 cp920t evb4510 pm9263 > TNY_A9260 cp922_XA10 gcplus pm9g45 > TNY_A9G20 cp926ejsimpa7 sbc2410x > afeb9260 cp946es imx31_phycore scb9328 > ap7 cp966 imx31_phycore_eet shannon > ap720tcpu9260 integratorapsmdk2400 > ap920tcpu9260_128Mintegratorcpsmdk6400 > ap922_XA10cpu9260_nandjornada snapper9260 > ap926ejs cpu9260_nand_128M kb9202 snapper9g20 > ap946es cpu9G20 lartspear300 > ap966 cpu9G20_128Mlpc2292sodimm spear310 > apollon cpu9G20_nandlpd7a400spear320 > armadillo cpu9G20_nand_128M m501sk spear600 > assabet cpuat91 meesc > tnetv107x_evm > at91cap9adk cpuat91_ram meesc_dataflash top9000eval_xe > at91rm9200dk csb226 modnet50top9000su_xe > at91rm9200ek csb637 mx1ads trab > at91rm9200ek_ramdnp1110 mx1fs2 versatile > at91sam9260ek eb_cpux9k2 mx31ads versatileab > at91sam9261ek edb9301 netstar versatilepb > at91sam9263ek edb9302 omap1510inn voiceblue > at91sam9g10ek edb9302aomap1610h2 zipitz2 > at91sam9g20ek edb9307 omap1610inn zylonite > > > Please submit fixes to prevent removal. > > Note: countdown is T minus 10 days, and counting. > > You have been warned. > Looks like the worst offenders of the current timer API are also on this list. If they get fixed within the next merge window, the timer API will get updated 'for free' - If you bring them back from the dead, you will have to sort out updating timer API usage yourself (as well as relocation) Regards, Graeme ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [STATUS] WARNING: huge ARM board removal pending
Dear "Andy Pont", In message <009601cc21c8$92412360$b6c36a20$@p...@sdcsystems.com> you wrote: > > Although I'm not the board maintainer I do have an omap5912osk board sat on > the shelf and am happy to do the necessary work to get the current code > release to work but it would have to wait until some current project work is > completed which may take the rest of June. > > Is that OK? Sure. Thanks in advance. 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: w...@denx.de There is, however, a strange, musty smell in the air that reminds me of something...hmm...yes...I've got it...there's a VMS nearby, or I'm a Blit. - Larry Wall in Configure from the perl distribution ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [Timer]Help need to clean up udelay() for several ARM CPUs
Hi Guys, I'm trying to cleanup the old timer API as much as possible in preparation for the new API. I've managed to purge reset_timer() for all but Nios2 as well as get_timer(). Where timer_init() was calling set_timer() or reset_timer() I folded the code into timer_init() I have then proceeded to do the same to reset_timer_masked() - Mostly this was only called by reset_timer() which in turn was only called by timer_init(), but the following 8 files have reset_timer_masked() used in udelay() arch/arm/cpu/arm926ejs/omap/timer.c arch/arm/cpu/arm926ejs/versatile/timer.c arch/arm/cpu/arm1136/omap24xx/timer.c arch/arm/cpu/arm1136/mx35/timer.c arch/arm/cpu/arm920t/a320/timer.c arch/arm/cpu/armv7/s5p-common/timer.c arch/arm/cpu/lh7a40x/timer.c board/armltd/vexpress/ca9x4_ct_vxp.c Now I'm sure something very funky is going on which allows udelay() to call reset_timer_masked() with impacting on get_timer() but I don't know ARM at all and I'm not willing to mess around with these for fear of causing a rather large breakage. Can someone please look into these and let me know how I can safely sanitise these 8 implementations of udelay()? If all else fails, I'll just make reset_timer_masked static in these files Thanks in advance Graeme ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [STATUS] WARNING: huge ARM board removal pending
Hi Wolfgang, cpu9260* and cpu9G20* were fixed in april by commit c2b2a07eeb688b52ad74a1b679904cf3c339f34f cpuat91* were fixed in 632f8fdf4c4fae8343409be13d5e028cd4eee32d All these boards were then broken by the at91 rework in Reinhard's pull request of may. So please don't remove these board until I find time to fix them. Thanks, Eric ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [STATUS] WARNING: huge ARM board removal pending
On 06/03/11 00:51, Wolfgang Denk wrote: > Hi, Hi Wolfgang, [...] > omap1610h2 > omap1610inn > Please submit fixes to prevent removal. I've sent a compile fix [1] for omap1610h2 and omap1610inn about a month ago, but still it hasn't been picked up. Sandeep said, he is on vacation, may be Albert should pick this up instead? [1] http://patchwork.ozlabs.org/patch/93545/ -- Regards, Igor. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 6/7] powerpc/mpc8xxx: Adding fallback to raw timing on supported boards
On Jun 3, 2011, at 3:10 AM, York Sun wrote: > On Fri, 2011-06-03 at 02:46 -0500, Kumar Gala wrote: >> On May 26, 2011, at 6:25 PM, York Sun wrote: >> >>> In case of empty SPD or checksum error, fallback to raw timing on >>> supported boards. >>> >>> Signed-off-by: York Sun >>> --- >>> arch/powerpc/cpu/mpc8xxx/ddr/main.c |8 >>> 1 files changed, 8 insertions(+), 0 deletions(-) >>> >>> diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c >>> b/arch/powerpc/cpu/mpc8xxx/ddr/main.c >>> index db7cf11..2e43da6 100644 >>> --- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c >>> +++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c >>> @@ -343,12 +343,20 @@ fsl_ddr_compute(fsl_ddr_info_t *pinfo, unsigned int >>> start_step, >>> &(pinfo->dimm_params[i][j]); >>> >>> retval = compute_dimm_parameters(spd, pdimm, i); >>> +#ifdef CONFIG_DDR_RAW_TIMING >> >> Should this be CONFIG_SYS_DDR_RAW_TIMING?? >> >> We need this added to README at a minimum for what DDR_RAW_TIMING means. >> > > Will do. > > York thanks. Might be good to do it in patch 3/7. Just repost 3/7, 6/7, 7/7 against 'next' branch of git://git.denx.de/u-boot-mpc85xx.git - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2 1/2] GPIO: Tegra2: add GPIO driver for Tegra2
On Thu, Jun 2, 2011 at 9:53 PM, Mike Frysinger wrote: > On Thursday, June 02, 2011 17:30:09 Tom Warren wrote: >> Let me double-check. IIRC, one (cmd_gpio) didn't apply since it was >> from another SoC > > no, it isnt. it's using the generic GPIO API as defined by Linux and > implemented by many ports in u-boot. any new GPIO provider in u-boot should > probably be implementing that API too. > -mike > Alright. I'll look at using cmd_gpio instead of my code, adding any missing GPIO API functions to my driver. Tom ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] da850evm: u-boot does not start without UBL since commit f1d2b313c9eb6808d30c16a9eb5251240452a56c
Hi again, On Wed, Jun 1, 2011 at 12:58 PM, Christian Riesch wrote: > Hi, > > I have tried to run recent versions of u-boot on the da850evm (AM1808 > eXperimenter's Kit) board. Using Texas Instrument's User Boot Loader (UBL) > to start u-boot (the default configuration for the EVM) everything works > fine. However, if I try to get rid of this UBL (I don't need to voltage > scaling features that it provides, so it's useless for me, just additional > code that needs maintenance), I run into trouble. > > Instead of using UBL, I use AIS [1] to configure PLLs and mDDR timings. > My AIS script is generated by the HexAIS tool [2], the settings in the > input file of HexAIS are > > [General] > busWidth=8 > BootMode=SPIMASTER > crcCheckType=NO_CRC > [PLLANDCLOCKCONFIG] > PLL0CFG0 = 0x00180001 > PLL0CFG1 = 0x0205 > PERIPHCLKCFG = 0x000a > [EMIF3DDR] > PLL1CFG0 = 0x15010001 > PLL1CFG1 = 0x0002 > DDRPHYC1R = 0x00C4 > SDCR = 0x0A034622 > SDTIMR = 0x184929C8 > SDTIMR2 = 0xB80FC700 > SDRCR = 0x0406 > CLK2XSRC = 0x > [INPUTFILE] > FILENAME=u-boot.bin > LOADADDRESS=0xC108 > ENTRYPOINTADDRESS=0xC108 > > While this configuration works fine for older versions of u-boot (like > v2009.11), it fails with recent u-boot versions (no sign of life on the > serial port). I have bisected down to the commits from > > commit f1d2b313c9eb6808d30c16a9eb5251240452a56c > ARM: add relocation support > > to > > commit ab86f72c354f9b2572340f72b74ca0a258c451bd > ARM: implement relocation for ARM926 I've been trying to reproduce here but not having any luck so far. I'm using the 2.31 Davincii Serial Boot and flashing utilites [1], Mono 2.10 and the parent of commit f1d2b313c9eb6808d30c16a9eb5251240452a56c: '4fff329 nand_boot_fsl_nfc.c: make "nfc" a "static const" pointer' I build u-boot with 'make mrproper; make da850evm_config; make -j9 all'; I create an ais_output.bin with 'mono /media/unixdata/src/OMAP-L138_FlashAndBootUtils_2_31/OMAP-L138/GNU/AISUtils/HexAIS_OMAP-L138.exe' I erase the SPI flash with 'mono /media/unixdata/src/OMAP-L138_FlashAndBootUtils_2_31/OMAP-L138/GNU/sfh_OMAP-L138.exe -erase -p /dev/ttyS0' I write the SPI flash with 'mono /media/unixdata/src/OMAP-L138_FlashAndBootUtils_2_31/OMAP-L138/GNU/sfh_OMAP-L138.exe -flash_noubl ais_output.bin' and the contents of my OMAP-L138.ini are as yours: [General] busWidth=8 BootMode=SPIMASTER crcCheckType=NO_CRC [PLLANDCLOCKCONFIG] PLL0CFG0 = 0x00180001 PLL0CFG1 = 0x0205 PERIPHCLKCFG = 0x000a [EMIF3DDR] PLL1CFG0 = 0x15010001 PLL1CFG1 = 0x0002 DDRPHYC1R = 0x00C4 SDCR = 0x0A034622 SDTIMR = 0x184929C8 SDTIMR2 = 0xB80FC700 SDRCR = 0x0406 CLK2XSRC = 0x [INPUTFILE] FILENAME=u-boot.bin LOADADDRESS=0xC108 ENTRYPOINTADDRESS=0xC108 I would like to help you debug the operation of UBL-free boot with relocation -- can you give me more details on your setup to help me reproduce here? Best Regards, Ben Gardiner --- Nanometrics Inc. http://www.nanometrics.ca ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request u-boot-blackfin.git (v2)
The following changes since commit 6f4dd40cddbd69c56fec1285fee02cbd5a3833d8: Prepare v2011.06-rc2 (2011-06-02 23:19:27 +0200) are available in the git repository at: git://www.denx.de/git/u-boot-blackfin.git master Harald Krapfenbauer (1): Blackfin: cm-bf537e/cm-bf537u/tcm-bf537: update embedded env settings Mike Frysinger (4): Blackfin: use common LDSCRIPT logic Blackfin: use on-chip reset func with newer parts Blackfin: bf548-ezkit/bf561-ezkit: update env location Blackfin: boards: build zlib dir with -O2 arch/blackfin/config.mk|4 - arch/blackfin/cpu/reset.c | 70 ++-- arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} |0 board/bct-brettl2/config.mk|1 + board/bf518f-ezbrd/config.mk |1 + board/bf526-ezbrd/config.mk|1 + board/bf527-ad7160-eval/config.mk |1 + board/bf527-ezkit/config.mk|1 + board/bf527-sdp/config.mk |1 + board/bf533-ezkit/config.mk|1 + board/bf533-stamp/config.mk|1 + board/bf537-stamp/config.mk|1 + board/bf538f-ezkit/config.mk |1 + board/bf548-ezkit/config.mk|1 + board/bf561-acvilon/config.mk |1 + board/bf561-ezkit/config.mk|1 + board/cm-bf527/config.mk |1 + board/cm-bf533/config.mk |1 + board/cm-bf537e/config.mk |1 + board/cm-bf537u/config.mk |1 + board/cm-bf548/config.mk |1 + board/cm-bf561/config.mk |1 + board/ip04/config.mk |1 + board/tcm-bf518/config.mk |1 + board/tcm-bf537/config.mk |1 + include/configs/bf548-ezkit.h | 10 ++-- include/configs/bf561-ezkit.h | 23 +-- include/configs/cm-bf537e.h| 11 ++-- include/configs/cm-bf537u.h| 11 ++-- include/configs/tcm-bf537.h| 11 ++-- 30 files changed, 79 insertions(+), 83 deletions(-) rename arch/blackfin/{lib/u-boot.lds.S => cpu/u-boot.lds} (100%) ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] common/env_common: Add CONFIG_SILENT_CONSOLE_AT_BOOT env option
On Thu, Jun 2, 2011 at 11:48 PM, Mike Frysinger wrote: > any reason you couldnt add silent=0 to CONFIG_EXTRA_ENV_SETTINGS ? I was just perturbed that setting CONFIG_SILENT_CONSOLE did not actually make the console silent - I thought it would be cleaner to have a define available for this. This is an optional patch though in that sense -M ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2 2/4] build/mkconfig: Add EXTRA_OPTS argument to make to modify build
Allow users to pass in extra defines via make so they can modify the build. Example make P1022DS EXTRA_OPTS=NAND is equivalent to make P1022DS_NAND Signed-off-by: Matthew McClintock --- v2: Fix tab indention, fix posix compliance mkconfig |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/mkconfig b/mkconfig index 6ff533f..bc6ce06 100755 --- a/mkconfig +++ b/mkconfig @@ -81,6 +81,12 @@ if [ "${ARCH}" -a "${ARCH}" != "${arch}" ]; then exit 1 fi +if [ -z "${options}" ] ; then + options=$EXTRA_OPTS +else + options="$options,$EXTRA_OPTS" +fi + if [ "$options" ] ; then echo "Configuring for ${BOARD_NAME} - Board: ${CONFIG_NAME}, Options: ${options}" else @@ -146,7 +152,7 @@ else > config.h # Create new config file fi echo "/* Automatically generated - do not edit */" >>config.h - +TARGETS+=`echo $EXTRA_OPTS | tr ',' ' '` for i in ${TARGETS} ; do i="`echo ${i} | sed '/=/ {s/=/\t/;q } ; { s/$/\t1/ }'`" echo "#define CONFIG_${i}" >>config.h ; -- 1.7.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] common/env_common: Add CONFIG_SILENT_CONSOLE_AT_BOOT env option
On Friday, June 03, 2011 14:34:27 McClintock Matthew-B29882 wrote: > On Thu, Jun 2, 2011 at 11:48 PM, Mike Frysinger wrote: > > any reason you couldnt add silent=0 to CONFIG_EXTRA_ENV_SETTINGS ? > > I was just perturbed that setting CONFIG_SILENT_CONSOLE did not > actually make the console silent - I thought it would be cleaner to > have a define available for this. i know people are surprised by this from time to time, but i think the README is pretty clear about it. is there clarification there that you'd like ? since CONFIG_EXTRA_ENV_SETTINGS is board-specific, i'm not sure adding another board-specific define for a single default env var gains us anything. -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 2/4] build/mkconfig: Add EXTRA_OPTS argument to make to modify build
On Friday, June 03, 2011 14:36:03 Matthew McClintock wrote: > +if [ -z "${options}" ] ; then > + options=$EXTRA_OPTS > +else > + options="$options,$EXTRA_OPTS" > +fi this can be simplified (or at least done in one line) with: options=${options:+${options},}${EXTRA_OPTS} although i can understand that not everyone can grok that at first blush > +TARGETS+=`echo $EXTRA_OPTS | tr ',' ' '` you're still using non-portable += append operator although i dont understand how EXTRA_OPTS can both be extra options and extra targets at the same time ... -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] autostart: unify duplicated logic into the bootm code
On Thu, Jun 2, 2011 at 10:18 AM, Mike Frysinger wrote: > diff --git a/common/cmd_usb.c b/common/cmd_usb.c > index b5731a7..efec895 100644 > --- a/common/cmd_usb.c > +++ b/common/cmd_usb.c > @@ -356,7 +356,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, char > * const argv[]) > { > char *boot_device = NULL; > char *ep; > - int dev, part = 1, rcode; > + int dev, part = 1; > ulong addr, cnt; > disk_partition_t info; > image_header_t *hdr; > @@ -490,16 +490,7 @@ int do_usbboot(cmd_tbl_t *cmdtp, int flag, int argc, > char * const argv[]) > > flush_cache(addr, (cnt+1)*info.blksz); > > - /* Check if we should attempt an auto-start */ > - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep, "yes") == 0)) > { > - char *local_args[2]; > - local_args[0] = argv[0]; > - local_args[1] = NULL; > - printf("Automatic boot of image at addr 0x%08lX ...\n", addr); > - rcode = do_bootm(cmdtp, 0, 1, local_args); > - return rcode; > - } > - return 0; > + return maybe_autostart(cmdtp, argv[0]); Typo here... need bootm_maybe_autostart -M ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] part_dos: fix crash with big sector size
Apple iPod nanos have sector sizes of 2 or 4 KiB, which crashes U-Boot when it tries to read the MBR into 512-byte buffer situated on stack. Instead use the variable length arrays to be safe with any large sector size. Signed-off-by: Sergei Shtylyov --- The same change is probably needed for disk/part_amiga.c but I'm not really sure if Amiga supports USB... :-) disk/part_dos.c |6 +++--- disk/part_dos.h |7 --- 2 files changed, 3 insertions(+), 10 deletions(-) Index: u-boot/disk/part_dos.c === --- u-boot.orig/disk/part_dos.c +++ u-boot/disk/part_dos.c @@ -87,7 +87,7 @@ static int test_block_type(unsigned char int test_part_dos (block_dev_desc_t *dev_desc) { - unsigned char buffer[DEFAULT_SECTOR_SIZE]; + unsigned char buffer[dev_desc->blksz]; if ((dev_desc->block_read(dev_desc->dev, 0, 1, (ulong *) buffer) != 1) || (buffer[DOS_PART_MAGIC_OFFSET + 0] != 0x55) || @@ -102,7 +102,7 @@ int test_part_dos (block_dev_desc_t *dev static void print_partition_extended (block_dev_desc_t *dev_desc, int ext_part_sector, int relative, int part_num) { - unsigned char buffer[DEFAULT_SECTOR_SIZE]; + unsigned char buffer[dev_desc->blksz]; dos_partition_t *pt; int i; @@ -166,7 +166,7 @@ static int get_partition_info_extended ( int relative, int part_num, int which_part, disk_partition_t *info) { - unsigned char buffer[DEFAULT_SECTOR_SIZE]; + unsigned char buffer[dev_desc->blksz]; dos_partition_t *pt; int i; Index: u-boot/disk/part_dos.h === --- u-boot.orig/disk/part_dos.h +++ u-boot/disk/part_dos.h @@ -25,13 +25,6 @@ #define _DISK_PART_DOS_H -#ifdef CONFIG_ISO_PARTITION -/* Make the buffers bigger if ISO partition support is enabled -- CD-ROMS - have 2048 byte blocks */ -#define DEFAULT_SECTOR_SIZE2048 -#else -#define DEFAULT_SECTOR_SIZE512 -#endif #define DOS_PART_TBL_OFFSET0x1be #define DOS_PART_MAGIC_OFFSET 0x1fe #define DOS_PBR_FSTYPE_OFFSET 0x36 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 2/4] build/mkconfig: Add EXTRA_OPTS argument to make to modify build
On Fri, Jun 3, 2011 at 2:24 PM, Mike Frysinger wrote: > On Friday, June 03, 2011 14:36:03 Matthew McClintock wrote: >> +if [ -z "${options}" ] ; then >> + options=$EXTRA_OPTS >> +else >> + options="$options,$EXTRA_OPTS" >> +fi > > this can be simplified (or at least done in one line) with: > options=${options:+${options},}${EXTRA_OPTS} > > although i can understand that not everyone can grok that at first blush I'm fine with doing this if it's understandable by all > >> +TARGETS+=`echo $EXTRA_OPTS | tr ',' ' '` > > you're still using non-portable += append operator > > although i dont understand how EXTRA_OPTS can both be extra options and extra > targets at the same time ... Actually I just looked over this again and I found a much simpler way to accomplish the same thing. See my next patch. -M ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v3 2/4] build/mkconfig: Add EXTRA_OPTS argument to make to modify build
Allow users to pass in extra defines via make so they can modify the build. Example make P1022DS EXTRA_OPTS=NAND is equivalent to make P1022DS_NAND Signed-off-by: Matthew McClintock --- v2: Fix tab indention, fix posix compliance v3: Move appending $EXTRA_OPTS up higher before we set $TARGETS so we only need to append $EXTRA_OPTS to $options and not $TARGETS mkconfig |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/mkconfig b/mkconfig index 6ff533f..77ddc1b 100755 --- a/mkconfig +++ b/mkconfig @@ -72,9 +72,13 @@ fi # Check if we only have a colon... if [ "${tmp}" != "$7" ] ; then options=${7#*:} - TARGETS="`echo ${options} | sed 's:,: :g'` ${TARGETS}" fi } +# Append options passed in via EXTRA_OPTS +if [ -n "$EXTRA_OPTS" ] ; then + options=${options:+${options},}${EXTRA_OPTS} +fi +TARGETS="`echo ${options} | sed 's:,: :g'` ${TARGETS}" if [ "${ARCH}" -a "${ARCH}" != "${arch}" ]; then echo "Failed: \$ARCH=${ARCH}, should be '${arch}' for ${BOARD_NAME}" 1>&2 -- 1.7.5 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] common/env_common: Add CONFIG_SILENT_CONSOLE_AT_BOOT env option
On Fri, Jun 3, 2011 at 2:16 PM, Mike Frysinger wrote: >> On Thu, Jun 2, 2011 at 11:48 PM, Mike Frysinger wrote: >> > any reason you couldnt add silent=0 to CONFIG_EXTRA_ENV_SETTINGS ? >> >> I was just perturbed that setting CONFIG_SILENT_CONSOLE did not >> actually make the console silent - I thought it would be cleaner to >> have a define available for this. > > i know people are surprised by this from time to time, but i think the README > is pretty clear about it. is there clarification there that you'd like ? > > since CONFIG_EXTRA_ENV_SETTINGS is board-specific, i'm not sure adding another > board-specific define for a single default env var gains us anything. Not really too concerned either way here. Some of our boards have some really long CONFIG_EXTRA_ENV_SETTINGS and it's nice to try to keep that shorter by moving stuff into CONFIG_NFSBOOTCOMMAND, CONFIG_RAMBOOTCOMMAD, CONFIG_SILENT_CONSOLE_AT_BOOT, etc. but beyond that we can just add to our CONFIG_EXTRA_ENV_SETTINGS as well. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] common/env_common: Add CONFIG_SILENT_CONSOLE_AT_BOOT env option
On Friday, June 03, 2011 16:14:29 McClintock Matthew-B29882 wrote: > On Fri, Jun 3, 2011 at 2:16 PM, Mike Frysinger wrote: > >> On Thu, Jun 2, 2011 at 11:48 PM, Mike Frysinger wrote: > >> > any reason you couldnt add silent=0 to CONFIG_EXTRA_ENV_SETTINGS ? > >> > >> I was just perturbed that setting CONFIG_SILENT_CONSOLE did not > >> actually make the console silent - I thought it would be cleaner to > >> have a define available for this. > > > > i know people are surprised by this from time to time, but i think the > > README is pretty clear about it. is there clarification there that > > you'd like ? > > > > since CONFIG_EXTRA_ENV_SETTINGS is board-specific, i'm not sure adding > > another board-specific define for a single default env var gains us > > anything. > > Not really too concerned either way here. > > Some of our boards have some really long CONFIG_EXTRA_ENV_SETTINGS and > it's nice to try to keep that shorter by moving stuff into > CONFIG_NFSBOOTCOMMAND, CONFIG_RAMBOOTCOMMAD, > CONFIG_SILENT_CONSOLE_AT_BOOT, etc. but beyond that we can just add to > our CONFIG_EXTRA_ENV_SETTINGS as well. we had a similar thing with Blackfin boards, but we just made it our own set of defines that eventually culminated in a single CONFIG_EXTRA_ENV_SETTINGS *shrug* -mike signature.asc Description: This is a digitally signed message part. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 1/4] common/env_common: Add CONFIG_SILENT_CONSOLE_AT_BOOT env option
Dear y...@right.am.freescale.net, In message <1307042852-10385-1-git-send-email-y> you wrote: > From: Matthew McClintock > > Just setting CONFIG_SILENT_CONSOLE does not make the CONSOLE > silent without the silent env variable set. This adds a new > define to add this to the default environment easily Mike has explained why: I NAK this, too. 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: w...@denx.de People with narrow minds usually have broad tongues. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2 2/4] build/mkconfig: Add EXTRA_OPTS argument to make to modify build
Dear Matthew McClintock, In message <1307126163-24859-1-git-send-email-...@freescale.com> you wrote: > Allow users to pass in extra defines via make so they can > modify the build. Example > > make P1022DS EXTRA_OPTS=NAND > > is equivalent to > > make P1022DS_NAND > > Signed-off-by: Matthew McClintock What would that be good for? I consider this not a good idea. NAK. 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: w...@denx.de Misquotation is, in fact, the pride and privilege of the learned. A widely-read man never quotes accurately, for the rather obvious reason that he has read too widely. - Hesketh Pearson _Common Misquotations_ introduction ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Supporting SCCB protocol
Hi All, I would like to know if someone here have implemented a SCCB support in uboot?. I would appreciate if you could give me some snapshot of your codes?. Regards, John ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] PICK UP UR FIRST USD5000.00
-- I write to inform you that we have transferred USD$100,000 dollars.we would have called to give you the MTCN on phone but we have lost your call number.we decided to email you the MTCN and sender name so that you can pick starting cashing your money of USD5000.00 daily instalment with the same MTCN and sender's name which will be valid for 20 days until you cash the full $100,000.00usd. Sender's Fist name: PerrySender's Last Name: PostonMTCN: 0341153617Question: Who Is GreatAnswer: GodAmount: $5000.00USDTotal Amount To be cashed:$100,000usdWith due respect please get back to us urgently after picking ur first USD5000.00 to anable us direct you for another!!!ThanksBest RegardsMr Phoenix Andersson.Western Union TransferNIGERIA OFFICE,F.C.T,AbujaEmail: moneyoffi...@yahoo.com.hkTel:+2348134736503 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] PICK UP UR FIRST USD5000.00
-- I write to inform you that we have transferred USD$100,000 dollars.we would have called to give you the MTCN on phone but we have lost your call number.we decided to email you the MTCN and sender name so that you can pick starting cashing your money of USD5000.00 daily instalment with the same MTCN and sender's name which will be valid for 20 days until you cash the full $100,000.00usd. Sender's Fist name: PerrySender's Last Name: PostonMTCN: 0341153617Question: Who Is GreatAnswer: GodAmount: $5000.00USDTotal Amount To be cashed:$100,000usdWith due respect please get back to us urgently after picking ur first USD5000.00 to anable us direct you for another!!!ThanksBest RegardsMr Phoenix Andersson.Western Union TransferNIGERIA OFFICE,F.C.T,AbujaEmail: moneyoffi...@yahoo.com.hkTel:+2348134736503 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] (no subject)
I am requesting for your partnership in re-profiling funds I will give the details, but in summary, the funds are coming via Bank Of Taipei Taiwan.Contact me for further details (wen.le...@9.cn) Wen Lee. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v2] autostart: unify duplicated logic into the bootm code
Rather than having a bunch of random commands handle autostart behavior, unify the logic in a single place. This also fixes building of these different commands when bootm is disabled. Acked-by: Matthew McClintock Acked-by: Scott Wood Signed-off-by: Mike Frysinger --- v2 - fix usb typo pointed out by Matthew common/cmd_bootm.c | 15 +++ common/cmd_fdc.c | 15 +-- common/cmd_fdos.c | 11 +-- common/cmd_ide.c | 15 +-- common/cmd_nand.c | 14 +- common/cmd_net.c | 13 ++--- common/cmd_scsi.c | 11 +-- common/cmd_usb.c | 13 ++--- include/command.h |8 9 files changed, 32 insertions(+), 83 deletions(-) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 18019d6..8982c92 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -707,6 +707,21 @@ int do_bootm (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) return 1; } +int bootm_maybe_autostart(cmd_tbl_t *cmdtp, const char *cmd) +{ + const char *ep = getenv("autostart"); + + if (ep && !strcmp(ep, "yes")) { + char *local_args[2]; + local_args[0] = (char *)cmd; + local_args[1] = NULL; + printf("Automatic boot of image at addr 0x%08lX ...\n", load_addr); + return do_bootm(cmdtp, 0, 1, local_args); + } + + return 0; +} + /** * image_get_kernel - verify legacy format kernel image * @img_addr: in RAM address of the legacy format image to be verified diff --git a/common/cmd_fdc.c b/common/cmd_fdc.c index cdb050c..20ebf6c 100644 --- a/common/cmd_fdc.c +++ b/common/cmd_fdc.c @@ -722,7 +722,6 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) unsigned char boot_drive; int i,nrofblk; char *ep; - int rcode = 0; #if defined(CONFIG_FIT) const void *fit_hdr = NULL; #endif @@ -823,19 +822,7 @@ int do_fdcboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) /* Loading ok, update default load address */ load_addr = addr; - /* Check if we should attempt an auto-start */ - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { - char *local_args[2]; - - local_args[0] = argv[0]; - local_args[1] = NULL; - - printf ("Automatic boot of image at addr 0x%08lX ...\n", addr); - - do_bootm (cmdtp, 0, 1, local_args); - rcode ++; - } - return rcode; + return bootm_maybe_autostart(cmdtp, argv[0]); } U_BOOT_CMD( diff --git a/common/cmd_fdos.c b/common/cmd_fdos.c index 2af4ca0..d714af8 100644 --- a/common/cmd_fdos.c +++ b/common/cmd_fdos.c @@ -40,7 +40,6 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) char *name; char *ep; int size; -int rcode = 0; char buf [12]; int drive = CONFIG_SYS_FDC_DRIVE_NUMBER; @@ -98,15 +97,7 @@ int do_fdosboot(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) printf("Floppy DOS load complete: %d bytes loaded to 0x%lx\n", size, load_addr); -/* Check if we should attempt an auto-start */ -if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { - char *local_args[2]; - local_args[0] = argv[0]; - local_args[1] = NULL; - printf ("Automatic boot of image at addr 0x%08lX ...\n", load_addr); - rcode = do_bootm (cmdtp, 0, 1, local_args); -} -return rcode; +return bootm_maybe_autostart(cmdtp, argv[0]); } /*- diff --git a/common/cmd_ide.c b/common/cmd_ide.c index a1f7e57..07890e7 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -356,7 +356,6 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ulong addr, cnt; disk_partition_t info; image_header_t *hdr; - int rcode = 0; #if defined(CONFIG_FIT) const void *fit_hdr = NULL; #endif @@ -495,19 +494,7 @@ int do_diskboot (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) load_addr = addr; - /* Check if we should attempt an auto-start */ - if (((ep = getenv("autostart")) != NULL) && (strcmp(ep,"yes") == 0)) { - char *local_args[2]; - - local_args[0] = argv[0]; - local_args[1] = NULL; - - printf ("Automatic boot of image at addr 0x%08lX ...\n", addr); - - do_bootm (cmdtp, 0, 1, local_args); - rcode = 1; - } - return rcode; + return bootm_maybe_autostart(cmdtp, argv[0]); } /* - */ diff --git a/common/cmd_nand.c b/common/cmd_nand.c index 7bd37de..92ae186 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -799,19 +799,7 @@ static