January 2016 - U-Boot

[U-Boot] Converting serial_s3c24x0.c to driver model
by Simon Glass 05 Feb '16

05 Feb '16

Hi David, I'm sorry if you have not heard about this before. I sent out an email to all maintainers some months ago. You are listed as the maintainer of a few boards which use the serial_s3c24x0.c serial driver. We are trying to convert all of these drivers to driver model. Please see doc/driver-model/serial-howto.txt. Do you have an update please? Regards, Simon

4 5

[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] [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 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

[U-Boot] [PATCH v3] Enable snooping on transactions from CAAM block
by Aneesh Bansal 03 Feb '16

03 Feb '16

To enable snooping on CAAM transactions following programming is done 1. Enable core snooping (CCI interface, Core is Slave5 on CCI) This setting is also required for making the system coherent 2. CAAM IP lies behind SMMU3 in the system. Configure SMMU3 to do the following: a) Program SCR to bypass transactions with stream ID other than that of CAAM b) Program S2CR to change memroy attributes of transactions with CAAM's stream ID (0x10) to cacheable. Signed-off-by: Ruchika Gupta <ruchika.gupta(a)nxp.com> Signed-off-by: Nitesh Narayan Lal <nitesh.lal(a)nxp.com> Signed-off-by: Aneesh Bansal <aneesh.bansal(a)nxp.com> --- Changes in v3: Modified the commit message. Changes in v2: Avoid mixing the use of u32 and uint32_t. Using uint32_t at all places. arch/arm/include/asm/arch-ls102xa/config.h | 1 + .../include/asm/arch-ls102xa/ls102xa_stream_id.h | 34 ++++++++++++++++++++ board/freescale/common/ls102xa_stream_id.c | 36 +++++++++++++++++++++- board/freescale/ls1021aqds/ls1021aqds.c | 4 +++ board/freescale/ls1021atwr/ls1021atwr.c | 4 +++ 5 files changed, 78 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index f066480..f14ea2f 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -38,6 +38,7 @@ #define CONFIG_SYS_LS102XA_XHCI_USB1_ADDR (CONFIG_SYS_IMMR + 0x02100000) #define CONFIG_SYS_LS102XA_USB1_ADDR \ (CONFIG_SYS_IMMR + CONFIG_SYS_LS102XA_USB1_OFFSET) +#define CONFIG_SYS_SMMU3_ADDR (CONFIG_SYS_IMMR + 0x300000) #define CONFIG_SYS_FSL_SEC_OFFSET 0x00700000 #define CONFIG_SYS_LS102XA_USB1_OFFSET 0x07600000 diff --git a/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h index fa571b3..68e4e02 100644 --- a/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h +++ b/arch/arm/include/asm/arch-ls102xa/ls102xa_stream_id.h @@ -6,6 +6,39 @@ #ifndef __FSL_LS102XA_STREAM_ID_H_ #define __FSL_LS102XA_STREAM_ID_H_ +#define CONFIG_SMMU_NSCR_OFFSET 0x400 +#define CONFIG_SMMU_SMR_OFFSET 0x800 +#define CONFIG_SMMU_S2CR_OFFSET 0xc00 + +#define SMMU_NSCR_CLIENTPD_SHIFT 0 +#define SMMU_NSCR_MTCFG_SHIFT 20 + +#define SMR_SMR_VALID_SHIFT 31 +#define SMR_ID_MASK 0x7fff +#define SMR_MASK_SHIFT 16 + +#define S2CR_WACFG_SHIFT 22 +#define S2CR_WACFG_MASK 0x3 +#define S2CR_WACFG_WRITE_ALLOCATE 0x2 + +#define S2CR_RACFG_SHIFT 20 +#define S2CR_RACFG_MASK 0x3 +#define S2CR_RACFG_READ_ALLOCATE 0x2 + +#define S2CR_TYPE_SHIFT 16 +#define S2CR_TYPE_MASK 0x3 +#define S2CR_TYPE_BYPASS 0x01 + +#define S2CR_MEM_ATTR_SHIFT 12 +#define S2CR_MEM_ATTR_MASK 0xf +#define S2CR_MEM_ATTR_CACHEABLE 0xa + +#define S2CR_MTCFG 0x00000800 + +#define S2CR_SHCFG_SHIFT 8 +#define S2CR_SHCFG_MASK 0x3 +#define S2CR_SHCFG_OUTER_CACHEABLE 0x1 +#define S2CR_SHCFG_INNER_CACHEABLE 0x2 #include <fsl_sec.h> @@ -71,4 +104,5 @@ struct smmu_stream_id { void ls1021x_config_caam_stream_id(struct liodn_id_table *tbl, int size); void ls102xa_config_smmu_stream_id(struct smmu_stream_id *id, uint32_t num); +void ls1021x_config_smmu3(uint32_t liodn); #endif diff --git a/board/freescale/common/ls102xa_stream_id.c b/board/freescale/common/ls102xa_stream_id.c index f434269..9ae29b8 100644 --- a/board/freescale/common/ls102xa_stream_id.c +++ b/board/freescale/common/ls102xa_stream_id.c @@ -20,7 +20,7 @@ void ls102xa_config_smmu_stream_id(struct smmu_stream_id *id, uint32_t num) void ls1021x_config_caam_stream_id(struct liodn_id_table *tbl, int size) { int i; - u32 liodn; + uint32_t liodn; for (i = 0; i < size; i++) { if (tbl[i].num_ids == 2) @@ -31,3 +31,37 @@ void ls1021x_config_caam_stream_id(struct liodn_id_table *tbl, int size) out_le32((uint32_t *)(tbl[i].reg_offset), liodn); } } + +void ls1021x_config_smmu3(uint32_t liodn) +{ + uint32_t *addr; + uint32_t smr, s2cr, nscr; + + addr = (uint32_t *)(CONFIG_SYS_SMMU3_ADDR + CONFIG_SMMU_NSCR_OFFSET); + /* SMMU NSCR configuration */ + nscr = in_le32(addr); + + nscr = nscr & ~(1 << SMMU_NSCR_CLIENTPD_SHIFT | + 1 << SMMU_NSCR_MTCFG_SHIFT); + out_le32(addr, nscr); + + /* SMMU SMR configuration */ + addr = (uint32_t *)(CONFIG_SYS_SMMU3_ADDR + CONFIG_SMMU_SMR_OFFSET); + + smr = 0; + smr = smr & (~(SMR_ID_MASK << SMR_MASK_SHIFT)); + smr = smr | (1 << SMR_SMR_VALID_SHIFT) | liodn; + + out_le32(addr, smr); + + /* SMMU S2CR configuration */ + addr = (uint32_t *)(CONFIG_SYS_SMMU3_ADDR + CONFIG_SMMU_S2CR_OFFSET); + s2cr = (S2CR_WACFG_WRITE_ALLOCATE << S2CR_WACFG_SHIFT) | + (S2CR_RACFG_READ_ALLOCATE << S2CR_RACFG_SHIFT) | + (S2CR_TYPE_BYPASS << S2CR_TYPE_SHIFT) | + (S2CR_MEM_ATTR_CACHEABLE << S2CR_MEM_ATTR_SHIFT) | + S2CR_MTCFG | + (S2CR_SHCFG_OUTER_CACHEABLE << S2CR_SHCFG_SHIFT); + + out_le32(addr, s2cr); +} diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index be3358a..ca1ea61 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -481,6 +481,10 @@ int board_init(void) ARRAY_SIZE(sec_liodn_tbl)); ls102xa_config_smmu_stream_id(dev_stream_id, ARRAY_SIZE(dev_stream_id)); + /* Configure SMMU3 to make transactions with CAAM stream ID + * as cacheable + */ + ls1021x_config_smmu3(0x10); #ifdef CONFIG_LAYERSCAPE_NS_ACCESS enable_layerscape_ns_access(); diff --git a/board/freescale/ls1021atwr/ls1021atwr.c b/board/freescale/ls1021atwr/ls1021atwr.c index 8eaff5f..ae62bca 100644 --- a/board/freescale/ls1021atwr/ls1021atwr.c +++ b/board/freescale/ls1021atwr/ls1021atwr.c @@ -528,6 +528,10 @@ int board_init(void) ARRAY_SIZE(sec_liodn_tbl)); ls102xa_config_smmu_stream_id(dev_stream_id, ARRAY_SIZE(dev_stream_id)); + /* Configure SMMU3 to make transactions with CAAM stream ID + * as cacheable + */ + ls1021x_config_smmu3(0x10); #ifdef CONFIG_LAYERSCAPE_NS_ACCESS enable_layerscape_ns_access(); -- 1.8.1.4

