July 2013 - U-Boot

[U-Boot] [PATCH 0/2] fix 2 items for nand_dump function
by Masahiro Yamada 23 Aug '13

23 Aug '13

These series of patches fix a memory leak and optimize a little nand_dump function. These 2 patches must be applied in this order. Masahiro Yamada (2): cmd_nand: fix a memory leak in nand_dump function cmd_nand: slight optimization of nand_dump function common/cmd_nand.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) -- 1.8.1.2

2 4

[U-Boot] [PATCH] cmd_nand: Do not show usage when scrub is aborted
by Masahiro Yamada 23 Aug '13

23 Aug '13

When executing nand scrub, the user gets the prompt: Really scrub this NAND flash? <y/N> We do not want the annoying usage displayed when saying N here. Signed-off-by: Masahiro Yamada <yamada.m(a)jp.panasonic.com> --- common/cmd_nand.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_nand.c b/common/cmd_nand.c index adc1ce4..04ab0f1 100644 --- a/common/cmd_nand.c +++ b/common/cmd_nand.c @@ -616,11 +616,11 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) opts.scrub = 1; else { puts("scrub aborted\n"); - return -1; + return 1; } } else { puts("scrub aborted\n"); - return -1; + return 1; } } ret = nand_erase_opts(nand, &opts); -- 1.8.1.2

2 1

[U-Boot] [PATCH v3 0/5] ARM: at91: atmel_nand: check ONFI ecc minimum requirement
by Josh Wu 22 Aug '13

22 Aug '13

In this patch series, first we make the nand driver can dynamic change sector size and ecc correct bits. Then we enable ONFI ecc parameters check. v2 --> v3: use dev_err/info(host->dev) instead of dev_err/info(NULL). use MTDDEBUG instead of pr_debug(). v1 --> v2: Fixes according to Scoot Wood's suggestion - add a new patch which make all driver can use dev_err, dev_info, dev_dbg. - replace all printk to dev_err or dev_info. - fix pmecc data allocate error handler. - fix the pmecc ecc requirement selection, should use <= instead of use <. Josh Wu (5): ARM: at91: atmel_nand: pmecc driver will select the galois table by sector size ARM: at91: sama5d3: remove unused definition about PMECC alpha table offset linux/compat.h: move dev_err, dev_info and dev_dbg from usb driver to compat.h mtd: atmel_nand: alloc memory instead of use static array for pmecc data ARM: at91: atmel_nand: add code to check the ONFI parameter ECC requirement arch/arm/include/asm/arch-at91/at91sam9x5.h | 6 + arch/arm/include/asm/arch-at91/sama5d3.h | 2 - doc/README.atmel_pmecc | 14 -- drivers/mtd/nand/atmel_nand.c | 197 +++++++++++++++++++++++++-- drivers/usb/musb-new/linux-compat.h | 16 --- include/configs/at91sam9x5ek.h | 1 - include/configs/sama5d3xek.h | 1 - include/linux/compat.h | 8 ++ 8 files changed, 201 insertions(+), 44 deletions(-) -- 1.7.9.5

3 17

[U-Boot] [PATCH] arm: atmel: add nand trimffs subcommand for at91sam9n12 and at91sam9x5
by Bo Shen 22 Aug '13

22 Aug '13

as the at91sam9n12 and at91sam9x5 soc support PMECC, when use u-boot to flash the rootfs, in order to avoid flash one sector with all 0xff into NAND, so use nand trimffs subcommand to avoid it Signed-off-by: Bo Shen <voice.shen(a)atmel.com> --- include/configs/at91sam9n12ek.h | 3 +++ include/configs/at91sam9x5ek.h | 2 ++ 2 files changed, 5 insertions(+) diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index b4b1c31..c2826f3 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -138,6 +138,9 @@ #define CONFIG_PMECC_CAP 2 #define CONFIG_PMECC_SECTOR_SIZE 512 #define CONFIG_PMECC_INDEX_TABLE_OFFSET 0x8000 + +#define CONFIG_CMD_NAND_TRIMFFS + #endif #define CONFIG_MTD_PARTITIONS diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index ee6e3fc..625142c 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -139,6 +139,8 @@ #define CONFIG_PMECC_SECTOR_SIZE 512 #define CONFIG_PMECC_INDEX_TABLE_OFFSET 0x8000 +#define CONFIG_CMD_NAND_TRIMFFS + #define CONFIG_MTD_DEVICE #define CONFIG_CMD_MTDPARTS #define CONFIG_MTD_PARTITIONS -- 1.7.9.5

