August 2012 - U-Boot

[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] README: Add handy kermit primer
by Karl O. Pinc 03 Oct '12

03 Oct '12

README: Add handy kermit primer Signed-off-by: Karl O. Pinc <kop(a)meme.com> --- Add handy primer on using C-Kermit to the README to make kermit juicyer for minicom users. I don't know if you really want this. It does seem a bit offtopic. But I need to look at this every time I start kermit so thought it might be handy to have in the README. README | 16 +++++++++++++++- 1 files changed, 15 insertions(+), 1 deletions(-) diff --git a/README b/README index 6bb5992..ad4e8fb 100644 --- a/README +++ b/README @@ -4633,7 +4633,21 @@ Unix, I recommend to use C-Kermit for general purpose use (and especially for kermit binary protocol download ("loadb" command), and use "cu" for S-Record download ("loads" command). -Nevertheless, if you absolutely want to use it try adding this +A typical C-Kermit session looks like: + +$ kermit ;# Start kermit from Unix shell +set modem type none ; null modem cable to device +set line /dev/ttyUSB0 ; change tty per your hardware +set flow /direct-serial ; turn off flow control +set speed 115200 ; change to your baud rate +set carrier-watch off ; needed when no CTS pin +show communications ; review result +connect ; talk to device +<talk to device> +Ctrl-\C ; exit back to kermit +exit ; exit kermit + +Nevertheless, if you absolutely want to use minicom try adding this configuration to your "File transfer protocols" section: Name Program Name U/D FullScr IO-Red. Multi -- 1.7.2.5

3 5

[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 00/10] mx5: Fix clocks
by Benoît Thébaudeau 02 Oct '12

02 Oct '12

Hi all, This series fixes the mx5 clocks. The previous code was full of bugs and missing parts. There is nothing special to say for each patch. Everything comes from the reference manuals. Best regards, Benoît

4 51

[U-Boot] [PATCH] mx25: Clean up lowlevel_init
by Benoît Thébaudeau 02 Oct '12

02 Oct '12

