Merge branch 'master' of git://www.denx.de/git/u-boot-imx

[u-boot] / arch / x86 / include / asm / arch-coreboot / sysinfo.h

diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h
index 5c44e1a47cbbacc0cb46dd1ae79ff619feae29aa..12b3b5d6ee6732db23552984596810e6a6f0bf85 100644 (file)
--- a/arch/x86/include/asm/arch-coreboot/sysinfo.h
+++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h
@@ -3,61 +3,59 @@
  *
  * Copyright (C) 2008 Advanced Micro Devices, Inc.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * SPDX-License-Identifier:    BSD-3-Clause
  */
 
 #ifndef _COREBOOT_SYSINFO_H
 #define _COREBOOT_SYSINFO_H
 
-#include <compiler.h>
+#include <asm/coreboot_tables.h>
 
-/* Allow a maximum of 16 memory range definitions. */
-#define SYSINFO_MAX_MEM_RANGES 16
+/* Maximum number of memory range definitions */
+#define SYSINFO_MAX_MEM_RANGES 32
+/* Allow a maximum of 8 GPIOs */
+#define SYSINFO_MAX_GPIOS      8
 
 struct sysinfo_t {
-       unsigned int cpu_khz;
-       unsigned short ser_ioport;
-       unsigned long ser_base; /* for mmapped serial */
-
        int n_memranges;
-
        struct memrange {
                unsigned long long base;
                unsigned long long size;
                unsigned int type;
        } memrange[SYSINFO_MAX_MEM_RANGES];
 
-       struct cb_cmos_option_table *option_table;
        u32 cmos_range_start;
        u32 cmos_range_end;
        u32 cmos_checksum_location;
+       u32 vbnv_start;
+       u32 vbnv_size;
+
+       char *version;
+       char *extra_version;
+       char *build;
+       char *compile_time;
+       char *compile_by;
+       char *compile_host;
+       char *compile_domain;
+       char *compiler;
+       char *linker;
+       char *assembler;
 
        struct cb_framebuffer *framebuffer;
 
-       unsigned long *mbtable; /** Pointer to the multiboot table */
+       int num_gpios;
+       struct cb_gpio gpios[SYSINFO_MAX_GPIOS];
+
+       void    *vdat_addr;
+       u32     vdat_size;
+       void    *tstamp_table;
+       void    *cbmem_cons;
+
+       struct cb_serial *serial;
 };
 
 extern struct sysinfo_t lib_sysinfo;
 
+int get_coreboot_info(struct sysinfo_t *info);
+
 #endif