April 2012 - U-Boot

[U-Boot] [PATCH] EXYNOS: add the enable_cache function for support cache
by Jaehoon Chung 30 Apr '12

30 Apr '12

By default, enable_cache() is implemented in arch/arm/lib. But didn't implemented enable_cache(). It should be implemented in platform code. This patch is added the enable_cache() in platform code for supporting cache Signed-off-by: Jaehoon Chung <jh80.chung(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- arch/arm/cpu/armv7/s5p-common/cpu_info.c | 8 ++++++++ include/configs/s5pc210_universal.h | 3 --- include/configs/trats.h | 3 --- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/armv7/s5p-common/cpu_info.c b/arch/arm/cpu/armv7/s5p-common/cpu_info.c index 527f32d..a015930 100644 --- a/arch/arm/cpu/armv7/s5p-common/cpu_info.c +++ b/arch/arm/cpu/armv7/s5p-common/cpu_info.c @@ -54,3 +54,11 @@ int print_cpuinfo(void) return 0; } #endif + +#ifndef CONFIG_SYS_DCACHE_OFF +void enable_caches(void) +{ + /* Enable D-cache. I-cache is already enabled in start.S */ + dcache_enable(); +} +#endif diff --git a/include/configs/s5pc210_universal.h b/include/configs/s5pc210_universal.h index 1301275..5ea09d7 100644 --- a/include/configs/s5pc210_universal.h +++ b/include/configs/s5pc210_universal.h @@ -41,9 +41,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -/* Keep L2 Cache Disabled */ -#define CONFIG_SYS_L2CACHE_OFF 1 - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_TEXT_BASE 0x44800000 diff --git a/include/configs/trats.h b/include/configs/trats.h index 5f913ca..480fcf0 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -41,9 +41,6 @@ #define CONFIG_DISPLAY_CPUINFO #define CONFIG_DISPLAY_BOARDINFO -/* Keep L2 Cache Disabled */ -#define CONFIG_SYS_L2CACHE_OFF - #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_TEXT_BASE 0x63300000

1 0

[U-Boot] [PATCH v2 3/4] patman: Change the location of patman path
by Vikram Narayanan 30 Apr '12

30 Apr '12

