* [PATCH 1/2] x86: Fix-up patch for showing video information
@ 2020-09-25 1:44 Simon Glass
2020-09-25 1:44 ` [PATCH 2/2] x86: Fixup for using multiple images Simon Glass
2020-09-25 1:56 ` [PATCH 1/2] x86: Fix-up patch for showing video information Bin Meng
0 siblings, 2 replies; 4+ messages in thread
From: Simon Glass @ 2020-09-25 1:44 UTC (permalink / raw)
To: u-boot
This should be merged into the following patch:
09bd6339966 ("x86: video: Show information about each video device")
Signed-off-by: Simon Glass <sjg@chromium.org>
---
cmd/bdinfo.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
index 39a606ba348..8d8daa6336a 100644
--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] x86: Fixup for using multiple images
2020-09-25 1:44 [PATCH 1/2] x86: Fix-up patch for showing video information Simon Glass
@ 2020-09-25 1:44 ` Simon Glass
2020-09-25 1:56 ` Bin Meng
2020-09-25 1:56 ` [PATCH 1/2] x86: Fix-up patch for showing video information Bin Meng
1 sibling, 1 reply; 4+ messages in thread
From: Simon Glass @ 2020-09-25 1:44 UTC (permalink / raw)
To: u-boot
This should be squashed into the following patch:
4c87a12c16c x86: Use multiple images
Signed-off-by: Simon Glass <sjg@chromium.org>
---
arch/x86/dts/emulation-u-boot.dtsi | 16 +++++++---------
arch/x86/dts/quark-u-boot.dtsi | 8 +++-----
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/arch/x86/dts/emulation-u-boot.dtsi b/arch/x86/dts/emulation-u-boot.dtsi
index 6b651a394f3..7245fe51b3b 100644
--- a/arch/x86/dts/emulation-u-boot.dtsi
+++ b/arch/x86/dts/emulation-u-boot.dtsi
@@ -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
diff --git a/arch/x86/dts/quark-u-boot.dtsi b/arch/x86/dts/quark-u-boot.dtsi
index 7ebc30166d2..60ffffcc0e7 100644
--- a/arch/x86/dts/quark-u-boot.dtsi
+++ b/arch/x86/dts/quark-u-boot.dtsi
@@ -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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 1/2] x86: Fix-up patch for showing video information
2020-09-25 1:44 [PATCH 1/2] x86: Fix-up patch for showing video information Simon Glass
2020-09-25 1:44 ` [PATCH 2/2] x86: Fixup for using multiple images Simon Glass
@ 2020-09-25 1:56 ` Bin Meng
1 sibling, 0 replies; 4+ messages in thread
From: Bin Meng @ 2020-09-25 1:56 UTC (permalink / raw)
To: u-boot
On Fri, Sep 25, 2020 at 9:44 AM Simon Glass <sjg@chromium.org> wrote:
>
> 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!
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> cmd/bdinfo.c | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c
> index 39a606ba348..8d8daa6336a 100644
> --- a/cmd/bdinfo.c
> +++ b/cmd/bdinfo.c
> @@ -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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] x86: Fixup for using multiple images
2020-09-25 1:44 ` [PATCH 2/2] x86: Fixup for using multiple images Simon Glass
@ 2020-09-25 1:56 ` Bin Meng
0 siblings, 0 replies; 4+ messages in thread
From: Bin Meng @ 2020-09-25 1:56 UTC (permalink / raw)
To: u-boot
On Fri, Sep 25, 2020 at 9:44 AM Simon Glass <sjg@chromium.org> wrote:
>
> This should be squashed into the following patch:
>
> 4c87a12c16c x86: Use multiple images
Squashed this patch to 4c87a12c16c to u-boot-x86/next, thanks!
>
> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
> arch/x86/dts/emulation-u-boot.dtsi | 16 +++++++---------
> arch/x86/dts/quark-u-boot.dtsi | 8 +++-----
> 2 files changed, 10 insertions(+), 14 deletions(-)
>
> diff --git a/arch/x86/dts/emulation-u-boot.dtsi b/arch/x86/dts/emulation-u-boot.dtsi
> index 6b651a394f3..7245fe51b3b 100644
> --- a/arch/x86/dts/emulation-u-boot.dtsi
> +++ b/arch/x86/dts/emulation-u-boot.dtsi
> @@ -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
> diff --git a/arch/x86/dts/quark-u-boot.dtsi b/arch/x86/dts/quark-u-boot.dtsi
> index 7ebc30166d2..60ffffcc0e7 100644
> --- a/arch/x86/dts/quark-u-boot.dtsi
> +++ b/arch/x86/dts/quark-u-boot.dtsi
> @@ -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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-25 1:56 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-25 1:44 [PATCH 1/2] x86: Fix-up patch for showing video information Simon Glass
2020-09-25 1:44 ` [PATCH 2/2] x86: Fixup for using multiple images Simon Glass
2020-09-25 1:56 ` Bin Meng
2020-09-25 1:56 ` [PATCH 1/2] x86: Fix-up patch for showing video information Bin Meng
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.