Eric Lee / smarc-uboot

26 Jan, 2015

3 commits

21 Jan, 2015

1 commit

11 Nov, 2014

1 commit

  • 290f1f999   zynq: Use GPLed files for SPL ... Browse Code »

    The latest Xilinx tools generate ps7_init files that are explicitly
    available under GPL. Change the makefile to allow drop in of those files
    for building the SPL.

    Signed-off-by: Soren Brinkmann
    Acked-by: Jagannadha Sutradharudu Teki
    Reviewed-and-tested-by: Masahiro Yamada
    Signed-off-by: Michal Simek

    Soren Brinkmann
     

14 Sep, 2014

1 commit

  • 461be2f96   kconfig: remove redundant "string" type in arch and board Kconfigs ... Browse Code »
    43

    Now the types of CONFIG_SYS_{ARCH, CPU, SOC, VENDOR, BOARD, CONFIG_NAME}
    are specified in arch/Kconfig.

    We can delete the ones in arch and board Kconfig files.

    This commit can be easily reproduced by the following command:

    find . -name Kconfig -a ! -path ./arch/Kconfig | xargs sed -i -e '
    /config[[:space:]]SYS_\(ARCH\|CPU\|SOC\|\VENDOR\|BOARD\|CONFIG_NAME\)/ {
    N
    s/\n[[:space:]]*string//
    }
    '

    Signed-off-by: Masahiro Yamada

    Masahiro Yamada
     

31 Aug, 2014

1 commit

30 Jul, 2014

2 commits

  • 93d4334f7   Add board MAINTAINERS files ... Browse Code »

    We have switched to Kconfig and the boards.cfg file is going to
    be removed. We have to retrieve the board status and maintainers
    information from it.

    The MAINTAINERS format as in Linux Kernel would be nice
    because we can crib the scripts/get_maintainer.pl script.

    After some discussion, we chose to put a MAINTAINERS file under each
    board directory, not the top-level one because we want to collect
    relevant information for a board into a single place.

    TODO:
    Modify get_maintainer.pl to scan multiple MAINTAINERS files.

    Signed-off-by: Masahiro Yamada
    Suggested-by: Tom Rini
    Acked-by: Simon Glass

    Masahiro Yamada
     
  • dd84058d2   kconfig: add board Kconfig and defconfig files ... Browse Code »

    This commit adds:
    - arch/${ARCH}/Kconfig
    provide a menu to select target boards
    - board/${VENDOR}/${BOARD}/Kconfig or board/${BOARD}/Kconfig
    set CONFIG macros to the appropriate values for each board
    - configs/${TARGET_BOARD}_defconfig
    default setting of each board

    (This commit was automatically generated by a conversion script
    based on boards.cfg)

    In Linux Kernel, defconfig files are located under
    arch/${ARCH}/configs/ directory.
    It works in Linux Kernel since ARCH is always given from the
    command line for cross compile.

    But in U-Boot, ARCH is not given from the command line.
    Which means we cannot know ARCH until the board configuration is done.
    That is why all the "*_defconfig" files should be gathered into a
    single directory ./configs/.

    Signed-off-by: Masahiro Yamada
    Acked-by: Simon Glass

    Masahiro Yamada
     

23 Jul, 2014

