April 2009 - U-Boot

[U-Boot] [PATCH] cmd_mmc: add support device command for selecting mmc device
by Minkyu Kang 17 Apr '09

17 Apr '09

This patch improves device command for selecting mmc device Signed-off-by: Minkyu Kang <mk7.kang(a)samsung.com> --- common/cmd_mmc.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 64 insertions(+), 5 deletions(-) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index 16c919b..2557892 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -26,20 +26,79 @@ #include <mmc.h> #ifndef CONFIG_GENERIC_MMC +int curr_device = -1; + int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) { - if (mmc_legacy_init (1) != 0) { - printf ("No MMC card found\n"); + switch (argc) { + case 0: + case 1: + cmd_usage(cmdtp); + return 1; + case 2: + if (strncmp(argv[1], "init", 4) == 0) { + if (curr_device < 0) + curr_device = 1; + + if (mmc_legacy_init(curr_device) != 0) { + printf("No MMC card found\n"); + return 1; + } + + printf("mmc%d is available\n", curr_device); + return 0; + } else if (strncmp(argv[1], "dev", 3) == 0) { + if (curr_device < 0) { + printf("no MMC devices available\n"); + return 1; + } + + printf("mmc%d is current device\n", curr_device); + return 0; + } + + cmd_usage(cmdtp); + return 1; + case 3: + if (strncmp(argv[1], "init", 4) == 0) { + int dev = (int)simple_strtoul(argv[2], NULL, 10); + + if (mmc_legacy_init(dev) != 0) { + printf("No MMC card found\n"); + return 1; + } + + curr_device = dev; + + printf("mmc%d is available\n", curr_device); + return 0; + } else if (strncmp(argv[1], "dev", 3) == 0) { + int dev = (int)simple_strtoul(argv[2], NULL, 10); + +#ifdef CONFIG_SYS_MMC_SET_DEV + if (mmc_set_dev(dev) != 0) + return 1; +#endif + + curr_device = dev; + + printf("mmc%d is now current device\n", curr_device); + return 0; + } + + cmd_usage(cmdtp); return 1; } return 0; } U_BOOT_CMD( - mmcinit, 1, 0, do_mmc, - "init mmc card", - NULL + mmc, 3, 1, do_mmc, + "MMC sub-system", + "mmc init [dev] - init MMC sub system\n" + "mmc device [dev] - show or set current device\n" ); + #else /* !CONFIG_GENERIC_MMC */

4 3

[U-Boot] [PATCH u-boot git] fix DaVinci NS16550_REG_SIZE regression
by David Brownell 16 Apr '09

16 Apr '09

From: David Brownell <dbrownell(a)users.sourceforge.net> Update the DaVinci DM6446 boards to use the new convention for CONFIG_SYS_NS16550_REG_SIZE ... the size hasn't changed from the original 4 bytes, but these chips are little-endian. (Resolves a regression added recently by the include/ns16550.h patch to "Unify structure declaration for registers". The code previously worked just fine because the registers were accessed as host-endian words, not as bytes.) Signed-off-by: David Brownell <dbrownell(a)users.sourceforge.net> --- include/configs/davinci_dvevm.h | 2 +- include/configs/davinci_schmoogie.h | 2 +- include/configs/davinci_sffsdr.h | 2 +- include/configs/davinci_sonata.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) --- a/include/configs/davinci_dvevm.h +++ b/include/configs/davinci_dvevm.h @@ -85,7 +85,7 @@ /*====================*/ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE 4 /* NS16550 register size */ +#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size, byteorder */ #define CONFIG_SYS_NS16550_COM1 0x01c20000 /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK 27000000 /* Input clock to NS16550 */ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ --- a/include/configs/davinci_schmoogie.h +++ b/include/configs/davinci_schmoogie.h @@ -52,7 +52,7 @@ /*====================*/ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE 4 /* NS16550 register size */ +#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size, byteorder */ #define CONFIG_SYS_NS16550_COM1 0x01c20000 /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK 27000000 /* Input clock to NS16550 */ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ --- a/include/configs/davinci_sffsdr.h +++ b/include/configs/davinci_sffsdr.h @@ -54,7 +54,7 @@ /* Serial Driver info */ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE 4 /* NS16550 register size */ +#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size, byteorder */ #define CONFIG_SYS_NS16550_COM1 0x01c20000 /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK 27000000 /* Input clock to NS16550 */ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */ --- a/include/configs/davinci_sonata.h +++ b/include/configs/davinci_sonata.h @@ -85,7 +85,7 @@ /*====================*/ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL -#define CONFIG_SYS_NS16550_REG_SIZE 4 /* NS16550 register size */ +#define CONFIG_SYS_NS16550_REG_SIZE -4 /* NS16550 register size, byteorder */ #define CONFIG_SYS_NS16550_COM1 0x01c20000 /* Base address of UART0 */ #define CONFIG_SYS_NS16550_CLK 27000000 /* Input clock to NS16550 */ #define CONFIG_CONS_INDEX 1 /* use UART0 for console */

