Skip to contentSkip to conversation

spl: Kconfig: Escape '$(ARCH)' in LDSCRIPT entries

PATCH New Tom Rini 6 participants 28 messages Mar 11, 2020 – Mar 17, 2020 1 message not in the archive

Subsystems (9)
lore
Share & tools
lore

Tom Rini

author
#0 lore raw

PATCH v2 1/8 spl: Kconfig: Escape '$(ARCH)' in LDSCRIPT entries

The default SPL / TPL linker script is in the $(ARCH) directory. The way we use this today works but isn't ideal. With an update to Kconfig to re-sync with the Linux Kernel, we need to escape the '$' here so that it will end up being evaluated by make.

Cc Masahiro Yamada <[email protected]>

---
Changes in v2:
- Only escape common/spl/Kconfig, reword commit.

---
 common/spl/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
common/spl/Kconfig +2 -2
index b03a476b9f69..9d52b75cb434 100644
@@ -139,7 +139,7 @@ config SPL_HANDOFF
 
 config SPL_LDSCRIPT
 	string "Linker script for the SPL stage"
-	default "arch/$(ARCH)/cpu/u-boot-spl.lds"
+	default "arch/\$(ARCH)/cpu/u-boot-spl.lds"
 	help
 	  The SPL stage will usually require a different linker-script
 	  (as it runs from a different memory region) than the regular
@@ -1306,7 +1306,7 @@ config TPL_LDSCRIPT
         string "Linker script for the TPL stage"
 	depends on TPL
 	default "arch/arm/cpu/armv8/u-boot-spl.lds" if ARM64
-	default "arch/$(ARCH)/cpu/u-boot-spl.lds"
+	default "arch/\$(ARCH)/cpu/u-boot-spl.lds"
 	help
 	  The TPL stage will usually require a different linker-script
 	  (as it runs from a different memory region) than the regular
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH v2 1/8 spl: Kconfig: Escape '$(ARCH)' in LDSCRIPT entries

Quoted 8 lines · Tom Rini

The default SPL / TPL linker script is in the $(ARCH) directory. The way we use this today works but isn't ideal. With an update to Kconfig to re-sync with the Linux Kernel, we need to escape the '$' here so that it will end up being evaluated by make.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200317/6f2b0f63/attachment.sig>
author
#2 lore raw

PATCH v2 2/8 Kconfig: Remove redundant variable sets

In reply to Tom Rini

In a few places we have Kconfig entries that set SPL_LDSCRIPT to what is the default value anyways. Drop these.

Cc Michal Simek <[email protected]>
Cc Rick Chen <[email protected]>
Cc Philippe Reynes <[email protected]>
Cc Eric Jarrige <[email protected]>
---
 arch/microblaze/Kconfig      | 3 ---
 arch/riscv/Kconfig           | 3 ---
 board/armadeus/apf27/Kconfig | 3 ---
 3 files changed, 9 deletions(-)
arch/microblaze/Kconfig +0 -3
index 5ce8261451d3..2bd260e5d76e 100644
@@ -30,7 +30,4 @@ config STACK_SIZE
 
 source "board/xilinx/microblaze-generic/Kconfig"
 
-config SPL_LDSCRIPT
-	default "arch/microblaze/cpu/u-boot-spl.lds"
-
 endmenu
arch/riscv/Kconfig +0 -3
index 3338b788f84a..f49618d24d26 100644
@@ -229,7 +229,4 @@ config STACK_SIZE_SHIFT
 	int
 	default 14
 
-config SPL_LDSCRIPT
-	default "arch/riscv/cpu/u-boot-spl.lds"
-
 endmenu
board/armadeus/apf27/Kconfig +0 -3
index a342d2e05ec5..65544a844834 100644
@@ -1,8 +1,5 @@
 if TARGET_APF27
 
-config SPL_LDSCRIPT
-	default "arch/$(ARCH)/cpu/u-boot-spl.lds"
-
 config SYS_BOARD
 	default "apf27"
 
Signature · 1 line
2.17.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

#4 lore raw

PATCH v2 2/8 Kconfig: Remove redundant variable sets

Quoted 34 lines

From: Tom Rini [mailto:trini at konsulko.com]
Sent: Thursday, March 12, 2020 6:11 AM
To: u-boot at lists.denx.de
Cc: Michal Simek; Rick Jian-Zhi Chen(???); Philippe Reynes; Eric Jarrige
Subject: [PATCHv2 2/8] Kconfig: Remove redundant variable sets

In a few places we have Kconfig entries that set SPL_LDSCRIPT to what is the default value anyways. Drop these.

Cc Michal Simek <[email protected]>
Cc Rick Chen <[email protected]>
Cc Philippe Reynes <[email protected]>
Cc Eric Jarrige <[email protected]>
---
 arch/microblaze/Kconfig      | 3 ---
 arch/riscv/Kconfig           | 3 ---
 board/armadeus/apf27/Kconfig | 3 ---
 3 files changed, 9 deletions(-)
arch/microblaze/Kconfig +0 -3
@@ -30,7 +30,4 @@ config STACK_SIZE
 
 source "board/xilinx/microblaze-generic/Kconfig"
 
-config SPL_LDSCRIPT
-       default "arch/microblaze/cpu/u-boot-spl.lds"
-
 endmenu

arch/riscv/Kconfig config STACK_SIZE_SHIFT · line 234

Quoted 6 lines
arch/riscv/Kconfig +0 -3
@@ -229,7 +229,4 @@ config STACK_SIZE_SHIFT
        int
        default 14
 
-config SPL_LDSCRIPT
-       default "arch/riscv/cpu/u-boot-spl.lds"
-
#5 lore raw

PATCH v2 2/8 Kconfig: Remove redundant variable sets

In reply to Tom Rini
Quoted 19 lines · Tom Rini

In a few places we have Kconfig entries that set SPL_LDSCRIPT to what is the default value anyways. Drop these.

Cc Michal Simek <[email protected]>
Cc Rick Chen <[email protected]>
Cc Philippe Reynes <[email protected]>
Cc Eric Jarrige <[email protected]>
---
 arch/microblaze/Kconfig      | 3 ---
 arch/riscv/Kconfig           | 3 ---
 board/armadeus/apf27/Kconfig | 3 ---
 3 files changed, 9 deletions(-)
arch/microblaze/Kconfig +0 -0
index 5ce8261451d3..2bd260e5d76e 100644

arch/microblaze/Kconfig config STACK_SIZE · line 35

Quoted 6 lines
arch/microblaze/Kconfig +0 -3
@@ -30,7 +30,4 @@ config STACK_SIZE
 
 source "board/xilinx/microblaze-generic/Kconfig"
 
-config SPL_LDSCRIPT
-	default "arch/microblaze/cpu/u-boot-spl.lds"
-

Thanks,
Michal

#6 lore raw

PATCH v2 2/8 Kconfig: Remove redundant variable sets

In reply to Tom Rini
Quoted 10 lines · Tom Rini

In a few places we have Kconfig entries that set SPL_LDSCRIPT to what is the default value anyways. Drop these.

Cc Michal Simek <[email protected]>
Cc Rick Chen <[email protected]>
Cc Philippe Reynes <[email protected]>
Cc Eric Jarrige <[email protected]>

--

Signature · 2 lines
Best Regards
Masahiro Yamada
author
#7 lore raw

PATCH v2 2/8 Kconfig: Remove redundant variable sets

In reply to Tom Rini
Quoted 11 lines · Tom Rini

In a few places we have Kconfig entries that set SPL_LDSCRIPT to what is the default value anyways. Drop these.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200317/f65fe1b7/attachment.sig>
author
#8 lore raw

PATCH v2 3/8 edminiv2: Move CONFIG_SPL_LDSCRIPT to defconfig

In reply to Tom Rini

As there is only one machine under mach-orion5x, having a Kconfig entry for SPL_LDSCRIPT is not helpful, move this to the defconfig file.

---
 arch/arm/mach-orion5x/Kconfig | 3 ---
 configs/edminiv2_defconfig    | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)
arch/arm/mach-orion5x/Kconfig +0 -3
index 2984a3edda21..7644b8dc854b 100644
@@ -15,7 +15,4 @@ config SYS_SOC
 
 source "board/LaCie/edminiv2/Kconfig"
 
-config SPL_LDSCRIPT
-	default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X
-
 endif
configs/edminiv2_defconfig +1 -0
index 2bbd6a783b94..b9a68a9263aa 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ORION5X=y
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
Signature · 1 line
2.17.1
#9 lore raw

PATCH v2 3/8 edminiv2: Move CONFIG_SPL_LDSCRIPT to defconfig

Quoted 7 lines · Tom Rini

As there is only one machine under mach-orion5x, having a Kconfig entry for SPL_LDSCRIPT is not helpful, move this to the defconfig file.

---

Quoted 31 lines
 arch/arm/mach-orion5x/Kconfig | 3 ---
 configs/edminiv2_defconfig    | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)
arch/arm/mach-orion5x/Kconfig +0 -3
index 2984a3edda21..7644b8dc854b 100644
@@ -15,7 +15,4 @@ config SYS_SOC
 
 source "board/LaCie/edminiv2/Kconfig"
 
-config SPL_LDSCRIPT
-       default "$(CPUDIR)/orion5x/u-boot-spl.lds" if ORION5X
-
 endif
configs/edminiv2_defconfig +1 -1
index 2bbd6a783b94..b9a68a9263aa 100644
@@ -1,6 +1,7 @@
 CONFIG_ARM=y
 CONFIG_ARCH_CPU_INIT=y
 CONFIG_ORION5X=y
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/arm926ejs/orion5x/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x00800000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
--

2.17.1

Signature · 2 lines
Best Regards
Masahiro Yamada
author
#10 lore raw

PATCH v2 3/8 edminiv2: Move CONFIG_SPL_LDSCRIPT to defconfig

In reply to Tom Rini
Quoted 6 lines · Tom Rini

As there is only one machine under mach-orion5x, having a Kconfig entry for SPL_LDSCRIPT is not helpful, move this to the defconfig file.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200317/b4201e39/attachment.sig>
author
#11 lore raw

PATCH v2 4/8 mach-davinci: Hard-code the default SPL_LDSCRIPT path

In reply to Tom Rini

As there is only one linker script to use in this case, rather than use the BOARDDIR variable hard-code the path.

---
Changes in v2.
- New patch

---
 arch/arm/mach-davinci/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-davinci/Kconfig +1 -1
index 8a81c078811d..6eca8db6d5ff 100644
@@ -135,6 +135,6 @@ source "board/davinci/da8xxevm/Kconfig"
 source "board/lego/ev3/Kconfig"
 
 config SPL_LDSCRIPT
-	default "board/$(BOARDDIR)/u-boot-spl-da850evm.lds"
+	default "board/davinci/da8xxevm/u-boot-spl-da850evm.lds"
 
 endif
Signature · 1 line
2.17.1
#13 lore raw

PATCH v2 4/8 mach-davinci: Hard-code the default SPL_LDSCRIPT path

In reply to Tom Rini
Quoted 8 lines · Tom Rini

As there is only one linker script to use in this case, rather than use the BOARDDIR variable hard-code the path.

---

Quoted 21 lines

Changes in v2.
- New patch

---
 arch/arm/mach-davinci/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-davinci/Kconfig +1 -2