2 1

[U-Boot] [PATCH] arm: atmel: add gmac support for sama5d3xek board
by Bo Shen 22 Aug '13

22 Aug '13

add gmac support for sama5d3xek board, the gmac embedded in: - sama5d33, sama5d34, sama5d35 Signed-off-by: Bo Shen <voice.shen(a)atmel.com> --- arch/arm/cpu/armv7/at91/sama5d3_devices.c | 24 ++++++++++++++++++++++++ arch/arm/include/asm/arch-at91/at91_common.h | 1 + board/atmel/sama5d3xek/sama5d3xek.c | 20 ++++++++++++++++++++ include/configs/sama5d3xek.h | 5 +++++ 4 files changed, 50 insertions(+) diff --git a/arch/arm/cpu/armv7/at91/sama5d3_devices.c b/arch/arm/cpu/armv7/at91/sama5d3_devices.c index acf8b43..76e8903 100644 --- a/arch/arm/cpu/armv7/at91/sama5d3_devices.c +++ b/arch/arm/cpu/armv7/at91/sama5d3_devices.c @@ -160,6 +160,30 @@ void at91_macb_hw_init(void) /* Enable clock */ at91_periph_clk_enable(ATMEL_ID_EMAC); } + +void at91_gmac_hw_init(void) +{ + at91_set_a_periph(AT91_PIO_PORTB, 0, 0); /* GTX0 */ + at91_set_a_periph(AT91_PIO_PORTB, 1, 0); /* GTX1 */ + at91_set_a_periph(AT91_PIO_PORTB, 2, 0); /* GTX2 */ + at91_set_a_periph(AT91_PIO_PORTB, 3, 0); /* GTX3 */ + at91_set_a_periph(AT91_PIO_PORTB, 4, 0); /* GRX0 */ + at91_set_a_periph(AT91_PIO_PORTB, 5, 0); /* GRX1 */ + at91_set_a_periph(AT91_PIO_PORTB, 6, 0); /* GRX2 */ + at91_set_a_periph(AT91_PIO_PORTB, 7, 0); /* GRX3 */ + at91_set_a_periph(AT91_PIO_PORTB, 8, 0); /* GTXCK */ + at91_set_a_periph(AT91_PIO_PORTB, 9, 0); /* GTXEN */ + + at91_set_a_periph(AT91_PIO_PORTB, 11, 0); /* GRXCK */ + at91_set_a_periph(AT91_PIO_PORTB, 13, 0); /* GRXER */ + + at91_set_a_periph(AT91_PIO_PORTB, 16, 0); /* GMDC */ + at91_set_a_periph(AT91_PIO_PORTB, 17, 0); /* GMDIO */ + at91_set_a_periph(AT91_PIO_PORTB, 18, 0); /* G125CK */ + + /* Enable clock */ + at91_periph_clk_enable(ATMEL_ID_GMAC); +} #endif #ifdef CONFIG_LCD diff --git a/arch/arm/include/asm/arch-at91/at91_common.h b/arch/arm/include/asm/arch-at91/at91_common.h index 5843935..70c5978 100644 --- a/arch/arm/include/asm/arch-at91/at91_common.h +++ b/arch/arm/include/asm/arch-at91/at91_common.h @@ -26,6 +26,7 @@ #define AT91_COMMON_H void at91_can_hw_init(void); +void at91_gmac_hw_init(void); void at91_macb_hw_init(void); void at91_mci_hw_init(void); void at91_serial0_hw_init(void); diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c index 541296d..4e69450 100644 --- a/board/atmel/sama5d3xek/sama5d3xek.c +++ b/board/atmel/sama5d3xek/sama5d3xek.c @@ -33,6 +33,7 @@ #include <lcd.h> #include <atmel_lcdc.h> #include <atmel_mci.h> +#include <micrel.h> #include <net.h> #include <netdev.h> @@ -194,6 +195,8 @@ int board_init(void) #ifdef CONFIG_MACB if (has_emac()) at91_macb_hw_init(); + if (has_gmac()) + at91_gmac_hw_init(); #endif #ifdef CONFIG_LCD if (has_lcdc()) @@ -209,6 +212,21 @@ int dram_init(void) return 0; } +int board_phy_config(struct phy_device *phydev) +{ + /* rx data delay */ + ksz9021_phy_extended_write(phydev, + MII_KSZ9021_EXT_RGMII_RX_DATA_SKEW, 0x2222); + /* tx data delay */ + ksz9021_phy_extended_write(phydev, + MII_KSZ9021_EXT_RGMII_TX_DATA_SKEW, 0x2222); + /* rx/tx clock delay */ + ksz9021_phy_extended_write(phydev, + MII_KSZ9021_EXT_RGMII_CLOCK_SKEW, 0xf2f4); + + return 0; +} + int board_eth_init(bd_t *bis) { int rc = 0; @@ -216,6 +234,8 @@ int board_eth_init(bd_t *bis) #ifdef CONFIG_MACB if (has_emac()) rc = macb_eth_initialize(0, (void *)ATMEL_BASE_EMAC, 0x00); + if (has_gmac()) + rc = macb_eth_initialize(0, (void *)ATMEL_BASE_GMAC, 0x00); #endif return rc; diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index c13e983..79fb7a3 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -152,6 +152,11 @@ #define CONFIG_NET_MULTI #define CONFIG_NET_RETRY_COUNT 20 #define CONFIG_MACB_SEARCH_PHY +#define CONFIG_RGMII +#define CONFIG_CMD_MII +#define CONFIG_PHYLIB +#define CONFIG_PHY_MICREL +#define CONFIG_PHY_MICREL_KSZ9021 /* MMC */ #define CONFIG_CMD_MMC -- 1.7.9.5

