March 2012 - U-Boot

[U-Boot] [PATCH] i.MX6: mx6qsabrelite: Add keypress support
by Eric Nelson 24 Mar '12

24 Mar '12

This patch adds support for the GPIO keyboard used on MX6Q SabreLite. This is generally used for invoking Android "recovery mode" in response to a long press of volume key down during boot. This can be tested by a boot script like so: if keypress voldown && sleep 1 && keypress voldown ; then echo "do recovery thing" ; fi Key values can be seen by issuing keypress with no arguments: MX6QSABRELITE U-Boot > keypress keys: !menu !back !search !home !volup !voldown --- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 76 +++++++++++++++++++++++++ 1 files changed, 76 insertions(+), 0 deletions(-) diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c index e0ba6a4..0d45615 100644 --- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c +++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c @@ -50,6 +50,10 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_PUS_100K_DOWN | PAD_CTL_SPEED_MED | \ PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST) +#define BUTTON_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ + PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_HYS) + int dram_init(void) { gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); @@ -122,6 +126,15 @@ iomux_v3_cfg_t enet_pads2[] = { MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), }; +static iomux_v3_cfg_t const button_pads[] = { + MX6Q_PAD_NANDF_D1__GPIO_2_1 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), /* J14 - Menu Button */ + MX6Q_PAD_NANDF_D2__GPIO_2_2 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), /* J14 - Back Button */ + MX6Q_PAD_NANDF_D3__GPIO_2_3 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), /* J14 - Search Button */ + MX6Q_PAD_NANDF_D4__GPIO_2_4 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), /* J14 - Home Button */ + MX6Q_PAD_GPIO_19__GPIO_4_5 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), /* J14 - Volume Down */ + MX6Q_PAD_GPIO_18__GPIO_7_13 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), /* J14 - Volume Up */ +}; + static void setup_iomux_enet(void) { gpio_direction_output(87, 0); /* GPIO 3-23 */ @@ -323,10 +336,18 @@ int setup_sata(void) } #endif +static void setup_buttons(void) +{ + imx_iomux_v3_setup_multiple_pads(button_pads, + ARRAY_SIZE(button_pads)); +} + int board_early_init_f(void) { setup_iomux_uart(); + setup_buttons(); + #ifdef CONFIG_CMD_SATA setup_sata(); #endif @@ -350,3 +371,58 @@ int checkboard(void) return 0; } + +struct button_key { + char const *name; + unsigned gpnum; +}; + +static struct button_key const buttons[] = { + {"menu", GPIO_NUMBER(2, 1)}, + {"back", GPIO_NUMBER(2, 2)}, + {"search", GPIO_NUMBER(2, 3)}, + {"home", GPIO_NUMBER(2, 4)}, + {"voldown", GPIO_NUMBER(4, 5)}, + {"volup", GPIO_NUMBER(7, 13)}, +}; + +static int keypress(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + if (1 < argc) { + int arg; + int pressed = 1 ; + for (arg=1; arg<argc; arg++) { + char const *keyname=argv[arg]; + int i; + for (i=0; pressed && (i < ARRAY_SIZE(buttons)); i++) { + if (0 == strcmp(buttons[i].name,keyname)) { + pressed = pressed && (0 == gpio_get_value(buttons[i].gpnum)); + break; + } + } + if (ARRAY_SIZE(buttons) == i) { + printf ("unrecognized key %s\n", keyname); + pressed = 0; + break; + } + } + return (0 == pressed); + } else { + int i; + printf ("keys: "); + for (i=0; i<ARRAY_SIZE(buttons); i++) { + if (0 != gpio_get_value(buttons[i].gpnum)) + printf("!"); + printf("%s\t",buttons[i].name); + } + printf("\n"); + return 0 ; + } +} + +U_BOOT_CMD( + keypress, CONFIG_SYS_MAXARGS, 1, keypress, + "Display or test keypresses", + " keypress - show key(s) pressed\n" + " keypress name - test key name (return 0 if pressed)\n" +); -- 1.7.9

