March 2012 - U-Boot

[U-Boot] fw_printenv is not working
by mateer 22 Oct '12

22 Oct '12

Hi, when i run fw_printenv , its not working..It shows:- fw_printenv: line 1: syntax error: "(" unexpected error... Let me tell you what i did... 1) i copy the u-boot source code from my colleague and copy in my hard disk. 2) After then i set the environment through commnads. the commands which i run are # make CROSS_COMPILE=arm-none-linux-gnueabi- ARCH=arm distclean # make CROSS_COMPILE=arm-none-linux-gnueabi- ARCH=arm omap3_evm_config # make CROSS_COMPILE=arm-none-linux-gnueabi- ARCH=arm 3) After then i go to /tools/env, where i configure the fw_env.config and then run make command. 4) After ruuning the command i got crc32.c and fw_printenv. 5)i copied the fw_printenv into the SD-Card and insert the card into the OMAP3EVM board. 6) after then when i use the command ./fw_printenv it throws the error fw_printenv: line 1: syntax error: "(" unexpected error.. Can u please help me what i have to do... I think i am doing something wrong... -- View this message in context: http://old.nabble.com/fw_printenv-is-not-working-tp29297562p29297562.html Sent from the Uboot - Users mailing list archive at Nabble.com.

4 3

[U-Boot] [PATCH] powerpc/usb: fix bug of CPU halt when missing USB PHY clock
by Shengzhou Liu 18 Oct '12

18 Oct '12

when missing USB PHY clock and issuing "usb start" at u-boot prompt, writing to or_portsc register will cause CPU halt. We should check USBGP[PHY_CLK_VALID] bit at the first time in ehci_hcd_init() to avoid CPU hang in this case. Signed-off-by: Shengzhou Liu <Shengzhou.Liu(a)freescale.com> --- drivers/usb/host/ehci-fsl.c | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index b2d294e..cc29375 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c @@ -31,6 +31,18 @@ #include "ehci.h" #include "ehci-core.h" +/* Check USB PHY clock valid */ +static int usb_phy_clk_valid(struct usb_ehci *ehci) +{ + if ((!(in_be32(&ehci->control) & PHY_CLK_VALID)) && + (!in_be32(&ehci->prictrl))) { + printf("WARNING: USB PHY clock invalid\n"); + return 0; + } else { + return 1; + } +} + /* * Create the appropriate control structures to manage * a new EHCI host controller. @@ -59,6 +71,9 @@ int ehci_hcd_init(void) out_be32(&ehci->snoop1, SNOOP_SIZE_2GB); out_be32(&ehci->snoop2, 0x80000000 | SNOOP_SIZE_2GB); + /* Enable interface. */ + setbits_be32(&ehci->control, USB_EN); + /* Init phy */ if (hwconfig_sub("usb1", "phy_type")) phy_type = hwconfig_subarg("usb1", "phy_type", &len); @@ -82,6 +97,8 @@ int ehci_hcd_init(void) setbits_be32(&ehci->control, UTMI_PHY_EN); udelay(1000); /* delay required for PHY Clk to appear */ #endif + if (!usb_phy_clk_valid(ehci)) + return -1; out_le32(&(hcor->or_portsc[0]), PORT_PTS_UTMI); } else { #if defined(CONFIG_SYS_FSL_USB_INTERNAL_UTMI_PHY) @@ -89,12 +106,11 @@ int ehci_hcd_init(void) setbits_be32(&ehci->control, PHY_CLK_SEL_ULPI); udelay(1000); /* delay required for PHY Clk to appear */ #endif + if (!usb_phy_clk_valid(ehci)) + return -1; out_le32(&(hcor->or_portsc[0]), PORT_PTS_ULPI); } - /* Enable interface. */ - setbits_be32(&ehci->control, USB_EN); - out_be32(&ehci->prictrl, 0x0000000c); out_be32(&ehci->age_cnt_limit, 0x00000040); out_be32(&ehci->sictrl, 0x00000001); -- 1.6.4

4 8

[U-Boot] [PATCH] Prevent malloc with size 0
by Kostaras Nikolaos 17 Oct '12

17 Oct '12