Fix the location of patman path in README Signed-off-by: Vikram Narayanan <vikram186(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- tools/patman/README | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/patman/README b/tools/patman/README index d98f081..4913510 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -93,17 +93,17 @@ How to run it First do a dry run: -$ ./tools/scripts/patman/patman -n +$ ./tools/patman/patman -n If it can't detect the upstream branch, try telling it how many patches there are in your series: -$ ./tools/scripts/patman/patman -n -c5 +$ ./tools/patman/patman -n -c5 This will create patch files in your current directory and tell you who it is thinking of sending them to. Take a look at the patch files. -$ ./tools/scripts/patman/patman -n -c5 -s1 +$ ./tools/patman/patman -n -c5 -s1 Similar to the above, but skip the first commit and take the next 5. This is useful if your top commit is for setting up testing. -- 1.7.4.1

2 1

[U-Boot] [PATCH v2 1/4] patman: Fix a typo error
by Vikram Narayanan 30 Apr '12

30 Apr '12

Replace gti with git in README file Signed-off-by: Vikram Narayanan <vikram186(a)gmail.com> Cc: Simon Glass <sjg(a)chromium.org> --- tools/patman/README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/patman/README b/tools/patman/README index 587c97f..d9820ab 100644 --- a/tools/patman/README +++ b/tools/patman/README @@ -197,7 +197,7 @@ patch series and see how the patches turn out. Where Patches Are Sent ====================== -Once the patches are created, patman sends them using gti send-email. The +Once the patches are created, patman sends them using git send-email. The whole series is sent to the recipients in Series-to: and Series-cc. You can Cc individual patches to other people with the Cc: tag. Tags in the subject are also picked up to Cc patches. For example, a commit like this: -- 1.7.4.1

2 1

[U-Boot] [PATCH] i.MX6Q: mx6qsabrelite: Add keypress support to alter boot flow
by Eric Nelson 29 Apr '12

29 Apr '12

Uses the 'magic_keys' idiom as described in doc/README.kbd: http://lists.denx.de/pipermail/u-boot/2012-April/122502.html Signed-off-by: Eric Nelson <eric.nelson(a)boundarydevices.com> Acked-by: Marek Vasut <marex(a)denx.de> --- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 122 ++++++++++++++++++++++++- include/configs/mx6qsabrelite.h | 3 + 2 files changed, 123 insertions(+), 2 deletions(-) diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c index db5e775..f63cef7 100644 --- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c +++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c @@ -52,6 +52,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); @@ -124,6 +128,22 @@ iomux_v3_cfg_t enet_pads2[] = { MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), }; +/* Button assignments for J14 */ +static iomux_v3_cfg_t button_pads[] = { + /* Menu */ + MX6Q_PAD_NANDF_D1__GPIO_2_1 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), + /* Back */ + MX6Q_PAD_NANDF_D2__GPIO_2_2 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), + /* Labelled Search (mapped to Power under Android) */ + MX6Q_PAD_NANDF_D3__GPIO_2_3 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), + /* Home */ + MX6Q_PAD_NANDF_D4__GPIO_2_4 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), + /* Volume Down */ + MX6Q_PAD_GPIO_19__GPIO_4_5 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), + /* Volume Up */ + MX6Q_PAD_GPIO_18__GPIO_7_13 | MUX_PAD_CTRL(BUTTON_PAD_CTRL), +}; + static void setup_iomux_enet(void) { gpio_direction_output(87, 0); /* GPIO 3-23 */ @@ -295,11 +315,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_iomux_uart(); + setup_buttons(); - return 0; + return 0; } int board_init(void) @@ -324,3 +351,94 @@ int checkboard(void) return 0; } + +struct button_key { + char const *name; + unsigned gpnum; + char ident; +}; + +static struct button_key const buttons[] = { + {"back", GPIO_NUMBER(2, 2), 'B'}, + {"home", GPIO_NUMBER(2, 4), 'H'}, + {"menu", GPIO_NUMBER(2, 1), 'M'}, + {"search", GPIO_NUMBER(2, 3), 'S'}, + {"volup", GPIO_NUMBER(7, 13), 'V'}, + {"voldown", GPIO_NUMBER(4, 5), 'v'}, +}; + +/* + * generate a null-terminated string containing the buttons pressed + * returns number of keys pressed + */ +static int read_keys(char *buf) +{ + int i, numpressed = 0; + for (i = 0; i < ARRAY_SIZE(buttons); i++) { + if (!gpio_get_value(buttons[i].gpnum)) + buf[numpressed++] = buttons[i].ident; + } + buf[numpressed] = '\0'; + return numpressed; +} + +static int do_kbd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +{ + char envvalue[ARRAY_SIZE(buttons)+1]; + int numpressed = read_keys(envvalue); + setenv("keybd", envvalue); + return numpressed == 0; +} + +U_BOOT_CMD( + kbd, 1, 1, do_kbd, + "Tests for keypresses, sets 'keybd' environment variable", + "Returns 0 (true) to shell if key is pressed." +); + +#ifdef CONFIG_PREBOOT +static char const kbd_magic_prefix[] = "key_magic"; +static char const kbd_command_prefix[] = "key_cmd"; + +static void preboot_keys(void) +{ + int numpressed; + char keypress[ARRAY_SIZE(buttons)+1]; + numpressed = read_keys(keypress); + if (numpressed) { + char *kbd_magic_keys = getenv("magic_keys"); + char *suffix; + /* + * loop over all magic keys + */ + for (suffix = kbd_magic_keys; *suffix; ++suffix) { + char *keys; + char magic[sizeof(kbd_magic_prefix) + 1]; + sprintf(magic, "%s%c", kbd_magic_prefix, *suffix); + keys = getenv(magic); + if (keys) { + if (!strcmp(keys, keypress)) + break; + } + } + if (*suffix) { + char cmd_name[sizeof(kbd_command_prefix) + 1]; + char *cmd; + sprintf(cmd_name, "%s%c", kbd_command_prefix, *suffix); + cmd = getenv(cmd_name); + if (cmd) { + setenv("preboot", cmd); + return; + } + } + } +} +#endif + +int misc_init_r(void) +{ +#ifdef CONFIG_PREBOOT + preboot_keys(); +#endif + return 0; +} diff --git a/include/configs/mx6qsabrelite.h b/include/configs/mx6qsabrelite.h index 50b5c31..c0511c7 100644 --- a/include/configs/mx6qsabrelite.h +++ b/include/configs/mx6qsabrelite.h @@ -42,6 +42,7 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_MISC_INIT_R #define CONFIG_MXC_GPIO #define CONFIG_MXC_UART @@ -123,6 +124,8 @@ #define CONFIG_BOOTDELAY 3 +#define CONFIG_PREBOOT "" + #define CONFIG_LOADADDR 0x10800000 #define CONFIG_SYS_TEXT_BASE 0x17800000 -- 1.7.9

4 7

[U-Boot] [PATCH 1/2] GCC47: Fix warning in cmd_nand.c
by Marek Vasut 29 Apr '12

29 Apr '12

cmd_nand.c: In function ‘arg_off_size’: cmd_nand.c:216:5: warning: ‘maxsize’ may be used uninitialized in this function [-Wmaybe-uninitialized] Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Scott Wood <scottwood(a)freescale.com> Cc: Wolfgang Denk <wd(a)denx.de> --- common/cmd_nand.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) NOTE: Why does this emit these blahs about UTF8? I just noticed git started behaving weird on me, anyone can give me a hint how to disable these? diff --git a/common/cmd_nand.c b/common/cmd_nand.c index bae630d..0fd3a6c 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -191,7 +191,7 @@ static int arg_off_size(int argc, char *const argv[], int *idx, loff_t *off, loff_t *size) { int ret; - loff_t maxsize; + loff_t maxsize = 0; if (argc == 0) { *off = 0; -- 1.7.10

3 6

Re: [U-Boot] [PATCH] eb_cpux9k2: fix chip select
by Jens Scharsig 29 Apr '12

29 Apr '12

Please ignore this patch, it was send with misconfigured mail server The resend http://patchwork.ozlabs.org/patch/155739/ is the valid one. Best regards Jens Scharsig

1 0

[U-Boot] Using sata on mx6qsabrelite
by Fabio Estevam 29 Apr '12

29 Apr '12

Hi, On Stefano´s tree I see this sata patch for mx5/mx6: http://git.denx.de/?p=u-boot/u-boot-imx.git;a=commit;h=6931bd30d03de827c52b… Has anyone tried sata support on mx6qsabrelite yet? Any patches missing that were not applied? I don't have a way to test it at the moment, but I have a colleague that wants to use sata on mx6qsabrelite. Thanks, Fabio Estevam

3 5

[U-Boot] [PATCH 1/4] mx28evk: Allow booting a zImage kernel
by Fabio Estevam 29 Apr '12

29 Apr '12

Allow booting a zImage kernel. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- include/configs/mx28evk.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index cb4ff37..31dc718 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -67,6 +67,7 @@ #define CONFIG_CMD_SF #define CONFIG_CMD_SPI #define CONFIG_CMD_USB +#define CONFIG_CMD_BOOTZ /* * Memory configurations -- 1.7.1

3 10

[U-Boot] [PATCH 1/2] mx28evk: Allow to booting a dt kernel
by Fabio Estevam 29 Apr '12

29 Apr '12

Allow to booting a dt kernel. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- The following patch is required to get dt booting to work: http://lists.denx.de/pipermail/u-boot/2012-April/122781.html include/configs/mx28evk.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 02f3366..cb4ff37 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -225,6 +225,7 @@ #define CONFIG_BOOTCOMMAND "run bootcmd_net" #define CONFIG_LOADADDR 0x42000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR +#define CONFIG_OF_LIBFDT /* * Extra Environments -- 1.7.1

2 3

[U-Boot] [PATCH] eb_cpux9k2: fix chip select
by y＠jenslinux.site 29 Apr '12

29 Apr '12

From: Jens Scharsig <js_at_ng(a)scharsoft.de> * fix chip select initialization for frame buffer, this will be increase frame buffer access speed Signed-off-by: Jens Scharsig <js_at_ng(a)scharsoft.de> --- board/BuS/eb_cpux9k2/cpux9k2.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/BuS/eb_cpux9k2/cpux9k2.c b/board/BuS/eb_cpux9k2/cpux9k2.c index 54f9b64..15a31be 100644 --- a/board/BuS/eb_cpux9k2/cpux9k2.c +++ b/board/BuS/eb_cpux9k2/cpux9k2.c @@ -269,9 +269,9 @@ int drv_video_init(void) display_height = 256; printf("%ld x %ld pixel matrix\n", display_width, display_height); - /* RWH = 7 | RWS =7 | TDF = 15 | NWS = 0x7F */ - csr = AT91_SMC_CSR_RWHOLD(7) | AT91_SMC_CSR_RWSETUP(7) | - AT91_SMC_CSR_TDF(15) | AT91_SMC_CSR_NWS(127) | + /* RWH = 2 | RWS =2 | TDF = 4 | NWS = 0x6 */ + csr = AT91_SMC_CSR_RWHOLD(2) | AT91_SMC_CSR_RWSETUP(2) | + AT91_SMC_CSR_TDF(4) | AT91_SMC_CSR_NWS(6) | AT91_SMC_CSR_ACSS_STANDARD | AT91_SMC_CSR_DBW_16 | AT91_SMC_CSR_BAT_16 | AT91_SMC_CSR_WSEN; writel(csr, &mc->smc.csr[2]); -- 1.7.7

1 0