Skip to contentSkip to conversation

arm: socfpga: Migrate CONFIG_HPS namespace to HPS

PATCH In review Tom Rini 3 participants 7 messages Aug 10, 2021 – Aug 12, 2021

Subsystems (3)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH 1/1 arm: socfpga: Migrate CONFIG_HPS namespace to HPS

None of the CONFIG_HPS namespace options are changed via the board config.h file, nor does it make sense to move them to Kconfig. Rename these options to the HPS namespace instead.

Cc Marek Vasut <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>

---
Note, this patch is complete as the changes to the regex qts-filter.sh are such a long line that git send-email fails. This patch was generated by:

$ git grep -l CONFIG_HPS_ | xargs sed -i -e 's/CONFIG_HPS_/HPS_/g'
and I will re-run that before applying.
 arch/arm/mach-socfpga/qts-filter.sh           |   4 +-
 arch/arm/mach-socfpga/wrap_iocsr_config.c     |   8 +-
 arch/arm/mach-socfpga/wrap_pll_config.c       | 100 ++++++------
 arch/arm/mach-socfpga/wrap_sdram_config.c     | 148 +++++++++---------
 board/altera/arria5-socdk/qts/iocsr_config.h  |   8 +-
 board/altera/arria5-socdk/qts/pll_config.h    | 136 ++++++++--------
 board/altera/arria5-socdk/qts/sdram_config.h  | 140 ++++++++---------
 .../altera/cyclone5-socdk/qts/iocsr_config.h  |   8 +-
 board/altera/cyclone5-socdk/qts/pll_config.h  | 136 ++++++++--------
 .../altera/cyclone5-socdk/qts/sdram_config.h  | 140 ++++++++---------
 board/aries/mcvevk/qts/iocsr_config.h         |   8 +-
 board/aries/mcvevk/qts/pll_config.h           | 136 ++++++++--------
 board/aries/mcvevk/qts/sdram_config.h         | 140 ++++++++---------
 board/devboards/dbm-soc1/qts/iocsr_config.h   |   8 +-
 board/devboards/dbm-soc1/qts/pll_config.h     | 136 ++++++++--------
 board/devboards/dbm-soc1/qts/sdram_config.h   | 140 ++++++++---------
 board/ebv/socrates/qts/iocsr_config.h         |   8 +-
 board/ebv/socrates/qts/pll_config.h           | 136 ++++++++--------
 board/ebv/socrates/qts/sdram_config.h         | 140 ++++++++---------
 board/is1/qts/iocsr_config.h                  |   8 +-
 board/is1/qts/pll_config.h                    | 136 ++++++++--------
 board/is1/qts/sdram_config.h                  | 140 ++++++++---------
 board/keymile/secu1/qts/iocsr_config.h        |   8 +-
 board/keymile/secu1/qts/pll_config.h          | 136 ++++++++--------
 board/keymile/secu1/qts/sdram_config.h        | 140 ++++++++---------
 board/softing/vining_fpga/qts/iocsr_config.h  |   8 +-
 board/softing/vining_fpga/qts/pll_config.h    | 136 ++++++++--------
 board/softing/vining_fpga/qts/sdram_config.h  | 140 ++++++++---------
 board/sr1500/qts/iocsr_config.h               |   8 +-
 board/sr1500/qts/pll_config.h                 | 136 ++++++++--------
 board/sr1500/qts/sdram_config.h               | 140 ++++++++---------
 board/terasic/de0-nano-soc/qts/iocsr_config.h |   8 +-
 board/terasic/de0-nano-soc/qts/pll_config.h   | 136 ++++++++--------
 board/terasic/de0-nano-soc/qts/sdram_config.h | 146 ++++++++---------
 board/terasic/de1-soc/qts/iocsr_config.h      |   8 +-
 board/terasic/de1-soc/qts/pll_config.h        | 148 +++++++++---------
 board/terasic/de1-soc/qts/sdram_config.h      | 140 ++++++++---------
 board/terasic/de10-nano/qts/iocsr_config.h    |   8 +-
 board/terasic/de10-nano/qts/pll_config.h      | 136 ++++++++--------
 board/terasic/de10-nano/qts/sdram_config.h    | 140 ++++++++---------
 board/terasic/sockit/qts/iocsr_config.h       |   8 +-
 board/terasic/sockit/qts/pll_config.h         | 136 ++++++++--------
 board/terasic/sockit/qts/sdram_config.h       | 140 ++++++++---------
 scripts/config_whitelist.txt                  | 142 -----------------
 44 files changed, 1985 insertions(+), 2127 deletions(-)
