December 2011 - U-Boot

[U-Boot] Conflicting definitions of flush_dcache
by Stefan Kristiansson 06 Mar '12

06 Mar '12

Hi, I noticed the following dilemma when I tried to enable both CONFIG_ETHOC and CONFIG_CMD_CACHE: The ethoc ethernet driver expects: void flush_dcache(unsigned long start, unsigned long size) while cmd_cache.c expect it to be: void flush_dcache(void) Grepping around the sources, I found that apart from drivers/net/ethoc.c also drivers/net/altera_tse.c uses flush_dcache with the two ulong parameters. No architecture apart from nios2 seems to provide flush_dcache like this and flush_dcache is not declared in common.h, so my gut feeling is that nios2 and the 2 ethernet drivers should be changed to use for example flush_dcache_range(?) Perhaps cmd_cache.c should also be fixed to use flush_dcache_all()? flush_icache() ofcourse suffer from the same problem. Stefan

4 5

[U-Boot] [PATCH] Makefile: Remove mmc_spl related enteries
by Chander Kashyap 06 Mar '12

06 Mar '12

As mmc_spl now follows spl infrastructure, removed unwanted enteries in Makefile for mmc_spl related compilation. Signed-off-by: Chander Kashyap <chander.kashyap(a)linaro.org> --- Makefile | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 294c762..d349c1c 100644 --- a/Makefile +++ b/Makefile @@ -361,7 +361,6 @@ ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin -ALL-$(CONFIG_MMC_U_BOOT) += $(obj)mmc_spl/u-boot-mmc-spl.bin ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin @@ -481,11 +480,6 @@ onenand_ipl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk $(obj)u-boot-onenand.bin: onenand_ipl $(obj)u-boot.bin cat $(ONENAND_BIN) $(obj)u-boot.bin > $(obj)u-boot-onenand.bin -mmc_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) depend - $(MAKE) -C mmc_spl/board/$(BOARDDIR) all - -$(obj)mmc_spl/u-boot-mmc-spl.bin: mmc_spl - $(obj)spl/u-boot-spl.bin: depend $(MAKE) -C spl all @@ -768,7 +762,6 @@ clean: @rm -f $(obj)$(CPUDIR)/$(SOC)/asm-offsets.s @rm -f $(obj)nand_spl/{u-boot.lds,u-boot-nand_spl.lds,u-boot-spl,u-boot-spl.map,System.map} @rm -f $(obj)onenand_ipl/onenand-{ipl,ipl.bin,ipl.map} - @rm -f $(obj)mmc_spl/{u-boot.lds,u-boot-spl,u-boot-spl.map,u-boot-spl.bin,u-boot-mmc-spl.bin} @rm -f $(ONENAND_BIN) @rm -f $(obj)onenand_ipl/u-boot.lds @rm -f $(obj)spl/{u-boot-spl,u-boot-spl.bin,u-boot-spl.lds,u-boot-spl.map} @@ -797,7 +790,6 @@ clobber: clean @rm -fr $(obj)include/generated @[ ! -d $(obj)nand_spl ] || find $(obj)nand_spl -name "*" -type l -print | xargs rm -f @[ ! -d $(obj)onenand_ipl ] || find $(obj)onenand_ipl -name "*" -type l -print | xargs rm -f - @[ ! -d $(obj)mmc_spl ] || find $(obj)mmc_spl -name "*" -type l -print | xargs rm -f @rm -f $(obj)dts/*.tmp mrproper \ -- 1.7.5.4

2 1

[U-Boot] [PATCH 00/18 V2] CHECKPATCH: fpgadata.c cleanup
by Marek Vasut 05 Mar '12

05 Mar '12

First of the CHECKPATCH series of patches with per-file checkpatch fixes. This series fixes all files fpgadata.c, which contains PPC FPGA firmwares. There are no functional changes, only CHECKPATCH fixes. Marek Vasut (18): CHECKPATCH: ./board/dave/PPChameleonEVB/fpgadata.c CHECKPATCH: ./board/esd/cpciiser4/fpgadata.c CHECKPATCH: ./board/esd/du405/fpgadata.c CHECKPATCH: ./board/esd/canbt/fpgadata.c CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci4052.c CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405ab.c CHECKPATCH: ./board/esd/cpci405/fpgadata_cpci405.c CHECKPATCH: ./board/esd/wuh405/fpgadata.c CHECKPATCH: ./board/esd/plu405/fpgadata.c CHECKPATCH: ./board/esd/ar405/fpgadata.c CHECKPATCH: ./board/esd/ar405/fpgadata_xl30.c CHECKPATCH: ./board/esd/dasa_sim/fpgadata.c CHECKPATCH: ./board/esd/ash405/fpgadata.c CHECKPATCH: ./board/esd/voh405/fpgadata.c CHECKPATCH: ./board/esd/apc405/fpgadata.c CHECKPATCH: ./board/esd/tasreg/fpgadata.c CHECKPATCH: ./board/esd/pci405/fpgadata.c CHECKPATCH: ./board/esd/hh405/fpgadata.c board/dave/PPChameleonEVB/fpgadata.c | 3416 +++++--- board/esd/apc405/fpgadata.c | 6012 ++++++++---- board/esd/ar405/fpgadata.c | 8250 +++++++++++------ board/esd/ar405/fpgadata_xl30.c | 7308 ++++++++++----- board/esd/ash405/fpgadata.c | 7475 ++++++++++----- board/esd/canbt/fpgadata.c | 1211 ++- board/esd/cpci405/fpgadata_cpci405.c | 1025 ++- board/esd/cpci405/fpgadata_cpci4052.c | 2294 +++-- board/esd/cpci405/fpgadata_cpci405ab.c | 3854 +++++--- board/esd/cpciiser4/fpgadata.c | 6204 +++++++++----- board/esd/dasa_sim/fpgadata.c | 5855 ++++++++---- board/esd/du405/fpgadata.c | 2108 +++-- board/esd/hh405/fpgadata.c | 7551 ++++++++++----- board/esd/pci405/fpgadata.c | 2238 +++-- board/esd/plu405/fpgadata.c | 3537 +++++--- board/esd/tasreg/fpgadata.c |15992 +++++++++++++++++++++----------- board/esd/voh405/fpgadata.c | 6032 ++++++++---- board/esd/wuh405/fpgadata.c | 5454 ++++++++---- 18 files changed, 63874 insertions(+), 31942 deletions(-) V2: Align to 8 bytes per line. Cc: Anatolij Gustschin <agust(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> Anatolij, Stefano, can you skim through these and give me your ACK so I can push them through staging ? Still, there is around three thousand files that don't conform to checkpatch style. -- 1.7.7.3

8 78

[U-Boot] [PATCH v3] ARM: s5p: pwm driver support
by Donghwa Lee 05 Mar '12

05 Mar '12

This is common pwm driver of S5P. Signed-off-by: Donghwa Lee <dh09.lee(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- Changes since v2: - Timer4 was blocked to access compare buffer register - code clean arch/arm/cpu/armv7/s5p-common/Makefile | 1 + arch/arm/cpu/armv7/s5p-common/pwm.c | 198 +++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-s5pc1xx/pwm.h | 7 + arch/arm/include/asm/arch-s5pc2xx/pwm.h | 7 + include/pwm.h | 31 +++++ 5 files changed, 244 insertions(+), 0 deletions(-) create mode 100644 arch/arm/cpu/armv7/s5p-common/pwm.c create mode 100644 include/pwm.h diff --git a/arch/arm/cpu/armv7/s5p-common/Makefile b/arch/arm/cpu/armv7/s5p-common/Makefile index 922cd95..ce0a41e 100644 --- a/arch/arm/cpu/armv7/s5p-common/Makefile +++ b/arch/arm/cpu/armv7/s5p-common/Makefile @@ -27,6 +27,7 @@ LIB = $(obj)libs5p-common.o COBJS-y += cpu_info.o COBJS-y += timer.o +COBJS-$(CONFIG_PWM) += pwm.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS-y) $(SOBJS)) diff --git a/arch/arm/cpu/armv7/s5p-common/pwm.c b/arch/arm/cpu/armv7/s5p-common/pwm.c new file mode 100644 index 0000000..29e996e --- /dev/null +++ b/arch/arm/cpu/armv7/s5p-common/pwm.c @@ -0,0 +1,198 @@ +/* + * Copyright (C) 2011 Samsung Electronics + * + * Donghwa Lee <dh09.lee(a)samsung.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <common.h> +#include <errno.h> +#include <pwm.h> +#include <asm/io.h> +#include <asm/arch/pwm.h> +#include <asm/arch/clk.h> + +#define PRESCALER_0 (8 - 1) /* prescaler of timer 0, 1 */ +#define PRESCALER_1 (16 - 1) /* prescaler of timer 2, 3, 4 */ +#define MUX_DIV_1 0 /* 1/1 period */ +#define MUX_DIV_2 1 /* 1/2 period */ +#define MUX_DIV_4 2 /* 1/4 period */ +#define MUX_DIV_8 3 /* 1/8 period */ +#define MUX_DIV_16 4 /* 1/16 period */ + +#define MUX_DIV_SHIFT(x) (x * 4) + +int pwm_enable(int pwm_id) +{ + const struct s5p_timer *pwm = + (struct s5p_timer *)samsung_get_base_timer(); + unsigned long tcon; + + tcon = readl(&pwm->tcon); + tcon |= TCON_START(pwm_id); + + writel(tcon, &pwm->tcon); + + return 0; +} + +void pwm_disable(int pwm_id) +{ + const struct s5p_timer *pwm = + (struct s5p_timer *)samsung_get_base_timer(); + unsigned long tcon; + + tcon = readl(&pwm->tcon); + tcon &= ~TCON_START(pwm_id); + + writel(tcon, &pwm->tcon); +} + +static unsigned long pwm_calc_tin(int pwm_id, unsigned long freq) +{ + unsigned long tin_parent_rate; + unsigned int div; + + tin_parent_rate = get_pwm_clk(); + + for (div = 2; div <= 16; div *= 2) { + if ((tin_parent_rate / (div << 16)) < freq) + return tin_parent_rate / div; + } + + return tin_parent_rate / 16; +} + +#define NS_IN_HZ (1000000000UL) + +int pwm_config(int pwm_id, int duty_ns, int period_ns) +{ + const struct s5p_timer *pwm = + (struct s5p_timer *)samsung_get_base_timer(); + unsigned int offset; + unsigned long tin_rate; + unsigned long tin_ns; + unsigned long period; + unsigned long tcon; + unsigned long tcnt; + unsigned long timer_rate_hz; + unsigned long tcmp; + + /* + * We currently avoid using 64bit arithmetic by using the + * fact that anything faster than 1GHz is easily representable + * by 32bits. + */ + if (period_ns > NS_IN_HZ || duty_ns > NS_IN_HZ) + return -ERANGE; + + if (duty_ns > period_ns) + return -EINVAL; + + period = NS_IN_HZ / period_ns; + + /* Check to see if we are changing the clock rate of the PWM */ + tin_rate = pwm_calc_tin(pwm_id, period); + timer_rate_hz = tin_rate; + + tin_ns = NS_IN_HZ / tin_rate; + tcnt = period_ns / tin_ns; + + /* Note, counters count down */ + tcmp = duty_ns / tin_ns; + tcmp = tcnt - tcmp; + + /* + * the pwm hw only checks the compare register after a decrement, + * so the pin never toggles if tcmp = tcnt + */ + if (tcmp == tcnt) + tcmp--; + + if (tcmp < 0) + tcmp = 0; + + /* Update the PWM register block. */ + offset = pwm_id * 0xc; + writel(tcnt, &pwm->tcntb0 + offset); + if (pwm_id < 4) + writel(tcmp, &pwm->tcmpb0 + offset); + + tcon = readl(&pwm->tcon); + tcon |= TCON_UPDATE(pwm_id); + if (pwm_id < 4) + tcon |= TCON_AUTO_RELOAD(pwm_id); + else + tcon |= TCON4_AUTO_RELOAD; + writel(tcon, &pwm->tcon); + + tcon &= ~TCON_UPDATE(pwm_id); + writel(tcon, &pwm->tcon); + + return 0; +} + +int pwm_init(int pwm_id, int div, int invert) +{ + u32 val; + const struct s5p_timer *pwm = + (struct s5p_timer *)samsung_get_base_timer(); + unsigned long timer_rate_hz; + unsigned int offset, prescaler; + + /* + * Timer Freq(HZ) = + * PWM_CLK / { (prescaler_value + 1) * (divider_value) } + */ + + val = readl(&pwm->tcfg0); + if (pwm_id < 2) { + prescaler = PRESCALER_0; + val &= ~0xff; + val |= (prescaler & 0xff); + } else { + prescaler = PRESCALER_1; + val &= ~(0xff << 8); + val |= (prescaler & 0xff) << 8; + } + writel(val, &pwm->tcfg0); + val = readl(&pwm->tcfg1); + val &= ~(0xf << MUX_DIV_SHIFT(pwm_id)); + val |= (div & 0xf) << MUX_DIV_SHIFT(pwm_id); + writel(val, &pwm->tcfg1); + + timer_rate_hz = get_pwm_clk() / ((prescaler + 1) * + (div + 1)); + + timer_rate_hz = timer_rate_hz / 100; + + /* set count value */ + offset = pwm_id * 0xc; + writel(timer_rate_hz, &pwm->tcntb0 + offset); + + val = readl(&pwm->tcon) & ~(0xf << TCON_OFFSET(pwm_id)); + if (invert && (pwm_id < 4)) + val |= TCON_INVERTER(pwm_id); + writel(val, &pwm->tcon); + + pwm_enable(pwm_id); + + return 0; +} diff --git a/arch/arm/include/asm/arch-s5pc1xx/pwm.h b/arch/arm/include/asm/arch-s5pc1xx/pwm.h index 0369968..ec62075 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/pwm.h +++ b/arch/arm/include/asm/arch-s5pc1xx/pwm.h @@ -29,6 +29,13 @@ /* start bit of PWM Timer 4 */ #define TCON4_START (1 << 20) +#define TCON_OFFSET(x) ((x + 1) * (!!x) << 2) + +#define TCON_START(x) (1 << TCON_OFFSET(x)) +#define TCON_UPDATE(x) (1 << (TCON_OFFSET(x) + 1)) +#define TCON_INVERTER(x) (1 << (TCON_OFFSET(x) + 2)) +#define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3)) + #ifndef __ASSEMBLY__ struct s5p_timer { unsigned int tcfg0; diff --git a/arch/arm/include/asm/arch-s5pc2xx/pwm.h b/arch/arm/include/asm/arch-s5pc2xx/pwm.h index 0369968..ec62075 100644 --- a/arch/arm/include/asm/arch-s5pc2xx/pwm.h +++ b/arch/arm/include/asm/arch-s5pc2xx/pwm.h @@ -29,6 +29,13 @@ /* start bit of PWM Timer 4 */ #define TCON4_START (1 << 20) +#define TCON_OFFSET(x) ((x + 1) * (!!x) << 2) + +#define TCON_START(x) (1 << TCON_OFFSET(x)) +#define TCON_UPDATE(x) (1 << (TCON_OFFSET(x) + 1)) +#define TCON_INVERTER(x) (1 << (TCON_OFFSET(x) + 2)) +#define TCON_AUTO_RELOAD(x) (1 << (TCON_OFFSET(x) + 3)) + #ifndef __ASSEMBLY__ struct s5p_timer { unsigned int tcfg0; diff --git a/include/pwm.h b/include/pwm.h new file mode 100644 index 0000000..13acf85 --- /dev/null +++ b/include/pwm.h @@ -0,0 +1,31 @@ +/* + * header file for pwm driver. + * + * Copyright (c) 2011 samsung electronics + * Donghwa Lee <dh09.lee(a)samsung.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef _pwm_h_ +#define _pwm_h_ + +int pwm_init (int pwm_id, int div, int invert); +int pwm_config (int pwm_id, int duty_ns, int period_ns); +int pwm_enable (int pwm_id); +void pwm_disable (int pwm_id); + +#endif /* _pwm_h_ */ -- 1.6.0.4