index 8a81c078811d..6eca8db6d5ff 100644
@@ -135,6 +135,6 @@ source "board/davinci/da8xxevm/Kconfig"
 source "board/lego/ev3/Kconfig"
 
 config SPL_LDSCRIPT
-       default "board/$(BOARDDIR)/u-boot-spl-da850evm.lds"
+       default "board/davinci/da8xxevm/u-boot-spl-da850evm.lds"
 
 endif
--

2.17.1

Signature · 2 lines
Best Regards
Masahiro Yamada
author
#14 lore raw

PATCH v2 4/8 mach-davinci: Hard-code the default SPL_LDSCRIPT path

In reply to Tom Rini
Quoted 8 lines · Tom Rini

As there is only one linker script to use in this case, rather than use the BOARDDIR variable hard-code the path.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200317/6eaaee18/attachment.sig>
author
#15 lore raw

PATCH v2 5/8 Azure / GitLab / Travis: Add Kconfig unit tests to a job

In reply to Tom Rini

The Kconfig language provides a unit test that can be run. As these require pytest to be installed and run very quickly, bundle them in to an existing CI job.

---
Changes in v2:
- Have Azure use O=${UBOOT_TRAVIS_BUILD_DIR} as pwd is not writable.

---
 .azure-pipelines.yml | 5 +++--
 .gitlab-ci.yml       | 7 ++++---
 .travis.yml          | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)
.azure-pipelines.yml +3 -2
index f66d58aa76f9..01b6eda359b6 100644
@@ -120,7 +120,7 @@ jobs:
           make tools-only_config envtools -j$(nproc)
 
   - job: utils
-    displayName: 'Run binman, buildman, dtoc and patman testsuites'
+    displayName: 'Run binman, buildman, dtoc, Kconfig and patman testsuites'
     pool:
       vmImage: $(ubuntu_vm)
     steps:
@@ -135,7 +135,7 @@ jobs:
           export USER=azure
           virtualenv -p /usr/bin/python3 /tmp/venv
           . /tmp/venv/bin/activate
-          pip install pyelftools
+          pip install pyelftools pytest
           export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl
           export PYTHONPATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt
           export PATH=${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}
@@ -144,6 +144,7 @@ jobs:
           ./tools/buildman/buildman -t
           ./tools/dtoc/dtoc -t
           ./tools/patman/patman --test
+          make O=${UBOOT_TRAVIS_BUILD_DIR} testconfig
           EOF
           cat build.sh
           # We cannot use "container" like other jobs above, as buildman
.gitlab-ci.yml +4 -3
index 55943bb3a245..f43b3c26ef81 100644
@@ -157,7 +157,7 @@ Build envtools:
   script:
     - make tools-only_config envtools -j$(nproc)
 
-Run binman, buildman, dtoc and patman testsuites:
+Run binman, buildman, dtoc, Kconfig and patman testsuites:
   tags: [ 'all' ]
   stage: testsuites
   script:
@@ -166,7 +166,7 @@ Run binman, buildman, dtoc and patman testsuites:
       export USER=gitlab;
       virtualenv -p /usr/bin/python3 /tmp/venv;
       . /tmp/venv/bin/activate;
-      pip install pyelftools;
+      pip install pyelftools pytest;
       export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl;
       export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt";
       export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}";
@@ -174,7 +174,8 @@ Run binman, buildman, dtoc and patman testsuites:
       ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test;
       ./tools/buildman/buildman -t;
       ./tools/dtoc/dtoc -t;
-      ./tools/patman/patman --test
+      ./tools/patman/patman --test;
+      make testconfig
 
 # Test sandbox with test.py
 sandbox test.py:
.travis.yml +2 -1
index c59bd7790b66..1914f98dfaa3 100644
@@ -152,7 +152,8 @@ script:
        ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test &&
        ./tools/patman/patman --test &&
        ./tools/buildman/buildman -t &&
-       ./tools/dtoc/dtoc -t;
+       ./tools/dtoc/dtoc -t &&
+       make testconfig;
      fi;
    fi
 
Signature · 1 line
2.17.1
author
#16 lore raw

PATCH v2 5/8 Azure / GitLab / Travis: Add Kconfig unit tests to a job

Quoted 5 lines · Tom Rini

The Kconfig language provides a unit test that can be run. As these require pytest to be installed and run very quickly, bundle them in to an existing CI job.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200317/1ed37529/attachment.sig>
author
#17 lore raw

PATCH v2 6/8 scripts/dtc: Update to upstream version v1.4.6-21-g84e414b0b5bc

In reply to Tom Rini

From: Rob Herring <[email protected]>

This adds the following commits from upstream:

84e414b0b5bc tests: Add a test case for the omit-if-no-ref keyword 4038fd90056e dtc: add ability to make nodes conditional on them being referenced e1f139ea4900 checks: drop warning for missing PCI bridge bus-range f4eba68d89ee checks: Print duplicate node name instead of parent name 46df1fb1b211 .travis.yml: Run valgrind checks via Travis 14a3002a1aee tests: Update valgrind suppressions for sw_tree1 02c5fe9debc0 tests: Remove valgrind error from tests/get_path df536831d02c checks: add graph binding checks
2347c96edcbe checks: add a check for duplicate unit-addresses of child nodes 8f1b35f88395 Correct overlay syntactic sugar for generating target-path fragments afbddcd418fb Suppress warnings on overlay fragments
119e27300359 Improve tests for dtc overlay generation

[From Linux Kernel commit 50aafd60898a8b3edf2f60e014a8288da3b2e5e3]
[For applying to U-Boot]
---
 scripts/dtc/checks.c      | 186 +++++++++++++++++++++++++++++++++++++-
 scripts/dtc/dtc-parser.y  |  22 ++---
 scripts/dtc/livetree.c    |  12 ++-
 scripts/dtc/version_gen.h |   2 +-
 4 files changed, 206 insertions(+), 16 deletions(-)
scripts/dtc/checks.c +185 -1
index 40879677c8c3..c35aa6f88639 100644
@@ -255,7 +255,7 @@ static void check_duplicate_node_names(struct check *c, struct dt_info *dti,
 		     child2;
 		     child2 = child2->next_sibling)
 			if (streq(child->name, child2->name))
-				FAIL(c, dti, node, "Duplicate node name");
+				FAIL(c, dti, child2, "Duplicate node name");
 }
 ERROR(duplicate_node_names, check_duplicate_node_names, NULL);
 