In case malloc is invoked with requested size 0, this patch will prevent the execution of the allocation algorithm (because it corrupts the data structures) and will return 0 to the caller. Signed-off-by: Nikolaos Kostaras <nkost(a)intracomdefense.com> --- common/dlmalloc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/dlmalloc.c b/common/dlmalloc.c index fce7a76..d9e3ea9 100644 --- a/common/dlmalloc.c +++ b/common/dlmalloc.c @@ -2182,7 +2182,7 @@ Void_t* mALLOc(bytes) size_t bytes; return 0; } - if ((long)bytes < 0) return 0; + if ((long)bytes <= 0) return 0; nb = request2size(bytes); /* padded request size; */ -- 1.6.4.4

9 74

[U-Boot] [PATCH 0/9] Fix a few warnings that bug me
by Simon Glass 16 Oct '12

16 Oct '12

This series fixes some warnings which seem to still be left over from all the warning-squashing efforts for 2011.12. If patches exist for some of these already then please ignore. The alias problem in USB is a bit odd, since I thought it was already fixed. But perhaps it has come back. Simon Glass (9): usb: Fix strict-aliasing warning in host/ohci-hcd.c Fix strict-aliasing warning in dlmalloc mpc5xxx: Fix strict-aliasing warnings in usb_ohci.c ppc4xx: Fix strict-aliasing warnings in usb_ohci.c sandbox: sort header files in os.c sandbox: Add required header to os.c Remove CONFIG_SYS_EXTBDINFO from snapper9260.h m68k: Change memsz to a signed char to avoid warning ppc: Change memsz variable to signed char arch/m68k/lib/board.c | 2 +- arch/powerpc/cpu/mpc5xxx/usb_ohci.c | 79 ++++++++++++++++++++-------------- arch/powerpc/cpu/ppc4xx/usb_ohci.c | 81 ++++++++++++++++++++-------------- arch/powerpc/lib/board.c | 7 +-- arch/sandbox/cpu/os.c | 11 +++-- common/dlmalloc.c | 8 ++-- drivers/usb/host/ohci-hcd.c | 26 ++++++------ include/configs/snapper9260.h | 1 - 8 files changed, 122 insertions(+), 93 deletions(-) -- 1.7.3.1

8 45

[U-Boot] [PATCH] tools/env: add posibility to inject configuration
by Andreas Bießmann 16 Oct '12

16 Oct '12

