January 2016 - U-Boot

[U-Boot] [PATCH v3] usb: add clock support for generic EHCI
by Masahiro Yamada 25 Jan '16

25 Jan '16

This driver is designed in a generic manner, so clocks should be handled genericly as well. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v3: - use for () instead of whilt (1) Changes in v2: - rephrase git-log - rebase on commit 12f229ea - do not store clk devices and IDs in the private data drivers/usb/host/ehci-generic.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/usb/host/ehci-generic.c b/drivers/usb/host/ehci-generic.c index 1292caa..84114c5 100644 --- a/drivers/usb/host/ehci-generic.c +++ b/drivers/usb/host/ehci-generic.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <clk.h> #include <dm.h> #include "ehci.h" @@ -21,6 +22,19 @@ static int ehci_usb_probe(struct udevice *dev) { struct ehci_hccr *hccr = (struct ehci_hccr *)dev_get_addr(dev); struct ehci_hcor *hcor; + int i; + + for (i = 0; ; i++) { + struct udevice *clk_dev; + int clk_id; + + clk_id = clk_get_by_index(dev, i, &clk_dev); + if (clk_id < 0) + break; + if (clk_enable(clk_dev, clk_id)) + printf("failed to enable clock (dev=%s, id=%d)\n", + clk_dev->name, clk_id); + } hcor = (struct ehci_hcor *)((uintptr_t)hccr + HC_LENGTH(ehci_readl(&hccr->cr_capbase))); -- 1.9.1

2 2

[U-Boot] [PATCH 1/2 v3] VID: support IR chip is used in Intel mode
by ying.zhang＠freescale.com 25 Jan '16

25 Jan '16

From: Ying Zhang <b40530(a)freescale.com> IR chip on all the boards support VID are required to be used in Intel mode. the VDD will not be adjusted while IR chip is not used in Intel mode. Signed-off-by: Ying Zhang <b40530(a)freescale.com> --- Changed from v2: - Separate this patch from T4RDB VID support patch Changed from v1: - Not support IR chip is used in AMD mode --- board/freescale/common/vid.c | 17 ++++++++++++++++- board/freescale/common/vid.h | 4 ++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/board/freescale/common/vid.c b/board/freescale/common/vid.c index f1bed51..1ea1b88 100644 --- a/board/freescale/common/vid.c +++ b/board/freescale/common/vid.c @@ -292,7 +292,7 @@ int adjust_vdd(ulong vdd_override) (void __iomem *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); #endif u32 fusesr; - u8 vid; + u8 vid, buf; int vdd_target, vdd_current, vdd_last; int ret, i2caddress; unsigned long vdd_string_override; @@ -346,6 +346,21 @@ int adjust_vdd(ulong vdd_override) debug("VID: IR Chip found on I2C address 0x%02x\n", i2caddress); } + /* check IR chip work on Intel mode*/ + ret = i2c_read(i2caddress, + IR36021_INTEL_MODE_OOFSET, + 1, (void *)&buf, 1); + if (ret) { + printf("VID: failed to read IR chip mode.\n"); + ret = -1; + goto exit; + } + if ((buf & IR36021_MODE_MASK) != IR36021_INTEL_MODE) { + printf("VID: IR Chip is not used in Intel mode.\n"); + ret = -1; + goto exit; + } + /* get the voltage ID from fuse status register */ fusesr = in_be32(&gur->dcfg_fusesr); /* diff --git a/board/freescale/common/vid.h b/board/freescale/common/vid.h index a9c7bb4..9182c20 100644 --- a/board/freescale/common/vid.h +++ b/board/freescale/common/vid.h @@ -11,6 +11,10 @@ #define IR36021_LOOP1_VOUT_OFFSET 0x9A #define IR36021_MFR_ID_OFFSET 0x92 #define IR36021_MFR_ID 0x43 +#define IR36021_INTEL_MODE_OOFSET 0x14 +#define IR36021_MODE_MASK 0x20 +#define IR36021_INTEL_MODE 0x00 +#define IR36021_AMD_MODE 0x20 /* step the IR regulator in 5mV increments */ #define IR_VDD_STEP_DOWN 5 -- 1.8.4.1

2 3