3 3

[U-Boot] [PATCHv4 0/9] Migrate NXP/Freescale Vybrid based boards to support pure DT
by Bhuvanchandra DV 02 Feb '16

02 Feb '16

Changes since v3: - Add missing space in device tree. - Reorder the patchset to avoid broken state. 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: 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 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 +++++++++ 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, 131 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

2 11

[U-Boot] [PATCH] imx: mx6sxsabresd: Add MCIMX28LCD display support
by Ye Li 02 Feb '16

02 Feb '16

The i.MX6SX SABRESD board supports MCIMX28LCD (800x480x24) at LCDIF1 port, enable this display feature by adding relevant BSP codes and configurations. Signed-off-by: Ye Li <ye.li(a)nxp.com> --- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 61 +++++++++++++++++++++++++++ include/configs/mx6sxsabresd.h | 20 +++++++++ 2 files changed, 81 insertions(+), 0 deletions(-) diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c index 56dc020..886c883 100644 --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c @@ -59,6 +59,9 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \ PAD_CTL_ODE) +#define LCD_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_UP | PAD_CTL_PUE | \ + PAD_CTL_PKE | PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm) + int dram_init(void) { gd->ram_size = PHYS_SDRAM_SIZE; @@ -458,6 +461,60 @@ int board_qspi_init(void) } #endif +#ifdef CONFIG_VIDEO_MXS +static iomux_v3_cfg_t const lcd_pads[] = { + MX6_PAD_LCD1_CLK__LCDIF1_CLK | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_ENABLE__LCDIF1_ENABLE | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_HSYNC__LCDIF1_HSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_VSYNC__LCDIF1_VSYNC | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA00__LCDIF1_DATA_0 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA01__LCDIF1_DATA_1 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA02__LCDIF1_DATA_2 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA03__LCDIF1_DATA_3 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA04__LCDIF1_DATA_4 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA05__LCDIF1_DATA_5 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA06__LCDIF1_DATA_6 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA07__LCDIF1_DATA_7 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA08__LCDIF1_DATA_8 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA09__LCDIF1_DATA_9 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA10__LCDIF1_DATA_10 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA11__LCDIF1_DATA_11 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA12__LCDIF1_DATA_12 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA13__LCDIF1_DATA_13 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA14__LCDIF1_DATA_14 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA15__LCDIF1_DATA_15 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA16__LCDIF1_DATA_16 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA17__LCDIF1_DATA_17 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA18__LCDIF1_DATA_18 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA19__LCDIF1_DATA_19 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA20__LCDIF1_DATA_20 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA21__LCDIF1_DATA_21 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA22__LCDIF1_DATA_22 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_DATA23__LCDIF1_DATA_23 | MUX_PAD_CTRL(LCD_PAD_CTRL), + MX6_PAD_LCD1_RESET__GPIO3_IO_27 | MUX_PAD_CTRL(NO_PAD_CTRL), + + /* Use GPIO for Brightness adjustment, duty cycle = period */ + MX6_PAD_SD1_DATA2__GPIO6_IO_4 | MUX_PAD_CTRL(NO_PAD_CTRL), +}; + +static int setup_lcd(void) +{ + enable_lcdif_clock(LCDIF1_BASE_ADDR); + + imx_iomux_v3_setup_multiple_pads(lcd_pads, ARRAY_SIZE(lcd_pads)); + + /* Reset the LCD */ + gpio_direction_output(IMX_GPIO_NR(3, 27) , 0); + udelay(500); + gpio_direction_output(IMX_GPIO_NR(3, 27) , 1); + + /* Set Brightness to high */ + gpio_direction_output(IMX_GPIO_NR(6, 4) , 1); + + return 0; +} +#endif + int board_init(void) { /* Address of boot parameters */ @@ -471,6 +528,10 @@ int board_init(void) board_qspi_init(); #endif +#ifdef CONFIG_VIDEO_MXS + setup_lcd(); +#endif + return 0; } diff --git a/include/configs/mx6sxsabresd.h b/include/configs/mx6sxsabresd.h index 0aec296..29e9c08 100644 --- a/include/configs/mx6sxsabresd.h +++ b/include/configs/mx6sxsabresd.h @@ -36,6 +36,7 @@ "fdt_addr=0x88000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ + "videomode=video=ctfb:x:800,y:480,depth:24,pclk:29850,le:89,ri:164,up:23,lo:10,hs:10,vs:10,sync:0,vmode:0\0" \ "mmcdev=2\0" \ "mmcpart=1\0" \ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ @@ -195,6 +196,25 @@ #define FSL_QSPI_FLASH_NUM 2 #endif +#ifndef CONFIG_SPL_BUILD +#define CONFIG_VIDEO +#ifdef CONFIG_VIDEO +#define CONFIG_CFB_CONSOLE +#define CONFIG_VIDEO_MXS +#define CONFIG_VIDEO_LOGO +#define CONFIG_VIDEO_SW_CURSOR +#define CONFIG_VGA_AS_SINGLE_DEVICE +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SPLASH_SCREEN +#define CONFIG_SPLASH_SCREEN_ALIGN +#define CONFIG_CMD_BMP +#define CONFIG_BMP_16BPP +#define CONFIG_VIDEO_BMP_RLE8 +#define CONFIG_VIDEO_BMP_LOGO +#define MXS_LCDIF_BASE MX6SX_LCDIF1_BASE_ADDR +#endif +#endif + #define CONFIG_ENV_OFFSET (8 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K #define CONFIG_ENV_IS_IN_MMC -- 1.7.4.1