Clean up mx25 lowlevel_init: - Add comments. - Do not use write32 repeatedly with the same value in order no to increase code size. - Make register values configurable. - Use defined values instead of literal constants. - Use defined macros instead of duplicating code. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Stefano Babic <sbabic(a)denx.de> --- .../arch/arm/include/asm/arch-mx25/macro.h | 57 +++++++++++++------- .../board/karo/tx25/lowlevel_init.S | 37 +++---------- .../board/syteco/zmx25/lowlevel_init.S | 6 +++ 3 files changed, 51 insertions(+), 49 deletions(-) diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx25/macro.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx25/macro.h index 3b694da..9550ade 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx25/macro.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx25/macro.h @@ -32,32 +32,49 @@ #include <asm/arch/imx-regs.h> #include <generated/asm-offsets.h> +#include <asm/macro.h> +/* + * AIPS setup - Only setup MPROTx registers. + * The PACR default values are good. + */ .macro init_aips - write32 IMX_AIPS1_BASE + AIPS_MPR_0_7, 0x77777777 - write32 IMX_AIPS1_BASE + AIPS_MPR_8_15, 0x77777777 - write32 IMX_AIPS2_BASE + AIPS_MPR_0_7, 0x77777777 - write32 IMX_AIPS2_BASE + AIPS_MPR_8_15, 0x77777777 + ldr r0, =IMX_AIPS1_BASE + ldr r1, =AIPS_MPR_CONFIG + str r1, [r0, #AIPS_MPR_0_7] + str r1, [r0, #AIPS_MPR_8_15] + ldr r2, =IMX_AIPS2_BASE + str r1, [r2, #AIPS_MPR_0_7] + str r1, [r2, #AIPS_MPR_8_15] .endm +/* MAX (Multi-Layer AHB Crossbar Switch) setup */ .macro init_max - write32 IMX_MAX_BASE + MAX_MPR0, 0x43210 - write32 IMX_MAX_BASE + MAX_MPR1, 0x43210 - write32 IMX_MAX_BASE + MAX_MPR2, 0x43210 - write32 IMX_MAX_BASE + MAX_MPR3, 0x43210 - write32 IMX_MAX_BASE + MAX_MPR4, 0x43210 - - write32 IMX_MAX_BASE + MAX_SGPCR0, 0x10 - write32 IMX_MAX_BASE + MAX_SGPCR1, 0x10 - write32 IMX_MAX_BASE + MAX_SGPCR2, 0x10 - write32 IMX_MAX_BASE + MAX_SGPCR3, 0x10 - write32 IMX_MAX_BASE + MAX_SGPCR4, 0x10 + ldr r0, =IMX_MAX_BASE + ldr r1, =MAX_MPR_CONFIG + str r1, [r0, #MAX_MPR0] /* for S0 */ + str r1, [r0, #MAX_MPR1] /* for S1 */ + str r1, [r0, #MAX_MPR2] /* for S2 */ + str r1, [r0, #MAX_MPR3] /* for S3 */ + str r1, [r0, #MAX_MPR4] /* for S4 */ + ldr r1, =MAX_SGPCR_CONFIG + str r1, [r0, #MAX_SGPCR0] /* for S0 */ + str r1, [r0, #MAX_SGPCR1] /* for S1 */ + str r1, [r0, #MAX_SGPCR2] /* for S2 */ + str r1, [r0, #MAX_SGPCR3] /* for S3 */ + str r1, [r0, #MAX_SGPCR4] /* for S4 */ + ldr r1, =MAX_MGPCR_CONFIG + str r1, [r0, #MAX_MGPCR0] /* for M0 */ + str r1, [r0, #MAX_MGPCR1] /* for M1 */ + str r1, [r0, #MAX_MGPCR2] /* for M2 */ + str r1, [r0, #MAX_MGPCR3] /* for M3 */ + str r1, [r0, #MAX_MGPCR4] /* for M4 */ +.endm - write32 IMX_MAX_BASE + MAX_MGPCR0, 0x0 - write32 IMX_MAX_BASE + MAX_MGPCR1, 0x0 - write32 IMX_MAX_BASE + MAX_MGPCR2, 0x0 - write32 IMX_MAX_BASE + MAX_MGPCR3, 0x0 - write32 IMX_MAX_BASE + MAX_MGPCR4, 0x0 +/* M3IF setup */ +.macro init_m3if + /* M3IF Control Register (M3IFCTL) */ + write32 IMX_M3IF_CTRL_BASE, M3IFCTL_CONFIG .endm #endif /* __ASSEMBLY__ */ diff --git u-boot-4d3c95f.orig/board/karo/tx25/lowlevel_init.S u-boot-4d3c95f/board/karo/tx25/lowlevel_init.S index 823df10..cdd9bda 100644 --- u-boot-4d3c95f.orig/board/karo/tx25/lowlevel_init.S +++ u-boot-4d3c95f/board/karo/tx25/lowlevel_init.S @@ -23,36 +23,13 @@ #include <asm/macro.h> -.macro init_aips - write32 0x43f00000, 0x77777777 - write32 0x43f00004, 0x77777777 - write32 0x43f00000, 0x77777777 - write32 0x53f00004, 0x77777777 -.endm +#define AIPS_MPR_CONFIG 0x77777777 +#define MAX_MPR_CONFIG 0x43210 +#define MAX_SGPCR_CONFIG 0x10 +#define MAX_MGPCR_CONFIG 0x0 +#define M3IFCTL_CONFIG 0x1 -.macro init_max - write32 0x43f04000, 0x43210 - write32 0x43f04100, 0x43210 - write32 0x43f04200, 0x43210 - write32 0x43f04300, 0x43210 - write32 0x43f04400, 0x43210 - - write32 0x43f04010, 0x10 - write32 0x43f04110, 0x10 - write32 0x43f04210, 0x10 - write32 0x43f04310, 0x10 - write32 0x43f04410, 0x10 - - write32 0x43f04800, 0x0 - write32 0x43f04900, 0x0 - write32 0x43f04a00, 0x0 - write32 0x43f04b00, 0x0 - write32 0x43f04c00, 0x0 -.endm - -.macro init_m3if - write32 0xb8003000, 0x1 -.endm +#include <asm/arch/macro.h> .macro init_clocks /* @@ -64,6 +41,8 @@ * 0x00600000 makes CLKO parent clk the USB clk */ write32 0x53f80064, 0x45600000 + + /* CCTL: ARM = 399 MHz, AHB = 133 MHz */ write32 0x53f80008, 0x20034000 /* diff --git u-boot-4d3c95f.orig/board/syteco/zmx25/lowlevel_init.S u-boot-4d3c95f/board/syteco/zmx25/lowlevel_init.S index 1002674..575755c 100644 --- u-boot-4d3c95f.orig/board/syteco/zmx25/lowlevel_init.S +++ u-boot-4d3c95f/board/syteco/zmx25/lowlevel_init.S @@ -25,6 +25,12 @@ */ #include <asm/macro.h> + +#define AIPS_MPR_CONFIG 0x77777777 +#define MAX_MPR_CONFIG 0x43210 +#define MAX_SGPCR_CONFIG 0x10 +#define MAX_MGPCR_CONFIG 0x0 + #include <asm/arch/macro.h> #include <asm/arch/imx-regs.h> #include <generated/asm-offsets.h>