2 1

[U-Boot] timer problem with new ARM relocation feature
by "David Müller (ELSOFT AG)" 05 Mar '12

05 Mar '12

Hello The timer implementation for s3c24xx based SoC (arch/arm/cpu/arm920t/s3c24x0/timer.c) uses several global variables. With the newly introduced ARM relocation feature, this timer code does no longer work as expected. What is the proposed fix/workaround for this? Is moving these variables to the "global data pointer area" an acceptable solution? Dave

6 19

[U-Boot] [PATCH/RFC] MAKEALL: allow people to specify arch/cpu/soc/vendor names
by Mike Frysinger 04 Mar '12

04 Mar '12

Rather than maintain a hand coded list of targets which represent cpus/etc and expand into a bunch of board names, add automatic look up to all targets. This makes target selection a bit more natural imo, and keeps down on code duplication. Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> --- MAKEALL | 384 ++++++++++++++++++++------------------------------------------- 1 files changed, 120 insertions(+), 264 deletions(-) diff --git a/MAKEALL b/MAKEALL index f582f8b..58a557d 100755 --- a/MAKEALL +++ b/MAKEALL @@ -185,304 +185,134 @@ boards_by_field() } boards_by_arch() { boards_by_field 2 "$@" ; } boards_by_cpu() { boards_by_field 3 "$@" ; } +boards_by_vend() { boards_by_field 5 "$@" ; } boards_by_soc() { boards_by_field 6 "$@" ; } ######################################################################### -## MPC5xx Systems -######################################################################### - -LIST_5xx="$(boards_by_cpu mpc5xx)" - -######################################################################### -## MPC5xxx Systems -######################################################################### - -LIST_5xxx="$(boards_by_cpu mpc5xxx)" - -######################################################################### -## MPC512x Systems -######################################################################### - -LIST_512x="$(boards_by_cpu mpc512x)" - -######################################################################### -## MPC8xx Systems -######################################################################### - -LIST_8xx="$(boards_by_cpu mpc8xx)" - -######################################################################### -## PPC4xx Systems -######################################################################### - -LIST_4xx="$(boards_by_cpu ppc4xx)" - -######################################################################### -## MPC8220 Systems -######################################################################### - -LIST_8220="$(boards_by_cpu mpc8220)" - -######################################################################### -## MPC824x Systems -######################################################################### - -LIST_824x="$(boards_by_cpu mpc824x)" - -######################################################################### -## MPC8260 Systems (includes 8250, 8255 etc.) -######################################################################### - -LIST_8260="$(boards_by_cpu mpc8260)" - -######################################################################### -## MPC83xx Systems (includes 8349, etc.) -######################################################################### - -LIST_83xx="$(boards_by_cpu mpc83xx)" - -######################################################################### -## MPC85xx Systems (includes 8540, 8560 etc.) -######################################################################### - -LIST_85xx="$(boards_by_cpu mpc85xx)" - -######################################################################### -## MPC86xx Systems -######################################################################### - -LIST_86xx="$(boards_by_cpu mpc86xx)" - -######################################################################### -## 74xx/7xx Systems -######################################################################### - -LIST_74xx_7xx="$(boards_by_cpu 74xx_7xx)" - -######################################################################### ## PowerPC groups ######################################################################### +for v in 5xx 5xxx 512x 8xx 8220 824x 8260 83xx 85xx 86xx ; do + eval LIST_${v}=\"$(boards_by_cpu mpc${v})\" +done +LIST_4xx="$(boards_by_cpu ppc4xx)" -LIST_TSEC=" \ - ${LIST_83xx} \ - ${LIST_85xx} \ - ${LIST_86xx} \ -" - -LIST_powerpc=" \ - ${LIST_5xx} \ - ${LIST_512x} \ - ${LIST_5xxx} \ - ${LIST_8xx} \ - ${LIST_8220} \ - ${LIST_824x} \ - ${LIST_8260} \ - ${LIST_83xx} \ - ${LIST_85xx} \ - ${LIST_86xx} \ - ${LIST_4xx} \ - ${LIST_74xx_7xx}\ +LIST_TSEC=" + ${LIST_83xx} + ${LIST_85xx} + ${LIST_86xx} " # Alias "ppc" -> "powerpc" to not break compatibility with older scripts # still using "ppc" instead of "powerpc" -LIST_ppc=" \ - ${LIST_powerpc} \ -" +LIST_ppc="$(boards_by_arch powerpc)" ######################################################################### -## StrongARM Systems +## ARM groups ######################################################################### LIST_SA="$(boards_by_cpu sa1100)" -######################################################################### -## ARM9 Systems -######################################################################### - -LIST_ARM9="$(boards_by_cpu arm920t) \ - $(boards_by_cpu arm926ejs) \ - $(boards_by_cpu arm925t) \ - omap1610h2 \ - omap1610inn \ - omap730p2 \ +LIST_ARM9=" + $(boards_by_cpu arm920t) + $(boards_by_cpu arm926ejs) + $(boards_by_cpu arm925t) + omap1610h2 + omap1610inn + omap730p2 " -######################################################################### -## ARM11 Systems -######################################################################### -LIST_ARM11="$(boards_by_cpu arm1136) \ - apollon \ - imx31_phycore \ - imx31_phycore_eet \ - mx31pdk \ - mx31pdk_nand \ - smdk6400 \ +LIST_ARM11=" + $(boards_by_cpu arm1136) + apollon + imx31_phycore + imx31_phycore_eet + mx31pdk + mx31pdk_nand + smdk6400 " -######################################################################### -## ARMV7 Systems -######################################################################### - LIST_ARMV7="$(boards_by_cpu armv7)" -######################################################################### -## AT91 Systems -######################################################################### - -LIST_at91="$(boards_by_soc at91)" - -######################################################################### -## Xscale Systems -######################################################################### - -LIST_pxa="$(boards_by_cpu pxa)" - -LIST_ixp="$(boards_by_cpu ixp) - pdnb3 \ - scpu \ +LIST_ixp=" + $(boards_by_cpu ixp) + pdnb3 + scpu " ######################################################################### -## ARM groups -######################################################################### - -LIST_arm=" \ - ${LIST_SA} \ - ${LIST_ARM9} \ - ${LIST_ARM10} \ - ${LIST_ARM11} \ - ${LIST_ARMV7} \ - ${LIST_at91} \ - ${LIST_pxa} \ - ${LIST_ixp} \ +## MIPS groups +######################################################################### + +LIST_mips4kc=" + incaip + qemu_mips + vct_platinum + vct_platinum_small + vct_platinum_onenand + vct_platinum_onenand_small + vct_platinumavc + vct_platinumavc_small + vct_platinumavc_onenand + vct_platinumavc_onenand_small + vct_premium + vct_premium_small + vct_premium_onenand + vct_premium_onenand_small " -######################################################################### -## MIPS Systems (default = big endian) -######################################################################### - -LIST_mips4kc=" \ - incaip \ - qemu_mips \ - vct_platinum \ - vct_platinum_small \ - vct_platinum_onenand \ - vct_platinum_onenand_small \ - vct_platinumavc \ - vct_platinumavc_small \ - vct_platinumavc_onenand \ - vct_platinumavc_onenand_small \ - vct_premium \ - vct_premium_small \ - vct_premium_onenand \ - vct_premium_onenand_small \ +LIST_au1xx0=" + dbau1000 + dbau1100 + dbau1500 + dbau1550 + dbau1550_el + gth2 " -LIST_mips5kc="" - -LIST_au1xx0=" \ - dbau1000 \ - dbau1100 \ - dbau1500 \ - dbau1550 \ - dbau1550_el \ - gth2 \ +LIST_mips_eb=" + ${LIST_mips4kc} + ${LIST_mips5kc} + ${LIST_au1xx0} " -LIST_mips=" \ - ${LIST_mips4kc} \ - ${LIST_mips5kc} \ - ${LIST_au1xx0} \ -" - -######################################################################### -## MIPS Systems (little endian) -######################################################################### - -LIST_mips4kc_el=" \ - qi_lb60 \ +LIST_mips4kc_el=" + qi_lb60 " LIST_mips5kc_el="" -LIST_au1xx0_el=" \ - dbau1550_el \ - pb1000 \ +LIST_au1xx0_el=" + dbau1550_el + pb1000 " -LIST_mips_el=" \ - ${LIST_mips4kc_el} \ - ${LIST_mips5kc_el} \ - ${LIST_au1xx0_el} \ +LIST_mips_el=" + ${LIST_mips4kc_el} + ${LIST_mips5kc_el} + ${LIST_au1xx0_el} " ######################################################################### -## x86 Systems -######################################################################### - -LIST_x86="$(boards_by_arch x86)" - -######################################################################### -## Nios-II Systems -######################################################################### - -LIST_nios2="$(boards_by_arch nios2)" - -######################################################################### -## MicroBlaze Systems -######################################################################### - -LIST_microblaze="$(boards_by_arch microblaze)" - -######################################################################### ## ColdFire Systems ######################################################################### -LIST_m68k="$(boards_by_arch m68k) - astro_mcf5373l \ - cobra5272 \ - EB+MCF-EV123 \ - EB+MCF-EV123_internal \ - M52277EVB \ - M5235EVB \ - M5329AFEE \ - M5373EVB \ - M54451EVB \ - M54455EVB \ - M5475AFE \ - M5485AFE \ +LIST_m68k=" + $(boards_by_arch m68k) + astro_mcf5373l + cobra5272 + EB+MCF-EV123 + EB+MCF-EV123_internal + M52277EVB + M5235EVB + M5329AFEE + M5373EVB + M54451EVB + M54455EVB + M5475AFE + M5485AFE " LIST_coldfire=${LIST_m68k} -######################################################################### -## AVR32 Systems -######################################################################### - -LIST_avr32="$(boards_by_arch avr32)" - -######################################################################### -## Blackfin Systems -######################################################################### - -LIST_blackfin="$(boards_by_arch blackfin)" - -######################################################################### -## SH Systems -######################################################################### - -LIST_sh2="$(boards_by_cpu sh2)" -LIST_sh3="$(boards_by_cpu sh3)" -LIST_sh4="$(boards_by_cpu sh4)" - -LIST_sh="$(boards_by_arch sh)" - -######################################################################### -## SPARC Systems -######################################################################### - -LIST_sparc="$(boards_by_arch sparc)" - #----------------------------------------------------------------------- build_target() { @@ -511,20 +341,46 @@ build_target() { ${CROSS_COMPILE}size ${BUILD_DIR}/u-boot \ | tee -a ${LOG_DIR}/$target.MAKELOG } + +expand_target() { + # Handle multiple target selectors + local list t=$1 + + # If a LIST_xxx var exists, use it. But avoid variable + # expansion in the eval when a board name contains certain + # characters that the shell interprets. + case ${t} in + *[-+=]*) list= ;; + *) list=$(eval echo '${LIST_'$t'}') ;; + esac + [ -n "${list}" ] && echo "${list}" && return 0 + + # see if this is an arch name + list=$(boards_by_arch "${t}") + [ -n "${list}" ] && echo "${list}" && return 0 + + # see if this is a cpu name + list=$(boards_by_cpu "${t}") + [ -n "${list}" ] && echo "${list}" && return 0 + + # see if this is a soc name + list=$(boards_by_soc "${t}") + [ -n "${list}" ] && echo "${list}" && return 0 + + # see if this is a vendor name + list=$(boards_by_vend "${t}") + [ -n "${list}" ] && echo "${list}" && return 0 + + # no hits, so let's just assume it's a board name + echo "${t}" +} + build_targets() { + local t tt for t in "$@" ; do - # If a LIST_xxx var exists, use it. But avoid variable - # expansion in the eval when a board name contains certain - # characters that the shell interprets. - case ${t} in - *[-+=]*) list= ;; - *) list=$(eval echo '${LIST_'$t'}') ;; - esac - if [ -n "${list}" ] ; then - build_targets ${list} - else - build_target ${t} - fi + for tt in $(expand_target "${t}") ; do + build_target ${tt} + done done } -- 1.7.6.1

