Revert "Merge tag 'dm-pull-20jul20' of git://git.denx.de/u-boot-dm"

This reverts commit 5d3a21d, reversing changes made to 56d37f1. Unfortunately this is causing CI failures: https://travis-ci.org/github/trini/u-boot/jobs/711313649 Signed-off-by: Tom Rini <[email protected]>
chewitt · Jul 24, 2020 · 7208396 · 7208396
1 parent 5d3a21d
commit 7208396
Show file tree

Hide file tree

Showing 319 changed files with 656 additions and 2,506 deletions.
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -158,7 +158,7 @@ jobs:
           ./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 O=${UBOOT_TRAVIS_BUILD_DIR} testconfig
           EOF
           cat build.sh

diff --git a/.gitignore b/.gitignore
@@ -92,6 +92,3 @@ GTAGS
 *.orig
 *~
 \#*#
-
-# Python cache
-__pycache__
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -169,7 +169,7 @@ Run binman, buildman, dtoc, Kconfig 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
 
 Run tests for Nokia RX-51 (aka N900):

diff --git a/.travis.yml b/.travis.yml
@@ -257,7 +257,7 @@ script:
        export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt";
        export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}";
        ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test &&
-       ./tools/patman/patman test &&
+       ./tools/patman/patman --test &&
        ./tools/buildman/buildman -t &&
        ./tools/dtoc/dtoc -t &&
        make testconfig;

diff --git a/arch/arm/dts/k3-am65-wakeup.dtsi b/arch/arm/dts/k3-am65-wakeup.dtsi
@@ -62,9 +62,4 @@
 		clocks = <&k3_clks 115 1>;
 		power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>;
 	};
-
-	chipid: chipid@43000014 {
-		compatible = "ti,am654-chipid";
-		reg = <0x43000014 0x4>;
-	};
 };
diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -246,7 +246,3 @@
 		u-boot,dm-spl;
 	};
 };
-
-&chipid {
-	u-boot,dm-spl;
-};
diff --git a/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi b/arch/arm/dts/k3-j721e-common-proc-board-u-boot.dtsi
@@ -211,7 +211,3 @@
 &mcu_fss0_ospi1_pins_default {
 	u-boot,dm-spl;
 };
-
-&chipid {
-	u-boot,dm-spl;
-};
diff --git a/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi b/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi
@@ -316,9 +316,4 @@
 			ti,cpts-periodic-outputs = <2>;
 		};
 	};
-
-	chipid: chipid@43000014 {
-		compatible = "ti,am654-chipid";
-		reg = <0x0 0x43000014 0x0 0x4>;
-	};
 };
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
@@ -25,7 +25,6 @@
 #include <fs.h>
 #include <env.h>
 #include <elf.h>
