January 2016 - U-Boot

[U-Boot] [PATCH v2 0/5] Retrieve MAC address from EEPROM
by Olliver Schinagl 26 Jan '16

26 Jan '16

Changes since v1: * Do not CRC the id byte, move it just after the crc byte. One of the reasons I decided to move it after the crc8 was mostly due to mass generation of MAC + CRC combo's where the ID is still unknown. Also not crc-ing the ID means that it is much easier for a user to change it (via the u-boot i2c cmd line or from within linux) without having to worry about the crc. * Add a generator to convert a MAC address from the input to a MAC + CRC8 on the output. Olliver Schinagl (5): net: Add ability to set MAC address via EEPROM to Kconfig sunxi: net: Allow the sunxi to set the MAC from an EEPROM sunxi: net: Enable eeprom on OLinuXino Lime2 boards tools: Allow crc8 to be used tools: Add tool to add crc8 to a mac address board/sunxi/Kconfig | 4 +++ board/sunxi/board.c | 36 +++++++++++++++++++++ configs/A20-OLinuXino-Lime2_defconfig | 3 ++ doc/README.enetaddr | 34 ++++++++++++++++++++ include/u-boot/crc.h | 3 ++ net/Kconfig | 59 +++++++++++++++++++++++++++++++++++ tools/Makefile | 5 +++ tools/gen_mac_addr.c | 51 ++++++++++++++++++++++++++++++ 8 files changed, 195 insertions(+) create mode 100644 tools/gen_mac_addr.c -- 2.6.2

3 23

[U-Boot] [PATCHv3 0/9] Migrate NXP/Freescale Vybrid based boards to support pure DT
by Bhuvanchandra DV 26 Jan '16

26 Jan '16

Changes since v2: - Split the patch for updating the license string. - Reorder the patchset to avoid broken state. Changes since v1: - Update the license string in device tree's. - Update all lpuart's uart nodes in device tree. - Dropped *_dtb_defconfig and updated the default defconfig's with DT support. - Reordered defconfig's using defconfig via savedefconfig. - Use one patch to update all Vybrid based board defconfig's. - Dropped vybrid_gpio driver legacy code. Thanks! Stefan for pointing this. - Dropped the legacy way of enabling GPIO, UART and SPI on NXP/Freescale Vybrid based board's. - Compile checked for vf610twr and pcm052 since I don't have access to such hardware at my end. Reviewer's and tester's welcome! Bhuvanchandra DV (9): arm: vybrid: Enable lpuart support arm: vybrid: Update the license string arm: colibri-vf: Enable serial support arm: vybrid: Drop enabling GPIO, UART and SPI in legacy mode arm: vf610-twr: Add device tree file's arm: pcm052: Add device tree file's arm: vybrid: Update defconfig's dm: lpuart: Drop the legacy code dm: vybrid_gpio: Drop legacy code arch/arm/dts/Makefile | 4 +- arch/arm/dts/pcm052.dts | 22 +++++++++ arch/arm/dts/vf-colibri.dtsi | 14 ++++-- arch/arm/dts/vf.dtsi | 48 +++++++++++++++++-- arch/arm/dts/vf500-colibri.dts | 5 -- arch/arm/dts/vf610-colibri.dts | 5 -- arch/arm/dts/vf610-twr.dts | 22 +++++++++ configs/colibri_vf_defconfig | 8 ++++ configs/colibri_vf_dtb_defconfig | 14 ------ configs/pcm052_defconfig | 7 +++ configs/vf610twr_defconfig | 7 +++ configs/vf610twr_nand_defconfig | 7 +++ drivers/gpio/vybrid_gpio.c | 18 ------- drivers/serial/serial_lpuart.c | 101 +-------------------------------------- include/configs/colibri_vf.h | 13 ----- include/configs/pcm052.h | 3 -- include/configs/vf610twr.h | 3 -- 17 files changed, 130 insertions(+), 171 deletions(-) create mode 100644 arch/arm/dts/pcm052.dts create mode 100644 arch/arm/dts/vf610-twr.dts delete mode 100644 configs/colibri_vf_dtb_defconfig -- 2.7.0

3 20

[U-Boot] [PATCH 0/3] ARM: at91: add PLLB handle functions
by Wenyou Yang 26 Jan '16

26 Jan '16

