Skip to contentSkip to conversation

x86: Fix-up patch for showing video information

PATCH New Simon Glass 2 participants 4 messages Sep 25, 2020 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 x86: Fix-up patch for showing video information

This should be merged into the following patch:

09bd6339966 ("x86: video: Show information about each video device")

---

 cmd/bdinfo.c | 6 ++++++
 1 file changed, 6 insertions(+)
cmd/bdinfo.c +6 -0
index 39a606ba348..8d8daa6336a 100644
@@ -36,6 +36,12 @@ static void print_eth(int idx)
 	printf("%-12s= %s\n", name, val);
 }
 
+static void print_phys_addr(const char *name, phys_addr_t value)
+{
+	printf("%-12s= 0x%.*llx\n", name, 2 * (int)sizeof(ulong),
+	       (unsigned long long)value);
+}
+
 void bdinfo_print_mhz(const char *name, unsigned long hz)
 {
 	char buf[32];
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#1 lore raw

PATCH 2/2 x86: Fixup for using multiple images

This should be squashed into the following patch:

4c87a12c16c x86: Use multiple images

---

 arch/x86/dts/emulation-u-boot.dtsi | 16 +++++++---------
 arch/x86/dts/quark-u-boot.dtsi     |  8 +++-----
 2 files changed, 10 insertions(+), 14 deletions(-)
arch/x86/dts/emulation-u-boot.dtsi +7 -9
index 6b651a394f3..7245fe51b3b 100644
@@ -7,17 +7,15 @@
 #include <u-boot.dtsi>
 
 #ifdef CONFIG_ROM_SIZE
-/ {
-	binman {
+&rom {
 #ifdef CONFIG_SPL
-		u-boot-spl-with-ucode-ptr {
-			optional-ucode;
-		};
+	u-boot-spl-with-ucode-ptr {
+		optional-ucode;
+	};
 #else
-		u-boot-with-ucode-ptr {
-			optional-ucode;
-		};
-#endif
+	u-boot-with-ucode-ptr {
+		optional-ucode;
 	};
+#endif
 };
 #endif
arch/x86/dts/quark-u-boot.dtsi +3 -5
index 7ebc30166d2..60ffffcc0e7 100644
@@ -6,11 +6,9 @@
 #include <u-boot.dtsi>
 
 #ifdef CONFIG_ROM_SIZE
-/ {
-	binman {
-		u-boot-with-ucode-ptr {
-			optional-ucode;
-		};
+&rom {
+	u-boot-with-ucode-ptr {
+		optional-ucode;
 	};
 };
 #endif
Signature · 1 line
2.28.0.681.g6f77f65b4e-goog
#2 lore raw

PATCH 2/2 x86: Fixup for using multiple images

Quoted 4 lines · Simon Glass

This should be squashed into the following patch:

   4c87a12c16c x86: Use multiple images

Squashed this patch to 4c87a12c16c to u-boot-x86/next, thanks!

Quoted 59 lines

---

 arch/x86/dts/emulation-u-boot.dtsi | 16 +++++++---------
 arch/x86/dts/quark-u-boot.dtsi     |  8 +++-----
 2 files changed, 10 insertions(+), 14 deletions(-)
arch/x86/dts/emulation-u-boot.dtsi +7 -9
index 6b651a394f3..7245fe51b3b 100644
@@ -7,17 +7,15 @@
 #include <u-boot.dtsi>
 
 #ifdef CONFIG_ROM_SIZE
-/ {
-       binman {
+&rom {
 #ifdef CONFIG_SPL
-               u-boot-spl-with-ucode-ptr {
-                       optional-ucode;
-               };
+       u-boot-spl-with-ucode-ptr {
+               optional-ucode;
+       };
 #else
-               u-boot-with-ucode-ptr {
-                       optional-ucode;
-               };
-#endif
+       u-boot-with-ucode-ptr {
+               optional-ucode;
        };
+#endif
 };
 #endif
arch/x86/dts/quark-u-boot.dtsi +3 -6
index 7ebc30166d2..60ffffcc0e7 100644
@@ -6,11 +6,9 @@
 #include <u-boot.dtsi>
 
 #ifdef CONFIG_ROM_SIZE
-/ {
-       binman {
-               u-boot-with-ucode-ptr {
-                       optional-ucode;
-               };
+&rom {
+       u-boot-with-ucode-ptr {
+               optional-ucode;
        };
 };
 #endif
--

2.28.0.681.g6f77f65b4e-goog

#3 lore raw

PATCH 1/2 x86: Fix-up patch for showing video information

In reply to Simon Glass
Quoted 4 lines · Simon Glass

This should be merged into the following patch:

09bd6339966 ("x86: video: Show information about each video device")

Squashed this patch to 09bd6339966 to u-boot-x86/next, thanks!

Quoted 27 lines

---

 cmd/bdinfo.c | 6 ++++++
 1 file changed, 6 insertions(+)
cmd/bdinfo.c +6 -1
index 39a606ba348..8d8daa6336a 100644
@@ -36,6 +36,12 @@ static void print_eth(int idx)
        printf("%-12s= %s\n", name, val);
 }
 
+static void print_phys_addr(const char *name, phys_addr_t value)
+{
+       printf("%-12s= 0x%.*llx\n", name, 2 * (int)sizeof(ulong),
+              (unsigned long long)value);
+}
+
 void bdinfo_print_mhz(const char *name, unsigned long hz)
 {
        char buf[32];
--

2.28.0.681.g6f77f65b4e-goog