4 10

[U-Boot] Please pull u-boot-cfi-flash/master
by Stefan Roese 23 Mar '12

23 Mar '12

Hi Wolfgang, please pull the following fix: The following changes since commit dbb87bbd8eff11cf974caa2b5cc397aea444bc5a: Armada100: gplugD: Add FAT & EXT2 command support (2012-03-19 00:08:26 +0100) are available in the git repository at: git://www.denx.de/git/u-boot-cfi-flash.git master for you to fetch changes up to 85c344e5f98408c0bcf988a6c6fca68c1f3c2015: cfi: fix the incomplete erased status check in buffer write (2012-03-21 16:25:33 +0100) ---------------------------------------------------------------- Tao Hou (1): cfi: fix the incomplete erased status check in buffer write drivers/mtd/cfi_flash.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[U-Boot] Pull request for u-boot-nds32
by Macpaul Lin 23 Mar '12

23 Mar '12

Dear Wolfgang, Please pull the following 2 fix patches into your master branch. Thanks! The following changes since commit dbb87bbd8eff11cf974caa2b5cc397aea444bc5a: Armada100: gplugD: Add FAT & EXT2 command support (2012-03-19 00:08:26 +0100) are available in the git repository at: git://git.denx.de/u-boot-nds32.git master Macpaul Lin (2): nds32: fix ptrace and interrupt register overflow nds32/n1213: correct vector table in start.S arch/nds32/cpu/n1213/start.S | 22 +++++++++++++++++++--- arch/nds32/include/asm/ptrace.h | 2 ++ arch/nds32/lib/interrupts.c | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) -- Best regards, Macpaul Lin

2 1

[U-Boot] [PATCH v2 1/5] Revert "Add board_pre_console_putc to deal with early console output"
by Simon Glass 23 Mar '12

23 Mar '12

This reverts commit 295d3942b806552503243f5cfb36aec6f1b5a9bf. It turns that this really doesn't work very nicely. Instead we should have a pre-console panic function so that we know that further execution is impossible and we don't need to worry about trampling on UARTs, etc. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- README | 17 ----------------- common/console.c | 10 +--------- include/common.h | 7 ------- 3 files changed, 1 insertions(+), 33 deletions(-) diff --git a/README b/README index 7adf7c7..84757a5 100644 --- a/README +++ b/README @@ -638,23 +638,6 @@ The following options need to be configured: 'Sane' compilers will generate smaller code if CONFIG_PRE_CON_BUF_SZ is a power of 2 -- Pre-console putc(): - Prior to the console being initialised, console output is - normally silently discarded. This can be annoying if a - panic() happens in this time. - - If the CONFIG_PRE_CONSOLE_PUTC option is defined, then - U-Boot will call board_pre_console_putc() for each output - character in this case, This function should try to output - the character if possible, perhaps on all available UARTs - (it will need to do this directly, since the console code - is not functional yet). Note that if the panic happens - early enough, then it is possible that board_init_f() - (or even arch_cpu_init() on ARM) has not been called yet. - You should init all clocks, GPIOs, etc. that are needed - to get the character out. Baud rates will need to default - to something sensible. - - Safe printf() functions Define CONFIG_SYS_VSNPRINTF to compile in safe versions of the printf() functions. These are defined in diff --git a/common/console.c b/common/console.c index 1d9fd7f..1177f7d 100644 --- a/common/console.c +++ b/common/console.c @@ -329,19 +329,14 @@ int tstc(void) return serial_tstc(); } -#if defined(CONFIG_PRE_CONSOLE_BUFFER) || defined(CONFIG_PRE_CONSOLE_PUTC) +#ifdef CONFIG_PRE_CONSOLE_BUFFER #define CIRC_BUF_IDX(idx) ((idx) % (unsigned long)CONFIG_PRE_CON_BUF_SZ) static void pre_console_putc(const char c) { -#ifdef CONFIG_PRE_CONSOLE_BUFFER char *buffer = (char *)CONFIG_PRE_CON_BUF_ADDR; buffer[CIRC_BUF_IDX(gd->precon_buf_idx++)] = c; -#endif -#ifdef CONFIG_PRE_CONSOLE_PUTC - board_pre_console_putc(c); -#endif } static void pre_console_puts(const char *s) @@ -352,7 +347,6 @@ static void pre_console_puts(const char *s) static void print_pre_console_buffer(void) { -#ifdef CONFIG_PRE_CONSOLE_BUFFER unsigned long i = 0; char *buffer = (char *)CONFIG_PRE_CON_BUF_ADDR; @@ -361,9 +355,7 @@ static void print_pre_console_buffer(void) while (i < gd->precon_buf_idx) putc(buffer[CIRC_BUF_IDX(i++)]); -#endif } - #else static inline void pre_console_putc(const char c) {} static inline void pre_console_puts(const char *s) {} diff --git a/include/common.h b/include/common.h index 59e0b00..b588410 100644 --- a/include/common.h +++ b/include/common.h @@ -285,13 +285,6 @@ extern ulong monitor_flash_len; int mac_read_from_eeprom(void); extern u8 _binary_dt_dtb_start[]; /* embedded device tree blob */ -/* - * Called when console output is requested before the console is available. - * The board should do its best to get the character out to the user any way - * it can. - */ -void board_pre_console_putc(int ch); - /* common/flash.c */ void flash_perror (int); -- 1.7.7.3