To reduce the duplicated code, add PLLB enable/disable functions, replace the UTMI PLL handle code with these functions. It is based on the following patch set. [PATCH 0/5] ARM: at91: improve peripheral and system clock handle functions [PATCH 0/4] ARM: at91: add UTMI PLL handle functions Wenyou Yang (3): ARM: at91: clock: add PLLB enable/disable functions drivers: usb: ohci-at91: clean up the PLLB code board: atmel: siemens: clean up PLLB code arch/arm/mach-at91/arm926ejs/clock.c | 38 +++++++++++++++++++++++++++++++++ arch/arm/mach-at91/include/mach/clk.h | 2 ++ board/siemens/smartweb/smartweb.c | 6 +----- board/siemens/taurus/taurus.c | 6 +----- drivers/usb/host/ohci-at91.c | 20 +++++------------ 5 files changed, 47 insertions(+), 25 deletions(-) -- 1.7.9.5

4 10

[U-Boot] [PATCH v2 22/22] ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver
by Ricardo Ribalda Delgado 26 Jan '16

26 Jan '16

If the xparameters file contains a LL_TEMAC definition compile its driver and the net commands. Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda(a)gmail.com> --- v2: Add whitespaces after /* and before*/ Credit-to: Bin Meng <bmeng.cn(a)gmail.com> .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 22 ++++++++++++++++++++++ board/xilinx/ppc440-generic/xparameters.h | 4 ++++ configs/xilinx-ppc440-generic_defconfig | 5 +++++ include/configs/xilinx-ppc440-generic.h | 22 ++++++++++++++++------ 4 files changed, 47 insertions(+), 6 deletions(-) diff --git a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c index 0e3ab94e31ef..d8233529304d 100644 --- a/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c +++ b/board/xilinx/ppc440-generic/xilinx_ppc440_generic.c @@ -8,6 +8,7 @@ #include <config.h> #include <common.h> +#include <netdev.h> #include <asm/processor.h> int checkboard(void) @@ -34,3 +35,24 @@ void get_sys_info(sys_info_t *sys_info) int get_serial_clock(void){ return XPAR_UARTNS550_0_CLOCK_FREQ_HZ; } + +int board_eth_init(bd_t *bis) +{ + int ret = 0; + + puts("Init xilinx temac\n"); +#ifdef XPAR_LLTEMAC_0_BASEADDR + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_0_BASEADDR, + XILINX_LL_TEMAC_M_SDMA_DCR | XILINX_LL_TEMAC_M_SDMA_PLB, + XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR); + +#endif + +#ifdef XPAR_LLTEMAC_1_BASEADDR + ret |= xilinx_ll_temac_eth_init(bis, XPAR_LLTEMAC_1_BASEADDR, + XILINX_LL_TEMAC_M_SDMA_DCR | XILINX_LL_TEMAC_M_SDMA_PLB, + XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR); +#endif + + return ret; +} diff --git a/board/xilinx/ppc440-generic/xparameters.h b/board/xilinx/ppc440-generic/xparameters.h index 9685560673ab..b45a6a1d7668 100644 --- a/board/xilinx/ppc440-generic/xparameters.h +++ b/board/xilinx/ppc440-generic/xparameters.h @@ -18,5 +18,9 @@ #define XPAR_CORE_CLOCK_FREQ_HZ 400000000 #define XPAR_INTC_MAX_NUM_INTR_INPUTS 32 #define XPAR_UARTNS550_0_CLOCK_FREQ_HZ 100000000 +#define XPAR_LLTEMAC_0_LLINK_CONNECTED_BASEADDR 0x80 +#define XPAR_LLTEMAC_1_LLINK_CONNECTED_BASEADDR 0x98 +#define XPAR_LLTEMAC_0_BASEADDR 0x83000000 +#define XPAR_LLTEMAC_1_BASEADDR 0x83000040 #endif diff --git a/configs/xilinx-ppc440-generic_defconfig b/configs/xilinx-ppc440-generic_defconfig index c66357e08724..64b55ee1359e 100644 --- a/configs/xilinx-ppc440-generic_defconfig +++ b/configs/xilinx-ppc440-generic_defconfig @@ -11,3 +11,8 @@ CONFIG_OF_CONTROL=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y CONFIG_DEFAULT_DEVICE_TREE="xilinx-ppc440-generic" +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_PING=y +CONFIG_NETCONSOLE=y + diff --git a/include/configs/xilinx-ppc440-generic.h b/include/configs/xilinx-ppc440-generic.h index 2af5f7fc1de5..f2505a6cd2b2 100644 --- a/include/configs/xilinx-ppc440-generic.h +++ b/include/configs/xilinx-ppc440-generic.h @@ -8,32 +8,42 @@ #ifndef __CONFIG_H #define __CONFIG_H -/*CPU*/ +/* CPU */ #define CONFIG_440 1 #define CONFIG_XILINX_440 1 #define CONFIG_XILINX_PPC440_GENERIC 1 #include "../board/xilinx/ppc440-generic/xparameters.h" -/*Mem Map*/ +/* Mem Map */ #define CONFIG_SYS_SDRAM_SIZE_MB 256 -/*Env*/ +/* Env */ #define CONFIG_ENV_IS_IN_FLASH 1 #define CONFIG_ENV_SIZE 0x20000 #define CONFIG_ENV_SECT_SIZE 0x20000 #define CONFIG_ENV_OFFSET 0x340000 #define CONFIG_ENV_ADDR (XPAR_FLASH_MEM0_BASEADDR+CONFIG_ENV_OFFSET) -/*Misc*/ +/* Misc */ #define CONFIG_PREBOOT "echo U-Boot is up and running;" -/*Flash*/ +/* Flash */ #define CONFIG_SYS_FLASH_SIZE (128*1024*1024) #define CONFIG_SYS_MAX_FLASH_SECT 1024 #define MTDIDS_DEFAULT "nor0=flash" #define MTDPARTS_DEFAULT "mtdparts=flash:-(user)" -/*Generic Configs*/ +/* Net */ +#ifdef XPAR_LLTEMAC_0_BASEADDR +#define CONFIG_XILINX_LL_TEMAC +#define CONFIG_MII +#define CONFIG_PHYLIB +#define CONFIG_PHY_MARVELL +#define CONFIG_NET_RANDOM_ETHADDR +#define CONFIG_LIB_RAND +#endif + +/* Generic Configs */ #include <configs/xilinx-ppc.h> #endif /* __CONFIG_H */ -- 2.7.0.rc3

