February 2016 - U-Boot

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 04 Feb '16

04 Feb '16

The following changes since commit 44189a032804c4a16632f4e80abf77f2820e9a48: Prepare v2016.03-rc1 (2016-02-02 11:29:50 -0500) are available in the git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 8c9b4d5598e014036d2f2637c17bd6e3748ff6a3: usb: gadget: dwc2_udc_otg: modified the check condition for max packet size of ep_in in high speed (2016-02-04 12:38:26 +0100) ---------------------------------------------------------------- Frank Wang (1): usb: gadget: dwc2_udc_otg: modified the check condition for max packet size of ep_in in high speed drivers/usb/gadget/dwc2_udc_otg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

2 1

[U-Boot] [PULL] u-boot-socfpga/master
by Marek Vasut 04 Feb '16

04 Feb '16

The following changes since commit 44189a032804c4a16632f4e80abf77f2820e9a48: Prepare v2016.03-rc1 (2016-02-02 11:29:50 -0500) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git master for you to fetch changes up to a409a8b85ee337250043aa0c031a31b3a6639e74: Revert "arm: socfpga: set the fpga global bit to disable HPS to FPGA signals" (2016-02-04 12:43:21 +0100) ---------------------------------------------------------------- Dinh Nguyen (1): Revert "arm: socfpga: set the fpga global bit to disable HPS to FPGA signals" drivers/fpga/socfpga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

2 1

[U-Boot] [PULL] Please pull u-boot-imx
by Stefano Babic 04 Feb '16

04 Feb '16

