Script: integrate the config in fragment for 32bit kernel [1/1]
PD#SWPL-127665
Problem:
the config in 32bit is unnecessary
Solution:
integrate the config in fragment for 32bit kernel
Verify:
local
Change-Id: I139a2753d1e5c0c018ffa6d6ef610e4f335e0d06
Signed-off-by: Dezhen Wang <dezhen.wang@amlogic.com>
diff --git a/amlogic_utils.sh b/amlogic_utils.sh
index b865590..6b32794 100644
--- a/amlogic_utils.sh
+++ b/amlogic_utils.sh
@@ -10,28 +10,36 @@
local temp_file=`mktemp /tmp/config.XXXXXXXXXXXX`
echo "CONFIG_AMLOGIC_SERIAL_MESON=y" > ${temp_file}
echo "CONFIG_DEVTMPFS=y" >> ${temp_file}
- if [[ ${GKI_CONFIG} == gki_20 ]]; then
+ if [[ ${ARCH} == arm ]]; then
KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${temp_file}
- elif [[ ${GKI_CONFIG} == gki_10 ]]; then
- KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_GKI10} ${temp_file}
- elif [[ ${GKI_CONFIG} == gki_debug ]]; then
- KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_GKI10} ${ROOT_DIR}/${FRAGMENT_CONFIG_DEBUG} ${temp_file}
+ else
+ if [[ ${GKI_CONFIG} == gki_20 ]]; then
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${temp_file}
+ elif [[ ${GKI_CONFIG} == gki_10 ]]; then
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_GKI10} ${temp_file}
+ elif [[ ${GKI_CONFIG} == gki_debug ]]; then
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_GKI10} ${ROOT_DIR}/${FRAGMENT_CONFIG_DEBUG} ${temp_file}
+ fi
fi
rm ${temp_file}
else
- if [[ ${GKI_CONFIG} == gki_20 ]]; then
- if [[ -n ${CHECK_GKI_20} ]]; then
- local temp_file=`mktemp /tmp/config.XXXXXXXXXXXX`
- echo "CONFIG_STMMAC_ETH=n" > ${temp_file}
- KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${temp_file}
- rm ${temp_file}
- else
- KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG}
+ if [[ ${ARCH} == arm ]]; then
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG}
+ else
+ if [[ ${GKI_CONFIG} == gki_20 ]]; then
+ if [[ -n ${CHECK_GKI_20} ]]; then
+ local temp_file=`mktemp /tmp/config.XXXXXXXXXXXX`
+ echo "CONFIG_STMMAC_ETH=n" > ${temp_file}
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${temp_file}
+ rm ${temp_file}
+ else
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG}
+ fi
+ elif [[ ${GKI_CONFIG} == gki_10 ]]; then
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_GKI10}
+ elif [[ ${GKI_CONFIG} == gki_debug ]]; then
+ KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_GKI10} ${ROOT_DIR}/${FRAGMENT_CONFIG_DEBUG}
fi
- elif [[ ${GKI_CONFIG} == gki_10 ]]; then
- KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_GKI10}
- elif [[ ${GKI_CONFIG} == gki_debug ]]; then
- KCONFIG_CONFIG=${ROOT_DIR}/${KCONFIG_DEFCONFIG} ${ROOT_DIR}/${KERNEL_DIR}/scripts/kconfig/merge_config.sh -m -r ${ROOT_DIR}/${GKI_BASE_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG} ${ROOT_DIR}/${FRAGMENT_CONFIG_GKI10} ${ROOT_DIR}/${FRAGMENT_CONFIG_DEBUG}
fi
fi
diff --git a/arch/arm/configs/gki_defconfig b/arch/arm/configs/a32_base_defconfig
similarity index 100%
rename from arch/arm/configs/gki_defconfig
rename to arch/arm/configs/a32_base_defconfig
diff --git a/arch/arm/configs/amlogic_gki.fragment b/arch/arm/configs/amlogic_a32.fragment
similarity index 93%
rename from arch/arm/configs/amlogic_gki.fragment
rename to arch/arm/configs/amlogic_a32.fragment
index 2fbf5f6..464046e 100644
--- a/arch/arm/configs/amlogic_gki.fragment
+++ b/arch/arm/configs/amlogic_a32.fragment
@@ -408,6 +408,49 @@
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
CONFIG_DVB_CORE=m
CONFIG_AMLOGIC_DVB_COMPAT=y
+
+# usb xxx ko
+CONFIG_AMLOGIC_COMMON_USB=y
+
+#support for vts thermal 1.0 test
+CONFIG_AMLOGIC_HOTPLUG_ARM_CPU0=y
+
+# break gki_20
+CONFIG_AMLOGIC_BREAK_GKI_20=y
+
+CONFIG_AMLOGIC_DEBUG_FILE=y
+# ONFIG_AMLOGIC_SAMPLES_DEBUG_FILE_TEST=m
+
+# amlogic serial
+CONFIG_AMLOGIC_SERIAL_MESON=y
+CONFIG_AMLOGIC_SERIAL_EARLY_CONSOLE=y
+
+# build in for amlogic memory change
+CONFIG_MEMCG=n
+CONFIG_AMLOGIC_PIN_LOCKED_FILE=y
+CONFIG_AMLOGIC_MEMORY_EXTEND=y
+CONFIG_AMLOGIC_PAGE_TRACE=y
+CONFIG_AMLOGIC_SLAB_TRACE=y
+CONFIG_AMLOGIC_CMA=y
+CONFIG_AMLOGIC_VMAP=y
+CONFIG_AMLOGIC_MEM_DEBUG=y
+CONFIG_AMLOGIC_STACKPROTECTOR=y
+CONFIG_AMLOGIC_USER_FAULT=y
+CONFIG_AMLOGIC_MEMORY_OPT=y
+CONFIG_AMLOGIC_MEMORY_STAT=y
+CONFIG_CRYPTO_ZSTD=y
+CONFIG_AMLOGIC_ZSTD=y
+CONFIG_AMLOGIC_PCIE_DMA_OPS=y
+
+# debug builtin
+CONFIG_AMLOGIC_BOOT_TIME=y
+CONFIG_PRINTK_CALLER=y
+CONFIG_AMLOGIC_DEBUG_PRINTK=y
+CONFIG_AMLOGIC_ENV_DEBUG=y
+CONFIG_AMLOGIC_ARM_UNWIND=y
+CONFIG_AMLOGIC_BGKI_DEBUG_MISC=y
+CONFIG_AMLOGIC_ARMV8_AARCH32=y
+
# CONFIG_CXD2880_SPI_DRV is not set
# CONFIG_MEDIA_TUNER_SIMPLE is not set
# CONFIG_MEDIA_TUNER_TDA18250 is not set
diff --git a/arch/arm/configs/amlogic_gki.10 b/arch/arm/configs/amlogic_gki.10
deleted file mode 100644
index f9daf71..0000000
--- a/arch/arm/configs/amlogic_gki.10
+++ /dev/null
@@ -1,10 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-
-# usb xxx ko
-CONFIG_AMLOGIC_COMMON_USB=y
-
-#support for vts thermal 1.0 test
-CONFIG_AMLOGIC_HOTPLUG_ARM_CPU0=y
-
-# break gki_20
-CONFIG_AMLOGIC_BREAK_GKI_20=y
\ No newline at end of file
diff --git a/arch/arm/configs/amlogic_gki.debug b/arch/arm/configs/amlogic_gki.debug
deleted file mode 100644
index b58cb9b..0000000
--- a/arch/arm/configs/amlogic_gki.debug
+++ /dev/null
@@ -1,34 +0,0 @@
-# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-
-CONFIG_AMLOGIC_DEBUG_FILE=y
-# ONFIG_AMLOGIC_SAMPLES_DEBUG_FILE_TEST=m
-
-# amlogic serial
-CONFIG_AMLOGIC_SERIAL_MESON=y
-CONFIG_AMLOGIC_SERIAL_EARLY_CONSOLE=y
-
-# build in for amlogic memory change
-CONFIG_MEMCG=n
-CONFIG_AMLOGIC_PIN_LOCKED_FILE=y
-CONFIG_AMLOGIC_MEMORY_EXTEND=y
-CONFIG_AMLOGIC_PAGE_TRACE=y
-CONFIG_AMLOGIC_SLAB_TRACE=y
-CONFIG_AMLOGIC_CMA=y
-CONFIG_AMLOGIC_VMAP=y
-CONFIG_AMLOGIC_MEM_DEBUG=y
-CONFIG_AMLOGIC_STACKPROTECTOR=y
-CONFIG_AMLOGIC_USER_FAULT=y
-CONFIG_AMLOGIC_MEMORY_OPT=y
-CONFIG_AMLOGIC_MEMORY_STAT=y
-CONFIG_CRYPTO_ZSTD=y
-CONFIG_AMLOGIC_ZSTD=y
-CONFIG_AMLOGIC_PCIE_DMA_OPS=y
-
-# debug builtin
-CONFIG_AMLOGIC_BOOT_TIME=y
-CONFIG_PRINTK_CALLER=y
-CONFIG_AMLOGIC_DEBUG_PRINTK=y
-CONFIG_AMLOGIC_ENV_DEBUG=y
-CONFIG_AMLOGIC_ARM_UNWIND=y
-CONFIG_AMLOGIC_BGKI_DEBUG_MISC=y
-CONFIG_AMLOGIC_ARMV8_AARCH32=y
diff --git a/arch/arm64/configs/README.txt b/arch/arm64/configs/README.txt
index 4241ff4..25e84b8 100644
--- a/arch/arm64/configs/README.txt
+++ b/arch/arm64/configs/README.txt
@@ -20,7 +20,7 @@
(3) Building with mk_gx32.sh:
command: ./common/common_drivers/scripts/amlogic/mk_gx32.sh
- config: gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 + amlogic_gki.debug + amlogic_gcc32_defconfig
+ config: a32_base_defconfig + amlogic_a32.fragment + amlogic_gcc32_defconfig
config path：(all the configs are in the same following path especially gki_defconfig in this situations)
common_drivers/arch/arm/configs/
savedefconfig cmd:
@@ -53,8 +53,8 @@
./common/common_drivers/scripts/amlogic/mk_zapper32.sh --savedefconfig
(7) Building with mk.sh with aarch64:
- ./mk.sh gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 +amlogic_gki.debug
- ./mk.sh --gki_debug gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 +amlogic_gki.debug
+ ./mk.sh gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 + amlogic_gki.debug
+ ./mk.sh --gki_debug gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 + amlogic_gki.debug
./mk.sh --gki_20 gki_defconfig + amlogic_gki.fragment
config path: common/arch/arm64/configs/gki_defconfig
common_drivers/arch/arm64/configs/amlogic_gki.fragment or amlogic_gki.10 or amlogic_gki.debug
@@ -65,11 +65,25 @@
amlogic_gki.debug This is the config file for adding the function for debug. It follows GKI1.0.
(8) Building with mk.sh with aarch32:
- ./mk.sh --arch arm gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 +amlogic_gki.debug
+ ./mk.sh --arch arm a32_base_defconfig + amlogic_a32.fragment
config path: (all the configs are in the same following path especially gki_defconfig in this situations)
common_drivers/arch/arm32/configs/
NOTE:
gki_defconfig This config is different from common/arch/arm64/configs/gki_defconfig for aarch64 build. It can be changed by our needs.
+ amlogic_gki.fragment This config is link from common_drivers/arch/arm64/configs/amlogic_gki.fragment which is a common config for 64 and 32
+ amlogic_a32.fragment This config is extra config file only for 32bit. if you want to change config for 32bit, please modify amlogic_a32.fragment
+
+ (9)Building with mk.sh for Android p, r and s
+ ./mk.sh --upgrade s gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 + amlogic_gki.debug + amlogic_upgrade_s.defconfig
+ ./mk.sh --upgrade r gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 + amlogic_gki.debug + amlogic_upgrade_r.defconfig
+ ./mk.sh --upgrade p gki_defconfig + amlogic_gki.fragment + amlogic_gki.10 + amlogic_gki.debug + amlogic_upgrade_p.defconfig
+
+ config path: common/arch/arm64/configs/amlogic_upgrade_s.defconfig or amlogic_upgrade_r.defconfig or amlogic_upgrade_p.defconfig
+
+ NOTE:
+ amlogic_upgrade_p.defconfig this config is for Android p + kernel 5.15
+ amlogic_upgrade_r.defconfig this config is for Android r + kernel 5.15
+ amlogic_upgrade_s.defconfig this config is for Android s + kernel 5.15
NOTE:
If you want to change the config in the situations (1)~(6). you must excute the savedefconfig cmd then you can submit config file.
@@ -82,5 +96,3 @@
(2) Adding some different config files in common_drivers/arch/arm64/configs/ like a_config b_config and c_config.
Example:
./mk.sh --dev_config a_config+b_config+c_config
-
-
diff --git a/build.config.amlogic32 b/build.config.amlogic32
index 854b1d5..14b4ed8 100644
--- a/build.config.amlogic32
+++ b/build.config.amlogic32
@@ -42,11 +42,9 @@
fi
DEFCONFIG=amlogic_gki_defconfig
-GKI_BASE_CONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/gki_defconfig
+GKI_BASE_CONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/a32_base_defconfig
KCONFIG_DEFCONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/${DEFCONFIG}
-FRAGMENT_CONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.fragment
-FRAGMENT_CONFIG_GKI10=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.10
-FRAGMENT_CONFIG_DEBUG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_gki.debug
+FRAGMENT_CONFIG=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_a32.fragment
FRAGMENT_CONFIG_UPGRADE_R=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_upgrade_r.defconfig
FRAGMENT_CONFIG_UPGRADE_P=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_upgrade_p.defconfig
FRAGMENT_CONFIG_UPGRADE_S=${KERNEL_DIR}/${COMMON_DRIVERS_DIR}/arch/${ARCH}/configs/amlogic_upgrade_s.defconfig
diff --git a/scripts/amlogic/mk_gx32.sh b/scripts/amlogic/mk_gx32.sh
index 651d4e5..65fcd40 100755
--- a/scripts/amlogic/mk_gx32.sh
+++ b/scripts/amlogic/mk_gx32.sh
@@ -13,10 +13,8 @@
export KCONFIG_CONFIG
${ROOT_DIR}/common/scripts/kconfig/merge_config.sh -m -r \
- ${ROOT_DIR}/common/common_drivers/arch/${ARCH}/configs/gki_defconfig \
- ${ROOT_DIR}/common/common_drivers/arch/${ARCH}/configs/amlogic_gki.fragment \
- ${ROOT_DIR}/common/common_drivers/arch/${ARCH}/configs/amlogic_gki.10 \
- ${ROOT_DIR}/common/common_drivers/arch/${ARCH}/configs/amlogic_gki.debug \
+ ${ROOT_DIR}/common/common_drivers/arch/${ARCH}/configs/a32_base_defconfig \
+ ${ROOT_DIR}/common/common_drivers/arch/${ARCH}/configs/amlogic_a32.fragment \
${ROOT_DIR}/common/common_drivers/arch/${ARCH}/configs/amlogic_gcc32_defconfig\
export -n KCONFIG_CONFIG