3 5

[U-Boot] [PATCH 00/22] xilinx-ppc4xx: Cleanout and port to DM serial
by Ricardo Ribalda Delgado 26 Jan '16

26 Jan '16

xilinx-ppc4xx made us of serial uartlite, which was ported to DM. This patch moves port these boards to DM. Now that Kconfig works really well, there is no need to maintain the specific boards (fx12mm, ml507 and v5fx30teval) or their flash version. The ppc440 boards have been wired to the ll_temac driver. A series of cleanouts have been done. This patchset sits on top of: http://git.denx.de/?p=u-boot/u-boot-microblaze.git;a=shortlog;h=refs/heads/… It has been tested on a ppc440 bard. Hopefully Georg Schardt can test the changes on his fx12mm. These changes can also be browset at https://github.com/ribalda/u-boot/tree/xilinx-ppc4xx-generic-dm Regards (and thanks for your patience)! Ricardo Ribalda (22): ppc: xilinx-ppc440: Remove support for ml507 ppc: xilinx-ppc405: Remove support for fx12mm xilinx-ppc440: Remove support for v5fx30teval .mailmap: Add all the mail alias for Ricardo Ribalda mailaddr: Update mail address ppc: pp405-generic: Simplify Makefile ppc: pp440-generic: Simplify Makefile ppc: ppc440: ppc440-generic_flash_defconfig ppc: ppc405: ppc405-generic_flash_defconfig ppc: xilinx-ppc440-generic: Cleanout header files ppc: xilinx-ppc405-generic: Cleanout header files ppc: xilinx-ppc4xx-generic: Update xparameters.h ppc: dts: Add device tree for xilix-ppc4xx-generic configs/xilinx-ppc405-generic: Typos and size configs/xilinx-ppc440-generic: Typos and size ppc: xilinx-ppc4xx: Port to DM serial ppc: xilinx_ppc405_generic: Remove weak attributes ppc: xilinx_ppc440_generic: Remove weak attributes ppc: xilinx_ppc405_generic: Remove uncalled functions ppc: xilinx_ppc440_generic: Remove uncalled functions net: xilinx_ll_temac: Fix string overflow ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver .mailmap | 3 ++ arch/powerpc/cpu/ppc4xx/Kconfig | 20 ++++----- arch/powerpc/cpu/ppc4xx/interrupts.c | 2 +- arch/powerpc/cpu/ppc4xx/uic.c | 2 +- arch/powerpc/cpu/ppc4xx/xilinx_irq.c | 2 +- arch/powerpc/dts/Makefile | 2 + arch/powerpc/dts/xilinx-ppc405-generic.dts | 13 ++++++ arch/powerpc/dts/xilinx-ppc440-generic.dts | 13 ++++++ arch/powerpc/include/asm/interrupt.h | 2 +- arch/powerpc/include/asm/xilinx_irq.h | 2 +- board/avnet/fx12mm/Kconfig | 12 ------ board/avnet/fx12mm/MAINTAINERS | 7 --- board/avnet/fx12mm/Makefile | 11 ----- board/avnet/fx12mm/fx12mm.c | 34 --------------- board/avnet/fx12mm/xparameters.h | 35 --------------- board/avnet/v5fx30teval/Kconfig | 12 ------ board/avnet/v5fx30teval/MAINTAINERS | 7 --- board/avnet/v5fx30teval/Makefile | 11 ----- board/avnet/v5fx30teval/v5fx30teval.c | 17 -------- board/avnet/v5fx30teval/xparameters.h | 22 ---------- board/xilinx/ml507/Kconfig | 12 ------ board/xilinx/ml507/MAINTAINERS | 7 --- board/xilinx/ml507/Makefile | 11 ----- board/xilinx/ml507/ml507.c | 17 -------- board/xilinx/ml507/xparameters.h | 23 ---------- board/xilinx/ppc405-generic/MAINTAINERS | 2 +- board/xilinx/ppc405-generic/Makefile | 4 +- .../xilinx/ppc405-generic/xilinx_ppc405_generic.c | 31 ++++++-------- board/xilinx/ppc405-generic/xparameters.h | 7 ++- board/xilinx/ppc440-generic/MAINTAINERS | 2 +- board/xilinx/ppc440-generic/Makefile | 6 +-- board/xilinx/ppc440-generic/init.S | 2 +- .../xilinx/ppc440-generic/xilinx_ppc440_generic.c | 49 ++++++++++++++------- board/xilinx/ppc440-generic/xparameters.h | 15 ++++--- configs/fx12mm_defconfig | 10 ----- configs/fx12mm_flash_defconfig | 9 ---- configs/ml507_defconfig | 9 ---- configs/ml507_flash_defconfig | 8 ---- configs/v5fx30teval_defconfig | 9 ---- configs/v5fx30teval_flash_defconfig | 8 ---- configs/xilinx-ppc405-generic_defconfig | 8 ++++ configs/xilinx-ppc405-generic_flash_defconfig | 8 ---- configs/xilinx-ppc440-generic_defconfig | 17 ++++++-- configs/xilinx-ppc440-generic_flash_defconfig | 8 ---- drivers/hwmon/adt7460.c | 2 +- drivers/net/xilinx_ll_temac.c | 3 +- drivers/serial/Kconfig | 2 +- include/configs/fx12mm.h | 50 ---------------------- include/configs/ml507.h | 38 ---------------- include/configs/v5fx30teval.h | 38 ---------------- include/configs/xilinx-ppc.h | 22 +++------- include/configs/xilinx-ppc405-generic.h | 19 ++++---- include/configs/xilinx-ppc405.h | 22 ---------- include/configs/xilinx-ppc440-generic.h | 27 ++++++++---- include/configs/xilinx-ppc440.h | 17 -------- 55 files changed, 169 insertions(+), 582 deletions(-) create mode 100644 arch/powerpc/dts/xilinx-ppc405-generic.dts create mode 100644 arch/powerpc/dts/xilinx-ppc440-generic.dts delete mode 100644 board/avnet/fx12mm/Kconfig delete mode 100644 board/avnet/fx12mm/MAINTAINERS delete mode 100644 board/avnet/fx12mm/Makefile delete mode 100644 board/avnet/fx12mm/fx12mm.c delete mode 100644 board/avnet/fx12mm/xparameters.h delete mode 100644 board/avnet/v5fx30teval/Kconfig delete mode 100644 board/avnet/v5fx30teval/MAINTAINERS delete mode 100644 board/avnet/v5fx30teval/Makefile delete mode 100644 board/avnet/v5fx30teval/v5fx30teval.c delete mode 100644 board/avnet/v5fx30teval/xparameters.h delete mode 100644 board/xilinx/ml507/Kconfig delete mode 100644 board/xilinx/ml507/MAINTAINERS delete mode 100644 board/xilinx/ml507/Makefile delete mode 100644 board/xilinx/ml507/ml507.c delete mode 100644 board/xilinx/ml507/xparameters.h delete mode 100644 configs/fx12mm_defconfig delete mode 100644 configs/fx12mm_flash_defconfig delete mode 100644 configs/ml507_defconfig delete mode 100644 configs/ml507_flash_defconfig delete mode 100644 configs/v5fx30teval_defconfig delete mode 100644 configs/v5fx30teval_flash_defconfig delete mode 100644 configs/xilinx-ppc405-generic_flash_defconfig delete mode 100644 configs/xilinx-ppc440-generic_flash_defconfig delete mode 100644 include/configs/fx12mm.h delete mode 100644 include/configs/ml507.h delete mode 100644 include/configs/v5fx30teval.h delete mode 100644 include/configs/xilinx-ppc405.h delete mode 100644 include/configs/xilinx-ppc440.h -- 2.7.0.rc3