3 9

[U-Boot] USB OTG host mode support in u-boot (Ethernet Over USB)
by behnam134 23 Mar '12

23 Mar '12

I am trying to get usb-ethernet dongle to work in u-boot but in order to get this to work I need to have the device in host mode. My current platform doesn't have USB host EHCI port but it has the micro OTG port and I have verified that keyboard/mouse/usb-ethernet all work on this port in Linux. But I have not been able to get ethernet over USB to work in u-boot (using Micro-A cable). Ethernet over USB is already supported in u-boot for the USB host but it seems that USB OTG support is missing from u-boot. Can someone advise or suggest a solution to get ethernet over USB to work in u-boot using USB OTG host? Thanks, Behnam

1 0

[U-Boot] [PATCH] tegra: Specify debugging serial port at boot.
by Stephen Warren 23 Mar '12

23 Mar '12

This works together with a kernel change that looks at the scratchpad register to determine which of the many UARTs it should use for early printing: http://www.spinics.net/lists/arm-kernel/msg154633.html Note that this configuration only affects the kernel's decompressor and earlyprintk code. Once the kernel is initialized far enough to parse the device tree, the console is initialized using information contained therein. Base on work by Doug Anderson <dianders(a)chromium.org>, but significantly rewritten. Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- Tom, this patch applies on top of u-boot-tegra/master, with the top 4 commits removed and replaced with Simon's latest putc series from last night. Simon, I wonder if tegra_pre_console_panic() shouldn't be modified to remove the uart_ids parameter and simply call get_uart_ids() internally? BTW, it seems inconsistent to have all the Tegra code key off CONFIG_TEGRA2_ENABLE_UART*, whereas the serial driver keys off CONFIG_SYS_NS16550_COM*. Can the two be unified somehow? arch/arm/cpu/armv7/tegra2/board.c | 31 +++++++++++++++++++++++++++++-- 1 files changed, 29 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/tegra2/board.c b/arch/arm/cpu/armv7/tegra2/board.c index c7ea96b..27831f3 100644 --- a/arch/arm/cpu/armv7/tegra2/board.c +++ b/arch/arm/cpu/armv7/tegra2/board.c @@ -115,7 +115,7 @@ void tegra_setup_uarts(int uart_ids) } } -void board_init_uart_f(void) +static int get_uart_ids(void) { int uart_ids = 0; /* bit mask of which UART ids to enable */ @@ -128,7 +128,13 @@ void board_init_uart_f(void) #ifdef CONFIG_TEGRA2_ENABLE_UARTD uart_ids |= TEGRA_UARTD; #endif - tegra_setup_uarts(uart_ids); + + return uart_ids; +} + +void board_init_uart_f(void) +{ + tegra_setup_uarts(get_uart_ids()); } #ifndef CONFIG_SYS_DCACHE_OFF @@ -150,6 +156,27 @@ static const u32 uart_reg_addr[TEGRA_UART_COUNT] = { NV_PA_APB_UARTD_BASE, }; +void arch_preboot_os(void) +{ + int uart_ids, i; + + /* + * The Linux kernel earlyprintk code detects which UART to use by + * searching for one with 'D' in the UART scratch register. This + * is set up here. + */ + uart_ids = get_uart_ids(); + + for (i = 0; i < TEGRA_UART_COUNT; i++) { + if (uart_ids & (1 << i)) { + NS16550_t regs = (NS16550_t)uart_reg_addr[i]; + if (!regs) + continue; + writeb('D', &regs->spr); + } + } +} + void tegra_pre_console_panic(int uart_ids, unsigned clock_freq, unsigned multiplier, const char *str) { -- 1.7.0.4

