The board/altera/socfpga directory is not a generic SoCFPGA machine anymore, but instead it represents the Altera SoCDK board. To make matters more complicated, it represents both CycloneV and ArriaV variant.
On the other hand, nowadays, the content of this board directory is mostly comprised of QTS-generated header files, while all the generic code is in arch/arm/mach-socfpga already.
Thus, this patch splits the board/altera/socfpga into a separate board directory for ArriaV SoCDK and CycloneV SoCDK, so that each can be populated with the correct QTS-generated header files for that particular board.
Signed-off-by: Marek Vasut marex@denx.de --- arch/arm/mach-socfpga/Kconfig | 4 ++-- board/altera/{socfpga => arria5-socdk}/MAINTAINERS | 0 board/altera/{socfpga => arria5-socdk}/Makefile | 0 board/altera/{socfpga => arria5-socdk}/qts/iocsr_config.c | 0 board/altera/{socfpga => arria5-socdk}/qts/iocsr_config.h | 0 board/altera/{socfpga => arria5-socdk}/qts/pinmux_config.c | 0 board/altera/{socfpga => arria5-socdk}/qts/pinmux_config.h | 0 board/altera/{socfpga => arria5-socdk}/qts/pll_config.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sdram_config.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto_ac_init.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto_inst_init.h | 0 board/altera/{socfpga => arria5-socdk}/qts/sequencer_defines.h | 0 board/altera/{socfpga => arria5-socdk}/socfpga.c | 0 board/altera/{socfpga => cyclone5-socdk}/MAINTAINERS | 0 board/altera/{socfpga => cyclone5-socdk}/Makefile | 0 board/altera/{socfpga => cyclone5-socdk}/qts/iocsr_config.c | 0 board/altera/{socfpga => cyclone5-socdk}/qts/iocsr_config.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/pinmux_config.c | 0 board/altera/{socfpga => cyclone5-socdk}/qts/pinmux_config.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/pll_config.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/sdram_config.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto_ac_init.h | 0 .../altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto_inst_init.h | 0 board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_defines.h | 0 board/altera/{socfpga => cyclone5-socdk}/socfpga.c | 0 27 files changed, 2 insertions(+), 2 deletions(-) copy board/altera/{socfpga => arria5-socdk}/MAINTAINERS (100%) copy board/altera/{socfpga => arria5-socdk}/Makefile (100%) copy board/altera/{socfpga => arria5-socdk}/qts/iocsr_config.c (100%) copy board/altera/{socfpga => arria5-socdk}/qts/iocsr_config.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/pinmux_config.c (100%) copy board/altera/{socfpga => arria5-socdk}/qts/pinmux_config.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/pll_config.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sdram_config.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto_ac_init.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sequencer_auto_inst_init.h (100%) copy board/altera/{socfpga => arria5-socdk}/qts/sequencer_defines.h (100%) copy board/altera/{socfpga => arria5-socdk}/socfpga.c (100%) rename board/altera/{socfpga => cyclone5-socdk}/MAINTAINERS (100%) rename board/altera/{socfpga => cyclone5-socdk}/Makefile (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/iocsr_config.c (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/iocsr_config.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/pinmux_config.c (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/pinmux_config.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/pll_config.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sdram_config.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto_ac_init.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_auto_inst_init.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/qts/sequencer_defines.h (100%) rename board/altera/{socfpga => cyclone5-socdk}/socfpga.c (100%)
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index 1a441ff..690e362 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -21,8 +21,8 @@ config TARGET_SOCFPGA_CYCLONE5_SOCDK endchoice
config SYS_BOARD - default "socfpga" if TARGET_SOCFPGA_ARRIA5_SOCDK - default "socfpga" if TARGET_SOCFPGA_CYCLONE5_SOCDK + default "arria5-socdk" if TARGET_SOCFPGA_ARRIA5_SOCDK + default "cyclone5-socdk" if TARGET_SOCFPGA_CYCLONE5_SOCDK
config SYS_VENDOR default "altera" if TARGET_SOCFPGA_ARRIA5_SOCDK diff --git a/board/altera/socfpga/MAINTAINERS b/board/altera/arria5-socdk/MAINTAINERS similarity index 100% copy from board/altera/socfpga/MAINTAINERS copy to board/altera/arria5-socdk/MAINTAINERS diff --git a/board/altera/socfpga/Makefile b/board/altera/arria5-socdk/Makefile similarity index 100% copy from board/altera/socfpga/Makefile copy to board/altera/arria5-socdk/Makefile diff --git a/board/altera/socfpga/qts/iocsr_config.c b/board/altera/arria5-socdk/qts/iocsr_config.c similarity index 100% copy from board/altera/socfpga/qts/iocsr_config.c copy to board/altera/arria5-socdk/qts/iocsr_config.c diff --git a/board/altera/socfpga/qts/iocsr_config.h b/board/altera/arria5-socdk/qts/iocsr_config.h similarity index 100% copy from board/altera/socfpga/qts/iocsr_config.h copy to board/altera/arria5-socdk/qts/iocsr_config.h diff --git a/board/altera/socfpga/qts/pinmux_config.c b/board/altera/arria5-socdk/qts/pinmux_config.c similarity index 100% copy from board/altera/socfpga/qts/pinmux_config.c copy to board/altera/arria5-socdk/qts/pinmux_config.c diff --git a/board/altera/socfpga/qts/pinmux_config.h b/board/altera/arria5-socdk/qts/pinmux_config.h similarity index 100% copy from board/altera/socfpga/qts/pinmux_config.h copy to board/altera/arria5-socdk/qts/pinmux_config.h diff --git a/board/altera/socfpga/qts/pll_config.h b/board/altera/arria5-socdk/qts/pll_config.h similarity index 100% copy from board/altera/socfpga/qts/pll_config.h copy to board/altera/arria5-socdk/qts/pll_config.h diff --git a/board/altera/socfpga/qts/sdram_config.h b/board/altera/arria5-socdk/qts/sdram_config.h similarity index 100% copy from board/altera/socfpga/qts/sdram_config.h copy to board/altera/arria5-socdk/qts/sdram_config.h diff --git a/board/altera/socfpga/qts/sequencer_auto.h b/board/altera/arria5-socdk/qts/sequencer_auto.h similarity index 100% copy from board/altera/socfpga/qts/sequencer_auto.h copy to board/altera/arria5-socdk/qts/sequencer_auto.h diff --git a/board/altera/socfpga/qts/sequencer_auto_ac_init.h b/board/altera/arria5-socdk/qts/sequencer_auto_ac_init.h similarity index 100% copy from board/altera/socfpga/qts/sequencer_auto_ac_init.h copy to board/altera/arria5-socdk/qts/sequencer_auto_ac_init.h diff --git a/board/altera/socfpga/qts/sequencer_auto_inst_init.h b/board/altera/arria5-socdk/qts/sequencer_auto_inst_init.h similarity index 100% copy from board/altera/socfpga/qts/sequencer_auto_inst_init.h copy to board/altera/arria5-socdk/qts/sequencer_auto_inst_init.h diff --git a/board/altera/socfpga/qts/sequencer_defines.h b/board/altera/arria5-socdk/qts/sequencer_defines.h similarity index 100% copy from board/altera/socfpga/qts/sequencer_defines.h copy to board/altera/arria5-socdk/qts/sequencer_defines.h diff --git a/board/altera/socfpga/socfpga.c b/board/altera/arria5-socdk/socfpga.c similarity index 100% copy from board/altera/socfpga/socfpga.c copy to board/altera/arria5-socdk/socfpga.c diff --git a/board/altera/socfpga/MAINTAINERS b/board/altera/cyclone5-socdk/MAINTAINERS similarity index 100% rename from board/altera/socfpga/MAINTAINERS rename to board/altera/cyclone5-socdk/MAINTAINERS diff --git a/board/altera/socfpga/Makefile b/board/altera/cyclone5-socdk/Makefile similarity index 100% rename from board/altera/socfpga/Makefile rename to board/altera/cyclone5-socdk/Makefile diff --git a/board/altera/socfpga/qts/iocsr_config.c b/board/altera/cyclone5-socdk/qts/iocsr_config.c similarity index 100% rename from board/altera/socfpga/qts/iocsr_config.c rename to board/altera/cyclone5-socdk/qts/iocsr_config.c diff --git a/board/altera/socfpga/qts/iocsr_config.h b/board/altera/cyclone5-socdk/qts/iocsr_config.h similarity index 100% rename from board/altera/socfpga/qts/iocsr_config.h rename to board/altera/cyclone5-socdk/qts/iocsr_config.h diff --git a/board/altera/socfpga/qts/pinmux_config.c b/board/altera/cyclone5-socdk/qts/pinmux_config.c similarity index 100% rename from board/altera/socfpga/qts/pinmux_config.c rename to board/altera/cyclone5-socdk/qts/pinmux_config.c diff --git a/board/altera/socfpga/qts/pinmux_config.h b/board/altera/cyclone5-socdk/qts/pinmux_config.h similarity index 100% rename from board/altera/socfpga/qts/pinmux_config.h rename to board/altera/cyclone5-socdk/qts/pinmux_config.h diff --git a/board/altera/socfpga/qts/pll_config.h b/board/altera/cyclone5-socdk/qts/pll_config.h similarity index 100% rename from board/altera/socfpga/qts/pll_config.h rename to board/altera/cyclone5-socdk/qts/pll_config.h diff --git a/board/altera/socfpga/qts/sdram_config.h b/board/altera/cyclone5-socdk/qts/sdram_config.h similarity index 100% rename from board/altera/socfpga/qts/sdram_config.h rename to board/altera/cyclone5-socdk/qts/sdram_config.h diff --git a/board/altera/socfpga/qts/sequencer_auto.h b/board/altera/cyclone5-socdk/qts/sequencer_auto.h similarity index 100% rename from board/altera/socfpga/qts/sequencer_auto.h rename to board/altera/cyclone5-socdk/qts/sequencer_auto.h diff --git a/board/altera/socfpga/qts/sequencer_auto_ac_init.h b/board/altera/cyclone5-socdk/qts/sequencer_auto_ac_init.h similarity index 100% rename from board/altera/socfpga/qts/sequencer_auto_ac_init.h rename to board/altera/cyclone5-socdk/qts/sequencer_auto_ac_init.h diff --git a/board/altera/socfpga/qts/sequencer_auto_inst_init.h b/board/altera/cyclone5-socdk/qts/sequencer_auto_inst_init.h similarity index 100% rename from board/altera/socfpga/qts/sequencer_auto_inst_init.h rename to board/altera/cyclone5-socdk/qts/sequencer_auto_inst_init.h diff --git a/board/altera/socfpga/qts/sequencer_defines.h b/board/altera/cyclone5-socdk/qts/sequencer_defines.h similarity index 100% rename from board/altera/socfpga/qts/sequencer_defines.h rename to board/altera/cyclone5-socdk/qts/sequencer_defines.h diff --git a/board/altera/socfpga/socfpga.c b/board/altera/cyclone5-socdk/socfpga.c similarity index 100% rename from board/altera/socfpga/socfpga.c rename to board/altera/cyclone5-socdk/socfpga.c