5 85

[U-Boot] [PATCH v2 0/3] arm: at91/spl: add DDR3-SDRAM initialization support
by Wenyou Yang 26 Jan '16

26 Jan '16

This patch series is to add DDR3-SDRAM initialzation sequence support. The DDR3-SDRAM initialization sequence is implemented in accordance with the DDR3-SRAM/DDR3L-SDRAM initialization section described in the SAMA5D2 datasheet. Changes in v2: - add Reviewed-by from Andreas. - remove comment accordingly after changing struct atmel_mpddr. - remove some registers which have different definitions on different SoCs to avoid confusion. - remove whitespace error. - rework commit log. - add Reviewed-by from Andreas. Wenyou Yang (3): arm: at91/spl: mpddrc: add struct atmel_mpddrc_config arm: at91/spl: mpddrc: add mpddrc DDR3-SDRAM initialization arm: at91/spl: mpddrc: use IP version to check configuration arch/arm/mach-at91/include/mach/atmel_mpddrc.h | 93 +++++++++++++++++++-- arch/arm/mach-at91/mpddrc.c | 102 +++++++++++++++++++++-- board/atmel/sama5d3_xplained/sama5d3_xplained.c | 4 +- board/atmel/sama5d3xek/sama5d3xek.c | 4 +- board/atmel/sama5d4_xplained/sama5d4_xplained.c | 4 +- board/atmel/sama5d4ek/sama5d4ek.c | 4 +- board/siemens/corvus/board.c | 4 +- 7 files changed, 193 insertions(+), 22 deletions(-) -- 1.7.9.5