2 1

[U-Boot] [PATCH v1 0/8] Support for the kmp204x reference design
by Valentin Longchamp 22 Aug '13

22 Aug '13

This series includes all the needed patches to run u-boot on Keymile's kmp204x reference design. The kmp204x is a reference design based on Freescale's P2040/P2041 SoC. It is supposed to be a reference platform for future boards. There is currently only one board that is based on this design which is called kmlion1. The first 7 patches of the series are small changes to the generic Keymile board support code as well as minor changes to some Freescale drivers and CPU support. The final patch 8 is where the new kmp204x code is introduced. It is mostly based on the existing P2041rdb code by Freescale which was adapted to our design. Valentin Longchamp (8): km-powerpc: move SYS_MALLOC_LEN out of keymile-common.h km-powerpc: move CONFIG_FLASH_CFI_MTD to km83xx-common.h KM: fix typo in default environment mpc8xxx: set x2 DDR3 refresh rate if SPD config requires it fsl: do not define FSL_SRIO_PCIE_BOOT_MASTER for all P2041 systems net/fman: add a fm_enable_port function mtd/fsl_elbc: take NAND_ECC_SOFT_BCH config option into accout mpc85xx: introduce the kmp204x reference design support MAINTAINERS | 1 + arch/powerpc/cpu/mpc8xxx/ddr/ddr3_dimm_params.c | 2 + board/keymile/common/common.c | 4 +- board/keymile/kmp204x/Makefile | 48 +++ board/keymile/kmp204x/ddr.c | 84 +++++ board/keymile/kmp204x/eth.c | 87 +++++ board/keymile/kmp204x/kmp204x.c | 307 ++++++++++++++++ board/keymile/kmp204x/kmp204x.h | 31 ++ board/keymile/kmp204x/law.c | 51 +++ board/keymile/kmp204x/pbi.cfg | 51 +++ board/keymile/kmp204x/pci.c | 49 +++ board/keymile/kmp204x/rcw_kmp204x.cfg | 11 + board/keymile/kmp204x/tlb.c | 122 +++++++ boards.cfg | 1 + drivers/mtd/nand/fsl_elbc_nand.c | 6 +- drivers/net/fm/init.c | 7 + include/configs/P2041RDB.h | 1 + include/configs/km/keymile-common.h | 4 +- include/configs/km/km-powerpc.h | 1 - include/configs/km/km83xx-common.h | 4 + include/configs/km/kmp204x-common.h | 462 ++++++++++++++++++++++++ include/configs/km82xx.h | 1 + include/configs/kmp204x.h | 84 +++++ include/fm_eth.h | 1 + 24 files changed, 1414 insertions(+), 6 deletions(-) create mode 100644 board/keymile/kmp204x/Makefile create mode 100644 board/keymile/kmp204x/ddr.c create mode 100644 board/keymile/kmp204x/eth.c create mode 100644 board/keymile/kmp204x/kmp204x.c create mode 100644 board/keymile/kmp204x/kmp204x.h create mode 100644 board/keymile/kmp204x/law.c create mode 100644 board/keymile/kmp204x/pbi.cfg create mode 100644 board/keymile/kmp204x/pci.c create mode 100644 board/keymile/kmp204x/rcw_kmp204x.cfg create mode 100644 board/keymile/kmp204x/tlb.c create mode 100644 include/configs/km/kmp204x-common.h create mode 100644 include/configs/kmp204x.h -- 1.8.0.1

