November 2011 - U-Boot

[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 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] 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

[U-Boot] Help: U-Boot on Nokia RX-51 (aka N900)
by Pali Rohár 27 Feb '12

27 Feb '12

Hello, U-Boot patches which add support for Nokia RX-51 (aka N900) is here: http://al.robotfuzz.com/~al/maemo/u-boot/ RX-51 has closed 2nd stage bootloader NOLO which can load kernel image from nand (or usb) to ram and boot it. NOLO also done all HW initializations. These U-Boot patches for RX-51 add support that builded U-Boot binary can be loaded and booted by NOLO. So U-Boot will be 3rd bootloader. Patches are on top of revision bd2313078114c4b44c4a5ce149af43bcb7fc8854 and working fine. I rebased these patches on top of u-boot git master repository, but booting failed. No output on device. Using git bisect I found that problem appeared at revision 561142af20f1fd7b425d9425730014e656defb91 ARM: implement relocation for ARM V7 (OMAP) If I defined CONFIG_SYS_ARM_WITHOUT_RELOC U-Boot working and booting fine up to revision a9aa3926295df759306258e5e24cace414f53b67 So problem is that relocation patches broke RX-51 support. Can somebody help me how to rewrite/port rx-51 patches to work with ARM relocation (do not forget that U-Boot is loaded by 2nd bootloader to RAM after HW is initialized by NOLO)? If U-Boot will be working on RX-51 I will prepair patches for upstreaming. -- Pali Rohár pali.rohar(a)gmail.com

7 110

[U-Boot] [PATCH v3] AVR32: fix timer_init() function
by Sven Schnelle 27 Feb '12

27 Feb '12

timer_init() now returns an int (the error code) instead of void. This makes compilation fail with: interrupts.c:111: error: conflicting types for 'timer_init' /home/svens/u-boot/u-boot/include/common.h:246: error: previous declaration of 'timer_init' was here make[1]: *** [interrupts.o] Error 1 Signed-off-by: Sven Schnelle <svens(a)stackframe.org> --- Changes for v3: - return -EINVAL regardless of the return value Changes for v2: - Coding style arch/avr32/cpu/interrupts.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/avr32/cpu/interrupts.c b/arch/avr32/cpu/interrupts.c index 6681e13..49a00f1 100644 --- a/arch/avr32/cpu/interrupts.c +++ b/arch/avr32/cpu/interrupts.c @@ -107,7 +107,7 @@ static int set_interrupt_handler(unsigned int nr, void (*handler)(void), return 0; } -void timer_init(void) +int timer_init(void) { extern void timer_interrupt_handler(void); u64 tmp; @@ -120,8 +120,9 @@ void timer_init(void) tb_factor = (u32)tmp; if (set_interrupt_handler(0, &timer_interrupt_handler, 3)) - return; + return -EINVAL; /* For all practical purposes, this gives us an overflow interrupt */ sysreg_write(COMPARE, 0xffffffff); + return 0; } -- 1.7.5.4

5 7

[U-Boot] [PATCH v2 0/7] Tidy up ARM link scripts
by Simon Glass 23 Feb '12

23 Feb '12

The ARM link scripts are very similar but each CPU has its own. This series adds support for a default link script across an architecture in arch/<arch>/cpu/u-boot.lds. It is then possible to remove most of the ARM link scripts. This will make it easier to maintain these. Changes in v2: - Add a comment explaining all the ldscript checks - Remove ziptz2 link script also as it breaks the build - Make this change in spl/Makefile also Simon Glass (7): Allow arch directory to contain .lds without requiring Makefile arm: Remove jornada link script arm: Remove zipitz2 link script Define CPUDIR for the .lds link script arm: Remove unneeded setting of LDCSRIPT arm: add a common .lds link script arm: Use common .lds file where possible Makefile | 11 ++++- arch/arm/config.mk | 7 --- arch/arm/cpu/arm1136/u-boot.lds | 89 ----------------------------------- arch/arm/cpu/arm1176/u-boot.lds | 78 ------------------------------ arch/arm/cpu/arm720t/u-boot.lds | 79 ------------------------------- arch/arm/cpu/arm920t/u-boot.lds | 88 ---------------------------------- arch/arm/cpu/arm925t/u-boot.lds | 83 -------------------------------- arch/arm/cpu/arm926ejs/u-boot.lds | 80 ------------------------------- arch/arm/cpu/arm946es/u-boot.lds | 80 ------------------------------- arch/arm/cpu/arm_intcm/u-boot.lds | 80 ------------------------------- arch/arm/cpu/lh7a40x/u-boot.lds | 80 ------------------------------- arch/arm/cpu/pxa/u-boot.lds | 80 ------------------------------- arch/arm/cpu/s3c44b0/u-boot.lds | 80 ------------------------------- arch/arm/cpu/sa1100/u-boot.lds | 83 -------------------------------- arch/arm/cpu/{armv7 => }/u-boot.lds | 6 +- board/jornada/u-boot.lds | 58 ----------------------- board/zipitz2/u-boot.lds | 56 ---------------------- spl/Makefile | 4 ++ 18 files changed, 17 insertions(+), 1105 deletions(-) delete mode 100644 arch/arm/cpu/arm1136/u-boot.lds delete mode 100644 arch/arm/cpu/arm1176/u-boot.lds delete mode 100644 arch/arm/cpu/arm720t/u-boot.lds delete mode 100644 arch/arm/cpu/arm920t/u-boot.lds delete mode 100644 arch/arm/cpu/arm925t/u-boot.lds delete mode 100644 arch/arm/cpu/arm926ejs/u-boot.lds delete mode 100644 arch/arm/cpu/arm946es/u-boot.lds delete mode 100644 arch/arm/cpu/arm_intcm/u-boot.lds delete mode 100644 arch/arm/cpu/lh7a40x/u-boot.lds delete mode 100644 arch/arm/cpu/pxa/u-boot.lds delete mode 100644 arch/arm/cpu/s3c44b0/u-boot.lds delete mode 100644 arch/arm/cpu/sa1100/u-boot.lds rename arch/arm/cpu/{armv7 => }/u-boot.lds (94%) delete mode 100644 board/jornada/u-boot.lds delete mode 100644 board/zipitz2/u-boot.lds -- 1.7.3.1

3 17