2 4

[U-Boot] [PATCH] net: remove scary warning about EEPROM provided MAC address
by Andre Przywara 26 Jan '16

26 Jan '16

In many parts of the computing world having a unique MAC address sitting in some on-NIC storage is considered the normal case. Remove the warning to not scare the user unnecessarily. This applies to Highbank/Midway and ARM's Juno, for instance. Besides that this fixes the formatting on Midway, for instance, which currently looks like: ... Net: xgmac0 Warning: xgmac0 using MAC address from net device , xgmac1 Warning: xgmac1 using MAC address from net device ... Signed-off-by: Andre Przywara <andre.przywara(a)arm.com> --- net/eth.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/net/eth.c b/net/eth.c index 6cf3a35..a1b8abc 100644 --- a/net/eth.c +++ b/net/eth.c @@ -761,8 +761,6 @@ int eth_write_hwaddr(struct eth_device *dev, const char *base_name, } else if (is_valid_ethaddr(dev->enetaddr)) { eth_setenv_enetaddr_by_index(base_name, eth_number, dev->enetaddr); - printf("\nWarning: %s using MAC address from net device\n", - dev->name); } else if (is_zero_ethaddr(dev->enetaddr)) { #ifdef CONFIG_NET_RANDOM_ETHADDR net_random_ethaddr(dev->enetaddr); -- 2.6.4

