Changes in v2: - Rebase on the top of u-boot-socfpga/master (commit b284d268a)
Masahiro Yamada (6): 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 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 +++++++++++++++++++ .../{cpu/armv7/socfpga => mach-socfpga}/Makefile | 0 .../armv7/socfpga => mach-socfpga}/clock_manager.c | 0 .../armv7/socfpga => mach-socfpga}/fpga_manager.c | 0 .../socfpga => mach-socfpga}/freeze_controller.c | 0 .../include/mach}/clock_manager.h | 0 .../include/mach}/dwmmc.h | 0 .../include/mach}/fpga_manager.h | 0 .../include/mach}/freeze_controller.h | 0 .../include/mach}/gpio.h | 0 .../include/mach}/nic301.h | 0 .../include/mach}/reset_manager.h | 0 .../include/mach}/scan_manager.h | 0 .../include/mach}/scu.h | 0 .../include/mach}/sdram.h | 0 .../include/mach}/socfpga_base_addrs.h | 0 .../include/mach}/system_manager.h | 0 .../include/mach}/timer.h | 0 .../arm/{cpu/armv7/socfpga => mach-socfpga}/misc.c | 0 .../armv7/socfpga => mach-socfpga}/reset_manager.c | 0 .../armv7/socfpga => mach-socfpga}/scan_manager.c | 0 arch/arm/{cpu/armv7/socfpga => mach-socfpga}/spl.c | 0 .../socfpga => mach-socfpga}/system_manager.c | 0 .../{cpu/armv7/socfpga => mach-socfpga}/timer.c | 0 .../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 + include/configs/socfpga_common.h | 4 +-- 36 files changed, 39 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 -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot