diff options
| author | Tom Rini <trini@konsulko.com> | 2017-09-12 09:32:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-09-12 09:32:51 -0400 |
| commit | de2ad2c40db389e4747f566e44aa7f1a1aec91fb (patch) | |
| tree | 76bd1340bc1b8b25e5acffeed74bceea5913969a /arch | |
| parent | d81a1de96e2636163783c342b8fda965e696e382 (diff) | |
| parent | ee87a097b0f66158ce2985940a5f28ba15a3552d (diff) | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/xusb-padctl-common.c | 8 | ||||
| -rw-r--r-- | arch/sandbox/Kconfig | 22 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 10 |
3 files changed, 30 insertions, 10 deletions
diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c index 37b5b8fb5b..abc18c03a5 100644 --- a/arch/arm/mach-tegra/xusb-padctl-common.c +++ b/arch/arm/mach-tegra/xusb-padctl-common.c @@ -224,9 +224,7 @@ tegra_xusb_padctl_config_parse_dt(struct tegra_xusb_padctl *padctl, config->name = ofnode_get_name(node); - for (subnode = ofnode_first_subnode(node); - ofnode_valid(subnode); - subnode = ofnode_next_subnode(subnode)) { + ofnode_for_each_subnode(subnode, node) { struct tegra_xusb_padctl_group *group; int err; @@ -256,9 +254,7 @@ static int tegra_xusb_padctl_parse_dt(struct tegra_xusb_padctl *padctl, return err; } - for (subnode = ofnode_first_subnode(node); - ofnode_valid(subnode); - subnode = ofnode_next_subnode(subnode)) { + ofnode_for_each_subnode(subnode, node) { struct tegra_xusb_padctl_config *config = &padctl->config; debug("%s: subnode=%s\n", __func__, ofnode_get_name(subnode)); diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index f7a6e1aef8..87418e3986 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -18,4 +18,26 @@ config SYS_CONFIG_NAME default "sandbox_spl" if SANDBOX_SPL default "sandbox" if !SANDBOX_SPL +choice + prompt "Run sandbox on 32/64-bit host" + default SANDBOX_64BIT + help + Sandbox can be built on 32-bit and 64-bit hosts. + The default is to build on a 64-bit host and run + on a 64-bit host. If you want to run sandbox on + a 32-bit host, change it here. + +config SANDBOX_32BIT + bool "32-bit host" + +config SANDBOX_64BIT + bool "64-bit host" + +endchoice + +config SANDBOX_BITS_PER_LONG + int + default 32 if SANDBOX_32BIT + default 64 if SANDBOX_64BIT + endmenu diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 65b2f8ecda..e67d428eb2 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -127,10 +127,12 @@ compatible = "denx,u-boot-fdt-test"; }; - clk_fixed: clk-fixed { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <1234>; + clocks { + clk_fixed: clk-fixed { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <1234>; + }; }; clk_sandbox: clk-sbox { |