From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Vasut Date: Fri, 8 May 2015 00:58:47 +0200 Subject: [U-Boot] [PULL] u-boot-socfpga/master Message-ID: <201505080058.47652.marex@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de The following changes since commit 905e8f9e53766e606bd4a0ed46d804889e613f32: Prepare v2015.07-rc1 (2015-05-05 19:52:15 -0400) are available in the git repository at: git://git.denx.de/u-boot-socfpga.git HEAD for you to fetch changes up to 57cc4e64c13bc5f42cb5e8572d2c46e25cf7aea1: git-mailrc: add Dinh Nguyen as a contact for SoCFPGA (2015-05-08 00:57:31 +0200) ---------------------------------------------------------------- Dinh Nguyen (1): git-mailrc: add Dinh Nguyen as a contact for SoCFPGA Masahiro Yamada (7): ARM: socfpga: do not add board directory to header search path ARM: socfpga: remove redundant config.mk ARM: socfpga: move board select into mach-socfpga/Kconfig ARM: socfpga: move SoC sources to mach-socfpga ARM: socfpga: move SoC headers to mach-socfpga/include/mach ARM: socfpga: abolish CONFIG_SOCFPGA git-mailrc: add Marek as SOCFPGA maintainer arch/arm/Kconfig | 15 ++++----------- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 3 +-- arch/arm/cpu/armv7/socfpga/config.mk | 11 ----------- arch/arm/dts/Makefile | 2 +- arch/arm/mach-socfpga/Kconfig | 27 +++++++++++++++++++++++++++ arch/arm/{cpu/armv7/socfpga => mach-socfpga}/Makefile | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/clock_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/fpga_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/freeze_controller.c | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/clock_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/dwmmc.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/fpga_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/freeze_controller.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/gpio.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/nic301.h | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/reset_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scan_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scu.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/sdram.h | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/socfpga_base_addrs.h | 0 arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/system_manager.h | 0 arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/timer.h | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/reset_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/scan_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/system_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/timer.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/u-boot-spl.lds | 0 board/altera/socfpga/Kconfig | 31 ------------------------------- board/altera/socfpga/iocsr_config.c | 2 +- configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_socrates_defconfig | 1 + doc/git-mailrc | 1 + include/configs/socfpga_common.h | 4 +--- 37 files changed, 40 insertions(+), 60 deletions(-) delete mode 100644 arch/arm/cpu/armv7/socfpga/config.mk create mode 100644 arch/arm/mach-socfpga/Kconfig rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/Makefile (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/clock_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/fpga_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/freeze_controller.c (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/clock_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/dwmmc.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/fpga_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/freeze_controller.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/nic301.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/reset_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/scan_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/scu.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/sdram.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/socfpga_base_addrs.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach- socfpga/include/mach}/system_manager.h (100%) rename arch/arm/{include/asm/arch-socfpga => mach-socfpga/include/mach}/timer.h (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/reset_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/scan_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/system_manager.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/timer.c (100%) rename arch/arm/{cpu/armv7/socfpga => mach-socfpga}/u-boot-spl.lds (100%) delete mode 100644 board/altera/socfpga/Kconfig