3 34

[U-Boot] [PATCH v3 17/21] arm: Implement the 'fake' go command
by Simon Glass 22 Aug '13

22 Aug '13

Implement this feature on ARM for tracing. It would be nice to have generic bootm support so that it is easily implemented on any arch. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Revert to using 'images' instead of 'image' in boot_jump_linux() Changes in v2: None arch/arm/lib/bootm.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 1b6e0ac..b22fbc9 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -68,12 +68,19 @@ void arch_lmb_reserve(struct lmb *lmb) gd->bd->bi_dram[0].start + gd->bd->bi_dram[0].size - sp); } -static void announce_and_cleanup(void) +/** + * announce_and_cleanup() - Print message and prepare for kernel boot + * + * @fake: non-zero to do everything except actually boot + */ +static void announce_and_cleanup(int fake) { - printf("\nStarting kernel ...\n\n"); + printf("\nStarting kernel ...%s\n\n", fake ? + "(fake run for tracing)" : ""); bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); #ifdef CONFIG_BOOTSTAGE_FDT - bootstage_fdt_add_report(); + if (flag == BOOTM_STATE_OS_FAKE_GO) + bootstage_fdt_add_report(); #endif #ifdef CONFIG_BOOTSTAGE_REPORT bootstage_report(); @@ -225,12 +232,13 @@ static void boot_prep_linux(bootm_headers_t *images) } /* Subcommand: GO */ -static void boot_jump_linux(bootm_headers_t *images) +static void boot_jump_linux(bootm_headers_t *images, int flag) { unsigned long machid = gd->bd->bi_arch_number; char *s; void (*kernel_entry)(int zero, int arch, uint params); unsigned long r2; + int fake = (flag & BOOTM_STATE_OS_FAKE_GO); kernel_entry = (void (*)(int, int, uint))images->ep; @@ -243,14 +251,15 @@ static void boot_jump_linux(bootm_headers_t *images) debug("## Transferring control to Linux (at address %08lx)" \ "...\n", (ulong) kernel_entry); bootstage_mark(BOOTSTAGE_ID_RUN_OS); - announce_and_cleanup(); + announce_and_cleanup(fake); if (IMAGE_ENABLE_OF_LIBFDT && images->ft_len) r2 = (unsigned long)images->ft_addr; else r2 = gd->bd->bi_boot_params; - kernel_entry(0, machid, r2); + if (!fake) + kernel_entry(0, machid, r2); } /* Main Entry point for arm bootm implementation @@ -270,13 +279,13 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images) return 0; } - if (flag & BOOTM_STATE_OS_GO) { - boot_jump_linux(images); + if (flag & (BOOTM_STATE_OS_GO | BOOTM_STATE_OS_FAKE_GO)) { + boot_jump_linux(images, flag); return 0; } boot_prep_linux(images); - boot_jump_linux(images); + boot_jump_linux(images, flag); return 0; } -- 1.8.3

3 4

[U-Boot] [PATCH] Fix for incorrect conversion hex string to number (FMAN firmware address).
by Nikolay Puzanov 20 Aug '13

20 Aug '13

--- arch/powerpc/cpu/mpc85xx/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/cpu/mpc85xx/fdt.c b/arch/powerpc/cpu/mpc85xx/fdt.c index 24eb978..ece1336 100644 --- a/arch/powerpc/cpu/mpc85xx/fdt.c +++ b/arch/powerpc/cpu/mpc85xx/fdt.c @@ -492,7 +492,7 @@ void fdt_fixup_fman_firmware(void *blob) if (!p) return; - fmanfw = (struct qe_firmware *) simple_strtoul(p, NULL, 0); + fmanfw = (struct qe_firmware *) simple_strtoul(p, NULL, 16); if (!fmanfw) return; -- 1.8.1.2

2 2

[U-Boot] [PATCH 1/2] powerpc: Use print_size() where appropriate
by Shruti Kanetkar 20 Aug '13

