diff --git a/components/esp8684/Kconfig b/components/esp8684/Kconfig
index ce17051b0f..2dab5b061d 100644
--- a/components/esp8684/Kconfig
+++ b/components/esp8684/Kconfig
@@ -4,7 +4,7 @@ menu "ESP8684-Specific"
     choice ESP8684_DEFAULT_CPU_FREQ_MHZ
         prompt "CPU frequency"
         default ESP8684_DEFAULT_CPU_FREQ_40 if IDF_ENV_FPGA
-        default ESP8684_DEFAULT_CPU_FREQ_160 if !IDF_ENV_FPGA
+        default ESP8684_DEFAULT_CPU_FREQ_120 if !IDF_ENV_FPGA
         help
             CPU frequency to be set on application startup.
 
@@ -13,6 +13,8 @@ menu "ESP8684-Specific"
             depends on IDF_ENV_FPGA
         config ESP8684_DEFAULT_CPU_FREQ_80
             bool "80 MHz"
+        config ESP8684_DEFAULT_CPU_FREQ_120
+            bool "120 MHz"
         config ESP8684_DEFAULT_CPU_FREQ_160
             bool "160 MHz"
     endchoice
@@ -21,6 +23,7 @@ menu "ESP8684-Specific"
         int
         default 40 if ESP8684_DEFAULT_CPU_FREQ_40
         default 80 if ESP8684_DEFAULT_CPU_FREQ_80
+        default 120 if ESP8684_DEFAULT_CPU_FREQ_120
         default 160 if ESP8684_DEFAULT_CPU_FREQ_160
 
     menu "Cache config"
diff --git a/components/esp_adc_cal/component.mk b/components/esp_adc_cal/component.mk
index e85ba07e4d..99814f4f86 100644
--- a/components/esp_adc_cal/component.mk
+++ b/components/esp_adc_cal/component.mk
@@ -3,4 +3,4 @@
 #
 
 COMPONENT_ADD_INCLUDEDIRS := include
-COMPONENT_OBJEXCLUDE += esp_adc_cal_esp32s2.o esp_adc_cal_esp32c3.o esp_adc_cal_esp32h2.o esp_adc_cal_esp32s3.o
+COMPONENT_OBJEXCLUDE += esp_adc_cal_esp32s2.o esp_adc_cal_esp32c3.o esp_adc_cal_esp32h2.o esp_adc_cal_esp32s3.o esp_adc_cal_esp8684.o
diff --git a/components/esp_common/include/esp_attr.h b/components/esp_common/include/esp_attr.h
index 7b73af7663..07ede16de8 100644
--- a/components/esp_common/include/esp_attr.h
+++ b/components/esp_common/include/esp_attr.h
@@ -1,17 +1,9 @@
 
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+/*
+ * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
 #ifndef __ESP_ATTR_H__
 #define __ESP_ATTR_H__