If one wants to use fw_printenv/fw_setenv in special variants (eg compiled in MTD parameters without configuration file) he needs to change the sources. This patch add the posibillity to change the behaviour of fw_printenv by defining a specific configuration header at compile time. Signed-off-by: Andreas Bießmann <biessmann(a)corscience.de> --- This patch was generated after http://patchwork.ozlabs.org/patch/112349/ without that patch auto-merge may fail. .gitignore | 2 + tools/env/Makefile | 12 ++++++- tools/env/fw_env.h | 28 +++--------------- tools/env/fw_env_config.h.in | 65 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 25 deletions(-) create mode 100644 tools/env/fw_env_config.h.in diff --git a/.gitignore b/.gitignore index 34a2ca9..351397f 100644 --- a/.gitignore +++ b/.gitignore @@ -46,6 +46,8 @@ /include/generated/ /lib/asm-offsets.s +/tools/env/fw_env_config.h + # stgit generated dirs patches-* .stgit-edit.txt diff --git a/tools/env/Makefile b/tools/env/Makefile index 28b73da..2109c83 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -24,12 +24,14 @@ include $(TOPDIR)/config.mk HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c -HEADERS := fw_env.h +HEADERS := fw_env.h $(obj)fw_env_config.h +FW_ENV_CONFIG_IN := $(if $(FW_ENV_CONFIG),$(FW_ENV_CONFIG),fw_env_config.h.in) # Compile for a hosted environment on the target HOSTCPPFLAGS = -idirafter $(SRCTREE)/include \ -idirafter $(OBJTREE)/include2 \ -idirafter $(OBJTREE)/include \ + -I $(obj) \ -DUSE_HOSTCC ifeq ($(MTD_VERSION),old) @@ -42,8 +44,14 @@ all: $(obj)fw_printenv $(obj)fw_printenv: $(HOSTSRCS) $(HEADERS) $(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS) +$(obj)fw_env_config.h: $(FW_ENV_CONFIG_IN) + @cp -f $< $@ + +# add additional dependency for .depend +$(obj).depend: $(obj)fw_env_config.h + clean: - rm -f $(obj)fw_printenv + rm -f $(obj)fw_printenv $(obj)fw_env_config.h ######################################################################### diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h index 9258c79..bc67c02 100644 --- a/tools/env/fw_env.h +++ b/tools/env/fw_env.h @@ -20,30 +20,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA */ +#ifndef _FW_ENV_H_ +#define _FW_ENV_H_ -/* - * To build the utility with the run-time configuration - * uncomment the next line. - * See included "fw_env.config" sample file - * for notes on configuration. - */ -#define CONFIG_FILE "/etc/fw_env.config" - -#define HAVE_REDUND /* For systems with 2 env sectors */ -#define DEVICE1_NAME "/dev/mtd1" -#define DEVICE2_NAME "/dev/mtd2" -#define DEVICE1_OFFSET 0x0000 -#define ENV1_SIZE 0x4000 -#define DEVICE2_OFFSET 0x0000 -#define ENV2_SIZE 0x4000 - -#define CONFIG_BAUDRATE 115200 -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ -#define CONFIG_BOOTCOMMAND \ - "bootp; " \ - "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ - "bootm" +#include "fw_env_config.h" extern int fw_printenv(int argc, char *argv[]); extern char *fw_getenv (char *name); @@ -54,3 +34,5 @@ extern int fw_env_write(char *name, char *value); extern int fw_env_close(void); extern unsigned long crc32 (unsigned long, const unsigned char *, unsigned); + +#endif // _FW_ENV_H_ diff --git a/tools/env/fw_env_config.h.in b/tools/env/fw_env_config.h.in new file mode 100644 index 0000000..3336af9 --- /dev/null +++ b/tools/env/fw_env_config.h.in @@ -0,0 +1,65 @@ +/* + * (C) Copyright 2002-2008 + * Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. + * + * (C) Copyright 2011 + * Andreas Bießmann, Corscience GmbH&Co.KG, biessmann(a)corscience.de + * + * 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 + */ + +/* + * This is an example configuration for fw_printenv/fw_setenv + * + * If you like to specialize your build of fw_printenv you may copy this file, + * modifiy it and add FW_ENV_CONFIG define to the make call: + * + * make O=/tmp/fw_env_build env FW_ENV_CONFIG=/my/special/configuration/header + * + * If the FW_ENV_CONFIG is not defined, this file will be used + */ + +#ifndef _FW_ENV_CONFIG_H_ +#define _FW_ENV_CONFIG_H_ + +/* + * To build the utility with the run-time configuration + * uncomment the next line. + * See included "fw_env.config" sample file + * for notes on configuration. + */ +#define CONFIG_FILE "/etc/fw_env.config" + +#define HAVE_REDUND /* For systems with 2 env sectors */ +#define DEVICE1_NAME "/dev/mtd1" +#define DEVICE2_NAME "/dev/mtd2" +#define DEVICE1_OFFSET 0x0000 +#define ENV1_SIZE 0x4000 +#define DEVICE2_OFFSET 0x0000 +#define ENV2_SIZE 0x4000 + +#define CONFIG_BAUDRATE 115200 +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */ +#define CONFIG_BOOTCOMMAND \ + "bootp; " \ + "setenv bootargs root=/dev/nfs nfsroot=${serverip}:${rootpath} " \ + "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; " \ + "bootm" + +#endif // _FW_ENV_CONFIG_H_ -- 1.7.5.4

5 10

[U-Boot] [PATCH v2] Add support for MMC to fw_printenv/setenv
by Christian Daudt 16 Oct '12

16 Oct '12

