May 2012 - U-Boot

[U-Boot] [PATCH 1/3] m28evk: use same notation to alloc the 128kB stack
by Otavio Salvador 13 Jun '12

13 Jun '12

Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> Cc: Marek Vasut <marex(a)denx.de> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Wolfgang Denk <wd(a)denx.de> --- include/configs/m28evk.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 68e46b7..a076aa5 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -88,7 +88,7 @@ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ #define PHYS_SDRAM_1 0x40000000 /* Base address */ #define PHYS_SDRAM_1_SIZE 0x20000000 /* Max 512 MB RAM */ -#define CONFIG_STACKSIZE 0x00010000 /* 128 KB stack */ +#define CONFIG_STACKSIZE (128 * 1024) /* 128 KB stack */ #define CONFIG_SYS_MALLOC_LEN 0x00400000 /* 4 MB for malloc */ #define CONFIG_SYS_GBL_DATA_SIZE 128 /* Initial data */ #define CONFIG_SYS_MEMTEST_START 0x40000000 /* Memtest start adr */ -- 1.7.10

5 19

[U-Boot] [PATCH 1/8] MX28: Fix a typo in mx28_reg_8 macro
by Otavio Salvador 13 Jun '12

13 Jun '12

The macro mistakenly referred to 32bit struct instead of 8bit one. Signed-off-by: Otavio Salvador <otavio(a)ossystems.com.br> Cc: Fabio Estevam <fabio.estevam(a)freescale.com> Cc: Marek Vasut <marex(a)denx.de> --- arch/arm/include/asm/arch-mx28/regs-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-mx28/regs-common.h b/arch/arm/include/asm/arch-mx28/regs-common.h index 94b512d..d2e1953 100644 --- a/arch/arm/include/asm/arch-mx28/regs-common.h +++ b/arch/arm/include/asm/arch-mx28/regs-common.h @@ -70,7 +70,7 @@ struct mx28_register_32 { #define mx28_reg_8(name) \ union { \ struct { __mx28_reg_8(name) }; \ - struct mx28_register_32 name##_reg; \ + struct mx28_register_8 name##_reg; \ }; #define mx28_reg_32(name) \ -- 1.7.10

3 11

[U-Boot] [PATCH 01/10] mx53loco: Remove unused SOBJS
by Fabio Estevam 12 Jun '12

12 Jun '12

There is no .S file in this directory, so just remove SOBJS. Cc: Jason Liu <r64343(a)freescale.com> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx53loco/Makefile | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/board/freescale/mx53loco/Makefile b/board/freescale/mx53loco/Makefile index a6ea939..8bc69a9 100644 --- a/board/freescale/mx53loco/Makefile +++ b/board/freescale/mx53loco/Makefile @@ -24,12 +24,11 @@ LIB = $(obj)lib$(BOARD).o COBJS := mx53loco.o -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +SRCS := $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS := $(addprefix $(obj),$(SOBJS)) -$(LIB): $(obj).depend $(OBJS) $(SOBJS) - $(call cmd_link_o_target, $(OBJS) $(SOBJS)) +$(LIB): $(obj).depend $(OBJS) + $(call cmd_link_o_target, $(OBJS)) ######################################################################### -- 1.7.1

4 13

[U-Boot] [PATCH] mx53: Fix mask for SATA reference clock
by Fabio Estevam 12 Jun '12

12 Jun '12

From: Fabio Estevam <fabio.estevam(a)freescale.com> SATA_ALT_REF_CLK field corresponds to bits 1 and 2 of offset 0x180c. Fix the mask for these bits. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- Stefano, I don't have a SATA disk handy to try this. arch/arm/cpu/armv7/mx5/clock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/cpu/armv7/mx5/clock.c b/arch/arm/cpu/armv7/mx5/clock.c index fc2406b..64862b3 100644 --- a/arch/arm/cpu/armv7/mx5/clock.c +++ b/arch/arm/cpu/armv7/mx5/clock.c @@ -843,7 +843,7 @@ void mxc_set_sata_internal_clock(void) set_usb_phy1_clk(); - writel((readl(tmp_base) & (~0x7)) | 0x4, tmp_base); + writel((readl(tmp_base) & (~0x6)) | 0x4, tmp_base); } #endif -- 1.7.1

2 3

[U-Boot] [PATCH] mx53loco: Fix revision of Dialog boards
by Fabio Estevam 12 Jun '12

12 Jun '12

Original code was assuming that the fuse revision version for all mx53loco boards based on Dialog PMIC was the same, which is not the case. Force the revision of Dialog-based boards to 0. This fixes a kernel crash when Dialog PMIC is accessed in the kernel for rev E boards. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx53loco/mx53loco.c | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index dec966d..1db4137 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -41,6 +41,7 @@ #include <fsl_pmic.h> DECLARE_GLOBAL_DATA_PTR; +static u32 system_rev; int dram_init(void) { @@ -62,16 +63,19 @@ void dram_init_banksize(void) gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE; } -u32 get_board_rev(void) +u32 get_board_rev_from_fuse(void) { struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE; struct fuse_bank *bank = &iim->bank[0]; struct fuse_bank0_regs *fuse = (struct fuse_bank0_regs *)bank->fuse_regs; - int rev = readl(&fuse->gp[6]); + return readl(&fuse->gp[6]); +} - return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8; +u32 get_board_rev(void) +{ + return system_rev; } static void setup_iomux_uart(void) @@ -329,6 +333,11 @@ static void setup_iomux_i2c(void) PAD_CTL_ODE_OPENDRAIN_ENABLE); } +static inline void setup_board_rev(int rev) +{ + system_rev |= (rev & 0xF) << 8; +} + static int power_init(void) { unsigned int val; @@ -350,6 +359,8 @@ static int power_init(void) /* Set Vcc peripheral to 1.30V */ ret |= pmic_reg_write(p, DA9053_BUCKPRO_REG, 0x62); ret |= pmic_reg_write(p, DA9053_SUPPLY_REG, 0x62); + + setup_board_rev(0); } if (!i2c_probe(CONFIG_SYS_FSL_PMIC_I2C_ADDR)) { @@ -379,6 +390,8 @@ static int power_init(void) /* Set SWBST to 5V in auto mode */ val = SWBST_AUTO; ret |= pmic_reg_write(p, SWBST_CTRL, val); + + setup_board_rev(get_board_rev_from_fuse()); } return ret; -- 1.7.1

2 2

[U-Boot] [PATCH] i.mx: i.mx6x: NO_MUX_I/NO_PAD_I not set correctly
by Jason Liu 12 Jun '12

12 Jun '12

If one PAD does not have mux or pad config register, we need set the NO_MUX_I/NO_PAD_I to 0, the old value is not correct Signed-off-by: Jason Liu <jason.hui(a)linaro.org> CC: Stefano Babic <sbabic(a)denx.de> --- arch/arm/include/asm/arch-mx6/mx6x_pins.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-mx6/mx6x_pins.h b/arch/arm/include/asm/arch-mx6/mx6x_pins.h index afaa068..9979651 100644 --- a/arch/arm/include/asm/arch-mx6/mx6x_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6x_pins.h @@ -48,8 +48,8 @@ #define PAD_CTL_SRE_FAST (1 << 0) #define PAD_CTL_SRE_SLOW (0 << 0) -#define NO_MUX_I 0x3FF -#define NO_PAD_I 0x7FF +#define NO_MUX_I 0 +#define NO_PAD_I 0 enum { MX6Q_PAD_SD2_DAT1__USDHC2_DAT1 = IOMUX_PAD(0x0360, 0x004C, 0, 0x0000, 0, 0), -- 1.7.5.4

3 3

[U-Boot] [PATCH 1/9] Define UART4 and UART5 base addresses
by Stefano Babic 12 Jun '12

12 Jun '12

Signed-off-by: Stefano Babic <sbabic(a)denx.de> --- arch/arm/include/asm/arch-mx5/imx-regs.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/arch-mx5/imx-regs.h b/arch/arm/include/asm/arch-mx5/imx-regs.h index 4fa6658..07296b5 100644 --- a/arch/arm/include/asm/arch-mx5/imx-regs.h +++ b/arch/arm/include/asm/arch-mx5/imx-regs.h @@ -93,6 +93,7 @@ #define GPIO5_BASE_ADDR (AIPS1_BASE_ADDR + 0x000DC000) #define GPIO6_BASE_ADDR (AIPS1_BASE_ADDR + 0x000E0000) #define GPIO7_BASE_ADDR (AIPS1_BASE_ADDR + 0x000E4000) +#define UART4_BASE_ADDR (AIPS1_BASE_ADDR + 0x000F0000) #endif /* * AIPS 2 @@ -133,6 +134,10 @@ #define VPU_BASE_ADDR (AIPS2_BASE_ADDR + 0x000F4000) #define SAHARA_BASE_ADDR (AIPS2_BASE_ADDR + 0x000F8000) +#if defined(CONFIG_MX53) +#define UART5_BASE_ADDR (AIPS2_BASE_ADDR + 0x00090000) +#endif + /* * WEIM CSnGCR1 */ -- 1.7.5.4

3 14

[U-Boot] pull request for u-boot-tegra/master
by Tom Warren 11 Jun '12

11 Jun '12

Albert, Please pull u-boot-tegra/master into ARM master. Thanks! The following changes since commit 2ca4a209a5b961ad1be8782c68dabe326d77dfaf: SRICHARAN R (1): OMAP4/5: Change omap4_sdp, omap4_panda, omap5_evm maintainer are available in the git repository at: git://git.denx.de/u-boot-tegra master Lucas Stach (2): tegra: sync SDIO1 pingroup enum name with TRM tegra: add SDIO1 funcmux entry for UARTA Simon Glass (1): tegra: Correct PLL access in ap20.c and clock.c Stephen Warren (22): tegra: paz00: fix typo in SD slot CD detect GPIO tegra: add alternate UART1 funcmux entry tegra: Whistler board support tegra: remove some cruft from CONFIG_EXTRA_ENV_SETTINGS tegra: flesh out bootcmd tegra: whistler: reduce and comment network cfg options tegra: seaboard: add support for USB networking tegra: add UART1 on GPU funcmux entry tegra: add SDMMC1 on SDIO1 funcmux entry tegra: Compulab TrimSlice board support tegra: harmony: add device tree support tegra: paz00: add device tree support tegra: remove CONFIG_USB_ETHER_SMSC95XX from boards without it tegra: ventana: add own device tree, enable USB env_mmc: align buffers using ALLOC_CACHE_ALIGN_BUFFER sf: winbond: Add support for the Winbond W25Q80BL tegra: ventana: store environment in eMMC tegra: whistler: store environment in eMMC tegra: trimslice: store environment in SPI flash tegra: paz00: store environment in eMMC tegra: seaboard: disable SPI, move environment to eMMC tegra: trimslice: fix a couple typos Tom Warren (6): spi: Tegra2: Seaboard: fix UART corruption during SPI transactions spi: Tegra2: Seaboard: enable SPI/UART corruption fix spi: tegra2: rename tegra2_spi.* to tegra_spi.* mmc: tegra2: rename tegra2_mmc.* to tegra_mmc.* gpio: tegra2: rename tegra2_gpio.* to tegra_gpio.* arm: Tegra: Use ODMDATA from BCT in IRAM amartin(a)nvidia.com (1): tegra: override compiler flags for low level init code MAINTAINERS | 2 + arch/arm/cpu/armv7/tegra2/ap20.c | 28 ++++- arch/arm/cpu/armv7/tegra2/board.c | 18 +++- arch/arm/cpu/armv7/tegra2/clock.c | 4 +- arch/arm/cpu/armv7/tegra2/config.mk | 7 +- arch/arm/cpu/armv7/tegra2/funcmux.c | 30 +++++- arch/arm/include/asm/arch-tegra2/clock.h | 5 +- arch/arm/include/asm/arch-tegra2/funcmux.h | 4 + arch/arm/include/asm/arch-tegra2/gpio.h | 7 +- arch/arm/include/asm/arch-tegra2/pinmux.h | 2 +- arch/arm/include/asm/arch-tegra2/tegra2.h | 4 + .../asm/arch-tegra2/{tegra2_spi.h => tegra_spi.h} | 9 +- arch/arm/include/asm/arch-tegra2/uart-spi-switch.h | 4 +- board/compal/dts/tegra2-paz00.dts | 57 ++++++++++ board/compal/paz00/paz00.c | 12 +- board/compulab/dts/tegra2-trimslice.dts | 57 ++++++++++ board/compulab/trimslice/Makefile | 49 ++++++++ board/compulab/trimslice/trimslice.c | 73 ++++++++++++ board/nvidia/common/uart-spi-switch.c | 29 ++---- board/nvidia/dts/tegra2-harmony.dts | 57 ++++++++++ board/nvidia/dts/tegra2-ventana.dts | 57 ++++++++++ board/nvidia/dts/tegra2-whistler.dts | 67 +++++++++++ board/nvidia/harmony/harmony.c | 4 +- board/nvidia/seaboard/seaboard.c | 4 +- board/nvidia/whistler/Makefile | 48 ++++++++ board/nvidia/whistler/whistler.c | 116 +++++++++++++++++++ boards.cfg | 2 + common/env_mmc.c | 10 +- drivers/gpio/Makefile | 2 +- drivers/gpio/{tegra2_gpio.c => tegra_gpio.c} | 2 +- drivers/mmc/Makefile | 2 +- drivers/mmc/{tegra2_mmc.c => tegra_mmc.c} | 4 +- drivers/mmc/{tegra2_mmc.h => tegra_mmc.h} | 8 +- drivers/mtd/spi/winbond.c | 8 ++ drivers/spi/Makefile | 2 +- drivers/spi/{tegra2_spi.c => tegra_spi.c} | 17 +++- include/configs/harmony.h | 29 ++++- include/configs/medcom.h | 6 +- include/configs/paz00.h | 34 +++++- include/configs/plutux.h | 6 +- include/configs/seaboard.h | 35 +++--- include/configs/tegra2-common-post.h | 117 ++++++++++++++++++++ include/configs/tegra2-common.h | 10 +-- include/configs/trimslice.h | 99 +++++++++++++++++ include/configs/ventana.h | 29 ++++- include/configs/whistler.h | 94 ++++++++++++++++ 46 files changed, 1150 insertions(+), 120 deletions(-) rename arch/arm/include/asm/arch-tegra2/{tegra2_spi.h => tegra_spi.h} (95%) create mode 100644 board/compal/dts/tegra2-paz00.dts create mode 100644 board/compulab/dts/tegra2-trimslice.dts create mode 100644 board/compulab/trimslice/Makefile create mode 100644 board/compulab/trimslice/trimslice.c create mode 100644 board/nvidia/dts/tegra2-harmony.dts create mode 100644 board/nvidia/dts/tegra2-ventana.dts create mode 100644 board/nvidia/dts/tegra2-whistler.dts create mode 100644 board/nvidia/whistler/Makefile create mode 100644 board/nvidia/whistler/whistler.c rename drivers/gpio/{tegra2_gpio.c => tegra_gpio.c} (99%) rename drivers/mmc/{tegra2_mmc.c => tegra_mmc.c} (99%) rename drivers/mmc/{tegra2_mmc.h => tegra_mmc.h} (97%) rename drivers/spi/{tegra2_spi.c => tegra_spi.c} (95%) create mode 100644 include/configs/tegra2-common-post.h create mode 100644 include/configs/trimslice.h create mode 100644 include/configs/whistler.h

4 10

[U-Boot] [PATCH v2 1/7] tegra: Rework Tamonten support
by Thierry Reding 11 Jun '12

11 Jun '12

This commit uses the common Tegra board implementation instead of duplicating a lot of the code. In addition, the Plutux and Medcom specific board files can be removed as the MMC/SD setup is common among all Tamonten-based boards. Signed-off-by: Thierry Reding <thierry.reding(a)avionic-design.de> --- Changes in v2: - new patch board/avionic-design/common/tamonten.c | 49 +++++--------------------------- board/avionic-design/common/tamonten.h | 32 --------------------- board/avionic-design/medcom/Makefile | 6 ++-- board/avionic-design/medcom/medcom.c | 45 ----------------------------- board/avionic-design/plutux/Makefile | 6 ++-- board/avionic-design/plutux/plutux.c | 45 ----------------------------- 6 files changed, 13 insertions(+), 170 deletions(-) delete mode 100644 board/avionic-design/common/tamonten.h delete mode 100644 board/avionic-design/medcom/medcom.c delete mode 100644 board/avionic-design/plutux/plutux.c diff --git a/board/avionic-design/common/tamonten.c b/board/avionic-design/common/tamonten.c index f23b657..d9ecd23 100644 --- a/board/avionic-design/common/tamonten.c +++ b/board/avionic-design/common/tamonten.c @@ -1,7 +1,7 @@ /* * (C) Copyright 2010,2011 * NVIDIA Corporation <www.nvidia.com> - * (C) Copyright 2011 + * (C) Copyright 2011-2012 * Avionic Design GmbH <www.avionic-design.de> * * See file CREDITS for list of people who contributed to this @@ -36,25 +36,17 @@ #include <asm/arch/pinmux.h> #include <asm/arch/uart.h> #include <asm/arch/mmc.h> -#include "tamonten.h" #ifdef CONFIG_TEGRA2_MMC #include <mmc.h> #endif -DECLARE_GLOBAL_DATA_PTR; - -const struct tegra2_sysinfo sysinfo = { - CONFIG_TEGRA2_BOARD_STRING -}; - /* - * Routine: timer_init - * Description: init the timestamp and lastinc value + * Routine: gpio_config_uart + * Description: Does nothing on Tamonten - no conflict w/SPI. */ -int timer_init(void) +void gpio_config_uart(void) { - return 0; } #ifdef CONFIG_TEGRA2_MMC @@ -65,46 +57,19 @@ int timer_init(void) static void pin_mux_mmc(void) { funcmux_select(PERIPH_ID_SDMMC4, FUNCMUX_SDMMC4_ATB_GMA_GME_8_BIT); + /* for CD GPIO PH2 */ + pinmux_tristate_disable(PINGRP_ATD); } -#endif - -/* - * Routine: board_init - * Description: Early hardware init. - */ -int board_init(void) -{ - clock_init(); - clock_verify(); - - /* boot param addr */ - gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100); - return 0; -} - -#ifdef CONFIG_TEGRA2_MMC /* this is a weak define that we are overriding */ int board_mmc_init(bd_t *bd) { - debug("board_mmc_init called\n"); /* Enable muxes, etc. for SDMMC controllers */ pin_mux_mmc(); - gpio_config_mmc(); - debug("board_mmc_init: init eMMC\n"); - /* init dev 0, eMMC chip, with 4-bit bus */ + /* init dev 0, SD slot, with 4-bit bus */ tegra2_mmc_init(0, 4, -1, GPIO_PH2); return 0; } #endif - -#ifdef CONFIG_BOARD_EARLY_INIT_F -int board_early_init_f(void) -{ - /* Initialize selected UARTs */ - board_init_uart_f(); - return 0; -} -#endif /* EARLY_INIT */ diff --git a/board/avionic-design/common/tamonten.h b/board/avionic-design/common/tamonten.h deleted file mode 100644 index 0e60b0f..0000000 --- a/board/avionic-design/common/tamonten.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - * (C) Copyright 2010,2011 - * NVIDIA Corporation <www.nvidia.com> - * (C) Copyright 2011 - * Avionic Design GmbH <www.avionic-design.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 - */ - -#ifndef _TAMONTEN_H_ -#define _TAMONTEN_H_ - -void tegra2_start(void); -void gpio_config_mmc(void); - -#endif /* TAMONTEN_H */ diff --git a/board/avionic-design/medcom/Makefile b/board/avionic-design/medcom/Makefile index b0c318c..d96d043 100644 --- a/board/avionic-design/medcom/Makefile +++ b/board/avionic-design/medcom/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> -# (C) Copyright 2011 +# (C) Copyright 2011,2012 # Avionic Design GmbH <www.avionic-design.de> # # See file CREDITS for list of people who contributed to this @@ -26,12 +26,12 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../common) +$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) endif LIB = $(obj)lib$(BOARD).o -COBJS := $(BOARD).o +COBJS := ../../nvidia/common/board.o COBJS += ../common/tamonten.o SRCS := $(COBJS:.o=.c) diff --git a/board/avionic-design/medcom/medcom.c b/board/avionic-design/medcom/medcom.c deleted file mode 100644 index 42c8094..0000000 --- a/board/avionic-design/medcom/medcom.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2010,2011 - * NVIDIA Corporation <www.nvidia.com> - * (C) Copyright 2011 - * Avionic Design GmbH <www.avionic-design.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 - */ - -#include <common.h> -#include <asm/io.h> -#include <asm/gpio.h> -#include <asm/arch/tegra2.h> -#ifdef CONFIG_TEGRA2_MMC -#include <mmc.h> -#endif - -#ifdef CONFIG_TEGRA2_MMC -/* - * Routine: gpio_config_mmc - * Description: Set GPIOs for SD card - */ -void gpio_config_mmc(void) -{ - /* configure pin as input for card detect */ - gpio_request(GPIO_PH2, "SD4 CD"); - gpio_direction_input(GPIO_PH2); -} -#endif diff --git a/board/avionic-design/plutux/Makefile b/board/avionic-design/plutux/Makefile index b0c318c..d96d043 100644 --- a/board/avionic-design/plutux/Makefile +++ b/board/avionic-design/plutux/Makefile @@ -1,7 +1,7 @@ # # (C) Copyright 2010,2011 # NVIDIA Corporation <www.nvidia.com> -# (C) Copyright 2011 +# (C) Copyright 2011,2012 # Avionic Design GmbH <www.avionic-design.de> # # See file CREDITS for list of people who contributed to this @@ -26,12 +26,12 @@ include $(TOPDIR)/config.mk ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../common) +$(shell mkdir -p $(obj)../common $(obj)../../nvidia/common) endif LIB = $(obj)lib$(BOARD).o -COBJS := $(BOARD).o +COBJS := ../../nvidia/common/board.o COBJS += ../common/tamonten.o SRCS := $(COBJS:.o=.c) diff --git a/board/avionic-design/plutux/plutux.c b/board/avionic-design/plutux/plutux.c deleted file mode 100644 index 42c8094..0000000 --- a/board/avionic-design/plutux/plutux.c +++ /dev/null @@ -1,45 +0,0 @@ -/* - * (C) Copyright 2010,2011 - * NVIDIA Corporation <www.nvidia.com> - * (C) Copyright 2011 - * Avionic Design GmbH <www.avionic-design.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 - */ - -#include <common.h> -#include <asm/io.h> -#include <asm/gpio.h> -#include <asm/arch/tegra2.h> -#ifdef CONFIG_TEGRA2_MMC -#include <mmc.h> -#endif - -#ifdef CONFIG_TEGRA2_MMC -/* - * Routine: gpio_config_mmc - * Description: Set GPIOs for SD card - */ -void gpio_config_mmc(void) -{ - /* configure pin as input for card detect */ - gpio_request(GPIO_PH2, "SD4 CD"); - gpio_direction_input(GPIO_PH2); -} -#endif -- 1.7.10.2

5 28

[U-Boot] Please pull u-boot-ti/master
by Tom Rini 10 Jun '12

10 Jun '12

Hello, The following changes since commit 2ca4a209a5b961ad1be8782c68dabe326d77dfaf: OMAP4/5: Change omap4_sdp, omap4_panda, omap5_evm maintainer (2012-05-15 08:31:41 +0200) are available in the git repository at: git://git.denx.de/u-boot-ti.git master for you to fetch changes up to aa54ece4e24f6ddd14914ca8c0c02ce5f279020e: cm-t35: print PCB revision information (2012-05-25 07:58:41 -0700) ---------------------------------------------------------------- Heiko Schocher (1): arm,davinci: update for enbw_cmc board Igor Grinberg (1): cm-t35: reduce the environment size Lokesh Vutla (7): OMAP5: Adding correct Control id code for OMAP5430 OMAP5: ADD chip detection for OMAP5432 SOC OMAP5: Configure the io settings for omap5432 uevm board OMAP5: ADD precalculated timings for ddr3 OMAP5: EMIF: Add support for DDR3 device OMAP5: DPLL core lock for OMAP5432 OMAP5: Change voltages for omap5432 Nikita Kiryanov (3): cm-t35: fix incorrect BOARD_REV_SIZE value cm-t35: fix legacy board revision representation cm-t35: print PCB revision information SRICHARAN R (5): ARM: OMAP4+: dmm: Take care of overlapping dmm and trap sections. ARM: OMAP5: dmm: Create a tiler trap section. ARM: OMAP5: Align memory used for testing to the power of 2 ARM: OMAP5: Correct the DRAM_ADDR_SPACE_END macro. ARM: OMAP4: Correct the lpddr2 io settings register value. Thomas Weber (1): omap4/5: Use CPUDIR for .lds script Tom Rini (10): am33xx: Do not call init_timer twice Revert "I2C: OMAP: detect more devices when probing an i2c bus" am335x: Correct i2c sysc offset am33xx: Fill in more cm_wkuppll / cm_perpll am33xx: Fix i2c sampling rate typo omap24xx_i2c: Add AM33XX support OMAP3 Beagle: Set BOOTDELAY to 3 omap3evm: Set BOOTDELAY to 3 omap3_beagle: Add CONFIG_CMD_ASKENV omap3evm: Add CONFIG_CMD_ASKENV Troy Kisky (1): DaVinci: fix ddr2 vtp i/o calibration arch/arm/cpu/arm926ejs/davinci/lowlevel_init.S | 7 +- arch/arm/cpu/armv7/am33xx/board.c | 30 +- arch/arm/cpu/armv7/omap-common/clocks-common.c | 8 +- arch/arm/cpu/armv7/omap-common/emif-common.c | 121 ++++++++- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 20 +- arch/arm/cpu/armv7/omap4/hwinit.c | 5 + arch/arm/cpu/armv7/omap4/sdram_elpida.c | 1 + arch/arm/cpu/armv7/omap5/clocks.c | 31 ++- arch/arm/cpu/armv7/omap5/hwinit.c | 123 +++++++-- arch/arm/cpu/armv7/omap5/sdram.c | 56 +++- arch/arm/include/asm/arch-am33xx/cpu.h | 42 ++- arch/arm/include/asm/arch-am33xx/i2c.h | 8 +- arch/arm/include/asm/arch-omap4/clocks.h | 5 + arch/arm/include/asm/arch-omap4/omap.h | 2 +- arch/arm/include/asm/arch-omap5/clocks.h | 15 + arch/arm/include/asm/arch-omap5/omap.h | 20 +- arch/arm/include/asm/emif.h | 50 +++- arch/arm/include/asm/omap_common.h | 1 + board/cm_t35/cm_t35.c | 33 +++ board/cm_t35/eeprom.c | 26 +- board/cm_t35/eeprom.h | 5 + board/enbw/enbw_cmc/enbw_cmc.c | 347 ++++++++++++++++++++++-- board/ti/am335x/evm.c | 13 +- doc/README.switch_config | 25 ++ drivers/i2c/omap24xx_i2c.c | 46 +++- include/configs/cm_t35.h | 3 +- include/configs/enbw_cmc.h | 20 +- include/configs/omap3_beagle.h | 4 +- include/configs/omap3_evm.h | 4 +- include/configs/omap4_common.h | 2 +- include/configs/omap5_evm.h | 2 +- 31 files changed, 922 insertions(+), 153 deletions(-) create mode 100644 doc/README.switch_config With this, I'm considering anything that's not a bugfix to existing code (that's in my custodial area) to be for the 'next' branch and not for the v2012.07 release (since we're a little bit past the official merge window closing). -- Tom

2 1