20 Aug '13

Makes the startup output more consistent Signed-off-by: Shruti Kanetkar <Shruti(a)Freescale.com> Acked-by: Andy Fleming <afleming(a)freescale.com> --- arch/powerpc/cpu/mpc824x/cpu.c | 8 +++----- arch/powerpc/cpu/mpc85xx/cpu_init.c | 8 +++++--- arch/powerpc/cpu/mpc8xx/cpu.c | 24 +++++++++++------------- arch/powerpc/cpu/mpc8xxx/ddr/main.c | 3 ++- 4 files changed, 21 insertions(+), 22 deletions(-) Hello PowerPC Custodians, These are two simple patches I've been playing with as part of my learning process. I realize that perhaps pieces of these patches should be submitted to their respective custodians, but given their simplicity I'm thinking one of the powerpc custodians can apply them (Andy perhaps) to their tree if nobody objects I compile-tested these patches on all the mpc8xx and mpc8[356]xxx powerpc boards/targets and I run them on one board each of the following families of SoC(s): MPC8xx, MPC83xx and MPC85xx Checkpatch has a few warnings like this: WARNING: space prohibited between function name and open parenthesis '(' #132: FILE: arch/powerpc/cpu/ppc4xx/cpu.c:670: + printf (" 16 KiB I-Cache %d KiB D-Cache", but I simply preserved the existing formating/style in the respective files Regards, Shruti. diff --git a/arch/powerpc/cpu/mpc824x/cpu.c b/arch/powerpc/cpu/mpc824x/cpu.c index 44f91b2..8be57ac 100644 --- a/arch/powerpc/cpu/mpc824x/cpu.c +++ b/arch/powerpc/cpu/mpc824x/cpu.c @@ -61,12 +61,10 @@ int checkcpu (void) return -1; /* no valid CPU revision info */ } - printf (" at %s MHz:", strmhz (buf, clock)); + printf (" at %s MHz: ", strmhz (buf, clock)); - printf (" %u kB I-Cache", checkicache () >> 10); - printf (" %u kB D-Cache", checkdcache () >> 10); - - puts ("\n"); + print_size(checkicache(), " I-Cache "); + print_size(checkdcache(), " D-Cache\n"); return 0; } diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 3c8f59c..6433997 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -182,7 +182,8 @@ static void enable_cpc(void) } - printf("Corenet Platform Cache: %d KB enabled\n", size); + puts("Corenet Platform Cache: "); + print_size(size * 1024, " enabled\n"); } static void invalidate_cpc(void) @@ -533,13 +534,14 @@ int cpu_init_r(void) if (CONFIG_SYS_INIT_L2CSR0 & L2CSR0_L2E) { while (!(mfspr(SPRN_L2CSR0) & L2CSR0_L2E)) ; - printf("%d KB enabled\n", (l2cfg0 & 0x3fff) * 64); + print_size((l2cfg0 & 0x3fff) * 64 * 1024, " enabled\n"); } skip_l2: #elif defined(CONFIG_SYS_FSL_QORIQ_CHASSIS2) if (l2cache->l2csr0 & L2CSR0_L2E) - printf("%d KB enabled\n", (l2cache->l2cfg0 & 0x3fff) * 64); + print_size((l2cache->l2cfg0 & 0x3fff) * 64 * 1024, + " enabled\n"); enable_cluster_l2(); #else diff --git a/arch/powerpc/cpu/mpc8xx/cpu.c b/arch/powerpc/cpu/mpc8xx/cpu.c index dc33eb3..b7f3eea 100644 --- a/arch/powerpc/cpu/mpc8xx/cpu.c +++ b/arch/powerpc/cpu/mpc8xx/cpu.c @@ -152,10 +152,8 @@ static int check_CPU (long clock, uint pvr, uint immr) #else printf (" at %s MHz: ", strmhz (buf, clock)); #endif - printf ("%u kB I-Cache %u kB D-Cache", - checkicache () >> 10, - checkdcache () >> 10 - ); + print_size(checkicache(), " I-Cache "); + print_size(checkdcache(), " D-Cache"); /* do we have a FEC (860T/P or 852/859/866/885)? */ @@ -220,10 +218,10 @@ static int check_CPU (long clock, uint pvr, uint immr) printf ("unknown MPC857 (0x%08x)", k); #endif - printf (" at %s MHz:", strmhz (buf, clock)); + printf (" at %s MHz: ", strmhz (buf, clock)); - printf (" %u kB I-Cache", checkicache () >> 10); - printf (" %u kB D-Cache", checkdcache () >> 10); + print_size(checkicache(), " I-Cache "); + print_size(checkdcache(), " D-Cache"); /* lets check and see if we're running on a 862T (or P?) */ @@ -281,10 +279,10 @@ static int check_CPU (long clock, uint pvr, uint immr) if (suf) printf ("PPC823ZTnn%s", suf); - printf (" at %s MHz:", strmhz (buf, clock)); + printf (" at %s MHz: ", strmhz (buf, clock)); - printf (" %u kB I-Cache", checkicache () >> 10); - printf (" %u kB D-Cache", checkdcache () >> 10); + print_size(checkicache(), " I-Cache "); + print_size(checkdcache(), " D-Cache"); /* lets check and see if we're running on a 860T (or P?) */ @@ -337,10 +335,10 @@ static int check_CPU (long clock, uint pvr, uint immr) default: printf ("unknown MPC850 (0x%08x)", k); } - printf (" at %s MHz:", strmhz (buf, clock)); + printf (" at %s MHz: ", strmhz (buf, clock)); - printf (" %u kB I-Cache", checkicache () >> 10); - printf (" %u kB D-Cache", checkdcache () >> 10); + print_size(checkicache(), " I-Cache "); + print_size(checkdcache(), " D-Cache"); /* lets check and see if we're running on a 850T (or P?) */ diff --git a/arch/powerpc/cpu/mpc8xxx/ddr/main.c b/arch/powerpc/cpu/mpc8xxx/ddr/main.c index 7a8636d..40c03d4 100644 --- a/arch/powerpc/cpu/mpc8xxx/ddr/main.c +++ b/arch/powerpc/cpu/mpc8xxx/ddr/main.c @@ -637,7 +637,8 @@ phys_size_t fsl_ddr_sdram(void) #if !defined(CONFIG_PHYS_64BIT) /* Check for 4G or more. Bad. */ if (total_memory >= (1ull << 32)) { - printf("Detected %lld MB of memory\n", total_memory >> 20); + puts("Detected "); + print_size(total_memory, " of memory\n"); printf(" This U-Boot only supports < 4G of DDR\n"); printf(" You could rebuild it with CONFIG_PHYS_64BIT\n"); printf(" "); /* re-align to match init_func_ram print */ -- 1.8.3.1

