net: sun8i-emac: fix printing NULL character

[u-boot] / lib / smbios.c

diff --git a/lib/smbios.c b/lib/smbios.c
index 09a90cae83053e1902eaa4737b40e20061c7dc19..df3d26b07107088d7bee64897d5c677b4f3592ed 100644 (file)
--- a/lib/smbios.c
+++ b/lib/smbios.c
@@ -1,9 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2015, Bin Meng <bmeng.cn@gmail.com>
  *
  * Adapted from coreboot src/arch/x86/smbios.c
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -16,8 +15,6 @@
 #include <dm/uclass-internal.h>
 #endif
 
-DECLARE_GLOBAL_DATA_PTR;
-
 /**
  * smbios_add_string() - add a string to the string area
  *
@@ -73,7 +70,7 @@ static int smbios_string_table_len(char *start)
        return len + 1;
 }
 
-static int smbios_write_type0(uintptr_t *current, int handle)
+static int smbios_write_type0(ulong *current, int handle)
 {
        struct smbios_type0 *t = (struct smbios_type0 *)*current;
        int len = sizeof(struct smbios_type0);
@@ -83,14 +80,20 @@ static int smbios_write_type0(uintptr_t *current, int handle)
        t->vendor = smbios_add_string(t->eos, "U-Boot");
        t->bios_ver = smbios_add_string(t->eos, PLAIN_VERSION);
        t->bios_release_date = smbios_add_string(t->eos, U_BOOT_DMI_DATE);
+#ifdef CONFIG_ROM_SIZE
        t->bios_rom_size = (CONFIG_ROM_SIZE / 65536) - 1;
+#endif
        t->bios_characteristics = BIOS_CHARACTERISTICS_PCI_SUPPORTED |
                                  BIOS_CHARACTERISTICS_SELECTABLE_BOOT |
                                  BIOS_CHARACTERISTICS_UPGRADEABLE;
 #ifdef CONFIG_GENERATE_ACPI_TABLE
        t->bios_characteristics_ext1 = BIOS_CHARACTERISTICS_EXT1_ACPI;
+#endif
+#ifdef CONFIG_EFI_LOADER
+       t->bios_characteristics_ext1 |= BIOS_CHARACTERISTICS_EXT1_UEFI;
 #endif
        t->bios_characteristics_ext2 = BIOS_CHARACTERISTICS_EXT2_TARGET;
+
        t->bios_major_release = 0xff;
        t->bios_minor_release = 0xff;
        t->ec_major_release = 0xff;
@@ -102,15 +105,20 @@ static int smbios_write_type0(uintptr_t *current, int handle)
        return len;
 }
 
-static int smbios_write_type1(uintptr_t *current, int handle)
+static int smbios_write_type1(ulong *current, int handle)
 {
        struct smbios_type1 *t = (struct smbios_type1 *)*current;
        int len = sizeof(struct smbios_type1);
+       char *serial_str = env_get("serial#");
 
        memset(t, 0, sizeof(struct smbios_type1));
        fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle);
        t->manufacturer = smbios_add_string(t->eos, CONFIG_SMBIOS_MANUFACTURER);
        t->product_name = smbios_add_string(t->eos, CONFIG_SMBIOS_PRODUCT_NAME);
+       if (serial_str) {
+               strncpy((char*)t->uuid, serial_str, sizeof(t->uuid));
+               t->serial_number = smbios_add_string(t->eos, serial_str);
+       }
 
        len = t->length + smbios_string_table_len(t->eos);
        *current += len;
@@ -118,7 +126,7 @@ static int smbios_write_type1(uintptr_t *current, int handle)
        return len;
 }
 
-static int smbios_write_type2(uintptr_t *current, int handle)
+static int smbios_write_type2(ulong *current, int handle)
 {
        struct smbios_type2 *t = (struct smbios_type2 *)*current;
        int len = sizeof(struct smbios_type2);
@@ -136,7 +144,7 @@ static int smbios_write_type2(uintptr_t *current, int handle)
        return len;
 }
 
-static int smbios_write_type3(uintptr_t *current, int handle)
+static int smbios_write_type3(ulong *current, int handle)
 {
        struct smbios_type3 *t = (struct smbios_type3 *)*current;
        int len = sizeof(struct smbios_type3);
@@ -188,7 +196,7 @@ static void smbios_write_type4_dm(struct smbios_type4 *t)
        t->processor_version = smbios_add_string(t->eos, name);
 }
 
-static int smbios_write_type4(uintptr_t *current, int handle)
+static int smbios_write_type4(ulong *current, int handle)
 {
        struct smbios_type4 *t = (struct smbios_type4 *)*current;
        int len = sizeof(struct smbios_type4);
@@ -210,7 +218,7 @@ static int smbios_write_type4(uintptr_t *current, int handle)
        return len;
 }
 
-static int smbios_write_type32(uintptr_t *current, int handle)
+static int smbios_write_type32(ulong *current, int handle)
 {
        struct smbios_type32 *t = (struct smbios_type32 *)*current;
        int len = sizeof(struct smbios_type32);
@@ -223,7 +231,7 @@ static int smbios_write_type32(uintptr_t *current, int handle)
        return len;
 }
 
-static int smbios_write_type127(uintptr_t *current, int handle)
+static int smbios_write_type127(ulong *current, int handle)
 {
        struct smbios_type127 *t = (struct smbios_type127 *)*current;
        int len = sizeof(struct smbios_type127);
@@ -246,10 +254,10 @@ static smbios_write_type smbios_write_funcs[] = {
        smbios_write_type127
 };
 
-uintptr_t write_smbios_table(uintptr_t addr)
+ulong write_smbios_table(ulong addr)
 {
        struct smbios_entry *se;
-       u32 tables;
+       ulong tables;
        int len = 0;
        int max_struct_size = 0;
        int handle = 0;
@@ -260,7 +268,7 @@ uintptr_t write_smbios_table(uintptr_t addr)
        /* 16 byte align the table address */
        addr = ALIGN(addr, 16);
 
-       se = (struct smbios_entry *)addr;
+       se = (struct smbios_entry *)(uintptr_t)addr;
        memset(se, 0, sizeof(struct smbios_entry));
 
        addr += sizeof(struct smbios_entry);
@@ -269,7 +277,7 @@ uintptr_t write_smbios_table(uintptr_t addr)
 
        /* populate minimum required tables */
        for (i = 0; i < ARRAY_SIZE(smbios_write_funcs); i++) {
-               int tmp = smbios_write_funcs[i](&addr, handle++);
+               int tmp = smbios_write_funcs[i]((ulong *)&addr, handle++);
                max_struct_size = max(max_struct_size, tmp);
                len += tmp;
        }