3 2

[U-Boot] [PATCH] cmd_nand: drop duplicate NULL ptr check
by Mike Frysinger 16 Apr '09

16 Apr '09

The first if statement checks for NULL ptrs, so there is no need to check it again in later else cases (such as .oob). Signed-off-by: Mike Frysinger <vapier(a)gentoo.org> CC: Scott Wood <scottwood(a)freescale.com> --- common/cmd_nand.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/common/cmd_nand.c b/common/cmd_nand.c index e142d76..ff5bc6e 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -390,7 +390,7 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) else ret = nand_write_skip_bad(nand, off, &size, (u_char *)addr); - } else if (s != NULL && !strcmp(s, ".oob")) { + } else if (!strcmp(s, ".oob")) { /* out-of-band data */ mtd_oob_ops_t ops = { .oobbuf = (u8 *)addr, -- 1.6.2.2

2 1

[U-Boot] [PATCH u-boot git] CMD_UBI != MTD_PARTITIONS
by David Brownell 16 Apr '09

16 Apr '09

From: David Brownell <dbrownell(a)users.sourceforge.net> Fix dependency goofage: it should certainly be possible to have the partition support without bringing in UBI commands. Signed-off-by: David Brownell <dbrownell(a)users.sourceforge.net> --- drivers/mtd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -25,7 +25,7 @@ include $(TOPDIR)/config.mk LIB := $(obj)libmtd.a -COBJS-$(CONFIG_CMD_UBI) += mtdcore.o mtdpart.o +COBJS-$(CONFIG_MTD_PARTITIONS) += mtdcore.o mtdpart.o COBJS-$(CONFIG_HAS_DATAFLASH) += at45.o COBJS-$(CONFIG_FLASH_CFI_DRIVER) += cfi_flash.o COBJS-$(CONFIG_FLASH_CFI_MTD) += cfi_mtd.o

3 2

[U-Boot] Please pull u-boot-ppc4xx
by Stefan Roese 16 Apr '09

16 Apr '09

Hi Wolfgang, please pull some fixes for ppc4xx: The following changes since commit f75a729b5c1434d5a5bbf453b1b699bf1c3ffbce: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-blackfin are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Stefan Roese (5): ppc4xx: Fixup chip-selects in dtb for NAND-booting Sequoia ppc4xx: Add "booting from NAND" to 4xx NAND-booting targets ppc4xx: Remove duplicated code for Sequoia NAND booting version ppc4xx: Disable POST memory test on NAND-booting Sequoia ppc4xx: Disable POST memory test on NAND-booting Kilauea board/amcc/sequoia/sdram.c | 6 +--- board/amcc/sequoia/sequoia.c | 58 ++++++++++++++++++++++++++++++++++++++++- cpu/ppc4xx/cpu.c | 6 +++- include/configs/kilauea.h | 13 ++++++++- include/configs/sequoia.h | 15 +++++++++- 5 files changed, 87 insertions(+), 11 deletions(-)

2 3

[U-Boot] Please pull u-boot-ppc4xx
by Stefan Roese 16 Apr '09

16 Apr '09

Hi Wolfgang, please pull a fix for ppc4xx: The following changes since commit f75a729b5c1434d5a5bbf453b1b699bf1c3ffbce: Wolfgang Denk (1): Merge branch 'master' of git://git.denx.de/u-boot-blackfin are available in the git repository at: git://www.denx.de/git/u-boot-ppc4xx.git master Stefan Roese (1): ppc4xx: Fixup chip-selects in dtb for NAND-booting Sequoia board/amcc/sequoia/sequoia.c | 58 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 56 insertions(+), 2 deletions(-)

2 1

[U-Boot] Power On Self Test (POST)
by lafarkas＠rockwellcollins.com 16 Apr '09

16 Apr '09

Can I get someone to point me in the right direction for researching out the Power On Self Test portion of U-Boot? Thanks! -Les This message contains PRIVILEGED AND PROPRIETARY INFORMATION intended solely for the use of the addressee(s) named above. Any disclosure, distribution, copying or use of the information by others is strictly prohibited. If you have received this message in error, please advise the sender by immediate reply and delete the original message. Thank You.

2 1

[U-Boot] [PATCH v2] ppc4xx: Remove unused code for Sequoia NAND booting version
by Stefan Roese 16 Apr '09

16 Apr '09

The current define of get_bus_freq() in the CONFIG_NAND_SPL #ifdef is not used at all. This patch changes it's define to the currently used value of 133333333 and removes the unnecessary code. Signed-off-by: Stefan Roese <sr(a)denx.de> --- board/amcc/sequoia/sdram.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c index c26e6ee..6df4c6d 100644 --- a/board/amcc/sequoia/sdram.c +++ b/board/amcc/sequoia/sdram.c @@ -44,7 +44,7 @@ extern void denali_core_search_data_eye(void); * for the 4k NAND boot image so define bus_frequency to 133MHz here * which is save for the refresh counter setup. */ -#define get_bus_freq(val) 133000000 +#define get_bus_freq(val) 133333333 #endif /************************************************************************* @@ -55,11 +55,7 @@ extern void denali_core_search_data_eye(void); phys_size_t initdram (int board_type) { #if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) -#if !defined(CONFIG_NAND_SPL) ulong speed = get_bus_freq(0); -#else - ulong speed = 133333333; /* 133MHz is on the safe side */ -#endif mtsdram(DDR0_02, 0x00000000); -- 1.6.2.3

2 3

Re: [U-Boot] Compiler error with BUILD_DIR
by Wolfgang Denk 16 Apr '09

16 Apr '09

Dear =?utf-8?B?R8O8bnRlciBMZW9uaGFyZHQ=?=, please do not post base64 encoded messages, post plain text only. And don't top-post / full quote. Make sure to read http://www.netmeister.org/news/learn2quote.html In message <D0B748CCD5DF144CA5C56A9D860A31341DE5FD(a)men-exch1.intra.men.de> you wrote: > > it's an own board, based on MPC8315ERDB. Well, then there is obviously a problem with the changes you added. Since you did not submit your changes for inclusion into mainline we have no chance of knowing what you did and what you may have done wrong. So how can you expect help on this stuff? We're trying to do software engineering here, not clairvoyance. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd(a)denx.de Always borrow money from a pessimist; they don't expect to be paid back.

2 2

[U-Boot] [PATCH] ppc4xx: Remove duplicated code for Sequoia NAND booting version
by Stefan Roese 16 Apr '09

16 Apr '09

Signed-off-by: Stefan Roese <sr(a)denx.de> --- board/amcc/sequoia/sdram.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/board/amcc/sequoia/sdram.c b/board/amcc/sequoia/sdram.c index c26e6ee..6df4c6d 100644 --- a/board/amcc/sequoia/sdram.c +++ b/board/amcc/sequoia/sdram.c @@ -44,7 +44,7 @@ extern void denali_core_search_data_eye(void); * for the 4k NAND boot image so define bus_frequency to 133MHz here * which is save for the refresh counter setup. */ -#define get_bus_freq(val) 133000000 +#define get_bus_freq(val) 133333333 #endif /************************************************************************* @@ -55,11 +55,7 @@ extern void denali_core_search_data_eye(void); phys_size_t initdram (int board_type) { #if !defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) -#if !defined(CONFIG_NAND_SPL) ulong speed = get_bus_freq(0); -#else - ulong speed = 133333333; /* 133MHz is on the safe side */ -#endif mtsdram(DDR0_02, 0x00000000); -- 1.6.2.3

2 4