Changes from previous: - Changed // to /* */ - Ran through checkpatch.pl, cleaned up a number of line-too-big and extra space in the code that was shifted due to being in the new 'if'. Thanks, csd Subject: [PATCH] Add support for MMC to fw_printenv/setenv This patch checks if the fd is MTD and if not (using an MTD-specific IOCTL) and skips the flash unlock/erase/lock sequence if it is not MTD. - fd_is_mtd function added to determine MTD/MMC - flash_write_block made to not try MTD operations if mtd_type == MTD_ABSENT - flash_read works with MMC devices now. Signed-off-by: Christian Daudt <csd(a)broadcom.com> --- tools/env/fw_env.c | 103 ++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 71 insertions(+), 32 deletions(-) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 996682e..c760429 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -211,6 +211,27 @@ static int flash_io (int mode); static char *envmatch (char * s1, char * s2); static int parse_config (void); + +/* + * Returns 1 if it is MTD and 0 if it is not MTD + */ +static int fd_is_mtd(int fd) +{ + struct mtd_info_user mtdinfo; + int rc; + + rc = ioctl(fd, MEMGETINFO, &mtdinfo); + if (rc < 0) { + /* Failed MEMGETINFO, not MTD */ + return 0; + } else { + /* Succeeded, MTD */ + return 1; + } +} + + + #if defined(CONFIG_FILE) static int get_config (char *); #endif @@ -836,31 +857,35 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, /* This only runs once on NOR flash and SPI-dataflash */ while (processed < write_total) { - rc = flash_bad_block (fd, mtd_type, &blockstart); - if (rc < 0) /* block test failed */ - return rc; + if (mtd_type != MTD_ABSENT) { + rc = flash_bad_block(fd, mtd_type, &blockstart); + if (rc < 0) /* block test failed */ + return rc; - if (blockstart + erasesize > top_of_range) { - fprintf (stderr, "End of range reached, aborting\n"); - return -1; - } + if (blockstart + erasesize > top_of_range) { + fprintf(stderr, + "End of range reached, aborting\n"); + return -1; + } - if (rc) { /* block is bad */ - blockstart += blocklen; - continue; - } + if (rc) { /* block is bad */ + blockstart += blocklen; + continue; + } - erase.start = blockstart; - ioctl (fd, MEMUNLOCK, &erase); + erase.start = blockstart; + ioctl(fd, MEMUNLOCK, &erase); - /* Dataflash does not need an explicit erase cycle */ - if (mtd_type != MTD_DATAFLASH) - if (ioctl (fd, MEMERASE, &erase) != 0) { - fprintf (stderr, "MTD erase error on %s: %s\n", - DEVNAME (dev), - strerror (errno)); - return -1; - } + /* Dataflash does not need an explicit erase cycle */ + if (mtd_type != MTD_DATAFLASH) + if (ioctl(fd, MEMERASE, &erase) != 0) { + fprintf(stderr, + "MTD erase error on %s: %s\n", + DEVNAME(dev), + strerror(errno)); + return -1; + } + } if (lseek (fd, blockstart, SEEK_SET) == -1) { fprintf (stderr, @@ -878,7 +903,8 @@ static int flash_write_buf (int dev, int fd, void *buf, size_t count, return -1; } - ioctl (fd, MEMLOCK, &erase); + if (mtd_type != MTD_ABSENT) + ioctl(fd, MEMLOCK, &erase); processed += blocklen; block_seek = 0; @@ -964,18 +990,31 @@ static int flash_read (int fd) { struct mtd_info_user mtdinfo; int rc; + int is_mtd; - rc = ioctl (fd, MEMGETINFO, &mtdinfo); - if (rc < 0) { - perror ("Cannot get MTD information"); - return -1; - } + is_mtd = fd_is_mtd(fd); - if (mtdinfo.type != MTD_NORFLASH && - mtdinfo.type != MTD_NANDFLASH && - mtdinfo.type != MTD_DATAFLASH) { - fprintf (stderr, "Unsupported flash type %u\n", mtdinfo.type); - return -1; + if (is_mtd) { + rc = ioctl(fd, MEMGETINFO, &mtdinfo); + if (rc < 0) { + perror("Cannot get MTD information"); + return -1; + } + + if (mtdinfo.type != MTD_NORFLASH && + mtdinfo.type != MTD_NANDFLASH && + mtdinfo.type != MTD_DATAFLASH) { + fprintf(stderr, "Unsupported flash type %u\n", + mtdinfo.type); + return -1; + } + } else { + /* + * Kinda hacky assuming !MTD means == MMC + * but seems to be the easiest way to + * determine that. + */ + mtdinfo.type = MTD_ABSENT; } DEVTYPE(dev_current) = mtdinfo.type; -- 1.7.1

3 3

[U-Boot] [PATCH] config.mk:Update DBGFLAGS with dwarf information
by Prabhakar Kushwaha 16 Oct '12