2 1

[U-Boot] Fastboot gadget, v2
by Sebastian Andrzej Siewior 29 Feb '12

29 Feb '12

This series contains a smaller version of the fastboot gadget. I removed the flash/mmc/write to media part and re-add once I'm through with this basic thing :) This "basic" gadget supports the retrieval of variables (like serial number), reboot functionality, download of binary data and booting them in case the binary data is a bootable image. I did not include the fastboot client in this series. Remy asked about this. I could take it and stash it in tools if someone really wants this to have. This would include the fastboot and libzipfile folder from Andorid's system/core repository. An online version can be found at [0]. I haven't seen the library somewhere else than Android. For basic testing, the library could be excluded. v1..v2: fixed all issues that came up so far, including: - s/andoir_img_get_kload/android_img_get_kload/ spotted by Mike - adjusted Copyright message to GPLv2 or later for f_fastboot.c and removed "change" comments. - removed two header files in example patch 3/3 I believe that the "All rights reserved" problem got resolved. [0] http://www.netmite.com/android/mydroid/system/core/ Sebastian

3 9

[U-Boot] [PATCH] USB: reevaluate iomux stdin on USB kbd detect
by Allen Martin 29 Feb '12

29 Feb '12

If CONSOLE_MUX is enabled, reevaluate console stdin when USB keyboard device is detected. Signed-off-by: Allen Martin <amartin(a)nvidia.com> --- common/usb_kbd.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/common/usb_kbd.c b/common/usb_kbd.c index e94bb7e..577a1eb 100644 --- a/common/usb_kbd.c +++ b/common/usb_kbd.c @@ -493,6 +493,11 @@ int drv_usb_kbd_init(void) if (error) return error; +#ifdef CONFIG_CONSOLE_MUX + error = iomux_doenv(stdin, stdinname); + if (error) + return error; +#else /* Check if this is the standard input device. */ if (strcmp(stdinname, DEVNAME)) return 1; @@ -504,6 +509,7 @@ int drv_usb_kbd_init(void) error = console_assign(stdin, DEVNAME); if (error) return error; +#endif return 1; } -- 1.7.5.4