@@ -317,6 +317,11 @@ static void check_unit_address_vs_reg(struct check *c, struct dt_info *dti,
 	const char *unitname = get_unitname(node);
 	struct property *prop = get_property(node, "reg");
 
+	if (get_subnode(node, "__overlay__")) {
+		/* HACK: Overlay fragments are a special case */
+		return;
+	}
+
 	if (!prop) {
 		prop = get_property(node, "ranges");
 		if (prop && !prop->val.len)
@@ -1030,6 +1035,36 @@ static void check_avoid_unnecessary_addr_size(struct check *c, struct dt_info *d
 }
 WARNING(avoid_unnecessary_addr_size, check_avoid_unnecessary_addr_size, NULL, &avoid_default_addr_size);
 
+static void check_unique_unit_address(struct check *c, struct dt_info *dti,
+					      struct node *node)
+{
+	struct node *childa;
+
+	if (node->addr_cells < 0 || node->size_cells < 0)
+		return;
+
+	if (!node->children)
+		return;
+
+	for_each_child(node, childa) {
+		struct node *childb;
+		const char *addr_a = get_unitname(childa);
+
+		if (!strlen(addr_a))
+			continue;
+
+		for_each_child(node, childb) {
+			const char *addr_b = get_unitname(childb);
+			if (childa == childb)
+				break;
+
+			if (streq(addr_a, addr_b))
+				FAIL(c, dti, childb, "duplicate unit-address (also used in node %s)", childa->fullpath);
+		}
+	}
+}
+WARNING(unique_unit_address, check_unique_unit_address, NULL, &avoid_default_addr_size);
+
 static void check_obsolete_chosen_interrupt_controller(struct check *c,
 						       struct dt_info *dti,
 						       struct node *node)
@@ -1370,6 +1405,152 @@ static void check_interrupts_property(struct check *c,
 }
 WARNING(interrupts_property, check_interrupts_property, &phandle_references);
 
+static const struct bus_type graph_port_bus = {
+	.name = "graph-port",
+};
+
+static const struct bus_type graph_ports_bus = {
+	.name = "graph-ports",
+};
+
+static void check_graph_nodes(struct check *c, struct dt_info *dti,
+			      struct node *node)
+{
+	struct node *child;
+
+	for_each_child(node, child) {
+		if (!(strprefixeq(child->name, child->basenamelen, "endpoint") ||
+		      get_property(child, "remote-endpoint")))
+			continue;
+
+		node->bus = &graph_port_bus;
+
+		/* The parent of 'port' nodes can be either 'ports' or a device */
+		if (!node->parent->bus &&
+		    (streq(node->parent->name, "ports") || get_property(node, "reg")))
+			node->parent->bus = &graph_ports_bus;
+
+		break;
+	}
+
+}
+WARNING(graph_nodes, check_graph_nodes, NULL);
+
+static void check_graph_child_address(struct check *c, struct dt_info *dti,
+				      struct node *node)
+{
+	int cnt = 0;
+	struct node *child;
+
+	if (node->bus != &graph_ports_bus && node->bus != &graph_port_bus)
+		return;
+
+	for_each_child(node, child) {
+		struct property *prop = get_property(child, "reg");
+
+		/* No error if we have any non-zero unit address */
+		if (prop && propval_cell(prop) != 0)
+			return;
+
+		cnt++;
+	}
+
+	if (cnt == 1 && node->addr_cells != -1)
+		FAIL(c, dti, node, "graph node has single child node '%s', #address-cells/#size-cells are not necessary",
+		     node->children->name);
+}
+WARNING(graph_child_address, check_graph_child_address, NULL, &graph_nodes);
+
+static void check_graph_reg(struct check *c, struct dt_info *dti,
+			    struct node *node)
+{
+	char unit_addr[9];
+	const char *unitname = get_unitname(node);
+	struct property *prop;
+
+	prop = get_property(node, "reg");
+	if (!prop || !unitname)
+		return;
+
+	if (!(prop->val.val && prop->val.len == sizeof(cell_t))) {
+		FAIL(c, dti, node, "graph node malformed 'reg' property");
+		return;
+	}
+
+	snprintf(unit_addr, sizeof(unit_addr), "%x", propval_cell(prop));
+	if (!streq(unitname, unit_addr))
+		FAIL(c, dti, node, "graph node unit address error, expected \"%s\"",
+		     unit_addr);
+
+	if (node->parent->addr_cells != 1)
+		FAIL_PROP(c, dti, node, get_property(node, "#address-cells"),
+			  "graph node '#address-cells' is %d, must be 1",
+			  node->parent->addr_cells);
+	if (node->parent->size_cells != 0)
+		FAIL_PROP(c, dti, node, get_property(node, "#size-cells"),
+			  "graph node '#size-cells' is %d, must be 0",
+			  node->parent->size_cells);
+}
+
+static void check_graph_port(struct check *c, struct dt_info *dti,
+			     struct node *node)
+{
+	if (node->bus != &graph_port_bus)
+		return;
+
+	if (!strprefixeq(node->name, node->basenamelen, "port"))
+		FAIL(c, dti, node, "graph port node name should be 'port'");
+
+	check_graph_reg(c, dti, node);
+}
+WARNING(graph_port, check_graph_port, NULL, &graph_nodes);
+
+static struct node *get_remote_endpoint(struct check *c, struct dt_info *dti,
+					struct node *endpoint)
+{
+	int phandle;
+	struct node *node;
+	struct property *prop;
+
+	prop = get_property(endpoint, "remote-endpoint");
+	if (!prop)
+		return NULL;
+
+	phandle = propval_cell(prop);
+	/* Give up if this is an overlay with external references */
+	if (phandle == 0 || phandle == -1)
+		return NULL;
+
+	node = get_node_by_phandle(dti->dt, phandle);
+	if (!node)
+		FAIL_PROP(c, dti, endpoint, prop, "graph phandle is not valid");
+
+	return node;
+}
+
+static void check_graph_endpoint(struct check *c, struct dt_info *dti,
+				 struct node *node)
+{
+	struct node *remote_node;
+
+	if (!node->parent || node->parent->bus != &graph_port_bus)
+		return;
+
+	if (!strprefixeq(node->name, node->basenamelen, "endpoint"))
+		FAIL(c, dti, node, "graph endpont node name should be 'endpoint'");
+
+	check_graph_reg(c, dti, node);
+
+	remote_node = get_remote_endpoint(c, dti, node);
+	if (!remote_node)
+		return;
+
+	if (get_remote_endpoint(c, dti, remote_node) != node)
+		FAIL(c, dti, node, "graph connection to node '%s' is not bidirectional",
+		     remote_node->fullpath);
+}
+WARNING(graph_endpoint, check_graph_endpoint, NULL, &graph_nodes);
+
 static struct check *check_table[] = {
 	&duplicate_node_names, &duplicate_property_names,
 	&node_name_chars, &node_name_format, &property_name_chars,
@@ -1404,6 +1585,7 @@ static struct check *check_table[] = {
 
 	&avoid_default_addr_size,
 	&avoid_unnecessary_addr_size,
+	&unique_unit_address,
 	&obsolete_chosen_interrupt_controller,
 	&chosen_node_is_root, &chosen_node_bootargs, &chosen_node_stdout_path,
 
@@ -1430,6 +1612,8 @@ static struct check *check_table[] = {
 
 	&alias_paths,
 
+	&graph_nodes, &graph_child_address, &graph_port, &graph_endpoint,
+
 	&always_fail,
 };
 
scripts/dtc/dtc-parser.y +11 -11
index 66ff7f7d8eb7..011a5b25539a 100644
@@ -191,18 +191,18 @@ devicetree:
 		}
 	| devicetree DT_REF nodedef
 		{
-			struct node *target = get_node_by_ref($1, $2);
-
-			if (target) {
-				merge_nodes(target, $3);
+			/*
+			 * We rely on the rule being always:
+			 *   versioninfo plugindecl memreserves devicetree
+			 * so $-1 is what we want (plugindecl)
+			 */
+			if ($<flags>-1 & DTSF_PLUGIN) {
+				add_orphan_node($1, $3, $2);
 			} else {
-				/*
-				 * We rely on the rule being always:
-				 *   versioninfo plugindecl memreserves devicetree
-				 * so $-1 is what we want (plugindecl)
-				 */
-				if ($<flags>-1 & DTSF_PLUGIN)
-					add_orphan_node($1, $3, $2);
+				struct node *target = get_node_by_ref($1, $2);
+
+				if (target)
+					merge_nodes(target, $3);
 				else
 					ERROR(&@2, "Label or path %s not found", $2);
 			}
scripts/dtc/livetree.c +9 -3
index 81b6c484542d..6e4c367f54b3 100644
@@ -238,10 +238,16 @@ struct node * add_orphan_node(struct node *dt, struct node *new_node, char *ref)
 	struct data d = empty_data;
 	char *name;
 
-	d = data_add_marker(d, REF_PHANDLE, ref);
-	d = data_append_integer(d, 0xffffffff, 32);
+	if (ref[0] == '/') {
+		d = data_append_data(d, ref, strlen(ref) + 1);
 
-	p = build_property("target", d);
+		p = build_property("target-path", d);
+	} else {
+		d = data_add_marker(d, REF_PHANDLE, ref);
+		d = data_append_integer(d, 0xffffffff, 32);
+
+		p = build_property("target", d);
+	}
 
 	xasprintf(&name, "fragment@%u",
 			next_orphan_fragment++);
scripts/dtc/version_gen.h +1 -1
index ad87849e333b..b00f14ff7a17 100644
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.4.6-gaadd0b65"
+#define DTC_VERSION "DTC 1.4.6-g84e414b0"
Signature · 1 line
2.17.1
maintainer
#18 lore raw

PATCH v2 6/8 scripts/dtc: Update to upstream version v1.4.6-21-g84e414b0b5bc

Quoted 5 lines · Tom Rini

From: Rob Herring <[email protected]>

This adds the following commits from upstream:

Quoted 12 lines

84e414b0b5bc tests: Add a test case for the omit-if-no-ref keyword 4038fd90056e dtc: add ability to make nodes conditional on them being referenced e1f139ea4900 checks: drop warning for missing PCI bridge bus-range f4eba68d89ee checks: Print duplicate node name instead of parent name 46df1fb1b211 .travis.yml: Run valgrind checks via Travis 14a3002a1aee tests: Update valgrind suppressions for sw_tree1 02c5fe9debc0 tests: Remove valgrind error from tests/get_path df536831d02c checks: add graph binding checks
2347c96edcbe checks: add a check for duplicate unit-addresses of child nodes 8f1b35f88395 Correct overlay syntactic sugar for generating target-path fragments afbddcd418fb Suppress warnings on overlay fragments
119e27300359 Improve tests for dtc overlay generation

That's 100s of commits behind master. Any reason why (IIRC, you revert the unaligned handling change)? In particular, there's a fix for GCC 10 and clang with commit:

0e9225eb0dfe Remove redundant YYLOC global declaration

Only just now pointed out to me for updating the kernel copy. Though I guess this could be handled with '-fcommon' instead.

Rob

Quoted 313 lines
[From Linux Kernel commit 50aafd60898a8b3edf2f60e014a8288da3b2e5e3]
[For applying to U-Boot]
---
 scripts/dtc/checks.c      | 186 +++++++++++++++++++++++++++++++++++++-
 scripts/dtc/dtc-parser.y  |  22 ++---
 scripts/dtc/livetree.c    |  12 ++-
 scripts/dtc/version_gen.h |   2 +-
 4 files changed, 206 insertions(+), 16 deletions(-)
scripts/dtc/checks.c +185 -1
index 40879677c8c3..c35aa6f88639 100644
@@ -255,7 +255,7 @@ static void check_duplicate_node_names(struct check *c, struct dt_info *dti,
                     child2;
                     child2 = child2->next_sibling)
                        if (streq(child->name, child2->name))
-                               FAIL(c, dti, node, "Duplicate node name");
+                               FAIL(c, dti, child2, "Duplicate node name");
 }
 ERROR(duplicate_node_names, check_duplicate_node_names, NULL);
 
@@ -317,6 +317,11 @@ static void check_unit_address_vs_reg(struct check *c, struct dt_info *dti,
        const char *unitname = get_unitname(node);
        struct property *prop = get_property(node, "reg");
 
+       if (get_subnode(node, "__overlay__")) {
+               /* HACK: Overlay fragments are a special case */
+               return;
+       }
+
        if (!prop) {
                prop = get_property(node, "ranges");
                if (prop && !prop->val.len)
@@ -1030,6 +1035,36 @@ static void check_avoid_unnecessary_addr_size(struct check *c, struct dt_info *d
 }
 WARNING(avoid_unnecessary_addr_size, check_avoid_unnecessary_addr_size, NULL, &avoid_default_addr_size);
 
+static void check_unique_unit_address(struct check *c, struct dt_info *dti,
+                                             struct node *node)
+{
+       struct node *childa;
+
+       if (node->addr_cells < 0 || node->size_cells < 0)
+               return;
+
+       if (!node->children)
+               return;
+
+       for_each_child(node, childa) {
+               struct node *childb;
+               const char *addr_a = get_unitname(childa);
+
+               if (!strlen(addr_a))
+                       continue;
+
+               for_each_child(node, childb) {
+                       const char *addr_b = get_unitname(childb);
+                       if (childa == childb)
+                               break;
+
+                       if (streq(addr_a, addr_b))
+                               FAIL(c, dti, childb, "duplicate unit-address (also used in node %s)", childa->fullpath);
+               }
+       }
+}
+WARNING(unique_unit_address, check_unique_unit_address, NULL, &avoid_default_addr_size);
+
 static void check_obsolete_chosen_interrupt_controller(struct check *c,
                                                       struct dt_info *dti,
                                                       struct node *node)
@@ -1370,6 +1405,152 @@ static void check_interrupts_property(struct check *c,
 }
 WARNING(interrupts_property, check_interrupts_property, &phandle_references);
 
+static const struct bus_type graph_port_bus = {
+       .name = "graph-port",
+};
+
+static const struct bus_type graph_ports_bus = {
+       .name = "graph-ports",
+};
+
+static void check_graph_nodes(struct check *c, struct dt_info *dti,
+                             struct node *node)
+{
+       struct node *child;
+
+       for_each_child(node, child) {
+               if (!(strprefixeq(child->name, child->basenamelen, "endpoint") ||
+                     get_property(child, "remote-endpoint")))
+                       continue;
+
+               node->bus = &graph_port_bus;
+
+               /* The parent of 'port' nodes can be either 'ports' or a device */
+               if (!node->parent->bus &&
+                   (streq(node->parent->name, "ports") || get_property(node, "reg")))
+                       node->parent->bus = &graph_ports_bus;
+
+               break;
+       }
+
+}
+WARNING(graph_nodes, check_graph_nodes, NULL);
+
+static void check_graph_child_address(struct check *c, struct dt_info *dti,
+                                     struct node *node)
+{
+       int cnt = 0;
+       struct node *child;
+
+       if (node->bus != &graph_ports_bus && node->bus != &graph_port_bus)
+               return;
+
+       for_each_child(node, child) {
+               struct property *prop = get_property(child, "reg");
+
+               /* No error if we have any non-zero unit address */
+               if (prop && propval_cell(prop) != 0)
+                       return;
+
+               cnt++;
+       }
+
+       if (cnt == 1 && node->addr_cells != -1)
+               FAIL(c, dti, node, "graph node has single child node '%s', #address-cells/#size-cells are not necessary",
+                    node->children->name);
+}
+WARNING(graph_child_address, check_graph_child_address, NULL, &graph_nodes);
+
+static void check_graph_reg(struct check *c, struct dt_info *dti,
+                           struct node *node)
+{
+       char unit_addr[9];
+       const char *unitname = get_unitname(node);
+       struct property *prop;
+
+       prop = get_property(node, "reg");
+       if (!prop || !unitname)
+               return;
+
+       if (!(prop->val.val && prop->val.len == sizeof(cell_t))) {
+               FAIL(c, dti, node, "graph node malformed 'reg' property");
+               return;
+       }
+
+       snprintf(unit_addr, sizeof(unit_addr), "%x", propval_cell(prop));
+       if (!streq(unitname, unit_addr))
+               FAIL(c, dti, node, "graph node unit address error, expected \"%s\"",
+                    unit_addr);
+
+       if (node->parent->addr_cells != 1)
+               FAIL_PROP(c, dti, node, get_property(node, "#address-cells"),
+                         "graph node '#address-cells' is %d, must be 1",
+                         node->parent->addr_cells);
+       if (node->parent->size_cells != 0)
+               FAIL_PROP(c, dti, node, get_property(node, "#size-cells"),
+                         "graph node '#size-cells' is %d, must be 0",
+                         node->parent->size_cells);
+}
+
+static void check_graph_port(struct check *c, struct dt_info *dti,
+                            struct node *node)
+{
+       if (node->bus != &graph_port_bus)
+               return;
+
+       if (!strprefixeq(node->name, node->basenamelen, "port"))
+               FAIL(c, dti, node, "graph port node name should be 'port'");
+
+       check_graph_reg(c, dti, node);
+}
+WARNING(graph_port, check_graph_port, NULL, &graph_nodes);
+
+static struct node *get_remote_endpoint(struct check *c, struct dt_info *dti,
+                                       struct node *endpoint)
+{
+       int phandle;
+       struct node *node;
+       struct property *prop;
+
+       prop = get_property(endpoint, "remote-endpoint");
+       if (!prop)
+               return NULL;
+
+       phandle = propval_cell(prop);
+       /* Give up if this is an overlay with external references */
+       if (phandle == 0 || phandle == -1)
+               return NULL;
+
+       node = get_node_by_phandle(dti->dt, phandle);
+       if (!node)
+               FAIL_PROP(c, dti, endpoint, prop, "graph phandle is not valid");
+
+       return node;
+}
+
+static void check_graph_endpoint(struct check *c, struct dt_info *dti,
+                                struct node *node)
+{
+       struct node *remote_node;
+
+       if (!node->parent || node->parent->bus != &graph_port_bus)
+               return;
+
+       if (!strprefixeq(node->name, node->basenamelen, "endpoint"))
+               FAIL(c, dti, node, "graph endpont node name should be 'endpoint'");
+
+       check_graph_reg(c, dti, node);
+
+       remote_node = get_remote_endpoint(c, dti, node);
+       if (!remote_node)
+               return;
+
+       if (get_remote_endpoint(c, dti, remote_node) != node)
+               FAIL(c, dti, node, "graph connection to node '%s' is not bidirectional",
+                    remote_node->fullpath);
+}
+WARNING(graph_endpoint, check_graph_endpoint, NULL, &graph_nodes);
+
 static struct check *check_table[] = {
        &duplicate_node_names, &duplicate_property_names,
        &node_name_chars, &node_name_format, &property_name_chars,
@@ -1404,6 +1585,7 @@ static struct check *check_table[] = {
 
        &avoid_default_addr_size,
        &avoid_unnecessary_addr_size,
+       &unique_unit_address,
        &obsolete_chosen_interrupt_controller,
        &chosen_node_is_root, &chosen_node_bootargs, &chosen_node_stdout_path,
 
@@ -1430,6 +1612,8 @@ static struct check *check_table[] = {
 
        &alias_paths,
 
+       &graph_nodes, &graph_child_address, &graph_port, &graph_endpoint,
+
        &always_fail,
 };
 
scripts/dtc/dtc-parser.y +11 -11
index 66ff7f7d8eb7..011a5b25539a 100644
@@ -191,18 +191,18 @@ devicetree:
                }
        | devicetree DT_REF nodedef
                {
-                       struct node *target = get_node_by_ref($1, $2);
-
-                       if (target) {
-                               merge_nodes(target, $3);
+                       /*
+                        * We rely on the rule being always:
+                        *   versioninfo plugindecl memreserves devicetree
+                        * so $-1 is what we want (plugindecl)
+                        */
+                       if ($<flags>-1 & DTSF_PLUGIN) {
+                               add_orphan_node($1, $3, $2);
                        } else {
-                               /*
-                                * We rely on the rule being always:
-                                *   versioninfo plugindecl memreserves devicetree
-                                * so $-1 is what we want (plugindecl)
-                                */
-                               if ($<flags>-1 & DTSF_PLUGIN)
-                                       add_orphan_node($1, $3, $2);
+                               struct node *target = get_node_by_ref($1, $2);
+
+                               if (target)
+                                       merge_nodes(target, $3);
                                else
                                        ERROR(&@2, "Label or path %s not found", $2);
                        }
scripts/dtc/livetree.c +9 -3
index 81b6c484542d..6e4c367f54b3 100644
@@ -238,10 +238,16 @@ struct node * add_orphan_node(struct node *dt, struct node *new_node, char *ref)
        struct data d = empty_data;
        char *name;
 
-       d = data_add_marker(d, REF_PHANDLE, ref);
-       d = data_append_integer(d, 0xffffffff, 32);
+       if (ref[0] == '/') {
+               d = data_append_data(d, ref, strlen(ref) + 1);
 
-       p = build_property("target", d);
+               p = build_property("target-path", d);
+       } else {
+               d = data_add_marker(d, REF_PHANDLE, ref);
+               d = data_append_integer(d, 0xffffffff, 32);
+
+               p = build_property("target", d);
+       }
 
        xasprintf(&name, "fragment@%u",
                        next_orphan_fragment++);
scripts/dtc/version_gen.h +1 -2
index ad87849e333b..b00f14ff7a17 100644
@@ -1 +1 @@
-#define DTC_VERSION "DTC 1.4.6-gaadd0b65"
+#define DTC_VERSION "DTC 1.4.6-g84e414b0"
--

2.17.1

author
#19 lore raw

PATCH v2 6/8 scripts/dtc: Update to upstream version v1.4.6-21-g84e414b0b5bc

Quoted 19 lines · Rob Herring
Quoted 5 lines · Tom Rini

From: Rob Herring <[email protected]>

This adds the following commits from upstream:

Quoted 12 lines

84e414b0b5bc tests: Add a test case for the omit-if-no-ref keyword 4038fd90056e dtc: add ability to make nodes conditional on them being referenced e1f139ea4900 checks: drop warning for missing PCI bridge bus-range f4eba68d89ee checks: Print duplicate node name instead of parent name 46df1fb1b211 .travis.yml: Run valgrind checks via Travis 14a3002a1aee tests: Update valgrind suppressions for sw_tree1 02c5fe9debc0 tests: Remove valgrind error from tests/get_path df536831d02c checks: add graph binding checks
2347c96edcbe checks: add a check for duplicate unit-addresses of child nodes 8f1b35f88395 Correct overlay syntactic sugar for generating target-path fragments afbddcd418fb Suppress warnings on overlay fragments
119e27300359 Improve tests for dtc overlay generation

Quoted 8 lines

That's 100s of commits behind master. Any reason why (IIRC, you revert the unaligned handling change)? In particular, there's a fix for GCC 10 and clang with commit:

0e9225eb0dfe Remove redundant YYLOC global declaration

Only just now pointed out to me for updating the kernel copy. Though I guess this could be handled with '-fcommon' instead.

I'm (slowly) getting all of the U-Boot Kbuild/Kconfig (and so, dtc) infrastructure in-line with Linux again, and then try and keep it up to date.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200313/c66a98b8/attachment.sig>
author
#20 lore raw

PATCH v2 6/8 scripts/dtc: Update to upstream version v1.4.6-21-g84e414b0b5bc

In reply to Tom Rini
Quoted 17 lines · Tom Rini

From: Rob Herring <[email protected]>

This adds the following commits from upstream:

84e414b0b5bc tests: Add a test case for the omit-if-no-ref keyword 4038fd90056e dtc: add ability to make nodes conditional on them being referenced e1f139ea4900 checks: drop warning for missing PCI bridge bus-range f4eba68d89ee checks: Print duplicate node name instead of parent name 46df1fb1b211 .travis.yml: Run valgrind checks via Travis 14a3002a1aee tests: Update valgrind suppressions for sw_tree1 02c5fe9debc0 tests: Remove valgrind error from tests/get_path df536831d02c checks: add graph binding checks
2347c96edcbe checks: add a check for duplicate unit-addresses of child nodes 8f1b35f88395 Correct overlay syntactic sugar for generating target-path fragments afbddcd418fb Suppress warnings on overlay fragments
119e27300359 Improve tests for dtc overlay generation

Quoted 5 lines
[From Linux Kernel commit 50aafd60898a8b3edf2f60e014a8288da3b2e5e3]
[For applying to U-Boot]

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200317/c3a484c2/attachment.sig>
author
#21 lore raw

PATCH v2 7/8 kconfig / kbuild: re-sync with Linux 4.18

In reply to Tom Rini

Align Kconfig and Kbuild logic to Linux 4.18 release with minimal impact on files outside of this scope.

Our previous Kconfig sync was done by commit e91610da7c8a ("kconfig:
re-sync with Linux 4.17-rc4").

A very small number of changes upstream since our sync with v4.17-rc4 that exist in the v4.18 release have already been applied here and have been omitted from the list in this commit (and are readily available in our own git history).

The imported Linux commits are:
[From priot to v4.17-rc4]
39a33ff80a25 kbuild: remove cc-option-align db547ef19064 Kbuild: don't add obj tree in additional includes b999596b963a Kbuild: don't add ../../ to include path

[From v4.17 to v4.18]
b3aa58d2e85d fixdep: suppress consecutive / from file paths in dependency list files 74656b682902 kbuild: disable new dtc graph and unit-address warnings 74d931716151 genksyms: remove symbol prefix support
e6ecfb45072c kbuild: do not display CHK for filechk
0b669a5076fd kconfig: refactor Qt package checks for building qconf b464ef583dc7 kconfig: refactor GTK+ package checks for building gconf 1c5af5cf9308 kconfig: refactor ncurses package checks for building mconf and nconf 694c49a7c01c kconfig: drop localization support
96f60dfa5819 trace: Use -mcount-record for dynamic ftrace
bb222ceeb327 kconfig: remove string expansion in file_lookup()
96d8e48da55a kconfig: remove string expansion for mainmenu after yyparse() 5b31a9746756 kconfig: remove sym_expand_string_value()
137c0118a900 kconfig: make default prompt of mainmenu less specific e298f3b49def kconfig: add built-in function support
2fd5b09c201e kconfig: add 'shell' built-in function
9de071536c87 kconfig: begin PARAM state only when seeing a command keyword 9ced3bddec08 kconfig: support user-defined function and recursively expanded variable 1175c02506ff kconfig: support simply expanded variable
ed2a22f277c6 kconfig: support append assignment operator
82bc8bd82e5c kconfig: expand lefthand side of assignment statement 1d6272e6fe43 kconfig: add 'info', 'warning-if', and 'error-if' built-in functions a702a6176e2f kconfig: add 'filename' and 'lineno' built-in variables 915f64901eb3 kconfig: error out if a recursive variable references itself 2bece88f89fa kconfig: test: add Kconfig macro language tests
21c54b774744 kconfig: show compiler version text in the top comment 59f7b5847b0c kbuild: $(CHECK) doesnt need NOSTDINC_FLAGS twice
145167650b96 kbuild: add endianness flag to CHEKCFLAGS
1f2f01b122d7 kbuild: add machine size to CHECKFLAGS
d6a0c8a1326b kconfig: Add testconfig into make help output
bb6d83dde191 kbuild: Move last word of nconfig help to the previous line 8593080c0fcf kconfig: fix localmodconfig
ed7d40bc67b8 tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount b2d00d7c61c8 kconfig: fix line numbers for if-entries in menu tree ecd53ac2f2c6 kconfig: handle P_SYMBOL in print_symbol()
73d1c580f92b kconfig: loop boundary condition fix
48f6e3cf5bc6 kbuild: do not drop -I without parameter
bd412d81b7ea kbuild: .PHONY is not a variable, but PHONY is
6916162c7308 kbuild: remove duplicated comments about PHONY

Cc Masahiro Yamada <[email protected]>
---
 Kconfig                                       |   6 +-
 Makefile                                      |  11 +-
 scripts/Kbuild.include                        |   8 +-
 scripts/Makefile.build                        |  10 +-
 scripts/Makefile.clean                        |   3 -
 scripts/Makefile.lib                          |  10 +-
 scripts/basic/fixdep.c                        |   6 +-
 scripts/kconfig/.gitignore                    |   4 -
 scripts/kconfig/Makefile                      | 194 ++----
 scripts/kconfig/POTFILES.in                   |  12 -
 scripts/kconfig/check.sh                      |  14 -
 scripts/kconfig/conf.c                        |  51 +-
 scripts/kconfig/confdata.c                    |  37 +-
 scripts/kconfig/expr.h                        |   3 +
 scripts/kconfig/gconf-cfg.sh                  |  23 +
 scripts/kconfig/gconf.c                       |  46 +-
 scripts/kconfig/kconf_id.c                    |   1 -
 scripts/kconfig/kxgettext.c                   | 235 -------
 scripts/kconfig/lkc.h                         |  19 +-
 scripts/kconfig/lkc_proto.h                   |  15 +-
 scripts/kconfig/lxdialog/check-lxdialog.sh    |  93 ---
 scripts/kconfig/lxdialog/checklist.c          |   4 +-
 scripts/kconfig/lxdialog/dialog.h             |   8 +-
 scripts/kconfig/lxdialog/inputbox.c           |   4 +-
 scripts/kconfig/lxdialog/menubox.c            |  10 +-
 scripts/kconfig/lxdialog/textbox.c            |   2 +-
 scripts/kconfig/lxdialog/yesno.c              |   4 +-
 scripts/kconfig/mconf-cfg.sh                  |  44 ++
 scripts/kconfig/mconf.c                       | 141 +++--
 scripts/kconfig/menu.c                        |  23 +-
 scripts/kconfig/nconf-cfg.sh                  |  44 ++
 scripts/kconfig/nconf.c                       | 148 +++--
 scripts/kconfig/nconf.h                       |   1 -
 scripts/kconfig/preprocess.c                  | 572 ++++++++++++++++++
 scripts/kconfig/qconf-cfg.sh                  |  25 +
 scripts/kconfig/qconf.cc                      | 104 ++--
 scripts/kconfig/streamline_config.pl          |   4 +-
 scripts/kconfig/symbol.c                      | 109 ----
 .../no_write_if_dep_unmet/expected_config     |   2 +-
 scripts/kconfig/util.c                        |  33 +-
 scripts/kconfig/zconf.l                       |  95 ++-
 scripts/kconfig/zconf.y                       |  54 +-
 42 files changed, 1202 insertions(+), 1030 deletions(-)
 delete mode 100644 scripts/kconfig/POTFILES.in
 delete mode 100755 scripts/kconfig/check.sh
 create mode 100755 scripts/kconfig/gconf-cfg.sh
 delete mode 100644 scripts/kconfig/kxgettext.c
 delete mode 100755 scripts/kconfig/lxdialog/check-lxdialog.sh
 create mode 100755 scripts/kconfig/mconf-cfg.sh
 create mode 100644 scripts/kconfig/nconf-cfg.sh
 create mode 100644 scripts/kconfig/preprocess.c
 create mode 100755 scripts/kconfig/qconf-cfg.sh
Kconfig +1 -5
index 66148ce47790..e7e574fcbf25 100644
@@ -3,11 +3,7 @@
 # see the file Documentation/kbuild/kconfig-language.txt in the
 # Linux kernel source tree.
 #
-mainmenu "U-Boot $UBOOTVERSION Configuration"
-
-config UBOOTVERSION
-	string
-	option env="UBOOTVERSION"
+mainmenu "U-Boot $(UBOOTVERSION) Configuration"
 
 # Allow defaults in arch-specific code to override any given here
 source "arch/Kconfig"
Makefile +9 -2
index 07539ca59686..84ab6803c93f 100644
@@ -436,6 +436,8 @@ export HOSTCXX HOSTCXXFLAGS CHECK CHECKFLAGS DTC DTC_FLAGS
 export KBUILD_CPPFLAGS NOSTDINC_FLAGS UBOOTINCLUDE OBJCOPYFLAGS LDFLAGS
 export KBUILD_CFLAGS KBUILD_AFLAGS
 
+export CC_VERSION_TEXT := $(shell $(CC) --version | head -n 1)
+
 # When compiling out-of-tree modules, put MODVERDIR in the module
 # tree rather than in the kernel tree. The kernel tree might
 # even be read-only.
@@ -710,7 +712,6 @@ UBOOTINCLUDE    := \
 		-include $(srctree)/include/linux/kconfig.h
 
 NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
-CHECKFLAGS     += $(NOSTDINC_FLAGS)
 
 # FIX ME
 cpp_flags := $(KBUILD_CPPFLAGS) $(PLATFORM_CPPFLAGS) $(UBOOTINCLUDE) \
@@ -924,6 +925,12 @@ ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA),)
 LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
 endif
 
+# insure the checker run with the right endianness
+CHECKFLAGS += $(if $(CONFIG_CPU_BIG_ENDIAN),-mbig-endian,-mlittle-endian)
+
+# the checker needs the correct machine size
+CHECKFLAGS += $(if $(CONFIG_64BIT),-m64,-m32)
+
 # Normally we fill empty space with 0xff
 quiet_cmd_objcopy = OBJCOPY $@
 cmd_objcopy = $(OBJCOPY) --gap-fill=0xff $(OBJCOPYFLAGS) \
@@ -2196,6 +2203,6 @@ endif	# skip-makefile
 PHONY += FORCE
 FORCE:
 
-# Declare the contents of the .PHONY variable as phony.  We keep that
+# Declare the contents of the PHONY variable as phony.  We keep that
 # information in a variable so we can use it in if_changed and friends.
 .PHONY: $(PHONY)
scripts/Kbuild.include +1 -7
index b8969e2a75e6..8ba7e9687532 100644
@@ -54,7 +54,6 @@ kecho := $($(quiet)kecho)
 #   to specify a valid file as first prerequisite (often the kbuild file)
 define filechk
 	$(Q)set -e;				\
-	$(kecho) '  CHK     $@';		\
 	mkdir -p $(dir $@);			\
 	$(filechk_$(1)) < $< > [email protected];		\
 	if [ -r $@ ] && cmp -s $@ [email protected]; then	\
@@ -121,11 +120,6 @@ cc-option = $(call try-run,\
 cc-option-yn = $(call try-run,\
 	$(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) $(1) -c -x c /dev/null -o "$$TMP",y,n)
 
-# cc-option-align
-# Prefix align with either -falign or -malign
-cc-option-align = $(subst -functions=0,,\
-	$(call cc-option,-falign-functions=0,-malign-functions=0))
-
 # cc-disable-warning
 # Usage: cflags-y += $(call cc-disable-warning,unused-but-set-variable)
 cc-disable-warning = $(call try-run,\
@@ -208,7 +202,7 @@ hdr-inst := -f $(srctree)/scripts/Makefile.headersinst obj
 # Prefix -I with $(srctree) if it is not an absolute path.
 # skip if -I has no parameter
 addtree = $(if $(patsubst -I%,%,$(1)), \
-$(if $(filter-out -I/%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1))) $(1))
+$(if $(filter-out -I/% -I./% -I../%,$(1)),$(patsubst -I%,-I$(srctree)/%,$(1)),$(1)),$(1))
 
 # Find all -I options and call addtree
 flags = $(foreach o,$($(1)),$(if $(filter -I%,$(o)),$(call addtree,$(o)),$(o)))
scripts/Makefile.build +6 -4
index 26eb701f8dea..f8362fbd89d9 100644
@@ -181,7 +181,6 @@ $(obj)/%.i: $(src)/%.c FORCE
 cmd_gensymtypes =                                                           \
     $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
     $(GENKSYMS) $(if $(1), -T $(2))                                         \
-     $(patsubst y,-s _,$(CONFIG_HAVE_UNDERSCORE_SYMBOL_PREFIX))             \
      $(if $(KBUILD_PRESERVE),-p)                                            \
      -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
 
@@ -231,6 +230,11 @@ cmd_modversions =								\
 endif
 
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
+# gcc 5 supports generating the mcount tables directly
+ifneq ($(call cc-option,-mrecord-mcount,y),y)
+KBUILD_CFLAGS += -mrecord-mcount
+else
+# else do it all manually
 ifdef BUILD_C_RECORDMCOUNT
 ifeq ("$(origin RECORDMCOUNT_WARN)", "command line")
   RECORDMCOUNT_FLAGS = -w
@@ -259,6 +263,7 @@ cmd_record_mcount =						\
 	     "$(CC_FLAGS_FTRACE)" ]; then			\
 		$(sub_cmd_record_mcount)			\
 	fi;
+endif # -record-mcount
 endif
 
 define rule_cc_o_c
@@ -450,7 +455,4 @@ ifneq ($(cmd_files),)
   include $(cmd_files)
 endif
 
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
-
 .PHONY: $(PHONY)
scripts/Makefile.clean +0 -3
index 4cc468d24eab..8fe9e05a14a9 100644
@@ -91,7 +91,4 @@ PHONY += $(subdir-ymn)
 $(subdir-ymn):
 	$(Q)$(MAKE) $(clean)=$@
 
-# Declare the contents of the .PHONY variable as phony.  We keep that
-# information in a variable se we can use it in if_changed and friends.
-
 .PHONY: $(PHONY)
scripts/Makefile.lib +7 -3
index 63d790e4e287..8c77eaaa4eed 100644
@@ -144,9 +144,10 @@ else
 # $(call addtree,-I$(obj)) locates .h files in srctree, from generated .c files
 #   and locates generated .h files
 # FIXME: Replace both with specific CFLAGS* statements in the makefiles
-__c_flags	= $(call addtree,-I$(obj)) $(call flags,_c_flags)
-__a_flags	=                          $(call flags,_a_flags)
-__cpp_flags     =                          $(call flags,_cpp_flags)
+__c_flags	= $(if $(obj),$(call addtree,-I$(src)) -I$(obj)) \
+		  $(call flags,_c_flags)
+__a_flags	= $(call flags,_a_flags)
+__cpp_flags     = $(call flags,_cpp_flags)
 endif
 
 # Modified for U-Boot: LINUXINCLUDE -> UBOOTINCLUDE
@@ -280,6 +281,9 @@ DTC_FLAGS += -Wno-unit_address_vs_reg \
 	-Wno-unit_address_format \
 	-Wno-avoid_unnecessary_addr_size \
 	-Wno-alias_paths \
+	-Wno-graph_child_address \
+	-Wno-graph_port \
+	-Wno-unique_unit_address \
 	-Wno-simple_bus_reg \
 	-Wno-pci_device_reg
 
scripts/basic/fixdep.c +4 -2
index a524f72e9e8b..c9277d782c5e 100644
@@ -117,7 +117,7 @@ static void usage(void)
  */
 static void print_dep(const char *m, int slen, const char *dir)
 {
-	int c, i;
+	int c, prev_c = '/', i;
 
 	printf("    $(wildcard %s/", dir);
 	for (i = 0; i < slen; i++) {
@@ -126,7 +126,9 @@ static void print_dep(const char *m, int slen, const char *dir)
 			c = '/';
 		else
 			c = tolower(c);
-		putchar(c);
+		if (c != '/' || prev_c != '/')
+			putchar(c);
+		prev_c = c;
 	}
 	printf(".h) \\\n");
 }
scripts/kconfig/.gitignore +0 -4
index 2da579edcbaf..0aabc1d6a182 100644
@@ -2,9 +2,6 @@
 # Generated files
 #
 *.moc
-gconf.glade.h
-*.pot
-*.mo
 
 #
 # configuration programs
@@ -14,4 +11,3 @@ mconf
 nconf
 qconf
 gconf
-kxgettext
scripts/kconfig/Makefile +53 -141

238 lines not on this page · raw message

scripts/kconfig/POTFILES.in deleted +0 -12
deleted file mode 100644
index 967457396990..000000000000
@@ -1,12 +0,0 @@
-scripts/kconfig/lxdialog/checklist.c
-scripts/kconfig/lxdialog/inputbox.c
-scripts/kconfig/lxdialog/menubox.c
-scripts/kconfig/lxdialog/textbox.c
-scripts/kconfig/lxdialog/util.c
-scripts/kconfig/lxdialog/yesno.c
-scripts/kconfig/mconf.c
-scripts/kconfig/conf.c
-scripts/kconfig/confdata.c
-scripts/kconfig/gconf.c
-scripts/kconfig/gconf.glade.h
-scripts/kconfig/qconf.cc
scripts/kconfig/check.sh deleted +0 -14
deleted file mode 100755
index 97f0fee7d173..000000000000
@@ -1,14 +0,0 @@
-#!/bin/sh
-# SPDX-License-Identifier: GPL-2.0
-# Needed for systems without gettext
-$* -x c -o /dev/null - > /dev/null 2>&1 << EOF
-#include <libintl.h>
-int main()
-{
-	gettext("");
-	return 0;
-}
-EOF
-if [ ! "$?" -eq "0"  ]; then
-	echo -DKBUILD_NO_NLS;
-fi
scripts/kconfig/conf.c +23 -28

181 lines not on this page · raw message

scripts/kconfig/confdata.c +6 -31
index a04bb26304fc..1abf849bf543 100644
@@ -30,7 +30,7 @@ static void conf_message(const char *fmt, ...)
 static const char *conf_filename;
 static int conf_lineno, conf_warnings;
 
-const char conf_defname[] = "arch/$ARCH/defconfig";
+const char conf_defname[] = "arch/$(ARCH)/defconfig";
 
 static void conf_warning(const char *fmt, ...)
 {
@@ -81,39 +81,13 @@ const char *conf_get_autoconfig_name(void)
 	return name ? name : "include/config/auto.conf";
 }
 
-static char *conf_expand_value(const char *in)
-{
-	struct symbol *sym;
-	const char *src;
-	static char res_value[SYMBOL_MAXLENGTH];
-	char *dst, name[SYMBOL_MAXLENGTH];
-
-	res_value[0] = 0;
-	dst = name;
-	while ((src = strchr(in, '$'))) {
-		strncat(res_value, in, src - in);
-		src++;
-		dst = name;
-		while (isalnum(*src) || *src == '_')
-			*dst++ = *src++;
-		*dst = 0;
-		sym = sym_lookup(name, 0);
-		sym_calc_value(sym);
-		strcat(res_value, sym_get_string_value(sym));
-		in = src;
-	}
-	strcat(res_value, in);
-
-	return res_value;
-}
-
 char *conf_get_default_confname(void)
 {
 	struct stat buf;
 	static char fullname[PATH_MAX+1];
 	char *env, *name;
 
-	name = conf_expand_value(conf_defname);
+	name = expand_string(conf_defname);
 	env = getenv(SRCTREE);
 	if (env) {
 		sprintf(fullname, "%s/%s", env, name);
@@ -270,10 +244,11 @@ int conf_read_simple(const char *name, int def)
 			if (expr_calc_value(prop->visible.expr) == no ||
 			    prop->expr->type != E_SYMBOL)
 				continue;
-			name = conf_expand_value(prop->expr->left.sym->name);
+			sym_calc_value(prop->expr->left.sym);
+			name = sym_get_string_value(prop->expr->left.sym);
 			in = zconf_fopen(name);
 			if (in) {
-				conf_message(_("using defaults found in %s"),
+				conf_message("using defaults found in %s",
 					 name);
 				goto load;
 			}
@@ -829,7 +804,7 @@ next:
 			return 1;
 	}
 
-	conf_message(_("configuration written to %s"), newname);
+	conf_message("configuration written to %s", newname);
 
 	sym_set_change_count(0);
 
scripts/kconfig/expr.h +3 -0
index 94a383b21df6..f63b41b0dd49 100644
@@ -171,6 +171,9 @@ struct symbol {
  * config BAZ
  *         int "BAZ Value"
  *         range 1..255
+ *
+ * Please, also check zconf.y:print_symbol() when modifying the
+ * list of property types!
  */
 enum prop_type {
 	P_UNKNOWN,
scripts/kconfig/gconf-cfg.sh new file +23 -0
new file mode 100755
index 000000000000..533b3d8f8f08
@@ -0,0 +1,23 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+PKG="gtk+-2.0 gmodule-2.0 libglade-2.0"
+
+if ! pkg-config --exists $PKG; then
+	echo >&2 "*"
+	echo >&2 "* Unable to find the GTK+ installation. Please make sure that"
+	echo >&2 "* the GTK+ 2.0 development package is correctly installed."
+	echo >&2 "* You need $PKG"
+	echo >&2 "*"
+	exit 1
+fi
+
+if ! pkg-config --atleast-version=2.0.0 gtk+-2.0; then
+	echo >&2 "*"
+	echo >&2 "* GTK+ is present but version >= 2.0.0 is required."
+	echo >&2 "*"
+	exit 1
+fi
+
+echo cflags=\"$(pkg-config --cflags $PKG)\"
+echo libs=\"$(pkg-config --libs $PKG)\"
scripts/kconfig/gconf.c +21 -25

167 lines not on this page · raw message

scripts/kconfig/kconf_id.c +0 -1
index 3ea9c5f9f730..b3e0ea0ac732 100644
@@ -32,7 +32,6 @@ static struct kconf_id kconf_id_array[] = {
 	{ "on",			T_ON,			TF_PARAM },
 	{ "modules",		T_OPT_MODULES,		TF_OPTION },
 	{ "defconfig_list",	T_OPT_DEFCONFIG_LIST,	TF_OPTION },
-	{ "env",		T_OPT_ENV,		TF_OPTION },
 	{ "allnoconfig_y",	T_OPT_ALLNOCONFIG_Y,	TF_OPTION },
 };
 
scripts/kconfig/kxgettext.c deleted +0 -235

235 lines not on this page · raw message

scripts/kconfig/lkc.h +1 -18
index f4394af6e4b8..ed3ff88e60ba 100644
@@ -8,15 +8,6 @@
 
 #include "expr.h"
 
-#ifndef KBUILD_NO_NLS
-# include <libintl.h>
-#else
-static inline const char *gettext(const char *txt) { return txt; }
-static inline void textdomain(const char *domainname) {}
-static inline void bindtextdomain(const char *name, const char *dir) {}
-static inline char *bind_textdomain_codeset(const char *dn, char *c) { return c; }
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -29,11 +20,6 @@ extern "C" {
 #define PACKAGE "linux"
 #endif
 
-#define LOCALEDIR "/usr/share/locale"
-
-#define _(text) gettext(text)
-#define N_(text) (text)
-
 #ifndef CONFIG_
 #define CONFIG_ "CONFIG_"
 #endif
@@ -58,7 +44,6 @@ enum conf_def_mode {
 
 #define T_OPT_MODULES		1
 #define T_OPT_DEFCONFIG_LIST	2
-#define T_OPT_ENV		3
 #define T_OPT_ALLNOCONFIG_Y	4
 
 struct kconf_id {
@@ -117,6 +102,7 @@ void *xmalloc(size_t size);
 void *xcalloc(size_t nmemb, size_t size);
 void *xrealloc(void *p, size_t size);
 char *xstrdup(const char *s);
+char *xstrndup(const char *s, size_t n);
 
 struct gstr {
 	size_t len;
@@ -134,9 +120,6 @@ void str_printf(struct gstr *gs, const char *fmt, ...);
 const char *str_get(struct gstr *gs);
 
 /* symbol.c */
-extern struct expr *sym_env_list;
-
-void sym_init(void);
 void sym_clear_all_valid(void);
 struct symbol *sym_choice_default(struct symbol *sym);
 const char *sym_get_string_default(struct symbol *sym);
scripts/kconfig/lkc_proto.h +14 -1
index 9dc8abfb1dc3..a8b7a330587e 100644
@@ -31,7 +31,6 @@ extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
 
 struct symbol * sym_lookup(const char *name, int flags);
 struct symbol * sym_find(const char *name);
-char *sym_expand_string_value(const char *in);
 const char * sym_escape_string_value(const char *in);
 struct symbol ** sym_re_search(const char *pattern);
 const char * sym_type_name(enum symbol_type type);
@@ -49,5 +48,19 @@ const char * sym_get_string_value(struct symbol *sym);
 
 const char * prop_get_type_name(enum prop_type type);
 
+/* preprocess.c */
+enum variable_flavor {
+	VAR_SIMPLE,
+	VAR_RECURSIVE,
+	VAR_APPEND,
+};
+void env_write_dep(FILE *f, const char *auto_conf_name);
+void variable_add(const char *name, const char *value,
+		  enum variable_flavor flavor);
+void variable_all_del(void);
+char *expand_string(const char *in);
+char *expand_dollar(const char **str);
+char *expand_one_token(const char **str);
+
 /* expr.c */
 void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *), void *data, int prevtoken);
scripts/kconfig/lxdialog/check-lxdialog.sh deleted +0 -93

93 lines not on this page · raw message

scripts/kconfig/lxdialog/checklist.c +2 -2
index fc0b12bbccbe..fd161cfff121 100644
@@ -90,8 +90,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
 	int x = width / 2 - 11;
 	int y = height - 2;
 
-	print_button(dialog, gettext("Select"), y, x, selected == 0);
-	print_button(dialog, gettext(" Help "), y, x + 14, selected == 1);
+	print_button(dialog, "Select", y, x, selected == 0);
+	print_button(dialog, " Help ", y, x + 14, selected == 1);
 
 	wmove(dialog, y, x + 1 + 14 * selected);
 	wrefresh(dialog);
scripts/kconfig/lxdialog/dialog.h +1 -7
index b1617ffbe70e..68b565e3c495 100644
@@ -13,16 +13,10 @@
 #include <string.h>
 #include <stdbool.h>
 
-#ifndef KBUILD_NO_NLS
-# include <libintl.h>
-#else
-# define gettext(Msgid) ((const char *) (Msgid))
-#endif
-
 #ifdef __sun__
 #define CURS_MACROS
 #endif
-#include CURSES_LOC
+#include <ncurses.h>
 
 /*
  * Colors in ncurses 1.9.9e do not work properly since foreground and
scripts/kconfig/lxdialog/inputbox.c +2 -2
index edeb094dbad0..611945611bf8 100644
@@ -18,8 +18,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
 	int x = width / 2 - 11;
 	int y = height - 2;
 
-	print_button(dialog, gettext("  Ok  "), y, x, selected == 0);
-	print_button(dialog, gettext(" Help "), y, x + 14, selected == 1);
+	print_button(dialog, "  Ok  ", y, x, selected == 0);
+	print_button(dialog, " Help ", y, x + 14, selected == 1);
 
 	wmove(dialog, y, x + 1 + 14 * selected);
 	wrefresh(dialog);
scripts/kconfig/lxdialog/menubox.c +5 -5
index 0ef23192c2dc..58c2f8afe59b 100644
@@ -144,11 +144,11 @@ static void print_buttons(WINDOW * win, int height, int width, int selected)
 	int x = width / 2 - 28;
 	int y = height - 2;
 
-	print_button(win, gettext("Select"), y, x, selected == 0);
-	print_button(win, gettext(" Exit "), y, x + 12, selected == 1);
-	print_button(win, gettext(" Help "), y, x + 24, selected == 2);
-	print_button(win, gettext(" Save "), y, x + 36, selected == 3);
-	print_button(win, gettext(" Load "), y, x + 48, selected == 4);
+	print_button(win, "Select", y, x, selected == 0);
+	print_button(win, " Exit ", y, x + 12, selected == 1);
+	print_button(win, " Help ", y, x + 24, selected == 2);
+	print_button(win, " Save ", y, x + 36, selected == 3);
+	print_button(win, " Load ", y, x + 48, selected == 4);
 
 	wmove(win, y, x + 1 + 12 * selected);
 	wrefresh(win);
scripts/kconfig/lxdialog/textbox.c +1 -1
index ab34000d9b93..4e339b12664e 100644
@@ -116,7 +116,7 @@ do_resize:
 
 	print_title(dialog, title, width);
 
-	print_button(dialog, gettext(" Exit "), height - 2, width / 2 - 4, TRUE);
+	print_button(dialog, " Exit ", height - 2, width / 2 - 4, TRUE);
 	wnoutrefresh(dialog);
 	getyx(dialog, cur_y, cur_x);	/* Save cursor position */
 
scripts/kconfig/lxdialog/yesno.c +2 -2
index 274341d02040..bcaac9b7bab2 100644
@@ -16,8 +16,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
 	int x = width / 2 - 10;
 	int y = height - 2;
 
-	print_button(dialog, gettext(" Yes "), y, x, selected == 0);
-	print_button(dialog, gettext("  No  "), y, x + 13, selected == 1);
+	print_button(dialog, " Yes ", y, x, selected == 0);
+	print_button(dialog, "  No  ", y, x + 13, selected == 1);
 
 	wmove(dialog, y, x + 1 + 13 * selected);
 	wrefresh(dialog);
scripts/kconfig/mconf-cfg.sh new file +44 -0

44 lines not on this page · raw message

scripts/kconfig/mconf.c +68 -73

367 lines not on this page · raw message

scripts/kconfig/menu.c +10 -13
index 5c5c1374b151..379a119dcd1e 100644
@@ -214,9 +214,6 @@ void menu_add_option(int token, char *arg)
 			zconf_error("trying to redefine defconfig symbol");
 		sym_defconfig_list->flags |= SYMBOL_AUTO;
 		break;
-	case T_OPT_ENV:
-		prop_add_env(arg);
-		break;
 	case T_OPT_ALLNOCONFIG_Y:
 		current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y;
 		break;
@@ -711,7 +708,7 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
 	struct menu *submenu[8], *menu, *location = NULL;
 	struct jump_key *jump = NULL;
 
-	str_printf(r, _("Prompt: %s\n"), _(prop->text));
+	str_printf(r, "Prompt: %s\n", prop->text);
 	menu = prop->menu->parent;
 	for (i = 0; menu != &rootmenu && i < 8; menu = menu->parent) {
 		bool accessible = menu_is_visible(menu);
@@ -744,16 +741,16 @@ static void get_prompt_str(struct gstr *r, struct property *prop,
 	}
 
 	if (i > 0) {
-		str_printf(r, _("  Location:\n"));
+		str_printf(r, "  Location:\n");
 		for (j = 4; --i >= 0; j += 2) {
 			menu = submenu[i];
 			if (jump && menu == location)
 				jump->offset = strlen(r->s);
 			str_printf(r, "%*c-> %s", j, ' ',
-				   _(menu_get_prompt(menu)));
+				   menu_get_prompt(menu));
 			if (menu->sym) {
 				str_printf(r, " (%s [=%s])", menu->sym->name ?
-					menu->sym->name : _("<choice>"),
+					menu->sym->name : "<choice>",
 					sym_get_string_value(menu->sym));
 			}
 			str_append(r, "\n");
@@ -817,23 +814,23 @@ static void get_symbol_str(struct gstr *r, struct symbol *sym,
 
 	prop = get_symbol_prop(sym);
 	if (prop) {
-		str_printf(r, _("  Defined at %s:%d\n"), prop->menu->file->name,
+		str_printf(r, "  Defined at %s:%d\n", prop->menu->file->name,
 			prop->menu->lineno);
 		if (!expr_is_yes(prop->visible.expr)) {
-			str_append(r, _("  Depends on: "));
+			str_append(r, "  Depends on: ");
 			expr_gstr_print(prop->visible.expr, r);
 			str_append(r, "\n");
 		}
 	}
 
-	get_symbol_props_str(r, sym, P_SELECT, _("  Selects: "));
+	get_symbol_props_str(r, sym, P_SELECT, "  Selects: ");
 	if (sym->rev_dep.expr) {
 		expr_gstr_print_revdep(sym->rev_dep.expr, r, yes, "  Selected by [y]:\n");
 		expr_gstr_print_revdep(sym->rev_dep.expr, r, mod, "  Selected by [m]:\n");
 		expr_gstr_print_revdep(sym->rev_dep.expr, r, no, "  Selected by [n]:\n");
 	}
 
-	get_symbol_props_str(r, sym, P_IMPLY, _("  Implies: "));
+	get_symbol_props_str(r, sym, P_IMPLY, "  Implies: ");
 	if (sym->implied.expr) {
 		expr_gstr_print_revdep(sym->implied.expr, r, yes, "  Implied by [y]:\n");
 		expr_gstr_print_revdep(sym->implied.expr, r, mod, "  Implied by [m]:\n");
@@ -852,7 +849,7 @@ struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head)
 	for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
 		get_symbol_str(&res, sym, head);
 	if (!i)
-		str_append(&res, _("No matches found.\n"));
+		str_append(&res, "No matches found.\n");
 	return res;
 }
 
@@ -867,7 +864,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
 			str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
 		help_text = menu_get_help(menu);
 	}
-	str_printf(help, "%s\n", _(help_text));
+	str_printf(help, "%s\n", help_text);
 	if (sym)
 		get_symbol_str(help, sym, NULL);
 }
scripts/kconfig/nconf-cfg.sh new file +44 -0

44 lines not on this page · raw message

scripts/kconfig/nconf.c +72 -76

388 lines not on this page · raw message

scripts/kconfig/nconf.h +0 -1
index 9f6f21d3b0d4..2b9e19f603c4 100644
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <locale.h>
 #include <ncurses.h>
 #include <menu.h>
 #include <panel.h>
scripts/kconfig/preprocess.c new file +572 -0

572 lines not on this page · raw message

scripts/kconfig/qconf-cfg.sh new file +25 -0
new file mode 100755
index 000000000000..0862e1562536
@@ -0,0 +1,25 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+
+PKG="Qt5Core Qt5Gui Qt5Widgets"
+PKG2="QtCore QtGui"
+
+if pkg-config --exists $PKG; then
+	echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)\"
+	echo libs=\"$(pkg-config --libs $PKG)\"
+	echo moc=\"$(pkg-config --variable=host_bins Qt5Core)/moc\"
+	exit 0
+fi
+
+if pkg-config --exists $PKG2; then
+	echo cflags=\"$(pkg-config --cflags $PKG2)\"
+	echo libs=\"$(pkg-config --libs $PKG2)\"
+	echo moc=\"$(pkg-config --variable=moc_location QtCore)\"
+	exit 0
+fi
+
+echo >&2 "*"
+echo >&2 "* Could not find Qt via pkg-config."
+echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH"
+echo >&2 "*"
+exit 1
scripts/kconfig/qconf.cc +46 -58

116 lines not on this page · raw message

scripts/kconfig/streamline_config.pl +2 -2
index a2e83ab17de3..4686531e2f8c 100755

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

scripts/kconfig/symbol.c +0 -109

109 lines not on this page · raw message

scripts/kconfig/tests/no_write_if_dep_unmet/expected_config +1 -1
index 0d15e41da475..473228810c35 100644

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

scripts/kconfig/util.c +13 -20
index c6f6e21b809f..a365594770d9 100644

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

scripts/kconfig/zconf.l +89 -6

95 lines not on this page · raw message

scripts/kconfig/zconf.y +31 -23

54 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.

#22 lore raw

PATCH v2 7/8 kconfig / kbuild: re-sync with Linux 4.18

Hi Tom,

Quoted 7 lines · Tom Rini

Align Kconfig and Kbuild logic to Linux 4.18 release with minimal impact on files outside of this scope.

Our previous Kconfig sync was done by commit e91610da7c8a ("kconfig:
re-sync with Linux 4.17-rc4").

Quoted 7 lines

A very small number of changes upstream since our sync with v4.17-rc4 that exist in the v4.18 release have already been applied here and have been omitted from the list in this commit (and are readily available in our own git history).

The imported Linux commits are:
[From priot to v4.17-rc4]

Just a nit.

"priot" -> "prior"

Other than that, looks good to me.

Thanks.

Quoted 47 lines

39a33ff80a25 kbuild: remove cc-option-align db547ef19064 Kbuild: don't add obj tree in additional includes b999596b963a Kbuild: don't add ../../ to include path

[From v4.17 to v4.18]
b3aa58d2e85d fixdep: suppress consecutive / from file paths in dependency list files 74656b682902 kbuild: disable new dtc graph and unit-address warnings 74d931716151 genksyms: remove symbol prefix support
e6ecfb45072c kbuild: do not display CHK for filechk
0b669a5076fd kconfig: refactor Qt package checks for building qconf b464ef583dc7 kconfig: refactor GTK+ package checks for building gconf 1c5af5cf9308 kconfig: refactor ncurses package checks for building mconf and nconf 694c49a7c01c kconfig: drop localization support
96f60dfa5819 trace: Use -mcount-record for dynamic ftrace
bb222ceeb327 kconfig: remove string expansion in file_lookup()
96d8e48da55a kconfig: remove string expansion for mainmenu after yyparse() 5b31a9746756 kconfig: remove sym_expand_string_value()
137c0118a900 kconfig: make default prompt of mainmenu less specific e298f3b49def kconfig: add built-in function support
2fd5b09c201e kconfig: add 'shell' built-in function
9de071536c87 kconfig: begin PARAM state only when seeing a command keyword 9ced3bddec08 kconfig: support user-defined function and recursively expanded variable 1175c02506ff kconfig: support simply expanded variable
ed2a22f277c6 kconfig: support append assignment operator
82bc8bd82e5c kconfig: expand lefthand side of assignment statement 1d6272e6fe43 kconfig: add 'info', 'warning-if', and 'error-if' built-in functions a702a6176e2f kconfig: add 'filename' and 'lineno' built-in variables 915f64901eb3 kconfig: error out if a recursive variable references itself 2bece88f89fa kconfig: test: add Kconfig macro language tests
21c54b774744 kconfig: show compiler version text in the top comment 59f7b5847b0c kbuild: $(CHECK) doesnt need NOSTDINC_FLAGS twice
145167650b96 kbuild: add endianness flag to CHEKCFLAGS
1f2f01b122d7 kbuild: add machine size to CHECKFLAGS
d6a0c8a1326b kconfig: Add testconfig into make help output
bb6d83dde191 kbuild: Move last word of nconfig help to the previous line 8593080c0fcf kconfig: fix localmodconfig
ed7d40bc67b8 tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount b2d00d7c61c8 kconfig: fix line numbers for if-entries in menu tree ecd53ac2f2c6 kconfig: handle P_SYMBOL in print_symbol()
73d1c580f92b kconfig: loop boundary condition fix
48f6e3cf5bc6 kbuild: do not drop -I without parameter
bd412d81b7ea kbuild: .PHONY is not a variable, but PHONY is
6916162c7308 kbuild: remove duplicated comments about PHONY

Cc Masahiro Yamada <[email protected]>

---

Signature · 2 lines
Best Regards
Masahiro Yamada
author
#23 lore raw

PATCH v2 7/8 kconfig / kbuild: re-sync with Linux 4.18

In reply to Tom Rini
Quoted 57 lines · Tom Rini

Align Kconfig and Kbuild logic to Linux 4.18 release with minimal impact on files outside of this scope.

Our previous Kconfig sync was done by commit e91610da7c8a ("kconfig:
re-sync with Linux 4.17-rc4").

A very small number of changes upstream since our sync with v4.17-rc4 that exist in the v4.18 release have already been applied here and have been omitted from the list in this commit (and are readily available in our own git history).

The imported Linux commits are:
[From prior to v4.17-rc4]
39a33ff80a25 kbuild: remove cc-option-align db547ef19064 Kbuild: don't add obj tree in additional includes b999596b963a Kbuild: don't add ../../ to include path

[From v4.17 to v4.18]
b3aa58d2e85d fixdep: suppress consecutive / from file paths in dependency list files 74656b682902 kbuild: disable new dtc graph and unit-address warnings 74d931716151 genksyms: remove symbol prefix support
e6ecfb45072c kbuild: do not display CHK for filechk
0b669a5076fd kconfig: refactor Qt package checks for building qconf b464ef583dc7 kconfig: refactor GTK+ package checks for building gconf 1c5af5cf9308 kconfig: refactor ncurses package checks for building mconf and nconf 694c49a7c01c kconfig: drop localization support
96f60dfa5819 trace: Use -mcount-record for dynamic ftrace
bb222ceeb327 kconfig: remove string expansion in file_lookup()
96d8e48da55a kconfig: remove string expansion for mainmenu after yyparse() 5b31a9746756 kconfig: remove sym_expand_string_value()
137c0118a900 kconfig: make default prompt of mainmenu less specific e298f3b49def kconfig: add built-in function support
2fd5b09c201e kconfig: add 'shell' built-in function
9de071536c87 kconfig: begin PARAM state only when seeing a command keyword 9ced3bddec08 kconfig: support user-defined function and recursively expanded variable 1175c02506ff kconfig: support simply expanded variable
ed2a22f277c6 kconfig: support append assignment operator
82bc8bd82e5c kconfig: expand lefthand side of assignment statement 1d6272e6fe43 kconfig: add 'info', 'warning-if', and 'error-if' built-in functions a702a6176e2f kconfig: add 'filename' and 'lineno' built-in variables 915f64901eb3 kconfig: error out if a recursive variable references itself 2bece88f89fa kconfig: test: add Kconfig macro language tests
21c54b774744 kconfig: show compiler version text in the top comment 59f7b5847b0c kbuild: $(CHECK) doesnt need NOSTDINC_FLAGS twice
145167650b96 kbuild: add endianness flag to CHEKCFLAGS
1f2f01b122d7 kbuild: add machine size to CHECKFLAGS
d6a0c8a1326b kconfig: Add testconfig into make help output
bb6d83dde191 kbuild: Move last word of nconfig help to the previous line 8593080c0fcf kconfig: fix localmodconfig
ed7d40bc67b8 tracing: Fix SKIP_STACK_VALIDATION=1 build due to bad merge with -mrecord-mcount b2d00d7c61c8 kconfig: fix line numbers for if-entries in menu tree ecd53ac2f2c6 kconfig: handle P_SYMBOL in print_symbol()
73d1c580f92b kconfig: loop boundary condition fix
48f6e3cf5bc6 kbuild: do not drop -I without parameter
bd412d81b7ea kbuild: .PHONY is not a variable, but PHONY is
6916162c7308 kbuild: remove duplicated comments about PHONY

Quoted 3 lines

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200317/3c4cf35a/attachment.sig>
#24 lore raw

PATCH v2 1/8 spl: Kconfig: Escape '$(ARCH)' in LDSCRIPT entries

In reply to Tom Rini
Quoted 8 lines · Tom Rini

The default SPL / TPL linker script is in the $(ARCH) directory. The way we use this today works but isn't ideal. With an update to Kconfig to re-sync with the Linux Kernel, we need to escape the '$' here so that it will end up being evaluated by make.

Cc Masahiro Yamada <[email protected]>
Signature · 2 lines
Best Regards
Masahiro Yamada
author
#25 lore raw

PATCH v2 8/8 configs: Drop '$(ARCH)' usage in CONFIG_SPL_LDSCRIPT

In reply to Tom Rini

In a few boards we had overridden, intentionally, the value used for CONFIG_SPL_LDSCRIPT. However, rather than using the ARCH value (arm) they used the $(ARCH) variable in make. This doesn't help really, so switch to a hard-coded value.

---
Changes in v2:
- New patch

---
 configs/axm_defconfig    | 2 +-
 configs/brppt2_defconfig | 2 +-
 configs/taurus_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
configs/axm_defconfig +1 -1
index 57683b183fc2..1ae78463d457 100644
@@ -5,7 +5,7 @@ CONFIG_SYS_THUMB_BUILD=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_AT91=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x21000000
 CONFIG_TARGET_TAURUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
configs/brppt2_defconfig +1 -1
index f94ea2837650..4fde3b963c3c 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 # CONFIG_SPL_SYS_THUMB_BUILD is not set
 CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_MX6=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x17800000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/taurus_defconfig +1 -1
index 0399132230a0..19d85f9b5a81 100644
@@ -6,7 +6,7 @@ CONFIG_SYS_THUMB_BUILD=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_AT91=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x21000000
 CONFIG_TARGET_TAURUS=y
 CONFIG_BOARD_TAURUS=y
Signature · 1 line
2.17.1
#26 lore raw

PATCH v2 8/8 configs: Drop '$(ARCH)' usage in CONFIG_SPL_LDSCRIPT

Quoted 21 lines · Tom Rini

In a few boards we had overridden, intentionally, the value used for CONFIG_SPL_LDSCRIPT. However, rather than using the ARCH value (arm) they used the $(ARCH) variable in make. This doesn't help really, so switch to a hard-coded value.

---
Changes in v2:
- New patch

---
 configs/axm_defconfig    | 2 +-
 configs/brppt2_defconfig | 2 +-
 configs/taurus_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
configs/axm_defconfig +0 -0
index 57683b183fc2..1ae78463d457 100644

configs/axm_defconfig CONFIG_SYS_THUMB_BUILD=y · line 8

Quoted 5 lines
configs/axm_defconfig +1 -1
@@ -5,7 +5,7 @@ CONFIG_SYS_THUMB_BUILD=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_AT91=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"

This is the same as the default,
so I think this can be simply removed.
(and squashed into "Kconfig: Remove redundant variable sets)").

Quoted 32 lines
configs/axm_defconfig +0 -0
 CONFIG_SYS_TEXT_BASE=0x21000000
 CONFIG_TARGET_TAURUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
configs/brppt2_defconfig +1 -1
index f94ea2837650..4fde3b963c3c 100644
@@ -2,7 +2,7 @@ CONFIG_ARM=y
 # CONFIG_SPL_SYS_THUMB_BUILD is not set
 CONFIG_SYS_L2CACHE_OFF=y
 CONFIG_ARCH_MX6=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x17800000
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/taurus_defconfig +1 -2
index 0399132230a0..19d85f9b5a81 100644
@@ -6,7 +6,7 @@ CONFIG_SYS_THUMB_BUILD=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_AT91=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"
 CONFIG_SYS_TEXT_BASE=0x21000000
 CONFIG_TARGET_TAURUS=y
 CONFIG_BOARD_TAURUS=y
--

2.17.1

Signature · 2 lines
Best Regards
Masahiro Yamada
author
#27 lore raw

PATCH v2 8/8 configs: Drop '$(ARCH)' usage in CONFIG_SPL_LDSCRIPT

Quoted 17 lines · Masahiro Yamada
Quoted 16 lines · Tom Rini

In a few boards we had overridden, intentionally, the value used for CONFIG_SPL_LDSCRIPT. However, rather than using the ARCH value (arm) they used the $(ARCH) variable in make. This doesn't help really, so switch to a hard-coded value.

---
Changes in v2:
- New patch

---
 configs/axm_defconfig    | 2 +-
 configs/brppt2_defconfig | 2 +-
 configs/taurus_defconfig | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Quoted 15 lines

configs/axm_defconfig CONFIG_SYS_THUMB_BUILD=y · line 8

Quoted 10 lines
configs/axm_defconfig +1 -1
index 57683b183fc2..1ae78463d457 100644
@@ -5,7 +5,7 @@ CONFIG_SYS_THUMB_BUILD=y
 # CONFIG_SPL_USE_ARCH_MEMCPY is not set
 # CONFIG_SPL_USE_ARCH_MEMSET is not set
 CONFIG_ARCH_AT91=y
-CONFIG_SPL_LDSCRIPT="arch/$(ARCH)/cpu/u-boot-spl.lds"
+CONFIG_SPL_LDSCRIPT="arch/arm/cpu/u-boot-spl.lds"

This is the same as the default,
so I think this can be simply removed.
(and squashed into "Kconfig: Remove redundant variable sets)").

For these specific defconfigs their default is changed by CPU type to not be the default ARM one. So the commit message wasn't clear enough here so I'll add a few more words to be clear they did not use the arch default value one evaluated but a different one when pushing. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200315/66847766/attachment.sig>
author
#28 lore raw

PATCH v2 8/8 configs: Drop '$(ARCH)' usage in CONFIG_SPL_LDSCRIPT

In reply to Tom Rini
Quoted 6 lines · Tom Rini

In a few boards we had overridden, intentionally, the value used for CONFIG_SPL_LDSCRIPT. However, rather than using the ARCH value (arm) they used the $(ARCH) variable in make. This doesn't help really, so switch to a hard-coded value.

Applied to u-boot/next, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200317/c0079d2f/attachment.sig>