2 4

Re: [U-Boot] [PATCH 06/10 v5] spl: env_common.c: make CONFIG_SPL_BUILD contain function env_import
by Scott Wood 20 Aug '13

20 Aug '13

On 06/25/2013 09:29:37 PM, Zhang Ying-B40530 wrote: > > > -----Original Message----- > From: Wolfgang Denk [mailto:wd@denx.de] > Sent: Friday, June 21, 2013 1:38 PM > To: Zhang Ying-B40530 > Cc: u-boot(a)lists.denx.de; Wood Scott-B07421; afleming(a)gmail.com; Xie > Xiaobo-R63061; Zhang Ying-B40530 > Subject: Re: [U-Boot] [PATCH 06/10 v5] spl: env_common.c: make > CONFIG_SPL_BUILD contain function env_import > > Dear ying.zhang(a)freescale.com, > > In message > <1371715468-21120-6-git-send-email-ying.zhang(a)freescale.com> you > wrote: > > > > The functionality env_import will be used in the SPL. They > > had been excluded by ifndef CONFIG_SPL_BUILD. Now, put it > > into the SPL. > > > > Signed-off-by: Ying Zhang <b40530(a)freescale.com> > > --- > > Compared with the original version, Changed as below: > > 1. Split from "boot from SD card/SPI flash with SPL". > > 2. Split from "spl: Make CONFIG_SPL_BUILD contain more > functionality" > > 3. No change. > > 4. No change. > > > > common/env_common.c | 2 -- > > 1 files changed, 0 insertions(+), 2 deletions(-) > > This affects all boards, all architectures? How well has this been > tested? > [Zhang Ying] > May I suggest we define a new symbol CONFIG_SPL_ENV_IMPORT to contain > the functionality "env_import"? > So, "#ifndef CONFIG_SPL_BUILD" will be changed to > "#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_ENV_IMPORT)" Can we figure out if the ifdef is really needed first? -Scott

5 13