4 6

[U-Boot] [PATCH] nds32/board.c: add PCI prompt at boot up
by Macpaul Lin 28 Feb '12

28 Feb '12

add PCI prompt at boot up for probing PCI device Signed-off-by: Macpaul Lin <macpaul(a)andestech.com> --- arch/nds32/lib/board.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/nds32/lib/board.c b/arch/nds32/lib/board.c index 66e4537..074aabf 100644 --- a/arch/nds32/lib/board.c +++ b/arch/nds32/lib/board.c @@ -365,6 +365,7 @@ void board_init_r(gd_t *id, ulong dest_addr) env_relocate(); #if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI) + puts("PCI: "); nds32_pci_init(); #endif -- 1.7.3.5

2 1

[U-Boot] [PATCH 1/2] nds32: add linkage support
by Macpaul Lin 28 Feb '12

28 Feb '12

Add linkage support. Signed-off-by: Macpaul Lin <macpaul(a)andestech.com> --- arch/nds32/include/asm/linkage.h | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) create mode 100644 arch/nds32/include/asm/linkage.h diff --git a/arch/nds32/include/asm/linkage.h b/arch/nds32/include/asm/linkage.h new file mode 100644 index 0000000..9d6edd9 --- /dev/null +++ b/arch/nds32/include/asm/linkage.h @@ -0,0 +1,31 @@ +/* + * U-boot - linkage.h + * + * Copyright (c) 2005-2007 Analog Devices Inc. + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef __ASM_LINKAGE_H +#define __ASM_LINKAGE_H + +#define __ALIGN .align 4 +#define __ALIGN_STR ".align 4" + +#endif -- 1.7.3.5

3 8