-#include <soc.h>
 
 struct ti_sci_handle *get_ti_sci_handle(void)
 {
@@ -309,27 +308,38 @@ void reset_cpu(ulong ignored)
 #if defined(CONFIG_DISPLAY_CPUINFO)
 int print_cpuinfo(void)
 {
-	struct udevice *soc;
-	char name[64];
-	int ret;
-
-	printf("SoC:   ");
+	u32 soc, rev;
+	char *name;
 
-	ret = soc_get(&soc);
-	if (ret) {
-		printf("UNKNOWN\n");
-		return 0;
-	}
+	soc = (readl(CTRLMMR_WKUP_JTAG_ID) &
+		JTAG_ID_PARTNO_MASK) >> JTAG_ID_PARTNO_SHIFT;
+	rev = (readl(CTRLMMR_WKUP_JTAG_ID) &
+		JTAG_ID_VARIANT_MASK) >> JTAG_ID_VARIANT_SHIFT;
 
-	ret = soc_get_family(soc, name, 64);
-	if (!ret) {
-		printf("%s ", name);
-	}
+	printf("SoC:   ");
+	switch (soc) {
+	case AM65X:
+		name = "AM65x";
+		break;
+	case J721E:
+		name = "J721E";
+		break;
+	default:
+		name = "Unknown Silicon";
+	};
 
-	ret = soc_get_revision(soc, name, 64);
-	if (!ret) {
-		printf("%s\n", name);
-	}
+	printf("%s SR ", name);
+	switch (rev) {
+	case REV_PG1_0:
+		name = "1.0";
+		break;
+	case REV_PG2_0:
+		name = "2.0";
+		break;
+	default:
+		name = "Unknown Revision";
+	};
+	printf("%s\n", name);
 
 	return 0;
 }

diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h
@@ -8,6 +8,12 @@
 
 #include <asm/armv7_mpu.h>
 
+#define AM65X	0xbb5a
+#define J721E	0xbb64
+
+#define REV_PG1_0	0
+#define REV_PG2_0	1
+
 struct fwl_data {
 	const char *name;
 	u16 fwl_id;

diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h
@@ -15,6 +15,7 @@
 #endif
 
 /* Assuming these addresses and definitions stay common across K3 devices */
+#define CTRLMMR_WKUP_JTAG_ID	0x43000014
 #define JTAG_ID_VARIANT_SHIFT	28
 #define JTAG_ID_VARIANT_MASK	(0xf << 28)
 #define JTAG_ID_PARTNO_SHIFT	12

diff --git a/arch/arm/mach-snapdragon/clock-snapdragon.c b/arch/arm/mach-snapdragon/clock-snapdragon.c
@@ -114,7 +114,7 @@ static int msm_clk_probe(struct udevice *dev)
 {
 	struct msm_clk_priv *priv = dev_get_priv(dev);
 
-	priv->base = dev_read_addr(dev);
+	priv->base = devfdt_get_addr(dev);
 	if (priv->base == FDT_ADDR_T_NONE)
 		return -EINVAL;
 

diff --git a/arch/arm/mach-snapdragon/pinctrl-snapdragon.c b/arch/arm/mach-snapdragon/pinctrl-snapdragon.c
@@ -56,7 +56,7 @@ static int msm_pinctrl_probe(struct udevice *dev)
 {
 	struct msm_pinctrl_priv *priv = dev_get_priv(dev);
 
-	priv->base = dev_read_addr(dev);
+	priv->base = devfdt_get_addr(dev);
 	priv->data = (struct msm_pinctrl_data *)dev->driver_data;
 
 	return priv->base == FDT_ADDR_T_NONE ? -EINVAL : 0;

diff --git a/arch/nios2/cpu/cpu.c b/arch/nios2/cpu/cpu.c
@@ -79,8 +79,7 @@ int arch_cpu_init_dm(void)
 	return 0;
 }
 
-static int altera_nios2_get_desc(const struct udevice *dev, char *buf,
-				 int size)
+static int altera_nios2_get_desc(struct udevice *dev, char *buf, int size)
 {
 	const char *cpu_name = "Nios-II";
 
@@ -91,8 +90,7 @@ static int altera_nios2_get_desc(const struct udevice *dev, char *buf,
 	return 0;
 }
 
-static int altera_nios2_get_info(const struct udevice *dev,
-				 struct cpu_info *info)
+static int altera_nios2_get_info(struct udevice *dev, struct cpu_info *info)
 {
 	info->cpu_freq = gd->cpu_clk;
 	info->features = (1 << CPU_FEAT_L1_CACHE) |
@@ -101,7 +99,7 @@ static int altera_nios2_get_info(const struct udevice *dev,
 	return 0;
 }
 
-static int altera_nios2_get_count(const struct udevice *dev)
+static int altera_nios2_get_count(struct udevice *dev)
 {
 	return 1;
 }

diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
@@ -521,10 +521,6 @@
 		};
 	};
 
-	chipid: chipid {
-		compatible = "sandbox,soc";
-	};
-
 	i2s: i2s {
 		compatible = "sandbox,i2s";
 		#sound-dai-cells = <1>;

diff --git a/arch/x86/cpu/apollolake/cpu.c b/arch/x86/cpu/apollolake/cpu.c
@@ -9,7 +9,7 @@
 #include <asm/cpu_common.h>
 #include <asm/cpu_x86.h>
 
-static int apl_get_info(const struct udevice *dev, struct cpu_info *info)
+static int apl_get_info(struct udevice *dev, struct cpu_info *info)
 {
 	return cpu_intel_get_info(info, INTEL_BCLK_MHZ);
 }

diff --git a/arch/x86/cpu/baytrail/cpu.c b/arch/x86/cpu/baytrail/cpu.c
@@ -150,15 +150,15 @@ static unsigned long tsc_freq(void)
 	return bclk * ((platform_info.lo >> 8) & 0xff);
 }
 
-static int baytrail_get_info(const struct udevice *dev, struct cpu_info *info)
+static int baytrail_get_info(struct udevice *dev, struct cpu_info *info)
 {
 	info->cpu_freq = tsc_freq();
 	info->features = 1 << CPU_FEAT_L1_CACHE | 1 << CPU_FEAT_MMU;
 
 	return 0;
 }
 
-static int baytrail_get_count(const struct udevice *dev)
+static int baytrail_get_count(struct udevice *dev)
 {
 	int ecx = 0;
 

diff --git a/arch/x86/cpu/broadwell/cpu_full.c b/arch/x86/cpu/broadwell/cpu_full.c
@@ -626,12 +626,12 @@ void cpu_set_power_limits(int power_limit_1_time)
 	}
 }
 
-static int broadwell_get_info(const struct udevice *dev, struct cpu_info *info)
+static int broadwell_get_info(struct udevice *dev, struct cpu_info *info)
 {
 	return cpu_intel_get_info(info, INTEL_BCLK_MHZ);
 }
 
-static int broadwell_get_count(const struct udevice *dev)
+static int broadwell_get_count(struct udevice *dev)
 {
 	return 4;
 }

diff --git a/arch/x86/cpu/cpu_x86.c b/arch/x86/cpu/cpu_x86.c
@@ -26,7 +26,7 @@ int cpu_x86_bind(struct udevice *dev)
 	return 0;
 }
 
-int cpu_x86_get_vendor(const struct udevice *dev, char *buf, int size)
+int cpu_x86_get_vendor(struct udevice *dev, char *buf, int size)
 {
 	const char *vendor = cpu_vendor_name(gd->arch.x86_vendor);
 
@@ -38,7 +38,7 @@ int cpu_x86_get_vendor(const struct udevice *dev, char *buf, int size)
 	return 0;
 }
 
-int cpu_x86_get_desc(const struct udevice *dev, char *buf, int size)
+int cpu_x86_get_desc(struct udevice *dev, char *buf, int size)
 {
 	char *ptr;
 
@@ -52,7 +52,7 @@ int cpu_x86_get_desc(const struct udevice *dev, char *buf, int size)
 	return 0;
 }
 
-int cpu_x86_get_count(const struct udevice *dev)
+int cpu_x86_get_count(struct udevice *dev)
 {
 	int node, cpu;
 	int num = 0;

diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c
@@ -410,15 +410,14 @@ static int model_206ax_init(struct udevice *dev)
 	return 0;
 }
 
-static int model_206ax_get_info(const struct udevice *dev,
-				struct cpu_info *info)
+static int model_206ax_get_info(struct udevice *dev, struct cpu_info *info)
 {
 	return cpu_intel_get_info(info, INTEL_BCLK_MHZ);
 
 	return 0;
 }
 
-static int model_206ax_get_count(const struct udevice *dev)
+static int model_206ax_get_count(struct udevice *dev)
 {
 	return 4;
 }

diff --git a/arch/x86/cpu/qemu/cpu.c b/arch/x86/cpu/qemu/cpu.c
@@ -10,7 +10,7 @@
 #include <qfw.h>
 #include <asm/cpu.h>
 
-int cpu_qemu_get_desc(const struct udevice *dev, char *buf, int size)
+int cpu_qemu_get_desc(struct udevice *dev, char *buf, int size)
 {
 	if (size < CPU_MAX_NAME_LEN)
 		return -ENOSPC;
@@ -20,7 +20,7 @@ int cpu_qemu_get_desc(const struct udevice *dev, char *buf, int size)
 	return 0;
 }
 
-static int cpu_qemu_get_count(const struct udevice *dev)
+static int cpu_qemu_get_count(struct udevice *dev)
 {
 	return qemu_fwcfg_online_cpus();
 }

diff --git a/arch/x86/include/asm/cpu_x86.h b/arch/x86/include/asm/cpu_x86.h
@@ -28,7 +28,7 @@ int cpu_x86_bind(struct udevice *dev);
  * @size:	Size of string space
  * @return:	0 if OK, -ENOSPC if buffer is too small, other -ve on error
  */
-int cpu_x86_get_desc(const struct udevice *dev, char *buf, int size);
+int cpu_x86_get_desc(struct udevice *dev, char *buf, int size);
 
 /**
  * cpu_x86_get_count() - Get the number of cores for an x86 CPU
@@ -40,7 +40,7 @@ int cpu_x86_get_desc(const struct udevice *dev, char *buf, int size);
  * @return:	Number of cores if successful,
  *		-ENOENT if not "/cpus" entry is found in the device tree
  */
-int cpu_x86_get_count(const struct udevice *dev);
+int cpu_x86_get_count(struct udevice *dev);
 
 /**
  * cpu_x86_get_vendor() - Get a vendor string for an x86 CPU
@@ -53,6 +53,6 @@ int cpu_x86_get_count(const struct udevice *dev);
  * @size:	Size of string space
  * @return:	0 if OK, -ENOSPC if buffer is too small, other -ve on error
  */
-int cpu_x86_get_vendor(const struct udevice *dev, char *buf, int size);
+int cpu_x86_get_vendor(struct udevice *dev, char *buf, int size);
 
 #endif /* _ASM_CPU_X86_H */
diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c
@@ -33,12 +33,12 @@ int fdtdec_board_setup(const void *fdt_blob)
 
 int dram_init(void)
 {
-	return fdtdec_setup_mem_size_base();
+	return fdtdec_setup_mem_size_base_fdt(gd->fdt_blob);
 }
 
 int dram_init_banksize(void)
 {
-	fdtdec_setup_memory_banksize();
+	fdtdec_setup_memory_banksize_fdt(gd->fdt_blob);
 
 	return 0;
 }

diff --git a/common/fdt_region.c b/common/fdt_region.c
@@ -65,8 +65,6 @@ int fdt_find_regions(const void *fdt, char * const inc[], int inc_count,
 			stop_at = offset;
 			prop = fdt_get_property_by_offset(fdt, offset, NULL);
 			str = fdt_string(fdt, fdt32_to_cpu(prop->nameoff));
-			if (!str)
-				return -FDT_ERR_BADSTRUCTURE;
 			if (str_in_list(str, exc_prop, exc_prop_count))
 				include = 0;
 			break;
-Original file line number
+Diff line change
@@ Expand Up / @@ -92,6 +92,3 @@ GTAGS @@
     *.orig
     *~
     \#*#
-    # Python cache
-    __pycache__