16 Oct '12

Built u-boot elf file does not contain any dwarf informations by default. This information is required for debugging. Add dwarf ver 2 flag in DBGFLAGS. Signed-off-by: Radu Lazarescu <radu.lazarescu(a)freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- Applies on http://git.denx.de/u-boot.git branch master config.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/config.mk b/config.mk index ddaa477..11bc20d 100644 --- a/config.mk +++ b/config.mk @@ -178,7 +178,7 @@ endif # who are porting old code to latest mainline but not updating $(AR). ARFLAGS = $(error update your Makefile to use cmd_link_o_target and not AR) RELFLAGS= $(PLATFORM_RELFLAGS) -DBGFLAGS= -g # -DDEBUG +DBGFLAGS= -g -gdwarf-2 # -DDEBUG OPTFLAGS= -Os #-fomit-frame-pointer OBJCFLAGS += --gap-fill=0xff -- 1.7.5.4

4 5

[U-Boot] [PATCH 5/5] msm7x30: Add support for msm7630_surf board
by mohamed.haneef＠lntinfotech.com 03 Oct '12

03 Oct '12

From: Mohamed Haneef <mohamed.haneef(a)lntinfotech.com> *Support for msm7630_surf board Signed-off-by: Mohamed Haneef <mohamed.haneef(a)lntinfotech.com> --- board/qcom/msm7630_surf/Makefile | 55 +++++++++++ board/qcom/msm7630_surf/msm7630_surf.c | 155 ++++++++++++++++++++++++++++++++ board/qcom/msm7630_surf/msm7630_surf.h | 30 ++++++ boards.cfg | 1 + include/configs/msm7630_surf.h | 131 +++++++++++++++++++++++++++ 5 files changed, 372 insertions(+), 0 deletions(-) create mode 100644 board/qcom/msm7630_surf/Makefile create mode 100644 board/qcom/msm7630_surf/msm7630_surf.c create mode 100644 board/qcom/msm7630_surf/msm7630_surf.h create mode 100644 include/configs/msm7630_surf.h diff --git a/board/qcom/msm7630_surf/Makefile b/board/qcom/msm7630_surf/Makefile new file mode 100644 index 0000000..f9dec32 --- /dev/null +++ b/board/qcom/msm7630_surf/Makefile @@ -0,0 +1,55 @@ +# +# (C) Copyright 2012 +# LARSEN & TOUBRO INFOTECH LTD <www.lntinfotech.com> +# +# (C) Copyright 2010,2011 +# NVIDIA Corporation <www.nvidia.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 $(TOPDIR)/config.mk +ifneq ($(OBJTREE),$(SRCTREE)) +$(shell mkdir -p $(obj)../../qcom/msm7630_surf/) +endif + +LIB = $(obj)lib$(BOARD).o + +COBJS := $(BOARD).o +SRCS := $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) + +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) + +clean: + rm -f $(OBJS) + +distclean: clean + rm -f $(LIB) core *.bak $(obj).depend + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +######################################################################### diff --git a/board/qcom/msm7630_surf/msm7630_surf.c b/board/qcom/msm7630_surf/msm7630_surf.c new file mode 100644 index 0000000..eb941c7 --- /dev/null +++ b/board/qcom/msm7630_surf/msm7630_surf.c @@ -0,0 +1,155 @@ +/* + * (C) Copyright 2012 + * LARSEN & TOUBRO INFOTECH LTD <www.lntinfotech.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 + * + */ + +#include <common.h> +#include <asm/arch/iomap.h> +#include <asm/arch/sys_proto.h> +#include <asm/arch/gpio.h> +#include <asm/io.h> +#include <malloc.h> +#include <asm/arch/mmc.h> +#include <linux/string.h> +#include <asm/mach-types.h> +#include <asm/arch/proc_comm.h> +#include "msm7630_surf.h" + +static struct msm_gpio uart2_gpio_table[] = { + { + .gpio_cfg = GPIO_CFG(49, 2, GPIO_OUTPUT, GPIO_PULL_DOWN, GPIO_2MA), + .label = NULL, + }, + { + .gpio_cfg = GPIO_CFG(50, 2, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_2MA), + .label = NULL, + }, + { + .gpio_cfg = GPIO_CFG(51, 2, GPIO_INPUT, GPIO_PULL_DOWN, GPIO_2MA), + .label = NULL, + }, + { + .gpio_cfg = GPIO_CFG(52, 2, GPIO_OUTPUT, GPIO_PULL_DOWN, GPIO_2MA), + .label = NULL, + }, +}; + + + +DECLARE_GLOBAL_DATA_PTR; + +void uart2_mux_init(void) +{ + platform_gpios_enable(uart2_gpio_table, ARRAY_SIZE(uart2_gpio_table)); +} + +#ifdef CONFIG_BOARD_EARLY_INIT_F +int board_early_init_f() +{ + uart2_mux_init(); + uart2_clock_init(); + return 0; +} +#endif +int board_init() +{ + unsigned long new_addr; + unsigned long offset; + offset = gd->relocaddr - CONFIG_SYS_TEXT_BASE; + new_addr = CONFIG_SYS_TEXT_BASE + offset; + set_vector_base(new_addr); + bd_t *bd = gd->bd; + bd->bi_arch_number = MACH_TYPE_MSM7X30_SURF; + acpu_clock_init(); + adm_enable_clock(); + return 0; +} + +#ifdef CONFIG_QC_MMC + +/* called during the scan of each mmc device */ +int qc_board_mmc_init(struct mmc *mmc) +{ + + struct mmc_priv *sd = (struct mmc_priv *)mmc->priv; + u32 smem_val; + do { + smem_val = 0; + smem_val = readl(MSM_SHARED_BASE + 0x14); + } while (smem_val != 1); + + if (sd->instance == 2 || sd->instance == 4) { + mmc_boot_main(mmc); + return 0; + } else + /* this board does not have an sd/mmc card on this interface. */ + return 1; + } +int board_mmc_init(bd_t *bis) +{ +#ifdef QC_SD + struct mmc *mmc_4; + struct mmc_priv *sdcc_4; + mmc_4 = (struct mmc *) malloc(sizeof(struct mmc)); + if (!mmc_4) + return 1; + sdcc_4 = (struct mmc_priv *) malloc(sizeof(struct mmc_priv)); + if (!sdcc_4) { + free(mmc_4); + return 1; + } + sdcc_4->instance = 4; + sdcc_4->base = MSM_SDC4_BASE; + mmc_4->priv = sdcc_4; + mmc_4->send_cmd = mmc_boot_send_command_map; + mmc_4->set_ios = mmc_boot_set_ios; + mmc_4->init = qc_board_mmc_init; + mmc_4->voltages = MMC_VDD_29_30|MMC_VDD_165_195; + mmc_4->host_caps = MMC_MODE_4BIT|MMC_MODE_HS; + mmc_4->f_min = MMC_CLK_400KHZ; + mmc_4->f_max = MMC_CLK_48MHZ; + sprintf(mmc_4->name, "External_Card"); + mmc_register(mmc_4); +#else + struct mmc *mmc_2; + struct mmc_priv *sdcc_2; + mmc_2 = (struct mmc *) malloc(sizeof(struct mmc)); + if (!mmc_2) + return 1; + sdcc_2 = (struct mmc_priv *) malloc(sizeof(struct mmc_priv)); + if (!sdcc_2) { + free(mmc_2); + return 1; + } + sdcc_2->instance = 2; + sdcc_2->base = MSM_SDC2_BASE; + mmc_2->priv = sdcc_2; + mmc_2->send_cmd = mmc_boot_send_command_map; + mmc_2->set_ios = mmc_boot_set_ios; + mmc_2->init = qc_board_mmc_init; + mmc_2->voltages = MMC_VDD_29_30|MMC_VDD_165_195; + mmc_2->host_caps = MMC_MODE_4BIT|MMC_MODE_HS|MMC_MODE_8BIT| + MMC_MODE_HS_52MHz; + mmc_2->f_min = MMC_CLK_400KHZ; + mmc_2->f_max = MMC_CLK_48MHZ; + sprintf(mmc_2->name, "Internal_Card"); + mmc_register(mmc_2); +#endif + return 0; +} +#endif diff --git a/board/qcom/msm7630_surf/msm7630_surf.h b/board/qcom/msm7630_surf/msm7630_surf.h new file mode 100644 index 0000000..a3d4bde --- /dev/null +++ b/board/qcom/msm7630_surf/msm7630_surf.h @@ -0,0 +1,30 @@ +/* + * (C) Copyright 2012 + * LARSEN & TOUBRO INFOTECH LTD <www.lntinfotech.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 __MSM7630_SURF_H_ +#define __MSM7630_SURF_H_ +#include <asm/arch/gpio_hw.h> + +extern void set_vector_base(unsigned long); +extern void adm_enable_clock(void); +extern void acpu_clock_init(void); +extern void uart2_clock_init(void); +extern int platform_gpios_enable(const struct msm_gpio *table, int size); +#endif diff --git a/boards.cfg b/boards.cfg index bf71a66..4ab9330 100644 --- a/boards.cfg +++ b/boards.cfg @@ -190,6 +190,7 @@ integratorcp_cm946es arm arm946es integrator armltd ca9x4_ct_vxp arm armv7 vexpress armltd am335x_evm arm armv7 am335x ti am33xx highbank arm armv7 highbank - highbank +msm7630_surf arm armv7 msm7630_surf qcom msm7630 efikamx arm armv7 efikamx - mx5 efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKAMX,IMX_CONFIG=board/efikamx/imximage_mx.cfg efikasb arm armv7 efikamx - mx5 efikamx:MACH_TYPE=MACH_TYPE_MX51_EFIKASB,IMX_CONFIG=board/efikamx/imximage_sb.cfg mx51evk arm armv7 mx51evk freescale mx5 mx51evk:IMX_CONFIG=board/freescale/mx51evk/imximage.cfg diff --git a/include/configs/msm7630_surf.h b/include/configs/msm7630_surf.h new file mode 100644 index 0000000..3356611 --- /dev/null +++ b/include/configs/msm7630_surf.h @@ -0,0 +1,131 @@ +/* + * (C) Copyright 2012 + * LARSEN & TOUBRO INFOTECH LTD <www.lntinfotech.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 __CONFIG_H +#define __CONFIG_H + +#include <asm/sizes.h> +#define PLATFORM_MSM7X30 1 +#define CONFIG_MSM_UART +#define CONFIG_SYS_NO_FLASH +#define CONFIG_L2_OFF +#define CONFIG_SKIP_LOWLEVEL_INIT +/* Environment */ +#define CONFIG_ENV_IS_NOWHERE +#define CONFIG_ENV_SIZE 0x20000 /* Total Size Environment */ +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_MSM_PCOMM +#define CONFIG_ARCH_CPU_INIT +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (4 * 1024) /* 4KB */ +#define CONFIG_MSM7630 + +/* + * select serial console configuration + */ +#define CONFIG_CONS_INDEX 1 + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ + 115200} + +#include <config_cmd_default.h> + +/* remove unused commands */ +#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */ +#undef CONFIG_CMD_FPGA /* FPGA configuration support */ +#undef CONFIG_CMD_IMI +#undef CONFIG_CMD_IMLS +#undef CONFIG_CMD_NFS /* NFS support */ +#undef CONFIG_CMD_NET /* network support */ +#undef CONFIG_SYS_MAX_FLASH_SECT +#define CONFIG_EXTRA_ENV_SETTINGS \ + "console=ttyS0,115200n8\0" \ + +#define CONFIG_BOOTDELAY 2 /* -1 to disable auto boot */ + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_HUSH_PARSER /* use "hush" command parser */ +#define CONFIG_SYS_PROMPT_HUSH_PS2 "> " +#define V_PROMPT "(MSM 7x30) # " +#define CONFIG_SYS_PROMPT V_PROMPT +/* + * Increasing the size of the IO buffer as default nfsargs size is more + * than 256 and so it is not possible to edit it + */ +#define CONFIG_SYS_CBSIZE (256 * 2) /* Console I/O Buffer Size */ +/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + \ + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +/* Boot Argument Buffer Size */ +#define CONFIG_SYS_BARGSIZE (CONFIG_SYS_CBSIZE) + +#define CONFIG_SYS_HZ 1000 +#define CONFIG_SYS_LOAD_ADDR 0x00208000 +#define CONFIG_SYS_MEMTEST_START 0x08008000 +#define CONFIG_SYS_MEMTEST_END 0x08008001 + +#define CONFIG_DOS_PARTITION +#define CONFIG_MMC +#define CONFIG_CMD_MMC + +#define CONFIG_GENERIC_MMC +#define CONFIG_QC_MMC + +/*--------------------------------------------------------------------- + * IRQ Settings + */ + +#define CONFIG_STACKSIZE_IRQ (4*1024) /* IRQ stack */ +#define CONFIG_STACKSIZE_FIQ (4*1024) /* FIQ stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ + + +#define CONFIG_NR_DRAM_BANKS 2 + +#define PHYS_SDRAM_1 0x00200000 +#define PHYS_SDRAM_1_SIZE (60*1024*1024) /* 512M */ + + +#define PHYS_SDRAM_2 0x07A00000 +#define PHYS_SDRAM_2_SIZE (134*1024*1024) + +#define CONFIG_SYS_TEXT_BASE 0x00000000 +#define CONFIG_SYS_INIT_RAM_ADDR 0x00000000 +#define CONFIG_SYS_INIT_RAM_SIZE 0x00100000 + + +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_INIT_RAM_ADDR + \ + CONFIG_SYS_INIT_RAM_SIZE - \ + GENERATED_GBL_DATA_SIZE) + +#endif -- 1.7.1 The contents of this e-mail and any attachment(s) may contain confidential or privileged information for the intended recipient(s). Unintended recipients are prohibited from taking action on the basis of information in this e-mail and using or disseminating the information, and must notify the sender and delete it from their system. L&T Infotech will not accept responsibility or liability for the accuracy or completeness of, or the presence of any virus or disabling code in this e-mail"