arch/arm/mach-socfpga/qts-filter.sh +1 -1
index a49cd1b68a9e..3b66781cdf2e 100755
@@ -36,7 +36,7 @@ EOF
 	# Retrieve the scan chain lengths
 	fix_newlines_in_macros \
 		${in_bsp_dir}/generated/iocsr_config_${soc}.h |
-	grep 'CONFIG_HPS_IOCSR_SCANCHAIN[0-9]\+_LENGTH'	| tr -d "()"
+	grep 'HPS_IOCSR_SCANCHAIN[0-9]\+_LENGTH'	| tr -d "()"
 
 	echo ""
 
arch/arm/mach-socfpga/wrap_iocsr_config.c +4 -4
index f810fade92a9..93ae1ebac9b0 100644
@@ -17,19 +17,19 @@ int iocsr_get_config_table(const unsigned int chain_id,
 	switch (chain_id) {
 	case 0:
 		*table = iocsr_scan_chain0_table;
-		*table_len = CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH;
+		*table_len = HPS_IOCSR_SCANCHAIN0_LENGTH;
 		break;
 	case 1:
 		*table = iocsr_scan_chain1_table;
-		*table_len = CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH;
+		*table_len = HPS_IOCSR_SCANCHAIN1_LENGTH;
 		break;
 	case 2:
 		*table = iocsr_scan_chain2_table;
-		*table_len = CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH;
+		*table_len = HPS_IOCSR_SCANCHAIN2_LENGTH;
 		break;
 	case 3:
 		*table = iocsr_scan_chain3_table;
-		*table_len = CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH;
+		*table_len = HPS_IOCSR_SCANCHAIN3_LENGTH;
 		break;
 	default:
 		return -EINVAL;
arch/arm/mach-socfpga/wrap_pll_config.c +50 -50

185 lines not on this page · raw message

arch/arm/mach-socfpga/wrap_sdram_config.c +74 -74

275 lines not on this page · raw message

board/altera/arria5-socdk/qts/iocsr_config.h +4 -4
index 69a92de6361b..3823d1a97b87 100644
@@ -6,10 +6,10 @@
 #ifndef __SOCFPGA_IOCSR_CONFIG_H__
 #define __SOCFPGA_IOCSR_CONFIG_H__
 
-#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH	1337
-#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH	1719
-#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH	1528
-#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH	16766
+#define HPS_IOCSR_SCANCHAIN0_LENGTH	1337
+#define HPS_IOCSR_SCANCHAIN1_LENGTH	1719
+#define HPS_IOCSR_SCANCHAIN2_LENGTH	1528
+#define HPS_IOCSR_SCANCHAIN3_LENGTH	16766
 
 const unsigned long iocsr_scan_chain0_table[] = {
 	0x00000000,
board/altera/arria5-socdk/qts/pll_config.h +68 -68

147 lines not on this page · raw message

board/altera/arria5-socdk/qts/sdram_config.h +70 -70

146 lines not on this page · raw message

board/altera/cyclone5-socdk/qts/iocsr_config.h +4 -4
index 81c507b842bc..c5cc495a90de 100644
@@ -6,10 +6,10 @@
 #ifndef __SOCFPGA_IOCSR_CONFIG_H__
 #define __SOCFPGA_IOCSR_CONFIG_H__
 
-#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH	764
-#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH	1719
-#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH	955
-#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH	16766
+#define HPS_IOCSR_SCANCHAIN0_LENGTH	764
+#define HPS_IOCSR_SCANCHAIN1_LENGTH	1719
+#define HPS_IOCSR_SCANCHAIN2_LENGTH	955
+#define HPS_IOCSR_SCANCHAIN3_LENGTH	16766
 
 const unsigned long iocsr_scan_chain0_table[] = {
 	0x00000000,
board/altera/cyclone5-socdk/qts/pll_config.h +68 -68

147 lines not on this page · raw message

board/altera/cyclone5-socdk/qts/sdram_config.h +70 -70

146 lines not on this page · raw message

board/aries/mcvevk/qts/iocsr_config.h +4 -4
index e233d02b97db..b2908f1b7e52 100644
@@ -6,10 +6,10 @@
 #ifndef __SOCFPGA_IOCSR_CONFIG_H__
 #define __SOCFPGA_IOCSR_CONFIG_H__
 
-#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH	764
-#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH	1719
-#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH	955
-#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH	16766
+#define HPS_IOCSR_SCANCHAIN0_LENGTH	764
+#define HPS_IOCSR_SCANCHAIN1_LENGTH	1719
+#define HPS_IOCSR_SCANCHAIN2_LENGTH	955
+#define HPS_IOCSR_SCANCHAIN3_LENGTH	16766
 
 const unsigned long iocsr_scan_chain0_table[] = {
 	0x00000000,
board/aries/mcvevk/qts/pll_config.h +68 -68

147 lines not on this page · raw message

board/aries/mcvevk/qts/sdram_config.h +70 -70

146 lines not on this page · raw message

board/devboards/dbm-soc1/qts/iocsr_config.h +4 -4
index 99ed62bb503e..84432ccf5bf3 100644
@@ -6,10 +6,10 @@
 #ifndef __SOCFPGA_IOCSR_CONFIG_H__
 #define __SOCFPGA_IOCSR_CONFIG_H__
 
-#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH	764
-#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH	1719
-#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH	955
-#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH	16766
+#define HPS_IOCSR_SCANCHAIN0_LENGTH	764
+#define HPS_IOCSR_SCANCHAIN1_LENGTH	1719
+#define HPS_IOCSR_SCANCHAIN2_LENGTH	955
+#define HPS_IOCSR_SCANCHAIN3_LENGTH	16766
 
 const unsigned long iocsr_scan_chain0_table[] = {
 	0x00000000,
board/devboards/dbm-soc1/qts/pll_config.h +68 -68

147 lines not on this page · raw message

board/devboards/dbm-soc1/qts/sdram_config.h +70 -70

146 lines not on this page · raw message

board/ebv/socrates/qts/iocsr_config.h +4 -4
index 18b9c6ce4dfc..fe14ff2c28f5 100644
@@ -6,10 +6,10 @@
 #ifndef __SOCFPGA_IOCSR_CONFIG_H__
 #define __SOCFPGA_IOCSR_CONFIG_H__
 
-#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH	764
-#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH	1719
-#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH	955
-#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH	16766
+#define HPS_IOCSR_SCANCHAIN0_LENGTH	764
+#define HPS_IOCSR_SCANCHAIN1_LENGTH	1719
+#define HPS_IOCSR_SCANCHAIN2_LENGTH	955
+#define HPS_IOCSR_SCANCHAIN3_LENGTH	16766
 
 const unsigned long iocsr_scan_chain0_table[] = {
 	0x00000000,
board/ebv/socrates/qts/pll_config.h +68 -68

147 lines not on this page · raw message

board/ebv/socrates/qts/sdram_config.h +70 -70

146 lines not on this page · raw message

board/is1/qts/iocsr_config.h +4 -4
index 1d2774aa41a7..c1a85b7e65cf 100644
@@ -6,10 +6,10 @@
 #ifndef __SOCFPGA_IOCSR_CONFIG_H__
 #define __SOCFPGA_IOCSR_CONFIG_H__
 
-#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH	764
-#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH	1719
-#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH	955
-#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH	16766
+#define HPS_IOCSR_SCANCHAIN0_LENGTH	764
+#define HPS_IOCSR_SCANCHAIN1_LENGTH	1719
+#define HPS_IOCSR_SCANCHAIN2_LENGTH	955
+#define HPS_IOCSR_SCANCHAIN3_LENGTH	16766
 
 const unsigned long iocsr_scan_chain0_table[] = {
 	0x00000000,
board/is1/qts/pll_config.h +68 -68

147 lines not on this page · raw message

board/is1/qts/sdram_config.h +70 -70

146 lines not on this page · raw message

board/keymile/secu1/qts/iocsr_config.h +4 -4
index 7640c56db166..bb87defc4add 100644
@@ -6,10 +6,10 @@
 #ifndef __SOCFPGA_IOCSR_CONFIG_H__
 #define __SOCFPGA_IOCSR_CONFIG_H__
 
-#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH	1337
-#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH	1719
-#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH	1528
-#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH	16766
+#define HPS_IOCSR_SCANCHAIN0_LENGTH	1337
+#define HPS_IOCSR_SCANCHAIN1_LENGTH	1719
+#define HPS_IOCSR_SCANCHAIN2_LENGTH	1528
+#define HPS_IOCSR_SCANCHAIN3_LENGTH	16766
 
 const unsigned long iocsr_scan_chain0_table[] = {
 	0x00100000,
board/keymile/secu1/qts/pll_config.h +68 -68

146 lines not on this page · raw message

board/keymile/secu1/qts/sdram_config.h +70 -70

146 lines not on this page · raw message

board/softing/vining_fpga/qts/iocsr_config.h +4 -4
index 8c78aecdd3de..63f96f1d2bd2 100644
@@ -6,10 +6,10 @@
 #ifndef __SOCFPGA_IOCSR_CONFIG_H__
 #define __SOCFPGA_IOCSR_CONFIG_H__
 
-#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH	764
-#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH	1719
-#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH	955
-#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH	16766
+#define HPS_IOCSR_SCANCHAIN0_LENGTH	764
+#define HPS_IOCSR_SCANCHAIN1_LENGTH	1719
+#define HPS_IOCSR_SCANCHAIN2_LENGTH	955
+#define HPS_IOCSR_SCANCHAIN3_LENGTH	16766
 
 const unsigned long iocsr_scan_chain0_table[] = {
 	0x00000000,
board/softing/vining_fpga/qts/pll_config.h +68 -68

147 lines not on this page · raw message

board/softing/vining_fpga/qts/sdram_config.h +70 -70

146 lines not on this page · raw message

board/sr1500/qts/iocsr_config.h +4 -4
index b3b167fa7fc0..17cdec6fb6ab 100644
@@ -6,10 +6,10 @@
 #ifndef __SOCFPGA_IOCSR_CONFIG_H__
 #define __SOCFPGA_IOCSR_CONFIG_H__
 
-#define CONFIG_HPS_IOCSR_SCANCHAIN0_LENGTH	764
-#define CONFIG_HPS_IOCSR_SCANCHAIN1_LENGTH	1719
-#define CONFIG_HPS_IOCSR_SCANCHAIN2_LENGTH	955
-#define CONFIG_HPS_IOCSR_SCANCHAIN3_LENGTH	16766
+#define HPS_IOCSR_SCANCHAIN0_LENGTH	764
+#define HPS_IOCSR_SCANCHAIN1_LENGTH	1719
+#define HPS_IOCSR_SCANCHAIN2_LENGTH	955
+#define HPS_IOCSR_SCANCHAIN3_LENGTH	16766
 
 const unsigned long iocsr_scan_chain0_table[] = {
 	0x00100000,
board/sr1500/qts/pll_config.h +68 -68

40 lines not on this page · raw message

board/sr1500/qts/sdram_config.h +70 -70

140 lines not on this page · raw message

board/terasic/de0-nano-soc/qts/iocsr_config.h +4 -4
index 6ff5bd57112a..ad2ddcc12407 100644

Lines of this file are not shown. View the raw message.

board/terasic/de0-nano-soc/qts/pll_config.h +68 -68

136 lines not on this page · raw message

board/terasic/de0-nano-soc/qts/sdram_config.h +73 -73

146 lines not on this page · raw message

board/terasic/de1-soc/qts/iocsr_config.h +4 -4
index c65183ed8c08..25a53dc75b0f 100644

Lines of this file are not shown. View the raw message.

board/terasic/de1-soc/qts/pll_config.h +74 -74

148 lines not on this page · raw message

board/terasic/de1-soc/qts/sdram_config.h +70 -70

140 lines not on this page · raw message

board/terasic/de10-nano/qts/iocsr_config.h +4 -4
index bc5b7a07c7d6..7f2c78ad63b2 100644

Lines of this file are not shown. View the raw message.

board/terasic/de10-nano/qts/pll_config.h +68 -68

136 lines not on this page · raw message

board/terasic/de10-nano/qts/sdram_config.h +70 -70

140 lines not on this page · raw message

board/terasic/sockit/qts/iocsr_config.h +4 -4
index b8cb5f08ab69..b57fdbc9b259 100644

Lines of this file are not shown. View the raw message.

board/terasic/sockit/qts/pll_config.h +68 -68

136 lines not on this page · raw message

board/terasic/sockit/qts/sdram_config.h +70 -70

140 lines not on this page · raw message

scripts/config_whitelist.txt +0 -142

142 lines not on this page · raw message

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.17.1

Part of the diff is not shown here. View the raw message.

#1 lore raw
Quoted 8 lines · Tom Rini

None of the CONFIG_HPS namespace options are changed via the board config.h file, nor does it make sense to move them to Kconfig. Rename these options to the HPS namespace instead.

Cc Marek Vasut <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>
Quoted 6 lines

---
Note, this patch is complete as the changes to the regex qts-filter.sh are such a long line that git send-email fails. This patch was generated by:

$ git grep -l CONFIG_HPS_ | xargs sed -i -e 's/CONFIG_HPS_/HPS_/g'
and I will re-run that before applying.

The problem is, it is the altera tools which generate all those CONFIG_* symbols which are processed by the qts-filter.sh and placed into those qts/ board directories, so this patch breaks all that. You'd have to fix the qts-filter to scrub the CONFIG_ prefixes first.

author
#2 lore raw
Quoted 16 lines · Marek Vasut
Quoted 8 lines · Tom Rini

None of the CONFIG_HPS namespace options are changed via the board config.h file, nor does it make sense to move them to Kconfig. Rename these options to the HPS namespace instead.

Cc Marek Vasut <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>
Quoted 6 lines

---
Note, this patch is complete as the changes to the regex qts-filter.sh are such a long line that git send-email fails. This patch was generated by:

$ git grep -l CONFIG_HPS_ | xargs sed -i -e 's/CONFIG_HPS_/HPS_/g'
and I will re-run that before applying.
Quoted 4 lines

The problem is, it is the altera tools which generate all those CONFIG_* symbols which are processed by the qts-filter.sh and placed into those qts/ board directories, so this patch breaks all that. You'd have to fix the qts-filter to scrub the CONFIG_ prefixes first.

Do you mean the in-tree qts-filter.sh file needs to be changed, or something else?

Signature · 1 line
Tom
author
#3 lore raw
In reply to Marek Vasut
Quoted 16 lines · Marek Vasut
Quoted 8 lines · Tom Rini

None of the CONFIG_HPS namespace options are changed via the board config.h file, nor does it make sense to move them to Kconfig. Rename these options to the HPS namespace instead.

Cc Marek Vasut <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>
Quoted 6 lines

---
Note, this patch is complete as the changes to the regex qts-filter.sh are such a long line that git send-email fails. This patch was generated by:

$ git grep -l CONFIG_HPS_ | xargs sed -i -e 's/CONFIG_HPS_/HPS_/g'
and I will re-run that before applying.
Quoted 4 lines

The problem is, it is the altera tools which generate all those CONFIG_* symbols which are processed by the qts-filter.sh and placed into those qts/ board directories, so this patch breaks all that. You'd have to fix the qts-filter to scrub the CONFIG_ prefixes first.

Or rather, ugh, are there out of tree tools we need to deal with here? Perhaps someone with the tools could pick up and v2 something tested if so as it'll probably be a bit tricky getting it all right.

Signature · 1 line
Tom
#4 lore raw
Quoted 17 lines · Tom Rini
Quoted 16 lines · Marek Vasut
Quoted 14 lines · Tom Rini

None of the CONFIG_HPS namespace options are changed via the board config.h file, nor does it make sense to move them to Kconfig. Rename these options to the HPS namespace instead.

Cc Marek Vasut <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>

---
Note, this patch is complete as the changes to the regex qts-filter.sh are such a long line that git send-email fails. This patch was generated by:

$ git grep -l CONFIG_HPS_ | xargs sed -i -e 's/CONFIG_HPS_/HPS_/g'
and I will re-run that before applying.
Quoted 8 lines
Quoted 4 lines

The problem is, it is the altera tools which generate all those CONFIG_* symbols which are processed by the qts-filter.sh and placed into those qts/ board directories, so this patch breaks all that. You'd have to fix the qts-filter to scrub the CONFIG_ prefixes first.

Or rather, ugh, are there out of tree tools we need to deal with here? Perhaps someone with the tools could pick up and v2 something tested if so as it'll probably be a bit tricky getting it all right.

See doc/README.socfpga . The out of tree tools generate board/bitstream specific input header files which you plug into the qts-filter.sh script , those files contain the CONFIG_* macros and those files get converted by the qts-filter.sh script into the output header files in board/*/qts/*.h . The output header files are what is used by U-Boot then.

author
#5 lore raw
Quoted 27 lines · Marek Vasut
Quoted 17 lines · Tom Rini
Quoted 16 lines · Marek Vasut
Quoted 14 lines · Tom Rini

None of the CONFIG_HPS namespace options are changed via the board config.h file, nor does it make sense to move them to Kconfig. Rename these options to the HPS namespace instead.

Cc Marek Vasut <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>

---
Note, this patch is complete as the changes to the regex qts-filter.sh are such a long line that git send-email fails. This patch was generated by:

$ git grep -l CONFIG_HPS_ | xargs sed -i -e 's/CONFIG_HPS_/HPS_/g'
and I will re-run that before applying.
Quoted 8 lines
Quoted 4 lines

The problem is, it is the altera tools which generate all those CONFIG_* symbols which are processed by the qts-filter.sh and placed into those qts/ board directories, so this patch breaks all that. You'd have to fix the qts-filter to scrub the CONFIG_ prefixes first.

Or rather, ugh, are there out of tree tools we need to deal with here? Perhaps someone with the tools could pick up and v2 something tested if so as it'll probably be a bit tricky getting it all right.

Quoted 5 lines

See doc/README.socfpga . The out of tree tools generate board/bitstream specific input header files which you plug into the qts-filter.sh script , those files contain the CONFIG_* macros and those files get converted by the qts-filter.sh script into the output header files in board/*/qts/*.h . The output header files are what is used by U-Boot then.

So doc/README.socfpga needs to be updated to rST as well, when someone that can run the tools and test the scripts work as expected and don't use the CONFIG_HPS namespace. Thanks for explaining a bit more.

Signature · 1 line
Tom
#6 lore raw

Hi,

Quoted 42 lines

-----Original Message-----
From: Tom Rini <[email protected]>
Sent: Wednesday, 11 August, 2021 4:57 AM
To: Marek Vasut <[email protected]>
Cc: [email protected]; Simon Goldschmidt <[email protected]>; Chee, Tien Fong <[email protected]>
Subject: Re: [PATCH 1/1] arm: socfpga: Migrate CONFIG_HPS namespace to HPS

Quoted 27 lines · Marek Vasut
Quoted 17 lines · Tom Rini
Quoted 16 lines · Marek Vasut
Quoted 14 lines · Tom Rini

None of the CONFIG_HPS namespace options are changed via the board config.h file, nor does it make sense to move them to Kconfig. Rename these options to the HPS namespace instead.

Cc Marek Vasut <[email protected]>
Cc Simon Goldschmidt <[email protected]>
Cc Tien Fong Chee <[email protected]>

---
Note, this patch is complete as the changes to the regex qts-filter.sh are such a long line that git send-email fails. This patch was generated by:

$ git grep -l CONFIG_HPS_ | xargs sed -i -e 's/CONFIG_HPS_/HPS_/g'
and I will re-run that before applying.
Quoted 8 lines
Quoted 4 lines

The problem is, it is the altera tools which generate all those CONFIG_* symbols which are processed by the qts-filter.sh and placed into those qts/ board directories, so this patch breaks all that. You'd have to fix the qts-filter to scrub the CONFIG_ prefixes first.

Or rather, ugh, are there out of tree tools we need to deal with here? Perhaps someone with the tools could pick up and v2 something tested if so as it'll probably be a bit tricky getting it all right.

Quoted 5 lines

See doc/README.socfpga . The out of tree tools generate board/bitstream specific input header files which you plug into the qts-filter.sh script , those files contain the CONFIG_* macros and those files get converted by the qts-filter.sh script into the output header files in board/*/qts/*.h . The output header files are what is used by U-

Quoted 5 lines

Boot then.

So doc/README.socfpga needs to be updated to rST as well, when someone that can run the tools and test the scripts work as expected and don't use the CONFIG_HPS namespace. Thanks for explaining a bit more.

Thanks for cleaning these up, the scripts are also required to get changed and testing. I will work with internal team to get these done, include converting doc/README.socfpga into rST as well.

TF

Quoted 3 lines

--
Tom