2 1

[U-Boot] [PATCH 1/2] imx: mx6sx: Fix issue in LCDIF clock enablement
by Ye Li 02 Feb '16

02 Feb '16

Wrong checking for the base_addr paramter with LCDIF1 and LCDIF2. Always enter the -EINVAL return. Signed-off-by: Ye Li <ye.li(a)nxp.com> --- arch/arm/cpu/armv7/mx6/clock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index 27a3f2f..007204d 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -742,8 +742,8 @@ int enable_lcdif_clock(u32 base_addr) u32 lcdif_clk_sel_mask, lcdif_ccgr3_mask; if (is_cpu_type(MXC_CPU_MX6SX)) { - if ((base_addr == LCDIF1_BASE_ADDR) || - (base_addr == LCDIF2_BASE_ADDR)) { + if ((base_addr != LCDIF1_BASE_ADDR) && + (base_addr != LCDIF2_BASE_ADDR)) { puts("Wrong LCD interface!\n"); return -EINVAL; } -- 1.7.4.1

2 5

[U-Boot] [PATCH V2] imx: MX6DQ{P}/DL:SABRESD Fix bmode eMMC failure
by Peng Fan 02 Feb '16

02 Feb '16

From: Ye Li <ye.li(a)nxp.com> The BOOTCFG value used by bmode for SABRESD eMMC boot are actually for SD card. Fixed the value to correct one. Signed-off-by: Ye Li <ye.li(a)nxp.com> Signed-off-by: Peng Fan <peng.fan(a)nxp.com> Reviewed-by: Stefano Babic <sbabic(a)denx.de> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> --- Change V2: Fix commit log, following Fabio's comments. board/freescale/mx6sabresd/mx6sabresd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index d20953d..42f89ab 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -638,7 +638,7 @@ static const struct boot_mode board_boot_modes[] = { {"sd2", MAKE_CFGVAL(0x40, 0x28, 0x00, 0x00)}, {"sd3", MAKE_CFGVAL(0x40, 0x30, 0x00, 0x00)}, /* 8 bit bus width */ - {"emmc", MAKE_CFGVAL(0x40, 0x38, 0x00, 0x00)}, + {"emmc", MAKE_CFGVAL(0x60, 0x58, 0x00, 0x00)}, {NULL, 0}, }; #endif -- 2.6.2

3 2