Hi Tom, please pull from u-boot-imx, thanks ! The following changes since commit 44189a032804c4a16632f4e80abf77f2820e9a48: Prepare v2016.03-rc1 (2016-02-02 11:29:50 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-imx.git master for you to fetch changes up to fb0d042814e6ea3463ee335523222f91d891d084: imx: mx6: implement board_mmc_get_env_dev (2016-02-04 10:13:53 +0100) ---------------------------------------------------------------- Bhuvanchandra DV (9): arm: vybrid: Enable lpuart support arm: vybrid: Update the license string arm: colibri-vf: Enable serial support arm: vf610-twr: Add device tree file's arm: pcm052: Add device tree file's arm: vybrid: Update defconfig's arm: vybrid: Drop enabling GPIO, SPI and UART in legacy mode dm: lpuart: Drop the legacy code dm: vybrid_gpio: Drop legacy code Bin Meng (1): tools: mxsboot: Use more portable cpu_to_le32() Fabio Estevam (3): mx6slevk: Fix the reset delay for the the LAN8720 PHY tqma6_wru4: Fix the reset delay for the the LAN8720 PHY mx6slevk: Remove CONFIG_ETHPRIME option Marek Vasut (2): arm: imx6: Add DDR3 calibration code for MX6 Q/D/DL arm: imx6: Enable DDR calibration on Novena Peng Fan (3): imx: mx7dsabresd: move mmc_get_env_devno to soc code imx: mx6: implement mmc_get_env_dev imx: mx6: implement board_mmc_get_env_dev Peter Robinson (1): wandboard: fix variable name so PXE boot works Ye Li (6): mx6: soc: Add ENET2 mac address support imx: mx6sxsabreauto: Add support for mx6sx SABREAUTO board imx: MX6DQ{P}/DL:SABRESD Fix bmode eMMC failure imx: mx6sx: Fix issue in LCDIF clock enablement imx: mx6ul/sx: Fix issue in LCDIF clock dividers calculation imx: mx6sxsabresd: Add MCIMX28LCD display support arch/arm/cpu/armv7/mx6/Kconfig | 6 + arch/arm/cpu/armv7/mx6/clock.c | 8 +- arch/arm/cpu/armv7/mx6/ddr.c | 559 ++++++++++++++++++++++++ arch/arm/cpu/armv7/mx6/soc.c | 64 ++- arch/arm/cpu/armv7/mx7/soc.c | 21 + arch/arm/dts/Makefile | 4 +- arch/arm/dts/pcm052.dts | 22 + arch/arm/dts/vf-colibri.dtsi | 15 +- 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 + arch/arm/include/asm/arch-mx6/imx-regs.h | 23 +- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 5 + board/freescale/mx6qarm2/mx6qarm2.c | 5 + board/freescale/mx6sabresd/mx6sabresd.c | 7 +- board/freescale/mx6slevk/mx6slevk.c | 7 +- board/freescale/mx6sxsabreauto/Kconfig | 12 + board/freescale/mx6sxsabreauto/MAINTAINERS | 6 + board/freescale/mx6sxsabreauto/Makefile | 6 + board/freescale/mx6sxsabreauto/imximage.cfg | 136 ++++++ board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 508 +++++++++++++++++++++ board/freescale/mx6sxsabresd/mx6sxsabresd.c | 66 +++ board/freescale/mx7dsabresd/mx7dsabresd.c | 20 +- board/kosagi/novena/novena_spl.c | 23 +- board/tqc/tqma6/tqma6_wru4.c | 2 +- configs/colibri_vf_defconfig | 8 + configs/colibri_vf_dtb_defconfig | 14 - configs/mx6sxsabreauto_defconfig | 11 + configs/pcm052_defconfig | 7 + configs/vf610twr_defconfig | 7 + configs/vf610twr_nand_defconfig | 7 + doc/README.imx6 | 5 +- drivers/gpio/vybrid_gpio.c | 18 - drivers/serial/serial_lpuart.c | 101 +---- include/configs/colibri_vf.h | 13 - include/configs/mx6slevk.h | 1 - include/configs/mx6sxsabreauto.h | 212 +++++++++ include/configs/mx6sxsabresd.h | 20 + include/configs/pcm052.h | 3 - include/configs/vf610twr.h | 3 - include/configs/wandboard.h | 2 +- tools/mxsboot.c | 18 +- 43 files changed, 1810 insertions(+), 245 deletions(-) create mode 100644 arch/arm/dts/pcm052.dts create mode 100644 arch/arm/dts/vf610-twr.dts create mode 100644 board/freescale/mx6sxsabreauto/Kconfig create mode 100644 board/freescale/mx6sxsabreauto/MAINTAINERS create mode 100644 board/freescale/mx6sxsabreauto/Makefile create mode 100644 board/freescale/mx6sxsabreauto/imximage.cfg create mode 100644 board/freescale/mx6sxsabreauto/mx6sxsabreauto.c delete mode 100644 configs/colibri_vf_dtb_defconfig create mode 100644 configs/mx6sxsabreauto_defconfig create mode 100644 include/configs/mx6sxsabreauto.h -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic(a)denx.de =====================================================================

2 1

[U-Boot] [GIT PULL] Xilinx changes
by Michal Simek 04 Feb '16

04 Feb '16

Hi Tom, here is the branch with xilinx changes which are flying around. It is targeting PowerPC, Microblaze, ARM and ARM64. I can't see any build problem via buildman. Thanks, Michal The following changes since commit 9e4de7fd4acc8f99b6d383c711d21c0159849629: Merge branch 'master' of http://git.denx.de/u-boot-sunxi (2016-01-26 17:45:37 -0500) are available in the git repository at: git://www.denx.de/git/u-boot-microblaze.git master for you to fetch changes up to f36919a8138ed7ecd3dbce4630e02936b13907da: ppc: xilinx-ppc440-generic: Wire LL_TEMAC driver (2016-01-27 15:57:20 +0100) ---------------------------------------------------------------- Michal Simek (75): 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 fpga: Fix compilation warnings serial: zynq: Extend compatible string list serial: zynq: Fix address reading from DM net: phy: ti: Enable automatic crossover mode net: zynq: Change MDC setup for arm64 ARM: zynq: Remove memory division by 2 for ECC case ARM: zynq: Do not select options if SPL is not enabled ARM: zynq: Enable SPI_FLASH for zc770 xm013 platform ARM: zynq: Move FLASH_BAR to Kconfig ARM: zynq: Clean DTSI coding style ARM: zynq: Fix all remaining zynq platform to use stdout-path ARM: zynq: Fix defconfig for zybo ARM: zynq: Move spi node to aligned location ARM64: zynqmp: Remove incorrect link to common config file ARM64: zynqmp: Use the same U-Boot version with/without ATF ARM64: zynqmp: Add initial support for the first silicon ARM64: zynqmp: Fix coding style in phy node ARM64: zynqmp: Add support for SD1 boot mode ARM64: zynqmp: Show information about bootmode ARM64: zynqmp: Differentiate EMMC boot mode ARM64: zynqmp: Fix bootmode SD_MODE1 ARM64: zynqmp: Remove unneeded timer_init function ARM64: zynqmp: Enable advance memory test by default ARM64: zynqmp: Move memory setup to board file ARM64: zynqmp: Setup correct COUNTER_FREQUENCY for silicon ARM64: zynqmp: Allow overwrite identification string ARM64: zynqmp: Enable NATSEMI phys ARM64: zynqmp: Include GbE speed/duplex detection ARM64: zynqmp: Do not setup bootargs ARM: zynq: zynqmp: Line up checkboard message Punnaiah Choudary Kalluri (1): ARM64: zynqmp: Correct the watchdog timer interrupt number 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: 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-generic: Update xparameters.h 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 Siva Durga Prasad Paladugu (11): fpga: xilinx: Check for substring in device ID validation fpga: Add bitstream type BIT_NONE sdhci: zynq: Remove hardcoded value zero as min frequency mmc: sdhci: Clear high speed if not supported mmc: zynq_sdhci: Added qurik to disable high speed ARM: zynq: Define sys prompt for all Zynq boards ARM64: zynqmp: ep: Define minimum sdhci frequency for ep ARM64: zynqmp: Modify the SD and QSPI bootmode values ARM64: zynqmp: Modify the autoboot commands ARM64: zynqmp: Dont use shortcut for setenv ARM64: zynqmp: Define auto negotiation timeout Soren Brinkmann (1): ARM64: zynqmp: DT: Fix UART compatible string .mailmap | 3 + arch/arm/Kconfig | 6 +- arch/arm/cpu/armv8/zynqmp/Kconfig | 4 - arch/arm/cpu/armv8/zynqmp/clk.c | 20 ++++- arch/arm/cpu/armv8/zynqmp/cpu.c | 18 ++++- arch/arm/dts/zynq-7000.dtsi | 10 +-- arch/arm/dts/zynq-zc770-xm010.dts | 5 +- arch/arm/dts/zynq-zc770-xm011.dts | 17 ++--- arch/arm/dts/zynq-zc770-xm012.dts | 17 ++--- arch/arm/dts/zynq-zc770-xm013.dts | 35 +++++---- arch/arm/dts/zynqmp-ep108.dts | 2 +- arch/arm/dts/zynqmp.dtsi | 6 +- arch/arm/include/asm/arch-zynqmp/clk.h | 1 + arch/arm/include/asm/arch-zynqmp/hardware.h | 30 ++++++-- arch/arm/mach-zynq/ddrc.c | 2 - arch/microblaze/Kconfig | 1 + arch/microblaze/cpu/Makefile | 2 +- arch/microblaze/cpu/cpu.c | 9 --- arch/microblaze/cpu/start.S | 4 + 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 | 15 ++++ arch/powerpc/dts/xilinx-ppc440-generic.dts | 15 ++++ 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/microblaze-generic/microblaze-generic.c | 39 +--------- board/xilinx/microblaze-generic/xparameters.h | 21 ------ 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 +- board/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 +- board/xilinx/ppc440-generic/xilinx_ppc440_generic.c | 49 +++++++++---- board/xilinx/ppc440-generic/xparameters.h | 15 ++-- board/xilinx/zynq/board.c | 26 +------ board/xilinx/zynqmp/zynqmp.c | 51 ++++++++++--- cmd/bdinfo.c | 2 +- cmd/fpga.c | 8 +- configs/fx12mm_defconfig | 10 --- configs/fx12mm_flash_defconfig | 9 --- configs/microblaze-generic_defconfig | 14 ++++ 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 | 16 +++- configs/xilinx-ppc440-generic_flash_defconfig | 8 -- configs/zynq_microzed_defconfig | 1 + configs/zynq_picozed_defconfig | 1 + configs/zynq_zc702_defconfig | 2 + configs/zynq_zc706_defconfig | 2 + configs/zynq_zc770_xm010_defconfig | 2 + configs/zynq_zc770_xm011_defconfig | 1 + configs/zynq_zc770_xm012_defconfig | 1 + configs/zynq_zc770_xm013_defconfig | 3 + configs/zynq_zed_defconfig | 2 + configs/zynq_zybo_defconfig | 5 +- doc/device-tree-bindings/serial/xilinx_uartlite.txt | 13 ++++ doc/driver-model/serial-howto.txt | 1 - drivers/fpga/xilinx.c | 4 +- drivers/hwmon/adt7460.c | 2 +- drivers/mmc/sdhci.c | 4 + drivers/mmc/zynq_sdhci.c | 12 ++- drivers/net/Kconfig | 16 ++++ drivers/net/phy/ti.c | 3 + drivers/net/xilinx_axi_emac.c | 280 ++++++++++++++++++++++++++++++++++++++++++++-------------------------- drivers/net/xilinx_emaclite.c | 610 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------- drivers/net/xilinx_ll_temac.c | 3 +- drivers/net/zynq_gem.c | 4 + drivers/serial/Kconfig | 14 ++++ drivers/serial/serial_xuartlite.c | 194 ++++++++++++++++++++++--------------------------- drivers/serial/serial_zynq.c | 8 +- include/configs/fx12mm.h | 50 ------------- include/configs/microblaze-generic.h | 74 +------------------ 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 | 43 +++++++---- include/configs/xilinx-ppc440.h | 17 ----- include/configs/xilinx_zynqmp.h | 33 +++++---- include/configs/xilinx_zynqmp_ep.h | 12 ++- include/configs/zynq-common.h | 1 - include/fpga.h | 1 + include/netdev.h | 5 -- 108 files changed, 1164 insertions(+), 1263 deletions(-) delete mode 100644 arch/microblaze/cpu/cpu.c 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 create mode 100644 doc/device-tree-bindings/serial/xilinx_uartlite.txt 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 -- 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 2

[U-Boot] [PATCH] .travis.yml: rework according to new travis-ci infra
by Roger Meier 04 Feb '16

04 Feb '16

- install using addons.apt - remove MAKEALL - split mpc85xx boards - remove TEST_CONFIG_CMD, just info - fetch mips toolchain via buildman - remove --list-error-boards param - conditional script - use TOOLCHAIN instead of INSTALL_TOOLCHAIN - add aarch64 - enable notifications via email Signed-off-by: Roger Meier <r.meier(a)siemens.com> Cc: Wolfgang Denk <wd(a)denx.de> Cc: Heiko Schocher <hs(a)denx.de> Cc: Tom Rini <trini(a)ti.com> Cc: Daniel Schwierzeck <daniel.schwierzeck(a)gmail.com> Cc: Andreas Färber <afaerber(a)suse.de> --- .travis.yml | 217 ++++++++++++++++++++++++------------------------------------ 1 file changed, 88 insertions(+), 129 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4e20e09..67674e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,23 +5,29 @@ language: c +addons: + apt: + packages: + - cppcheck + - sloccount + - sparse + - bc + - build-essential + - libsdl1.2-dev + cache: - apt install: - # install U-Boot build dependencies - - sudo apt-get install -qq cppcheck sloccount sparse bc libsdl-dev build-essential # install latest device tree compiler - git clone --depth=1 https://git.kernel.org/pub/scm/utils/dtc/dtc.git /tmp/dtc - make -j4 -C /tmp/dtc # prepare buildman environment - export BUILDMAN_ROOT="root:" - - export BUILDMAN_MIPS="mips:" - export BUILDMAN_PPC="ppc:" - export BUILDMAN_ARM="arm:" - export BUILDMAN_SANDBOX="sandbox:" - echo -e "[toolchain]\n${BUILDMAN_ROOT} /\n" > ~/.buildman - - echo -e "${BUILDMAN_MIPS} /opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/\n" >> ~/.buildman - echo -e "${BUILDMAN_PPC} /opt/eldk-5.4/powerpc/sysroots/i686-eldk-linux/usr/bin/powerpc-linux/\n" >> ~/.buildman - echo -e "${BUILDMAN_ARM} /opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/\n" >> ~/.buildman - echo -e "${BUILDMAN_SANDBOX} /usr/bin/gcc\n" >> ~/.buildman @@ -35,165 +41,121 @@ env: global: - PATH=/tmp/dtc:$PATH - BUILD_DIR=build - - CROSS_COMPILE="" - HOSTCC="cc" - HOSTCXX="c++" - - TEST_CONFIG_CMD="" before_script: - # install toolchains based on INSTALL_TOOLCHAIN} variable - - if [[ "${INSTALL_TOOLCHAIN}" == *arm* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/armv5te/eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *arm* ]]; then sh eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh -y ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *arm* ]]; then ls -al /opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *i386* ]]; then ./tools/buildman/buildman sandbox --fetch-arch i386 ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *mips* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/mips/eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *mips* ]]; then sh eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh -y ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi + # install toolchains based on TOOLCHAIN} variable + - if [[ "${TOOLCHAIN}" == *aarch64* ]]; then ./tools/buildman/buildman --fetch-arch aarch64 ; fi + - if [[ "${TOOLCHAIN}" == *arm* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/armv5te/eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh ; fi + - if [[ "${TOOLCHAIN}" == *arm* ]]; then sh eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh -y ; fi + - if [[ "${TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi + - if [[ "${TOOLCHAIN}" == *i386* ]]; then ./tools/buildman/buildman sandbox --fetch-arch i386 ; fi + - if [[ "${TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi + - if [[ "${TOOLCHAIN}" == *mips* ]]; then ./tools/buildman/buildman --fetch-arch mips ; fi + - if [[ "${TOOLCHAIN}" == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi + - if [[ "${TOOLCHAIN}" == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi script: # the execution sequence for each test - - echo ${TEST_CONFIG_CMD} - - ${TEST_CONFIG_CMD} - - echo ${TEST_CMD} - - ${TEST_CMD} + - if [[ "${TEST_CMD}" != "" ]]; then + ${TEST_CMD}; + fi + - if [[ "${BUILDMAN}" != "" ]]; then + tools/buildman/buildman ${BUILDMAN}; + fi matrix: include: # we need to build by vendor due to 50min time limit for builds # each env setting here is a dedicated build - env: - - TEST_CMD="./MAKEALL -a arm -v atmel" - INSTALL_TOOLCHAIN="arm" - CROSS_COMPILE="/opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-" + - BUILDMAN="arm1136" + TOOLCHAIN="arm" + - env: + - BUILDMAN="arm1136" + TOOLCHAIN="arm" + - env: + - BUILDMAN="arm1176" + TOOLCHAIN="arm" - env: - - TEST_CMD="./MAKEALL -a arm -v denx" - INSTALL_TOOLCHAIN="arm" - CROSS_COMPILE="/opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-" + - BUILDMAN="arm720t" + TOOLCHAIN="arm" - env: - - TEST_CMD="./MAKEALL -a arm -v freescale" - INSTALL_TOOLCHAIN="arm" - CROSS_COMPILE="/opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-" + - BUILDMAN="arm920t" + TOOLCHAIN="arm" - env: - - TEST_CMD="./MAKEALL -a arm -v siemens" - INSTALL_TOOLCHAIN="arm" - CROSS_COMPILE="/opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-" + - BUILDMAN="atmel -x avr32" + TOOLCHAIN="arm" - env: - - TEST_CMD="./MAKEALL -a arm -v ti" - INSTALL_TOOLCHAIN="arm" - CROSS_COMPILE="/opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi/arm-linux-gnueabi-" + - BUILDMAN="avr32" + TOOLCHAIN="avr32" - env: - - TEST_CONFIG_CMD="make sandbox_defconfig" - TEST_CMD="make -j4" - HOSTCC = "gcc" - HOSTCXX = "g++" + - BUILDMAN="davinci" + TOOLCHAIN="arm" - env: - - TEST_CONFIG_CMD="make sandbox_defconfig" - TEST_CMD="make -j4" - HOSTCC = "clang" - HOSTCXX = "clang++" + - BUILDMAN="denx" + TOOLCHAIN="arm" - env: - - TEST_CMD="./MAKEALL -a mips" - INSTALL_TOOLCHAIN="mips" - CROSS_COMPILE="/opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/mips-linux-" + - BUILDMAN="freescale -x powerpc,m68k,aarch64" + TOOLCHAIN="arm" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards arm1136" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="sandbox x86" + TOOLCHAIN="i386" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards arm1176" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="kirkwood" + TOOLCHAIN="arm" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards arm720t" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="m68k" + TOOLCHAIN="m68k" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards arm920t" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="mips" + TOOLCHAIN="mips" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards atmel -x avr32" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="mpc512x" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards avr32" - INSTALL_TOOLCHAIN="avr32" + - BUILDMAN="mpc5xx" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards davinci" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="mpc5xxx" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards denx" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="mpc8260" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards freescale -x powerpc,m68k,aarch64" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="mpc83xx" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards freescale -x arm,m68k,aarch64" - INSTALL_TOOLCHAIN="ppc" + - BUILDMAN="mpc85xx -x freescale" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards sandbox x86" - INSTALL_TOOLCHAIN="i386" + - BUILDMAN="mpc85xx -x t208xrdb -x t4qds -x t102* -x p1_p2_rdb_pc -x p1010rdb -x corenet_ds -x b4860qds -x sbc8548 -x bsc91*" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards kirkwood" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="t208xrdb t4qds t102*" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards m68k" - INSTALL_TOOLCHAIN="m68k" + - BUILDMAN="p1_p2_rdb_pc p1010rdb" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mips" - INSTALL_TOOLCHAIN="mips" + - BUILDMAN="corenet_ds b4860qds sbc8548 bsc91*" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc512x" - INSTALL_TOOLCHAIN="ppc" + - BUILDMAN="mpc86xx" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc5xx" - INSTALL_TOOLCHAIN="ppc" + - BUILDMAN="mpc8xx" + TOOLCHAIN="ppc" - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc5xxx" - INSTALL_TOOLCHAIN="ppc" - - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc8260" - INSTALL_TOOLCHAIN="ppc" - - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc83xx" - INSTALL_TOOLCHAIN="ppc" - - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc85xx" - INSTALL_TOOLCHAIN="ppc" - - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc86xx" - INSTALL_TOOLCHAIN="ppc" - - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc8xx" - INSTALL_TOOLCHAIN="ppc" - - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards siemens" - INSTALL_TOOLCHAIN="arm" - - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards ti" - INSTALL_TOOLCHAIN="arm" + - BUILDMAN="siemens" + TOOLCHAIN="arm" + - env: + - BUILDMAN="ti" + TOOLCHAIN="arm" + - env: + - BUILDMAN="aarch64" + TOOLCHAIN="aarch64" # QA jobs for code analytics # static code analysis with cppcheck (we can add --enable=all later) @@ -214,7 +176,4 @@ matrix: - env: - TEST_CMD="sloccount ." -notifications: - email: false - # TODO make it perfect ;-r -- 2.1.4

6 6

[U-Boot] do i have any chance of booting a vxworks 5.5.2 image with u-boot?
by Robert P. J. Day 04 Feb '16

04 Feb '16

i know u-boot has a "bootvx" command for booting vxworks images, but from what i read here: http://stackoverflow.com/questions/24114948/vxworks-portingdm8168 it's only vxworks 7 that supports u-boot as its bootloader. i know precious little about vxworks, i was just handed a version 5.5.2 image and asked whether it was possible for u-boot to boot it. do i have any chance whatsoever? any guidance would be useful. rday

3 3

[U-Boot] [PATCH] usb: gadget: f_thor: free the allocated out request buffer
by Michal Simek 04 Feb '16

04 Feb '16

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Fix the memory leak by freeing the allocated out request buffer Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- drivers/usb/gadget/f_thor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/usb/gadget/f_thor.c b/drivers/usb/gadget/f_thor.c index a60e9487e774..75b72902c9d5 100644 --- a/drivers/usb/gadget/f_thor.c +++ b/drivers/usb/gadget/f_thor.c @@ -51,6 +51,7 @@ DEFINE_CACHE_ALIGN_BUFFER(unsigned char, thor_rx_data_buf, DEFINE_CACHE_ALIGN_BUFFER(char, f_name, F_NAME_BUF_SIZE); static unsigned long long int thor_file_size; static int alt_setting_num; +static void *out_req_buf; static void send_rsp(const struct rsp_box *rsp) { @@ -891,6 +892,8 @@ static void thor_func_disable(struct usb_function *f) } if (dev->out_ep->driver_data) { + if (out_req_buf) + free(out_req_buf); dev->out_req->buf = NULL; usb_ep_free_request(dev->out_ep, dev->out_req); usb_ep_disable(dev->out_ep); @@ -947,6 +950,7 @@ static int thor_eps_setup(struct usb_function *f) } dev->out_req = req; + out_req_buf = dev->out_req->buf; /* ACM control EP */ ep = dev->int_ep; ep->driver_data = cdev; /* claim */ -- 1.9.1

3 2

[U-Boot] [PATCH 1/4] zynq: zc770: Remove unused ifdefs for xm011 and xm013
by Michal Simek 04 Feb '16

04 Feb '16

Clean config file. Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/zynq_zc770.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/configs/zynq_zc770.h b/include/configs/zynq_zc770.h index 32ea1f37d6a4..f49715b6cfff 100644 --- a/include/configs/zynq_zc770.h +++ b/include/configs/zynq_zc770.h @@ -17,13 +17,9 @@ #if defined(CONFIG_ZC770_XM010) # define CONFIG_ZYNQ_SDHCI0 -#elif defined(CONFIG_ZC770_XM011) - #elif defined(CONFIG_ZC770_XM012) # undef CONFIG_SYS_NO_FLASH -#elif defined(CONFIG_ZC770_XM013) - #endif #include <configs/zynq-common.h> -- 1.9.1

1 3

[U-Boot] [PATCH] api: Add FreeBSD API support for MIPS platforms
by Stanislav Galabov 04 Feb '16

04 Feb '16

This patch adds U-Boot API support (used by FreeBSD loader) for MIPS platforms. Signed-off-by: Stanislav Galabov <sgalabov(a)gmail.com> --- api/Makefile | 1 + api/api_platform-mips.c | 32 ++++++++++++++++++++++++++++++++ examples/api/Makefile | 3 +++ examples/api/crt0.S | 24 ++++++++++++++++++++++++ 4 files changed, 60 insertions(+) create mode 100644 api/api_platform-mips.c diff --git a/api/Makefile b/api/Makefile index 3c095ee..14b7608 100644 --- a/api/Makefile +++ b/api/Makefile @@ -7,3 +7,4 @@ obj-y += api.o api_display.o api_net.o api_storage.o obj-$(CONFIG_ARM) += api_platform-arm.o obj-$(CONFIG_PPC) += api_platform-powerpc.o +obj-$(CONFIG_MIPS) += api_platform-mips.o diff --git a/api/api_platform-mips.c b/api/api_platform-mips.c new file mode 100644 index 0000000..a75b0f6 --- /dev/null +++ b/api/api_platform-mips.c @@ -0,0 +1,32 @@ +/* + * (C) Copyright 2007 Stanislav Galabov <sgalabov(a)gmail.com> + * + * SPDX-License-Identifier: GPL-2.0+ + * + * This file contains routines that fetch data from bd_info sources + */ + +#include <config.h> +#include <linux/types.h> +#include <api_public.h> + +#include <asm/u-boot.h> +#include <asm/global_data.h> + +#include "api_private.h" + +DECLARE_GLOBAL_DATA_PTR; + +/* + * Important notice: handling of individual fields MUST be kept in sync with + * include/asm-generic/u-boot.h, so any changes + * need to reflect their current state and layout of structures involved! + */ +int platform_sys_info(struct sys_info *si) +{ + + platform_set_mr(si, gd->bd->bi_memstart, + gd->bd->bi_memsize, MR_ATTR_DRAM); + + return 1; +} diff --git a/examples/api/Makefile b/examples/api/Makefile index 6cf23d1..4e9b8ea 100644 --- a/examples/api/Makefile +++ b/examples/api/Makefile @@ -10,6 +10,9 @@ endif ifeq ($(ARCH),arm) LOAD_ADDR = 0x1000000 endif +ifeq ($(ARCH),mips) +LOAD_ADDR = 0x80200000 +endif # Resulting ELF and binary exectuables will be named demo and demo.bin extra-y = demo diff --git a/examples/api/crt0.S b/examples/api/crt0.S index 78d35a2..ced2c82 100644 --- a/examples/api/crt0.S +++ b/examples/api/crt0.S @@ -40,6 +40,30 @@ syscall: ldr ip, =syscall_ptr ldr pc, [ip] +#elif defined(CONFIG_MIPS) + .text + .globl __start + .ent __start +__start: + sw $sp, search_hint + b main + .end __start + + .globl syscall + .ent syscall +syscall: + sw $ra, return_addr + lw $t9, syscall_ptr + jalr $t9 + nop + lw $ra, return_addr + jr $ra + nop + .end syscall + +return_addr: + .align 4 + .long 0 #else #error No support for this arch! #endif -- 1.9.1

1 0

[U-Boot] [PATCH V2 1/4] imx: mx7dsabresd: move mmc_get_env_devno to soc code
by Peng Fan 04 Feb '16

04 Feb '16

Move mmc_get_env_devno to soc.c Introduce a weak function board_mmc_get_env_devno. Different boards can implement this according to sdhc controller which is used by the board. Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> --- Changes V2: new patch. mx7dsabresd implemented mmc_get_env_devno. So need to refactor it for patch 2/4 arch/arm/cpu/armv7/mx7/soc.c | 19 +++++++++++++++++++ board/freescale/mx7dsabresd/mx7dsabresd.c | 18 ++++-------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/arch/arm/cpu/armv7/mx7/soc.c b/arch/arm/cpu/armv7/mx7/soc.c index c777922..d0891ea 100644 --- a/arch/arm/cpu/armv7/mx7/soc.c +++ b/arch/arm/cpu/armv7/mx7/soc.c @@ -268,6 +268,25 @@ enum boot_device get_boot_device(void) return boot_dev; } +__weak int board_mmc_get_env_devno(int devno) +{ + return CONFIG_SYS_MMC_ENV_DEV; +} + +int mmc_get_env_devno(void) +{ + struct bootrom_sw_info **p = + (struct bootrom_sw_info **)ROM_SW_INFO_ADDR; + int devno = (*p)->boot_dev_instance; + u8 boot_type = (*p)->boot_dev_type; + + /* If not boot from sd/mmc, use default value */ + if ((boot_type != BOOT_TYPE_SD) && (boot_type != BOOT_TYPE_MMC)) + return CONFIG_SYS_MMC_ENV_DEV; + + return board_mmc_get_env_devno(devno); +} + void s_init(void) { #if !defined CONFIG_SPL_BUILD diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c index f8ae973..12327c2 100644 --- a/board/freescale/mx7dsabresd/mx7dsabresd.c +++ b/board/freescale/mx7dsabresd/mx7dsabresd.c @@ -293,22 +293,12 @@ static struct fsl_esdhc_cfg usdhc_cfg[3] = { {USDHC3_BASE_ADDR}, }; -static int mmc_get_env_devno(void) +int board_mmc_get_env_devno(int devno) { - struct bootrom_sw_info **p = - (struct bootrom_sw_info **)ROM_SW_INFO_ADDR; + if (devno == 2) + devno--; - u8 boot_type = (*p)->boot_dev_type; - u8 dev_no = (*p)->boot_dev_instance; - - /* If not boot from sd/mmc, use default value */ - if ((boot_type != BOOT_TYPE_SD) && (boot_type != BOOT_TYPE_MMC)) - return CONFIG_SYS_MMC_ENV_DEV; - - if (dev_no == 2) - dev_no--; - - return dev_no; + return devno; } static int mmc_map_to_kernel_blk(int dev_no) -- 2.6.2

3 6