From 919c1c1204225fa9b2e52690b915af18c0b0f4a7 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Wed, 23 May 2018 12:38:02 +0300 Subject: x86: acpi: Adopt new version of iASL compiler The commit f9a88a4c1cd0 ("iASL: Enhance the -tc option (create AML hex file in C)") in ACPICA project changed a template of the variable that is used in the generated C-file. Now, instead of hard coded "AmlCode" the "%s_aml_code" is in use, where the prefix is a lowered case base name of the output file. In our case it will be "dsdt" producing a name as "dsdt_aml_code". The quick solution is to call sed which replaces new name by the old one to keep compatibility with old version of iASL. The long term solution would be to modify code to use the new name because it is more scalable. Cc: Robert Moore Cc: Sami Mujawar Cc: Evan Lloyd Signed-off-by: Andy Shevchenko Reviewed-by: Bin Meng [bmeng: fixed two sentences in the commit message] Signed-off-by: Bin Meng --- scripts/Makefile.lib | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts') diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index ef7604c4638..2a7d73432d7 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 # --------------------------------------------------------------------------- -- cgit v1.3.1 From a8542ad81f544e754a7173b43b13f9db1354de0f Mon Sep 17 00:00:00 2001 From: Bin Meng Date: Sun, 3 Jun 2018 19:04:19 -0700 Subject: x86: ivybridge: Drop CONFIG_USBDEBUG This is not used anywhere. Clean this up. Signed-off-by: Bin Meng Reviewed-by: Simon Glass --- arch/x86/cpu/intel_common/mrc.c | 5 ----- arch/x86/cpu/ivybridge/model_206ax.c | 15 --------------- scripts/config_whitelist.txt | 1 - 3 files changed, 21 deletions(-) (limited to 'scripts') diff --git a/arch/x86/cpu/intel_common/mrc.c b/arch/x86/cpu/intel_common/mrc.c index a5697a62a5e..b35102a3f08 100644 --- a/arch/x86/cpu/intel_common/mrc.c +++ b/arch/x86/cpu/intel_common/mrc.c @@ -242,11 +242,6 @@ static int sdram_initialise(struct udevice *dev, struct udevice *me_dev, version >> 24 , (version >> 16) & 0xff, (version >> 8) & 0xff, version & 0xff); -#if CONFIG_USBDEBUG - /* mrc.bin reconfigures USB, so reinit it to have debug */ - early_usbdebug_init(); -#endif - return 0; } diff --git a/arch/x86/cpu/ivybridge/model_206ax.c b/arch/x86/cpu/ivybridge/model_206ax.c index c5441aafea8..33e5c6263d4 100644 --- a/arch/x86/cpu/ivybridge/model_206ax.c +++ b/arch/x86/cpu/ivybridge/model_206ax.c @@ -393,10 +393,6 @@ static void configure_mca(void) msr_write(IA32_MC0_STATUS + (i * 4), msr); } -#if CONFIG_USBDEBUG -static unsigned ehci_debug_addr; -#endif - static int model_206ax_init(struct udevice *dev) { int ret; @@ -404,17 +400,6 @@ static int model_206ax_init(struct udevice *dev) /* Clear out pending MCEs */ configure_mca(); -#if CONFIG_USBDEBUG - /* Is this caution really needed? */ - if (!ehci_debug_addr) - ehci_debug_addr = get_ehci_debug(); - set_ehci_debug(0); -#endif - -#if CONFIG_USBDEBUG - set_ehci_debug(ehci_debug_addr); -#endif - /* Enable the local cpu apics */ enable_lapic_tpr(); diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index e99ba6b85ab..1a543375940 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 -- cgit v1.3.1