[U-Boot] [PATCH][v2] arch/powperpc: Fix start_align due to use of __ffs64() instead ffs64()
by Ashish Kumar 25 Jan '16

25 Jan '16

Return value of ffs64() different to that of __ffs64(), ffs64(0x80000000) = 0x20 __ffs64(0x80000000) = 0x1f, as result of this change -1 from start_align needs to be removed. Incorrect DDR law was created in case of B4860qds Signed-off-by: Ashish Kumar <Ashish.Kumar(a)nxp.com> --- * Test on B4860qds and T1040 * 83xx platform not tested arch/powerpc/cpu/mpc83xx/law.c | 4 ++-- arch/powerpc/cpu/mpc8xxx/law.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/cpu/mpc83xx/law.c b/arch/powerpc/cpu/mpc83xx/law.c index 262ae7f..ae9cba8 100644 --- a/arch/powerpc/cpu/mpc83xx/law.c +++ b/arch/powerpc/cpu/mpc83xx/law.c @@ -21,7 +21,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (start == 0) start_align = 1ull << (LAW_SIZE_2G + 1); else - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; @@ -41,7 +41,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (sz) { start += law_sz; - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; ecm = &immap->sysconf.ddrlaw[1]; diff --git a/arch/powerpc/cpu/mpc8xxx/law.c b/arch/powerpc/cpu/mpc8xxx/law.c index 24baad4..bd79297 100644 --- a/arch/powerpc/cpu/mpc8xxx/law.c +++ b/arch/powerpc/cpu/mpc8xxx/law.c @@ -188,7 +188,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (start == 0) start_align = 1ull << (LAW_SIZE_32G + 1); else - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; @@ -203,7 +203,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id) if (sz) { start += law_sz; - start_align = 1ull << (__ffs64(start) - 1); + start_align = 1ull << (__ffs64(start)); law_sz = min(start_align, sz); law_sz_enc = __ilog2_u64(law_sz) - 1; -- 1.7.6.GIT

2 2

[U-Boot] [PATCH][v2] powerpc: mpc85xx: Move set_liodns, setup_portals to common boot seq
by Prabhakar Kushwaha 25 Jan '16

25 Jan '16

Users migrating Freescale's PowerPC SoC U-Boot code to their custom board, often overlook the need to execute set_liodns() and setup_portals() being called by platform files. So Move set_liodns() and setup_portals() to common u-boot boot sequence Signed-off-by: Prabhakar Kushwaha <prabhakar.kushwaha(a)nxp.com> --- Changes for v2 - put function call CONFIG_FSL_CORENET arch/powerpc/cpu/mpc85xx/cpu_init.c | 11 +++++++++++ board/freescale/b4860qds/b4860qds.c | 5 ----- board/freescale/corenet_ds/corenet_ds.c | 6 ------ board/freescale/p2041rdb/p2041rdb.c | 3 --- board/freescale/t102xqds/t102xqds.c | 5 ----- board/freescale/t102xrdb/t102xrdb.c | 5 ----- board/freescale/t1040qds/t1040qds.c | 5 ----- board/freescale/t104xrdb/t104xrdb.c | 6 ------ board/freescale/t208xqds/t208xqds.c | 6 ------ board/freescale/t208xrdb/t208xrdb.c | 6 ------ board/freescale/t4qds/t4240emu.c | 6 ------ board/freescale/t4qds/t4240qds.c | 6 ------ board/freescale/t4rdb/t4240rdb.c | 6 ------ 13 files changed, 11 insertions(+), 65 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/cpu_init.c b/arch/powerpc/cpu/mpc85xx/cpu_init.c index 13a7d0f..8c6b678 100644 --- a/arch/powerpc/cpu/mpc85xx/cpu_init.c +++ b/arch/powerpc/cpu/mpc85xx/cpu_init.c @@ -23,6 +23,10 @@ #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> #include <asm/fsl_srio.h> +#ifdef CONFIG_FSL_CORENET +#include <asm/fsl_portals.h> +#include <asm/fsl_liodn.h> +#endif #include <fsl_usb.h> #include <hwconfig.h> #include <linux/compiler.h> @@ -788,6 +792,13 @@ int cpu_init_r(void) spin_table_compat = 1; #endif +#ifdef CONFIG_FSL_CORENET + set_liodns(); +#ifdef CONFIG_SYS_DPAA_QBMAN + setup_portals(); +#endif +#endif + l2cache_init(); #if defined(CONFIG_RAMBOOT_PBL) disable_cpc_sram(); diff --git a/board/freescale/b4860qds/b4860qds.c b/board/freescale/b4860qds/b4860qds.c index 6a8fca6..e582abb 100644 --- a/board/freescale/b4860qds/b4860qds.c +++ b/board/freescale/b4860qds/b4860qds.c @@ -16,7 +16,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> #include <hwconfig.h> @@ -1023,10 +1022,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif /* * Adjust core voltage according to voltage ID * This function changes I2C mux to channel 2. diff --git a/board/freescale/corenet_ds/corenet_ds.c b/board/freescale/corenet_ds/corenet_ds.c index 6f0fea1..f41985d 100644 --- a/board/freescale/corenet_ds/corenet_ds.c +++ b/board/freescale/corenet_ds/corenet_ds.c @@ -14,7 +14,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> @@ -125,11 +124,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, /* perms, wimge */ 0, flash_esel, BOOKE_PAGESZ_256M, 1); /* ts, esel, tsize, iprot */ - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif - return 0; } diff --git a/board/freescale/p2041rdb/p2041rdb.c b/board/freescale/p2041rdb/p2041rdb.c index e600bdb..c6a7242 100644 --- a/board/freescale/p2041rdb/p2041rdb.c +++ b/board/freescale/p2041rdb/p2041rdb.c @@ -14,7 +14,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> @@ -140,8 +139,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); - set_liodns(); - setup_portals(); board_config_lanes_mux(); return 0; diff --git a/board/freescale/t102xqds/t102xqds.c b/board/freescale/t102xqds/t102xqds.c index 708afca..76793a1 100644 --- a/board/freescale/t102xqds/t102xqds.c +++ b/board/freescale/t102xqds/t102xqds.c @@ -15,7 +15,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> #include <hwconfig.h> @@ -280,10 +279,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); #endif - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); board_mux_lane_to_slot(); board_retimer_ds125df111_init(); diff --git a/board/freescale/t102xrdb/t102xrdb.c b/board/freescale/t102xrdb/t102xrdb.c index fddd240..01dbf38 100644 --- a/board/freescale/t102xrdb/t102xrdb.c +++ b/board/freescale/t102xrdb/t102xrdb.c @@ -14,7 +14,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> #include "t102xrdb.h" @@ -151,10 +150,6 @@ int board_early_init_r(void) 0, flash_esel, BOOKE_PAGESZ_256M, 1); #endif - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif #ifdef CONFIG_T1024RDB board_mux_lane(); #endif diff --git a/board/freescale/t1040qds/t1040qds.c b/board/freescale/t1040qds/t1040qds.c index eaca57f..d7d56b4 100644 --- a/board/freescale/t1040qds/t1040qds.c +++ b/board/freescale/t1040qds/t1040qds.c @@ -15,7 +15,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> #include <hwconfig.h> @@ -153,10 +152,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); #endif - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); return 0; diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index 3227652..ec97677 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -16,7 +16,6 @@ #include <asm/fsl_fdt.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> #include "../common/sleep.h" @@ -84,11 +83,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); #endif - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif - return 0; } diff --git a/board/freescale/t208xqds/t208xqds.c b/board/freescale/t208xqds/t208xqds.c index 7c89cd5..bfea3a1 100644 --- a/board/freescale/t208xqds/t208xqds.c +++ b/board/freescale/t208xqds/t208xqds.c @@ -14,7 +14,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> @@ -356,11 +355,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif - /* Disable remote I2C connection to qixis fpga */ QIXIS_WRITE(brdcfg[5], QIXIS_READ(brdcfg[5]) & ~BRDCFG5_IRE); diff --git a/board/freescale/t208xrdb/t208xrdb.c b/board/freescale/t208xrdb/t208xrdb.c index 0c2c1c5..0cb05aa 100644 --- a/board/freescale/t208xrdb/t208xrdb.c +++ b/board/freescale/t208xrdb/t208xrdb.c @@ -14,7 +14,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> #include "t208xrdb.h" @@ -81,11 +80,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif - /* * Adjust core voltage according to voltage ID * This function changes I2C mux to channel 2. diff --git a/board/freescale/t4qds/t4240emu.c b/board/freescale/t4qds/t4240emu.c index 5441094..f1393f2 100644 --- a/board/freescale/t4qds/t4240emu.c +++ b/board/freescale/t4qds/t4240emu.c @@ -15,7 +15,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> DECLARE_GLOBAL_DATA_PTR; @@ -56,11 +55,6 @@ int board_early_init_r(void) MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif - return 0; } diff --git a/board/freescale/t4qds/t4240qds.c b/board/freescale/t4qds/t4240qds.c index 4f2cccd..d6df144 100644 --- a/board/freescale/t4qds/t4240qds.c +++ b/board/freescale/t4qds/t4240qds.c @@ -15,7 +15,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> @@ -552,11 +551,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif - /* Disable remote I2C connection to qixis fpga */ QIXIS_WRITE(brdcfg[5], QIXIS_READ(brdcfg[5]) & ~BRDCFG5_IRE); diff --git a/board/freescale/t4rdb/t4240rdb.c b/board/freescale/t4rdb/t4240rdb.c index fac442b..4f0bbed 100644 --- a/board/freescale/t4rdb/t4240rdb.c +++ b/board/freescale/t4rdb/t4240rdb.c @@ -15,7 +15,6 @@ #include <asm/immap_85xx.h> #include <asm/fsl_law.h> #include <asm/fsl_serdes.h> -#include <asm/fsl_portals.h> #include <asm/fsl_liodn.h> #include <fm_eth.h> @@ -75,11 +74,6 @@ int board_early_init_r(void) MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, flash_esel, BOOKE_PAGESZ_256M, 1); - set_liodns(); -#ifdef CONFIG_SYS_DPAA_QBMAN - setup_portals(); -#endif - return 0; } -- 1.9.1

2 1

[U-Boot] [PATCH] nds32: fix mmc rescan hang problem.
by Andes 25 Jan '16

25 Jan '16

From: rick <rick(a)andestech.com> When execute mmc rescan command, system will hang. Signed-off-by: rick <rick(a)andestech.com> --- common/cmd_mmc.c | 9 +++++++++ common/env_common.c | 3 +++ include/environment.h | 3 +++ 3 files changed, 15 insertions(+) diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c index dfc1ec8..3090466 100644 --- a/common/cmd_mmc.c +++ b/common/cmd_mmc.c @@ -814,6 +814,15 @@ static cmd_tbl_t cmd_mmc[] = { U_BOOT_CMD_MKENT(setdsr, 2, 0, do_mmc_setdsr, "", ""), }; +#if defined(__NDS32__) +#ifdef CONFIG_NEEDS_MANUAL_RELOC +void mmc_reloc(void) +{ + fixup_cmdtable(cmd_mmc, ARRAY_SIZE(cmd_mmc)); +} +#endif +#endif + static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { cmd_tbl_t *cp; diff --git a/common/env_common.c b/common/env_common.c index af59c72..8e7b0a5 100644 --- a/common/env_common.c +++ b/common/env_common.c @@ -253,6 +253,9 @@ void env_relocate(void) { #if defined(CONFIG_NEEDS_MANUAL_RELOC) env_reloc(); +#if defined(CONFIG_NDS32) + mmc_reloc(); +#endif env_htab.change_ok += gd->reloc_off; #endif if (gd->env_valid == 0) { diff --git a/include/environment.h b/include/environment.h index 1fdbdad..4bc5326 100644 --- a/include/environment.h +++ b/include/environment.h @@ -178,6 +178,9 @@ extern unsigned char env_get_char_spec(int); #if defined(CONFIG_NEEDS_MANUAL_RELOC) extern void env_reloc(void); +#if defined(CONFIG_NDS32) +extern void mmc_reloc(void); +#endif #endif #ifdef CONFIG_ENV_IS_IN_MMC -- 1.7.9.5

2 1

[U-Boot] U-Boot as a next bootloader in a chain - reading the kernel boot args provided by the previous stage bootlader?
by Wael Almattar 25 Jan '16

25 Jan '16

Hi, How do you suggest to implement such functionality? Do you want to make u-boot able to modify kernel args which has been sent by start.elf? or you want during u-boot stage to press a hotkey which give you the opportunity to edit previous bootargs? Please explain how do you expect u-boot to behave after implementing this patch.. Best Regards, Wael Almattar Hello Wojciech, On Mon, 16 Nov 2015 13:09:43 +0100, Wojciech Zabolotny <wzab01 at gmail.com <http://lists.denx.de/mailman/listinfo/u-boot>> wrote: >* 2015-11-16 11:52 GMT+01:00 Albert ARIBAUD <albert.u.boot at aribaud.net <http://lists.denx.de/mailman/listinfo/u-boot>>: *>* > Hello Wojciech, *>* > *>* > On Mon, 16 Nov 2015 10:42:50 +0100, Wojciech Zabolotny *>* > <wzab01 at gmail.com <http://lists.denx.de/mailman/listinfo/u-boot>> wrote: *>* >> Hi, *>* >> *>* >> I need to use U-Boot (or barebox) as a bootloader in a Raspberry Pi *>* >> based system to extend booting flexibility. *>* >> The problem however is that certain kernel boot arguments are prepared *>* >> by the previous stage bootloader (start.elf) *>* >> basing on the properties of the individual board. *>* >> For example in one of the boards I use, the kernel command line when a *>* >> standard kernel is booted, looks as follows (MAC address and serial *>* >> number are partially masked for privacy): *>* >> *>* >> dma.dmachans=0x7f35 bcm2708_fb.fbwidth=720 bcm2708_fb.fbheight=480 *>* >> bcm2708.boardrev=0xd bcm2708.serial=0x6f15XXXX *>* >> smsc95xx.macaddr=B8:27:EB:XX:XX:XX bcm2708_fb.fbswap=1 *>* >> sdhci-bcm2708.emmc_clock_freq=250000000 vc_mem.mem_base=0x1ec00000 *>* >> vc_mem.mem_size=0x20000000 console=ttyAMA0 root=/dev/mmcblk0p2 *>* >> rootwait *>* >> *>* >> Only the "console=ttyAMA0 root=/dev/mmcblk0p2 rootwait" is provided by *>* >> the user (in the cmdline.txt file). The rest is generated by the *>* >> start.elf. *>* >> *>* >> Of course when I boot the u-boot.bin instead of zImage, the same *>* >> parameters are passed to it, but the U-Boot is not able to read them *>* >> and to pass them to the finally booted kernel. *>* >> As U-Boot shares a lot of code with the Linux kernel it should be *>* >> possible to add necessary functions. *>* >> It could be useful in all applications where U-Boot is used as an *>* >> additional stage in the boot chain e.g., to add new booting *>* >> functionalities (booting from the network, booting from the flash disk *>* >> etc.). *>* >> *>* >> I have found a nice description, how the paremeters are passed in ARM *>* >> architecture: *>* >> http://www.simtec.co.uk/products/SWLINUX/files/booting%5Farticle.html <http://www.simtec.co.uk/products/SWLINUX/files/booting_article.html> *>* >> but of course the solution should be probably portable (or implemented *>* >> for each platform independently with unified API). *>* > *>* > Not sure what kind of answer you're asking for here. Do you want to *>* > know if what you're suggesting is feasible? Are you looking for someone *>* > to implement it? Are you going to implement it yourself but asking for *>* > feedback? *>* > *>* >> -- *>* > *>* > (aside: if the above should be a signature delimiter, then it lacks a *>* > space after the dashes) *>* > *>* > Amicalement, *>* > -- *>* > Albert. *> >* Dear Albert, *> >* Yes the first question is if this feature is feasible. * In software, just about anything is feasible; ask any PHB. :) Specifically, catching information passed to U-Boot's entry point is something that e.g. OMAPs do already. It is probably not going to be portable, though, because the passing method is inherently specific to your platform and pre-U-Boot loader. >* If yes, then I'd like to propose such functionality as a possible improvement. *>* I think that may be more people interested in such a feature. *>>* I'll appreciate any sugestions/pointers regarding the possible implementation. *> >* Probably I can try to implement it. Of course if there are other *>* interested users *>* who can do it, I'll be definitely happy to discuss that with them. * Best is that you post a patch with a working implementation which can be build above current u-boot/master branch; people interested in it will comment. >* Regards, * Amicalement, -- Albert.

1 0

[U-Boot] CONFIG_DISPLAY causes build error on microblaze-generic
by Bin Meng 25 Jan '16

25 Jan '16

Hi Simon, Anatolij, At present CONFIG_DISPLAY is set to y by default when driver model is on. This causes the following building error on microblaze-generic. drivers/built-in.o: In function 'display_read_timing': drivers/video/display-uclass.c:45: undefined reference to 'edid_get_timing' I think we should make CONFIG_DISPLAY 'default n' and update whatever boards who want DM video support to explicitly turn in on in its board defconfig files. This will fix microblaze-generic build error too. Regards, Bin

3 2

[U-Boot] [GIT PULL] Microblaze changes
by Michal Simek 25 Jan '16

25 Jan '16

Hi Tom, here are microblaze patches for moving stuff to DM. This is the patch series which we postpone to next release. Buildman doesn't show any problems for mb, zynq_zc702 and zynqmp. Thanks, Michal The following changes since commit d29892ba854f40980b84f86566cd0c2308c66afe: part_dos.c: Don't wrap to negative after 2G sectors (2016-01-13 16:33:20 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git mb for you to fetch changes up to 8283903d4df0685af98a45d323f880ce07c60cec: microblaze: Fix board_init calling sequence (2016-01-14 09:35:04 +0100) ---------------------------------------------------------------- Michal Simek (45): microblaze: Remove CONSOLE_ARG microblaze: Move baudrate setting out driver selection serial: uartlite: Move driver to DM serial: uartlite: Add support for debug console serial: uartlite: Add uartlite to Kconfig microblaze: Enable uart16550 DM by default microblaze: Do not print eth device when DM_ETH is enabled microblaze: Enable PHYLIB via Kconfig microblaze: Remove unused I2C macros microblaze: Wire-up debug_uart in asm microblaze: Enable MICREL_KSZ9021 net: axi_emac: Fix parentheses around operand ! net: axi_emac: Show phy address instead of register content net: axi_emac: Pass directly pointer to register space net: axi_emac: Put iobase to private structure net: axi_emac: Pass private structure to phyread/phywrite net: axi_emac: Pass private structure where possible net: axi_emac: Move driver to DM net: axi_emac: Enable access to MDIO in probe net: axi_emac: Split recv from free_pkt net: axi_emac: Rename start, stop, write_hwaddr functions net: Add axi emac to Kconfig net: emaclite: Remove ancient OF probe function net: emaclite: Add MDIO support to driver net: emaclite: Convert MDIO to use register offset net: emaclite: Use indirect register access for tx_ping/pong net: emaclite: Use indirect register access for rx_ping/pong net: emaclite: Use indirect register access for TX reset net: emaclite: Fix logic around available TX buffers net: emaclite: Remove XEL_TSR_XMIT_ACTIVE_MASK flag net: emaclite: Use indirect reg access in send net: emaclite: Use indirect access in emaclite_recv net: emaclite: Move driver to DM net: emaclite: Rename start and stop functions net: emaclite: Let core to handle received packet net: emaclite: Move emaclite to Kconfig microblaze: Enable axi emac via Kconfig microblaze: Move eth configuration to Kconfig microblaze: Remove systemace from board file microblaze: Remove CONFIG_FIT from board file microblaze: Move CONFIG_NETCONSOLE to Kconfig microblaze: Remove empty file - cpu.c microblaze: Read information about RAM from DT microblaze: Enable HUSH via Kconfig microblaze: Fix board_init calling sequence arch/microblaze/Kconfig | 1 + arch/microblaze/cpu/Makefile | 2 +- arch/microblaze/cpu/cpu.c | 9 -- arch/microblaze/cpu/start.S | 4 + board/xilinx/microblaze-generic/microblaze-generic.c | 39 +------ board/xilinx/microblaze-generic/xparameters.h | 21 ---- board/xilinx/zynq/board.c | 24 ---- common/cmd_bdinfo.c | 2 +- configs/microblaze-generic_defconfig | 14 +++ doc/device-tree-bindings/serial/xilinx_uartlite.txt | 13 +++ doc/driver-model/serial-howto.txt | 1 - drivers/net/Kconfig | 16 +++ drivers/net/xilinx_axi_emac.c | 280 ++++++++++++++++++++++++++++----------------- drivers/net/xilinx_emaclite.c | 610 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------ drivers/serial/Kconfig | 14 +++ drivers/serial/serial_xuartlite.c | 194 ++++++++++++++----------------- include/configs/microblaze-generic.h | 74 +----------- include/netdev.h | 5 - 18 files changed, 757 insertions(+), 566 deletions(-) delete mode 100644 arch/microblaze/cpu/cpu.c create mode 100644 doc/device-tree-bindings/serial/xilinx_uartlite.txt -- Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

3 12

[U-Boot] [PATCH] nand: mxs: fix error handling for mxs_nand_init
by Peng Fan 25 Jan '16

25 Jan '16

From: Peng Fan <peng.fan(a)nxp.com> Fix error handling for mxs_nand_init. The original error handling is wrong for err2 and err1. Should first free desc[x], then free desc. This patch also correctly handle err3, should use MXS_DMA_CHANNEL_AHB_APBH_GPMI0 as the check point. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> CC: Fabio Estevam <Fabio.Estevam(a)freescale.com> Cc: Scott Wood <scottwood(a)freescale.com> Signed-off-by: Peng Fan <peng.fan(a)nxp.com> --- drivers/mtd/nand/mxs_nand.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index f15cf36..5102e4b 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -1090,24 +1090,29 @@ int mxs_nand_init(struct mxs_nand_info *info) (struct mxs_gpmi_regs *)MXS_GPMI_BASE; struct mxs_bch_regs *bch_regs = (struct mxs_bch_regs *)MXS_BCH_BASE; - int i = 0, j; + int i = 0, j, ret = 0; info->desc = malloc(sizeof(struct mxs_dma_desc *) * MXS_NAND_DMA_DESCRIPTOR_COUNT); - if (!info->desc) + if (!info->desc) { + ret = -ENOMEM; goto err1; + } /* Allocate the DMA descriptors. */ for (i = 0; i < MXS_NAND_DMA_DESCRIPTOR_COUNT; i++) { info->desc[i] = mxs_dma_desc_alloc(); - if (!info->desc[i]) + if (!info->desc[i]) { + ret = -ENOMEM; goto err2; + } } /* Init the DMA controller. */ for (j = MXS_DMA_CHANNEL_AHB_APBH_GPMI0; j <= MXS_DMA_CHANNEL_AHB_APBH_GPMI7; j++) { - if (mxs_dma_init_channel(j)) + ret = mxs_dma_init_channel(j); + if (ret) goto err3; } @@ -1127,15 +1132,16 @@ int mxs_nand_init(struct mxs_nand_info *info) return 0; err3: - for (--j; j >= 0; j--) + for (--j; j >= MXS_DMA_CHANNEL_AHB_APBH_GPMI0; j--) mxs_dma_release(j); err2: - free(info->desc); -err1: for (--i; i >= 0; i--) mxs_dma_desc_free(info->desc[i]); - printf("MXS NAND: Unable to allocate DMA descriptors\n"); - return -ENOMEM; + free(info->desc); +err1: + if (ret == -ENOMEM) + printf("MXS NAND: Unable to allocate DMA descriptors\n"); + return ret; } /*! -- 2.6.2

1 1

[U-Boot] [PATCH] ARM: zynq: zynqmp: Line up checkboard message
by Michal Simek 25 Jan '16

25 Jan '16

Use space instead of tab in checkboard print to aligned it with others boards. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- board/xilinx/zynq/board.c | 2 +- board/xilinx/zynqmp/zynqmp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 414f5302a066..477385b442a1 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -94,7 +94,7 @@ int board_late_init(void) #ifdef CONFIG_DISPLAY_BOARDINFO int checkboard(void) { - puts("Board:\tXilinx Zynq\n"); + puts("Board: Xilinx Zynq\n"); return 0; } #endif diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 1a837897194e..44d347ed3bf0 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -117,7 +117,7 @@ int board_late_init(void) int checkboard(void) { - puts("Board:\tXilinx ZynqMP\n"); + puts("Board: Xilinx ZynqMP\n"); return 0; } -- 1.9.1

3 2