1 commit

  • 327474915   zynq: disable -Wstrict-prototypes option for ps7_init.c ... Browse Code »

    The files ps7_init.c and ps7_init.h are supposed to be generated by
    hw projects such as Vivado, PlanAhead and then to be copied into
    board/xilinx/zynq directory.

    But some prototypes in them cause annoying warning messages:

    CC spl/board/xilinx/zynq/ps7_init.o
    In file included from board/xilinx/zynq/ps7_init.c:50:0:
    board/xilinx/zynq/ps7_init.h:137:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
    board/xilinx/zynq/ps7_init.h:138:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
    board/xilinx/zynq/ps7_init.h:139:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
    board/xilinx/zynq/ps7_init.h:145:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
    board/xilinx/zynq/ps7_init.c:12602:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
    board/xilinx/zynq/ps7_init.c:12723:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
    board/xilinx/zynq/ps7_init.c:12742:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
    board/xilinx/zynq/ps7_init.c:12761:1: warning: function declaration isn't a prototype [-Wstrict-prototypes]
    board/xilinx/zynq/ps7_init.c:12854:6: warning: function declaration isn't a prototype [-Wstrict-prototypes]

    The prototypes should be

    int ps7_init(void);
    int ps7_post_config(void);
    int ps7_debug(void);

    rather than

    int ps7_init();
    int ps7_post_config();
    int ps7_debug();

    We do not want to be bothered because of automatically generated files.
    But we cannot touch the external projects for now.
    What we can do is to disable -Wstrict-prototypes for ps7_init.c

    Signed-off-by: Masahiro Yamada
    Cc: Michal Simek
    Tested-by: Michal Simek
    Signed-off-by: Michal Simek

    Masahiro Yamada
     

14 May, 2014

4 commits

  • 66e6715c5   zynq: treat ps7_init.c/h as external files to ignore them ... Browse Code »

    ps7_init.c and ps7_init.h are supposed to be exported by hw project
    and copied to board/xilinx/zynq/ directory.

    We want them to be ignored by git.
    So what we should do is to always treat them as external files
    rather than replacing ps7_init.c

    This commit does:

    - Move a weak function ps7_init() to arch/arm/cpu/armv7/zynq/spl.c
    and delete board/xilinx/zynq/ps7_init.c

    - Compile board/xilinx/zynq/ps7_init.c only when it exists

    - Add .gitignore to ignore ps7_init.c/h

    Signed-off-by: Masahiro Yamada
    Signed-off-by: Michal Simek

    Masahiro Yamada
     
  • f05862d7b   zynq: add empty xil_io.h to avoid compile error ... Browse Code »

    ps7_init.c exported by hw project has #include "xil_io.h" line
    but U-Boot does not have "xil_io.h".

    So we get an error on SPL build:
    ps7_init.c:12581:20: fatal error: xil_io.h: No such file or directory

    We can delete the include directive in ps7_init.c to avoid this error.
    But it is painful to do this every time we export ps7_init.c file.

    Instead, we can put an empty xil_io.h in the same directory
    so we can directly copy ps7_init.c as is.

    Signed-off-by: Masahiro Yamada
    Acked-by: Tom Rini
    Signed-off-by: Michal Simek

    Masahiro Yamada
     
  • 0b680206c   ARM: zynq: Fix building SPL without FPGA support ... Browse Code »

    When CONFIG_FPGA is defined but CONFIG_SPL_FPGA is not, the build fails:
    board.c: In function 'board_init':
    board.c:41:3: error: 'fpga' undeclared (first use in this function)
    fpga = fpga010;

    Fix this by expanding the "#if.." around this block to match the other
    FPGA checks and don't compile this block when buildign for SPL without
    FPGA support.

    Tested a bootloader that had CONFIG_FPGA defined without CONFIG_SPL_FPGA,
    this now compiles without errors and loading FPGA from u-boot works.

    Signed-off-by: Mike Looijmans
    Signed-off-by: Michal Simek

    Michal Simek
     
  • 5b73caffe   ARM: zynq: Remove sparse warnings ... Browse Code »

    Warnings:
    board/xilinx/zynq/board.c:17:13: warning: symbol 'fpga' was not declared. Should it be static?
    board/xilinx/zynq/board.c:20:13: warning: symbol 'fpga010' was not declared. Should it be static?
    board/xilinx/zynq/board.c:21:13: warning: symbol 'fpga015' was not declared. Should it be static?
    board/xilinx/zynq/board.c:22:13: warning: symbol 'fpga020' was not declared. Should it be static?
    board/xilinx/zynq/board.c:23:13: warning: symbol 'fpga030' was not declared. Should it be static?
    board/xilinx/zynq/board.c:24:13: warning: symbol 'fpga045' was not declared. Should it be static?
    board/xilinx/zynq/board.c:25:13: warning: symbol 'fpga100' was not declared. Should it be static?
    board/xilinx/zynq/board.c:120:5: warning: symbol 'board_mmc_init' was not declared. Should it be static?

    Signed-off-by: Michal Simek

    Michal Simek
     