3 9

[U-Boot] [PATCH 1/3] disk: part_efi: parse and store partition UUID
by Stephen Warren 02 Oct '12

02 Oct '12

From: Stephen Warren <swarren(a)nvidia.com> Each EFI partition table entry contains a UUID. Extend U-Boot's struct disk_partition to be able to store this information, and modify get_partition_info_efi() to fill it in. The implementation of uuid_string() was stolen from the Linux kernel. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- Note: I made this field part of struct disk_partition, and wrote a generic command to retrieve it, rather than adding an EFI-/GPT-specific command, since I imagine the kernel's PARTUUID support could be extended to support e.g. NT disk signatures, or other partition types, in the future. disk/part.c | 3 +++ disk/part_efi.c | 21 +++++++++++++++++++++ include/part.h | 1 + 3 files changed, 25 insertions(+), 0 deletions(-) diff --git a/disk/part.c b/disk/part.c index 76f3939..266d77e 100644 --- a/disk/part.c +++ b/disk/part.c @@ -294,6 +294,9 @@ void init_part (block_dev_desc_t * dev_desc) int get_partition_info (block_dev_desc_t *dev_desc, int part , disk_partition_t *info) { + /* The common case is no UUID support */ + info->uuid[0] = 0; + switch (dev_desc->part_type) { #ifdef CONFIG_MAC_PARTITION case PART_TYPE_MAC: diff --git a/disk/part_efi.c b/disk/part_efi.c index 02927a0..199c054 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -154,6 +154,26 @@ void print_part_efi(block_dev_desc_t * dev_desc) return; } +static void uuid_string(unsigned char *uuid, char *str) +{ + static const u8 le[16] = {3, 2, 1, 0, 5, 4, 7, 6, 8, 9, 10, 11, + 12, 13, 14, 15}; + int i; + + for (i = 0; i < 16; i++) { + sprintf(str, "%02x", uuid[le[i]]); + str += 2; + switch (i) { + case 3: + case 5: + case 7: + case 9: + *str++ = '-'; + break; + } + } +} + int get_partition_info_efi(block_dev_desc_t * dev_desc, int part, disk_partition_t * info) { @@ -183,6 +203,7 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part, sprintf((char *)info->name, "%s", print_efiname(&gpt_pte[part - 1])); sprintf((char *)info->type, "U-Boot"); + uuid_string(gpt_pte[part - 1].unique_partition_guid.b, info->uuid); debug("%s: start 0x%lX, size 0x%lX, name %s", __func__, info->start, info->size, info->name); diff --git a/include/part.h b/include/part.h index e1478f4..52002f5 100644 --- a/include/part.h +++ b/include/part.h @@ -93,6 +93,7 @@ typedef struct disk_partition { ulong blksz; /* block size in bytes */ uchar name[32]; /* partition name */ uchar type[32]; /* string type description */ + char uuid[37]; /* filesystem UUID as string, if exists */ } disk_partition_t; /* Misc _get_dev functions */ -- 1.7.0.4

4 9

[U-Boot] Is there file size limiation of tftp
by J.Hwan Kim 02 Oct '12

02 Oct '12

Hi, everyone Is there any limit of file size for tftpboot? I have a problem downloading the file of which file size is 65MB. The procedure stops in the middle of downloading. Thanks in advnace. Best Regards, J.Hwan Kim ----------------------------------------------------------------------------------------------------------------------------- # tftp 0xc0000000 192.168.100.10:system.img smc911x: detected LAN9221 controller smc911x: phy initialized smc911x: MAC c3ea1460M (00405c260a5b) TFTP from server 192.168.100.10; our IP address is 192.168.100.50 Filename 'system.img'. Load address: 0xc0000000 Loading: T ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ################################################################# ##########

5 4

[U-Boot] [PATCH 0/4] Some patman fixes
by Ilya Yanok 02 Oct '12

02 Oct '12

Patman is the great tool but I've found it nearly unusable for me. First of all I need to work with multiple signoffs in commits, then I'd like to use multiline changelog entries and I accostomed to putting changelog enties to the bottom of the commit. These patches fix changelog processing and disables additional signoff and changelog processing. Ilya Yanok (4): patman: fix end of changes detection patman: don't pick changes while processing patches patman: don't mess with changelog patman: don't mess with signoffs tools/patman/patchstream.py | 22 ++++++++++------------ tools/patman/series.py | 5 ++--- 2 files changed, 12 insertions(+), 15 deletions(-) -- 1.7.9.5

3 9

[U-Boot] [PATCH V4 1/4] README: fix references to config_cmd_default.h
by Stephen Warren 02 Oct '12

02 Oct '12

All usage of config_cmd_default.h uses <> for the include statement. Update the README to do the same, rather than using "". Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- v4: No change v3: No change v2: New patch --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index dac46f3..a7deaf4 100644 --- a/README +++ b/README @@ -744,8 +744,8 @@ The following options need to be configured: - Monitor Functions: Monitor commands can be included or excluded from the build by using the #include files - "config_cmd_all.h" and #undef'ing unwanted - commands, or using "config_cmd_default.h" + <config_cmd_all.h> and #undef'ing unwanted + commands, or using <config_cmd_default.h> and augmenting with additional #define's for wanted commands. -- 1.7.9.5

3 6

[U-Boot] [PATCH 0/8] EXYNOS5: Enable SPI support
by Rajeshwari Shinde 02 Oct '12

02 Oct '12

This patch set adds SPI driver for EXYNOS5 and enables same. This patchset is based on top of latest V7 I2C patches which are merged in u-boot-i2c. url for same: http://comments.gmane.org/gmane.comp.boot-loaders.u-boot/136058 Rajeshwari Shinde (8): EXYNOS5: Add pinmux support for SPI SPI: Add W25Q32 to Winbond SPI flash table EXYNOS: Add clock for SPI. EXYNOS5: Add base address for SPI. SPI: Add SPI slave mode flag SPI: Add SPI Driver for EXYNOS. EXYNOS5: Enable SPI EXYNOS5: Enable SPI booting. arch/arm/cpu/armv7/exynos/clock.c | 122 +++++++ arch/arm/cpu/armv7/exynos/pinmux.c | 51 +++- arch/arm/include/asm/arch-exynos/clk.h | 4 +- arch/arm/include/asm/arch-exynos/cpu.h | 6 + arch/arm/include/asm/arch-exynos/periph.h | 5 + arch/arm/include/asm/arch-exynos/pinmux.h | 3 + arch/arm/include/asm/arch-exynos/spi.h | 78 ++++ board/samsung/smdk5250/Makefile | 2 +- board/samsung/smdk5250/smdk5250.c | 3 + board/samsung/smdk5250/{mmc_boot.c => spl_boot.c} | 31 ++- drivers/mtd/spi/winbond.c | 8 + drivers/spi/Makefile | 1 + drivers/spi/exynos_spi.c | 400 +++++++++++++++++++++ include/configs/smdk5250.h | 28 ++- include/spi.h | 1 + 15 files changed, 737 insertions(+), 6 deletions(-) create mode 100644 arch/arm/include/asm/arch-exynos/spi.h rename board/samsung/smdk5250/{mmc_boot.c => spl_boot.c} (66%) create mode 100644 drivers/spi/exynos_spi.c -- 1.7.4.4

3 10