Skip to contentSkip to conversation

arm: socfpga: Move generated files into qts subdir

PATCH New Marek Vasut 1 participant 2 messages Jul 27, 2015 – Aug 3, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm: socfpga: Move generated files into qts subdir

Move all the files generated by Quartus into the qts/ subdir of the board/altera/socfpga dir to make them explicitly separate from the generic U-Boot code.

---
 board/altera/socfpga/Makefile                  | 2 +-
 board/altera/socfpga/qts/Makefile              | 7 +++++++
 board/altera/socfpga/{ => qts}/iocsr_config.c  | 0
 board/altera/socfpga/{ => qts}/iocsr_config.h  | 0
 board/altera/socfpga/{ => qts}/pinmux_config.c | 0
 board/altera/socfpga/{ => qts}/pinmux_config.h | 0
 board/altera/socfpga/{ => qts}/pll_config.h    | 0
 include/configs/socfpga_arria5.h               | 6 +++---
 include/configs/socfpga_cyclone5.h             | 6 +++---
 9 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 board/altera/socfpga/qts/Makefile
 rename board/altera/socfpga/{ => qts}/iocsr_config.c (100%)
 rename board/altera/socfpga/{ => qts}/iocsr_config.h (100%)
 rename board/altera/socfpga/{ => qts}/pinmux_config.c (100%)
 rename board/altera/socfpga/{ => qts}/pinmux_config.h (100%)
 rename board/altera/socfpga/{ => qts}/pll_config.h (100%)
board/altera/socfpga/Makefile +1 -1
index c867f73..d960394 100644
@@ -7,4 +7,4 @@
 #
 
 obj-y	:= socfpga.o
-obj-$(CONFIG_SPL_BUILD) += pinmux_config.o iocsr_config.o
+obj-$(CONFIG_SPL_BUILD) += qts/
board/altera/socfpga/qts/Makefile new file +7 -0
new file mode 100644
index 0000000..dbcedd8
@@ -0,0 +1,7 @@
+#
+# (C) Copyright 2015 Marek Vasut <[email protected]>
+#
+# SPDX-License-Identifier:	GPL-2.0+
+#
+
+obj-y += pinmux_config.o iocsr_config.o
board/altera/socfpga/qts/iocsr_config.c renamed from board/altera/socfpga/iocsr_config.c +0 -0
similarity index 100%
rename from board/altera/socfpga/iocsr_config.c
rename to board/altera/socfpga/qts/iocsr_config.c
board/altera/socfpga/qts/iocsr_config.h renamed from board/altera/socfpga/iocsr_config.h +0 -0
similarity index 100%
rename from board/altera/socfpga/iocsr_config.h
rename to board/altera/socfpga/qts/iocsr_config.h
board/altera/socfpga/qts/pinmux_config.c renamed from board/altera/socfpga/pinmux_config.c +0 -0
similarity index 100%
rename from board/altera/socfpga/pinmux_config.c
rename to board/altera/socfpga/qts/pinmux_config.c
board/altera/socfpga/qts/pinmux_config.h renamed from board/altera/socfpga/pinmux_config.h +0 -0
similarity index 100%
rename from board/altera/socfpga/pinmux_config.h
rename to board/altera/socfpga/qts/pinmux_config.h
board/altera/socfpga/qts/pll_config.h renamed from board/altera/socfpga/pll_config.h +0 -0
similarity index 100%
rename from board/altera/socfpga/pll_config.h
rename to board/altera/socfpga/qts/pll_config.h
include/configs/socfpga_arria5.h +3 -3
index 5a4417f..48744bc 100644
@@ -7,9 +7,9 @@
 #define __CONFIG_SOCFPGA_ARRIA5_H__
 
 #include <asm/arch/socfpga_base_addrs.h>
-#include "../../board/altera/socfpga/pinmux_config.h"
-#include "../../board/altera/socfpga/iocsr_config.h"
-#include "../../board/altera/socfpga/pll_config.h"
+#include "../../board/altera/socfpga/qts/pinmux_config.h"
+#include "../../board/altera/socfpga/qts/iocsr_config.h"
+#include "../../board/altera/socfpga/qts/pll_config.h"
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
include/configs/socfpga_cyclone5.h +3 -3
index 9a9c85a..e8cd11d 100644
@@ -7,9 +7,9 @@
 #define __CONFIG_SOCFPGA_CYCLONE5_H__
 
 #include <asm/arch/socfpga_base_addrs.h>
-#include "../../board/altera/socfpga/pinmux_config.h"
-#include "../../board/altera/socfpga/iocsr_config.h"
-#include "../../board/altera/socfpga/pll_config.h"
+#include "../../board/altera/socfpga/qts/pinmux_config.h"
+#include "../../board/altera/socfpga/qts/iocsr_config.h"
+#include "../../board/altera/socfpga/qts/pll_config.h"
 
 /* U-Boot Commands */
 #define CONFIG_SYS_NO_FLASH
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 arm: socfpga: Move generated files into qts subdir

Quoted 15 lines · Marek Vasut

Move all the files generated by Quartus into the qts/ subdir of the board/altera/socfpga dir to make them explicitly separate from the generic U-Boot code.

---
 board/altera/socfpga/Makefile                  | 2 +-
 board/altera/socfpga/qts/Makefile              | 7 +++++++
 board/altera/socfpga/{ => qts}/iocsr_config.c  | 0
 board/altera/socfpga/{ => qts}/iocsr_config.h  | 0
 board/altera/socfpga/{ => qts}/pinmux_config.c | 0
 board/altera/socfpga/{ => qts}/pinmux_config.h | 0
 board/altera/socfpga/{ => qts}/pll_config.h    | 0
 include/configs/socfpga_arria5.h               | 6 +++---
Quoted 8 lines
 include/configs/socfpga_cyclone5.h             | 6 +++---
 9 files changed, 14 insertions(+), 7 deletions(-)
 create mode 100644 board/altera/socfpga/qts/Makefile
 rename board/altera/socfpga/{ => qts}/iocsr_config.c (100%)
 rename board/altera/socfpga/{ => qts}/iocsr_config.h (100%)
 rename board/altera/socfpga/{ => qts}/pinmux_config.c (100%)
 rename board/altera/socfpga/{ => qts}/pinmux_config.h (100%)
 rename board/altera/socfpga/{ => qts}/pll_config.h (100%)

Applied to u-boot-socfpga/master .

Best regards,
Marek Vasut