2 1

[U-Boot] [PATCH 1/2] openrisc/bitops: add hweightX defines
by Stefan Kristiansson 03 Oct '12

03 Oct '12

Signed-off-by: Stefan Kristiansson <stefan.kristiansson(a)saunalahti.fi> --- arch/openrisc/include/asm/bitops.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/openrisc/include/asm/bitops.h b/arch/openrisc/include/asm/bitops.h index c001a5d..c76a409 100644 --- a/arch/openrisc/include/asm/bitops.h +++ b/arch/openrisc/include/asm/bitops.h @@ -25,4 +25,8 @@ #define PLATFORM_FFS #include <asm/bitops/ffs.h> +#define hweight32(x) generic_hweight32(x) +#define hweight16(x) generic_hweight16(x) +#define hweight8(x) generic_hweight8(x) + #endif /* __ASM_GENERIC_BITOPS_H */ -- 1.7.5.4

5 8

[U-Boot] [PATCH 0/6] add zip command support for uboot
by adrian.wenl＠gmail.com 29 Sep '12

29 Sep '12

From: Lei Wen <leiwen(a)marvell.com> This patch set add zip command support for uboot. The first two patches import deflate and trees functions from zlib 1.2.5 without any change. While the third patch did the necessary change to make the import file could be built passed in uboot environment. The fourth patch make us could zip the memory from 0 in the address space. The latter fifth and sixth patch does the adding gzip lib function exporting and zip command support. Patch set test with zip&unzip and compared with original memory content. Lei Wen (6): lib: zlib: import deflate source file from 1.2.5 lib: zlib: import trees file from 1.2.5 lib: zlib: include deflate into zlib build lib: zlib: remove the limitation for cannot using 0 as start lib: add gzip lib function callback common: add zip command support common/Makefile | 1 + common/cmd_zip.c | 60 ++ include/common.h | 7 + include/u-boot/zlib.h | 40 +- lib/Makefile | 1 + lib/gzip.c | 143 ++++ lib/zlib/deflate.c | 1831 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/zlib/deflate.h | 342 +++++++++ lib/zlib/trees.c | 1244 +++++++++++++++++++++++++++++++++ lib/zlib/trees.h | 128 ++++ lib/zlib/zlib.c | 8 + lib/zlib/zutil.h | 4 + 12 files changed, 3804 insertions(+), 5 deletions(-) create mode 100644 common/cmd_zip.c create mode 100644 lib/gzip.c create mode 100644 lib/zlib/deflate.c create mode 100644 lib/zlib/deflate.h create mode 100644 lib/zlib/trees.c create mode 100644 lib/zlib/trees.h -- 1.7.5.4

8 40