dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-04 02:02:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

acpi: Add an __ACPI__ preprocessor symbol

Browse Source 
The ASL compiler cannot handle C structures and the like so needs some
sort of header guard around these.

We already have an __ASSEMBLY__ #define but it seems best to create a new
one for ACPI since the rules may be different.

Add the check to a few files that ACPI always includes.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Wolfgang Wallner <wolfgang.wallner@br-automation.com>
This commit is contained in:
Simon Glass
2020-04-08 16:57:37 -06:00
committed by Bin Meng
parent 776cc20194
commit 89c2798f1f
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/acpi/acpi_table.h
View File

@@ -21,6 +21,8 @@
#define ACPI_RSDP_REV_ACPI_1_0 0 #define ACPI_RSDP_REV_ACPI_1_0 0
#define ACPI_RSDP_REV_ACPI_2_0 2 #define ACPI_RSDP_REV_ACPI_2_0 2
#if !defined(__ACPI__)
/* /*
* RSDP (Root System Description Pointer) * RSDP (Root System Description Pointer)
* Note: ACPI 1.0 didn't have length, xsdt_address, and ext_checksum * Note: ACPI 1.0 didn't have length, xsdt_address, and ext_checksum
@@ -389,6 +391,8 @@ struct __packed acpi_spcr {
u32 reserved2; u32 reserved2;
}; };
#endif /* !__ACPI__*/
#include <asm/acpi_table.h> #include <asm/acpi_table.h>
#endif /* __ACPI_TABLE_H__ */ #endif /* __ACPI_TABLE_H__ */

4
include/dm/acpi.h
View File

@@ -22,6 +22,8 @@
/* Length of an ACPI name string including nul terminator */ /* Length of an ACPI name string including nul terminator */
#define ACPI_NAME_MAX (ACPI_NAME_LEN + 1) #define ACPI_NAME_MAX (ACPI_NAME_LEN + 1)
#if !defined(__ACPI__)
/** /**
* struct acpi_ops - ACPI operations supported by driver model * struct acpi_ops - ACPI operations supported by driver model
*/ */
@@ -70,4 +72,6 @@ int acpi_get_name(const struct udevice *dev, char *out_name);
*/ */
int acpi_copy_name(char *out_name, const char *name); int acpi_copy_name(char *out_name, const char *name);
#endif /* __ACPI__ */
#endif #endif

4
scripts/Makefile.lib
View File

@@ -437,8 +437,8 @@ ASL_TMP = $(patsubst %.c,%.asl.tmp,$@)
quiet_cmd_acpi_c_asl= ASL $< quiet_cmd_acpi_c_asl= ASL $<
cmd_acpi_c_asl= \ cmd_acpi_c_asl= \
$(CPP) -x assembler-with-cpp -D__ASSEMBLY__ -P $(UBOOTINCLUDE) \ $(CPP) -x assembler-with-cpp -D__ASSEMBLY__ -D__ACPI__ \
-o $(ASL_TMP) $< && \ -P $(UBOOTINCLUDE) -o $(ASL_TMP) $< && \
iasl -p $@ -tc $(ASL_TMP) $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \ iasl -p $@ -tc $(ASL_TMP) $(if $(KBUILD_VERBOSE:1=), >/dev/null) && \
mv $(patsubst %.c,%.hex,$@) $@ mv $(patsubst %.c,%.hex,$@) $@