x86: edison: Bring minimal ACPI support to the board

This board is based on Intel Tangier SoC (Intel Merrifield platform)
and may utilize ACPI powerfulness.

Bring minimum support by appending initial DSDT table for it.

Note, the addresses for generated tables are carefully chosen to avoid
any conflicts with existing shadowed BIOS data. The user have somewhat
like ~31 kB available for compiled ACPI tables that ought to be enough.

Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/board/intel/edison/.gitignore b/board/intel/edison/.gitignore
new file mode 100644 (file)
index 0000000..6eb8a54
--- /dev/null
+++ b/board/intel/edison/.gitignore
@@ -0,0 +1,3 @@
+dsdt.aml
+dsdt.asl.tmp
+dsdt.c

diff --git a/board/intel/edison/Kconfig b/board/intel/edison/Kconfig
index 4ff9d5adece0654a54b6376e5b81409f89317fe5..ef9b14aa2bfde1c230af783611d9a44e2606a883 100644 (file)
--- a/board/intel/edison/Kconfig
+++ b/board/intel/edison/Kconfig
@@ -15,6 +15,12 @@ config SYS_CONFIG_NAME
 config SYS_TEXT_BASE
        default 0x01101000
 
+config ROM_TABLE_ADDR
+       default 0x0e4500
+
+config ROM_TABLE_SIZE
+       default 0x007b00
+
 config BOARD_SPECIFIC_OPTIONS # dummy
        def_bool y
        select X86_LOAD_FROM_32_BIT

diff --git a/board/intel/edison/Makefile b/board/intel/edison/Makefile
index dde159435b31f47c40d69138346e001fe1f45918..eed8d65eb6614be9d26088a91dbfffecedf2eedf 100644 (file)
--- a/board/intel/edison/Makefile
+++ b/board/intel/edison/Makefile
@@ -5,3 +5,4 @@
 #
 
 obj-y  += start.o edison.o
+obj-$(CONFIG_GENERATE_ACPI_TABLE) += dsdt.o

diff --git a/board/intel/edison/dsdt.asl b/board/intel/edison/dsdt.asl
new file mode 100644 (file)
index 0000000..d2e0473
--- /dev/null
+++ b/board/intel/edison/dsdt.asl
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2017 Intel Corporation
+ *
+ * Partially based on dsdt.asl for other x86 boards
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+DefinitionBlock("dsdt.aml", "DSDT", 2, "U-BOOT", "U-BOOTBL", 0x00010000)
+{
+       /* platform specific */
+       #include <asm/arch/acpi/platform.asl>
+}

diff --git a/include/configs/edison.h b/include/configs/edison.h
index e26a4c7a39fb3e027ecbccac15ffbe45116ceaf4..79dd690e71efeb824655a6852ccaadeeb2c86feb 100644 (file)
--- a/include/configs/edison.h
+++ b/include/configs/edison.h
@@ -9,6 +9,9 @@
 
 #include <asm/ibmpc.h>
 
+/* ACPI */
+#define CONFIG_LAST_STAGE_INIT
+
 /* Boot */
 #define CONFIG_BOOTCOMMAND "run bootcmd"