diff options
| author | Tom Rini <trini@konsulko.com> | 2018-06-13 11:43:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-06-13 11:43:59 -0400 |
| commit | 66398944f53921ec641e1c2202390933767dbb87 (patch) | |
| tree | e68f31898efc1f8963bcd37cb6703a61a9c5f76f /scripts | |
| parent | acaee30608ce203289a180d664b7f0abb2e64ee7 (diff) | |
| parent | bee053e248e93d82e5c352708f8c892f4a488c54 (diff) | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index ef7604c463..2a7d73432d 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -399,6 +399,7 @@ cmd_acpi_c_asl= \ $(obj)/dsdt.c: $(src)/dsdt.asl $(call cmd,acpi_c_asl) + $(Q)sed -i -e "s,dsdt_aml_code,AmlCode," $@ # Bzip2 # --------------------------------------------------------------------------- diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e99ba6b85a..1a54337594 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4581,7 +4581,6 @@ CONFIG_USART1 CONFIG_USART_BASE CONFIG_USART_ID CONFIG_USBBOOTCOMMAND -CONFIG_USBDEBUG CONFIG_USBD_CONFIGURATION_STR CONFIG_USBD_CTRL_INTERFACE_STR CONFIG_USBD_DATA_INTERFACE_STR |