13 May, 2014

1 commit

13 Mar, 2014

1 commit

  • 01286329b   kbuild: rename SRCTREE to srctree ... Browse Code »

    Prior to Kbuild, $(TOPDIR) or $(SRCTREE) was used for
    pointing to the top of source directory.
    (No difference between the two.)

    In Kbuild style, $(srctree) is used for instead.
    This commit renames SRCTREE to srctree and deletes the
    defition of SRCTREE.

    Note that SRCTREE in scripts/kernel-doc, scripts/docproc.c,
    doc/DocBook/Makefile should be keep.

    Signed-off-by: Masahiro Yamada

    Masahiro Yamada
     

07 Mar, 2014

1 commit

04 Mar, 2014

1 commit

20 Feb, 2014

2 commits

  • 3e1135025   Merge branch 'u-boot/master' into 'u-boot-arm/master' ... Browse Code »

    Conflicts:
    Makefile
    drivers/net/npe/Makefile

    These two conflicts arise from commit 0b2d3f20
    ("ARM: NET: Remove the IXP NPE ethernet driver") and are
    resolved by deleting the drivers/net/npe/Makefile file
    and removing the CONFIG_IXP4XX_NPE line from Makefile.

    Albert ARIBAUD
     
  • 5ab502cb8   dts: move device tree sources to arch/$(ARCH)/dts/ ... Browse Code »

    Unlike Linux Kernel, U-Boot historically had *.dts files under
    board/$(VENDOR)/dts/ and *.dtsi files under arch/$(ARCH)/dts/.

    I think arch/$(ARCH)/dts dicretory is a better location
    to store both *.dts and *.dtsi files.

    For example, before this commit, board/xilinx/dts directory
    had both Microblaze dts (microblaze-generic.dts) and
    ARM dts (zynq-*.dts), which are totally unrelated.

    This commit moves *.dts to arch/$(ARCH)/dts/ directories,
    allowing us to describe nicely mutiple DTBs generation in the next commit.

    Signed-off-by: Masahiro Yamada

    Masahiro Yamada
     

19 Feb, 2014

4 commits

06 Feb, 2014

1 commit

10 Jan, 2014

3 commits

  • 9e0802bf8   dts: zynq: Add more zynq dts files ... Browse Code »

    This patch adds initial dts support for supported
    zynq boards.

    Signed-off-by: Jagannadha Sutradharudu Teki

    Jagannadha Sutradharudu Teki
     
  • f8f36c5dd   dts: zynq: Add basic fdt support ... Browse Code »

    This patch provides a basic fdt support for zynq u-boot.

    zynq-7000.dtsi-> initial arch dts file
    zynq-zed.dts -> initial zed board dts file
    more devices should be added in subsequent patches.

    u-boot build: once configuring of a board done
    for building dtb with zynq-zed.dts as an input
    zynq-uboot> make DEVICE_TREE=zynq-zed

    Enabled CONFIG_OF_SEPARATE for building dtb separately.
    There is a new binary called u-boot-dtb.bin which is a u-boot
    with devicetree supported.

    Signed-off-by: Jagannadha Sutradharudu Teki

    Jagannadha Sutradharudu Teki
     
  • b3de92495   zynq: Add support to find bootmode ... Browse Code »

    Added support to find the bootmodes by reading
    slcr bootmode register. this can be helpful to
    autoboot the configurations w.r.t a specified bootmode.

    Added this functionality on board_late_init as it's not
    needed for normal initializtion part.

    Signed-off-by: Jagannadha Sutradharudu Teki

    Jagannadha Sutradharudu Teki
     

18 Nov, 2013

1 commit

01 Nov, 2013

3 commits

15 Oct, 2013

1 commit

03 Sep, 2013

1 commit

12 Aug, 2013

3 commits

03 Aug, 2013

1 commit

24 Jul, 2013

1 commit

30 May, 2013

1 commit