3 3

[U-Boot] [PATCH] env_mmc: support overriding mmc dev from board code
by Clemens Gruber 26 Jan '16

26 Jan '16

This enables boards to choose where to/from the environment should be saved/loaded. They can then for example support using the same device (dynamically) from which the bootloader was launched to load and save env data and do not have to define CONFIG_SYS_MMC_ENV_DEV statically. In my use case, the environment needs to be on the same device I booted from. It can be the eMMC or an optional SD card. I therefore would override mmc_get_env_dev in the board code, read the CPU registers to determine where we booted from and return the corresponding device index. Cc: Tom Rini <trini(a)konsulko.com> Cc: Stephen Warren <swarren(a)nvidia.com> Cc: Tim Harvey <tharvey(a)gateworks.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Hans de Goede <hdegoede(a)redhat.com> Signed-off-by: Clemens Gruber <clemens.gruber(a)pqgruber.com> --- common/env_mmc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/common/env_mmc.c b/common/env_mmc.c index 15aa43d..bdb452e 100644 --- a/common/env_mmc.c +++ b/common/env_mmc.c @@ -54,6 +54,11 @@ __weak int mmc_get_env_addr(struct mmc *mmc, int copy, u32 *env_addr) return 0; } +__weak int mmc_get_env_dev(void) +{ + return CONFIG_SYS_MMC_ENV_DEV; +} + int env_init(void) { /* use default */ @@ -74,7 +79,7 @@ static unsigned char env_mmc_orig_hwpart; static int mmc_set_env_part(struct mmc *mmc) { uint part = mmc_get_env_part(mmc); - int dev = CONFIG_SYS_MMC_ENV_DEV; + int dev = mmc_get_env_dev(); int ret = 0; #ifdef CONFIG_SPL_BUILD @@ -109,7 +114,7 @@ static const char *init_mmc_for_env(struct mmc *mmc) static void fini_mmc_for_env(struct mmc *mmc) { #ifdef CONFIG_SYS_MMC_ENV_PART - int dev = CONFIG_SYS_MMC_ENV_DEV; + int dev = mmc_get_env_dev(); #ifdef CONFIG_SPL_BUILD dev = 0; @@ -140,7 +145,8 @@ static unsigned char env_flags; int saveenv(void) { ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1); - struct mmc *mmc = find_mmc_device(CONFIG_SYS_MMC_ENV_DEV); + int dev = mmc_get_env_dev(); + struct mmc *mmc = find_mmc_device(dev); u32 offset; int ret, copy = 0; const char *errmsg; @@ -167,8 +173,7 @@ int saveenv(void) goto fini; } - printf("Writing to %sMMC(%d)... ", copy ? "redundant " : "", - CONFIG_SYS_MMC_ENV_DEV); + printf("Writing to %sMMC(%d)... ", copy ? "redundant " : "", dev); if (write_env(mmc, CONFIG_ENV_SIZE, offset, (u_char *)env_new)) { puts("failed\n"); ret = 1; @@ -212,7 +217,7 @@ void env_relocate_spec(void) int crc1_ok = 0, crc2_ok = 0; env_t *ep; int ret; - int dev = CONFIG_SYS_MMC_ENV_DEV; + int dev = mmc_get_env_dev(); const char *errmsg = NULL; ALLOC_CACHE_ALIGN_BUFFER(env_t, tmp_env1, 1); @@ -298,7 +303,7 @@ void env_relocate_spec(void) struct mmc *mmc; u32 offset; int ret; - int dev = CONFIG_SYS_MMC_ENV_DEV; + int dev = mmc_get_env_dev(); const char *errmsg; #ifdef CONFIG_SPL_BUILD -- 2.7.0

4 8

[U-Boot] [PATCH v2 1/2] mx6: soc: Add ENET2 mac address support
by Ye Li 26 Jan '16

26 Jan '16

The i.MX6SX and i.MX6UL has two ENET controllers, add support for reading MAC address from fuse for ENET2. Signed-off-by: Ye Li <ye.li(a)nxp.com> --- Changes for v2: - Add second MAC address to README.imx6. - Rename mac_addr_low and mac_addr_high fields to mac_addr0 and mac_addr1 to align with the reigster names in RM. arch/arm/cpu/armv7/mx6/soc.c | 32 +++++++++++++++++++++-------- arch/arm/include/asm/arch-mx6/imx-regs.h | 23 ++------------------ doc/README.imx6 | 5 +++- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c index bf5ae8c..f83dfa0 100644 --- a/arch/arm/cpu/armv7/mx6/soc.c +++ b/arch/arm/cpu/armv7/mx6/soc.c @@ -364,15 +364,29 @@ void imx_get_mac_from_fuse(int dev_id, unsigned char *mac) struct fuse_bank4_regs *fuse = (struct fuse_bank4_regs *)bank->fuse_regs; - u32 value = readl(&fuse->mac_addr_high); - mac[0] = (value >> 8); - mac[1] = value ; - - value = readl(&fuse->mac_addr_low); - mac[2] = value >> 24 ; - mac[3] = value >> 16 ; - mac[4] = value >> 8 ; - mac[5] = value ; + if ((is_cpu_type(MXC_CPU_MX6SX) || is_cpu_type(MXC_CPU_MX6UL)) && + 1 == dev_id) { + u32 value = readl(&fuse->mac_addr2); + mac[0] = value >> 24 ; + mac[1] = value >> 16 ; + mac[2] = value >> 8 ; + mac[3] = value ; + + value = readl(&fuse->mac_addr1); + mac[4] = value >> 24 ; + mac[5] = value >> 16 ; + + } else { + u32 value = readl(&fuse->mac_addr1); + mac[0] = (value >> 8); + mac[1] = value ; + + value = readl(&fuse->mac_addr0); + mac[2] = value >> 24 ; + mac[3] = value >> 16 ; + mac[4] = value >> 8 ; + mac[5] = value ; + } } #endif diff --git a/arch/arm/include/asm/arch-mx6/imx-regs.h b/arch/arm/include/asm/arch-mx6/imx-regs.h index f24525e..5c45bf6 100644 --- a/arch/arm/include/asm/arch-mx6/imx-regs.h +++ b/arch/arm/include/asm/arch-mx6/imx-regs.h @@ -715,39 +715,22 @@ struct fuse_bank1_regs { u32 rsvd7[3]; }; -#if (defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL)) struct fuse_bank4_regs { u32 sjc_resp_low; u32 rsvd0[3]; u32 sjc_resp_high; u32 rsvd1[3]; - u32 mac_addr_low; + u32 mac_addr0; u32 rsvd2[3]; - u32 mac_addr_high; + u32 mac_addr1; u32 rsvd3[3]; - u32 mac_addr2; + u32 mac_addr2; /*For i.MX6SX and i.MX6UL*/ u32 rsvd4[7]; u32 gp1; u32 rsvd5[3]; u32 gp2; u32 rsvd6[3]; }; -#else -struct fuse_bank4_regs { - u32 sjc_resp_low; - u32 rsvd0[3]; - u32 sjc_resp_high; - u32 rsvd1[3]; - u32 mac_addr_low; - u32 rsvd2[3]; - u32 mac_addr_high; - u32 rsvd3[0xb]; - u32 gp1; - u32 rsvd4[3]; - u32 gp2; - u32 rsvd5[3]; -}; -#endif struct aipstz_regs { u32 mprot0; diff --git a/doc/README.imx6 b/doc/README.imx6 index e26ab71..7c9a4ac 100644 --- a/doc/README.imx6 +++ b/doc/README.imx6 @@ -7,7 +7,10 @@ SoC. ----------------------------------- 1.1 MAC Address: It is stored in fuse bank 4, with the 32 lsbs in word 2 and the - 16 msbs in word 3. + 16 msbs in word 3[15:0]. + For i.MX6SX and i.MX6UL, they have two MAC addresses. The second MAC address + is stored in fuse bank 4, with the 16 lsb in word 3[31:16] and the 32 msbs in + word 4. Example: -- 1.7.4.1

3 3

[U-Boot] [ANN] U-Boot v2016.01-rc4 released
by Tom Rini 26 Jan '16

26 Jan '16

Hey all, I've tagged and uploaded 2016.01-rc4 now. I grabbed a few general bugfix patches that I saw outstanding. At this point, I really do just want bug fixes and I think there's a few net related ones outstanding, along with something for mx6cuboxi and maybe some others. Thanks all! -- Tom

7 12