6 39

[U-Boot] [PATCH] mx53ard: Initialize return code with error
by Fabio Estevam 23 Mar '12

23 Mar '12

The variable "rc" is the return of board_eth_init() function. Initialize it with an error code, so that this function can return an error when CONFIG_SMC911X is not set. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx53ard/mx53ard.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c index e90e39e..2d21584 100644 --- a/board/freescale/mx53ard/mx53ard.c +++ b/board/freescale/mx53ard/mx53ard.c @@ -287,7 +287,7 @@ int board_init(void) int board_eth_init(bd_t *bis) { - int rc = 0; + int rc = -ENODEV; weim_smc911x_iomux(); weim_cs1_settings(); -- 1.7.1

2 2

[U-Boot] [PATCH] mx53: Make PLL2 to be the parent of UART clock
by Fabio Estevam 23 Mar '12

23 Mar '12

Change the parent UART clock to be PLL2, so that U-boot can also boot a Freescale 2.6.35 kernel for mx53. FSL kernel and U-boot changed the UART parent from PLL3 to PLL2 to avoid conflicts with IPU clocks, so that the video resolution can be changed without affecting the UART clock. On a 2.6.35 kernel the serial console is messed up after IPU driver is loaded and this patch fixes this problem. Tested on a mx53loco board booting a FSL kernel and also a mainline kernel. Reported-by: Otavio Salvador <otavio(a)ossystems.com.br> Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- arch/arm/cpu/armv7/mx5/lowlevel_init.S | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/mx5/lowlevel_init.S b/arch/arm/cpu/armv7/mx5/lowlevel_init.S index 01f6d75..90c6ec1 100644 --- a/arch/arm/cpu/armv7/mx5/lowlevel_init.S +++ b/arch/arm/cpu/armv7/mx5/lowlevel_init.S @@ -284,10 +284,24 @@ ldr r1, =0x00C30321 str r1, [r0, #CLKCTL_CSCDR1] #elif defined(CONFIG_MX53) + /* Switch peripheral to PLL2 */ + ldr r0, =CCM_BASE_ADDR + ldr r1, =0x00808145 + orr r1, r1, #(2 << 10) + orr r1, r1, #(0 << 16) + orr r1, r1, #(1 << 19) + str r1, [r0, #CLKCTL_CBCDR] + + ldr r1, =0x00016154 + str r1, [r0, #CLKCTL_CBCMR] + /* Change uart clk parent to pll2*/ + ldr r1, [r0, #CLKCTL_CSCMR1] + and r1, r1, #0xfcffffff + orr r1, r1, #0x01000000 + str r1, [r0, #CLKCTL_CSCMR1] ldr r1, [r0, #CLKCTL_CSCDR1] - orr r1, r1, #0x3f - eor r1, r1, #0x3f - orr r1, r1, #0x21 + and r1, r1, #0xffffffc0 + orr r1, r1, #0x0a str r1, [r0, #CLKCTL_CSCDR1] #endif /* make sure divider effective */ -- 1.7.1

3 2

[U-Boot] [PATCH 1/2] mx28evk: Provide default values for SPI bus and chip select
by Fabio Estevam 23 Mar '12

23 Mar '12

From: Fabio Estevam <fabio.estevam(a)freescale.com> Provide default values for SPI bus and chip select. This allows the command "sf probe" to work without passing SPI bus and chip select numbers as arguments. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/configs/mx28evk.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 04967d7..112fda4 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -186,6 +186,8 @@ /* SPI Flash */ #ifdef CONFIG_CMD_SF #define CONFIG_SPI_FLASH +#define CONFIG_SF_DEFAULT_BUS 2 +#define CONFIG_SF_DEFAULT_CS 0 /* this may vary and depends on the installed chip */ #define CONFIG_SPI_FLASH_SST #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 -- 1.7.1

4 8

[U-Boot] [PATCH] OMAP3: pandora: pin mux updates for DM3730 board variant
by Grazvydas Ignotas 23 Mar '12

23 Mar '12

DM3730 needs some additional pin mux configuration for GPIOs 126-129 to work, add it. Signed-off-by: Grazvydas Ignotas <notasas(a)gmail.com> --- arch/arm/include/asm/arch-omap3/mux.h | 6 ++++++ board/pandora/pandora.c | 3 +++ board/pandora/pandora.h | 6 ++++++ 3 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/arch-omap3/mux.h b/arch/arm/include/asm/arch-omap3/mux.h index 6daef49..71f183d 100644 --- a/arch/arm/include/asm/arch-omap3/mux.h +++ b/arch/arm/include/asm/arch-omap3/mux.h @@ -445,6 +445,12 @@ #define CONTROL_PADCONF_STRBEN_DLY1 0x0224 #define CONTROL_PADCONF_SYS_BOOT8 0x0226 +/* AM/DM37xx specific */ +#define CONTROL_PADCONF_GPIO127 0x0A54 +#define CONTROL_PADCONF_GPIO126 0x0A56 +#define CONTROL_PADCONF_GPIO128 0x0A58 +#define CONTROL_PADCONF_GPIO129 0x0A5A + #define MUX_VAL(OFFSET,VALUE)\ writew((VALUE), OMAP34XX_CTRL_BASE + (OFFSET)); diff --git a/board/pandora/pandora.c b/board/pandora/pandora.c index 58a676d..70d2d82 100644 --- a/board/pandora/pandora.c +++ b/board/pandora/pandora.c @@ -103,6 +103,9 @@ int misc_init_r(void) void set_muxconf_regs(void) { MUX_PANDORA(); + if (get_cpu_family() == CPU_OMAP36XX) { + MUX_PANDORA_3730(); + } } #ifdef CONFIG_GENERIC_MMC diff --git a/board/pandora/pandora.h b/board/pandora/pandora.h index f0ad16b..fea8bf2 100644 --- a/board/pandora/pandora.h +++ b/board/pandora/pandora.h @@ -399,4 +399,10 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)) /*sdrc_cke0*/\ MUX_VAL(CP(SDRC_CKE1), (IDIS | PTU | EN | M0)) /*sdrc_cke1*/ +#define MUX_PANDORA_3730() \ + MUX_VAL(CP(GPIO126), (IEN | PTD | DIS | M4)) /*GPIO_126 - MMC1_WP*/\ + MUX_VAL(CP(GPIO127), (IEN | PTD | DIS | M4)) /*GPIO_127 - MMC2_WP*/\ + MUX_VAL(CP(GPIO128), (IDIS | PTD | DIS | M4)) /*GPIO_128 - LED_MMC1*/\ + MUX_VAL(CP(GPIO129), (IDIS | PTD | DIS | M4)) /*GPIO_129 - LED_MMC2*/ + #endif -- 1.7.0.4

1 2