Conflicts:
include/configs/axs101.h
Signed-off-by:
Tom Rini <trini@konsulko.com>
Showing
- arch/arm/dts/socfpga_cyclone5_socdk.dts 4 additions, 0 deletionsarch/arm/dts/socfpga_cyclone5_socdk.dts
- arch/arm/mach-socfpga/include/mach/reset_manager.h 2 additions, 1 deletionarch/arm/mach-socfpga/include/mach/reset_manager.h
- arch/arm/mach-socfpga/misc.c 15 additions, 2 deletionsarch/arm/mach-socfpga/misc.c
- arch/arm/mach-socfpga/spl.c 1 addition, 0 deletionsarch/arm/mach-socfpga/spl.c
- board/altera/cyclone5-socdk/qts/pinmux_config.h 34 additions, 34 deletionsboard/altera/cyclone5-socdk/qts/pinmux_config.h
- board/altera/cyclone5-socdk/qts/pll_config.h 2 additions, 2 deletionsboard/altera/cyclone5-socdk/qts/pll_config.h
- board/spear/spear600/spear600.c 0 additions, 3 deletionsboard/spear/spear600/spear600.c
- configs/socfpga_arria5_defconfig 2 additions, 0 deletionsconfigs/socfpga_arria5_defconfig
- configs/socfpga_cyclone5_defconfig 2 additions, 0 deletionsconfigs/socfpga_cyclone5_defconfig
- configs/socfpga_sr1500_defconfig 1 addition, 0 deletionsconfigs/socfpga_sr1500_defconfig
- drivers/net/Kconfig 1 addition, 0 deletionsdrivers/net/Kconfig
- drivers/net/designware.c 7 additions, 11 deletionsdrivers/net/designware.c
- include/configs/axs101.h 0 additions, 6 deletionsinclude/configs/axs101.h
- include/configs/bf609-ezkit.h 0 additions, 1 deletioninclude/configs/bf609-ezkit.h
- include/configs/galileo.h 0 additions, 1 deletioninclude/configs/galileo.h
- include/configs/socfpga_arria5_socdk.h 6 additions, 6 deletionsinclude/configs/socfpga_arria5_socdk.h
- include/configs/socfpga_common.h 67 additions, 2 deletionsinclude/configs/socfpga_common.h
- include/configs/socfpga_cyclone5_socdk.h 6 additions, 6 deletionsinclude/configs/socfpga_cyclone5_socdk.h
- include/configs/socfpga_de0_nano_soc.h 0 additions, 2 deletionsinclude/configs/socfpga_de0_nano_soc.h
- include/configs/socfpga_mcvevk.h 0 additions, 2 deletionsinclude/configs/socfpga_mcvevk.h
Loading
Please register or sign in to comment