defconfig: aarch32: sync defconfig between aarch32 and aarch64

PD#173683: defconfig

Change-Id: I70017bc8af82d52c61d5c872c077b900879e9550
Signed-off-by: Jianxiong Pan <jianxiong.pan@amlogic.com>

diff --git a/arch/arm/configs/meson64_a32_defconfig b/arch/arm/configs/meson64_a32_defconfig
index 015afb7..ec72b64 100644 (file)
--- a/arch/arm/configs/meson64_a32_defconfig
+++ b/arch/arm/configs/meson64_a32_defconfig
@@ -14,10 +14,12 @@ CONFIG_LOG_BUF_SHIFT=19
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_CGROUP_BPF=y
+CONFIG_DEFAULT_USE_ENERGY_AWARE=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
@@ -35,14 +37,20 @@ CONFIG_ARCH_MESON=y
 CONFIG_ARM64_A32=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_PCI=y
+CONFIG_PCI_MSI=y
 CONFIG_PCIE_DW_PLAT=y
 CONFIG_SMP=y
 CONFIG_SCHED_MC=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
+CONFIG_NR_CPUS=8
+CONFIG_ARM_PSCI=y
 CONFIG_PREEMPT=y
+CONFIG_HZ_250=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 CONFIG_CMA=y
+CONFIG_CMA_DEBUGFS=y
 CONFIG_CMA_AREAS=15
 CONFIG_ZSMALLOC=y
 CONFIG_SECCOMP=y
@@ -51,12 +59,14 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
 CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_ARM_BIG_LITTLE_CPUFREQ=y
 CONFIG_ARM_SCPI_CPUFREQ=y
 CONFIG_CPU_IDLE=y
 CONFIG_ARM_CPUIDLE=y
 CONFIG_VFP=y
 CONFIG_NEON=y
+CONFIG_KERNEL_MODE_NEON=y
 CONFIG_BINFMT_MISC=y
 CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
@@ -204,6 +214,8 @@ CONFIG_MAC80211=y
 CONFIG_RFKILL=y
 CONFIG_AMLOGIC_DRIVER=y
 CONFIG_AMLOGIC_MODIFY=y
+CONFIG_AMLOGIC_CPUFREQ=y
+CONFIG_AMLOGIC_MESON_CPUFREQ=y
 CONFIG_AMLOGIC_INPUT_BOOST=y
 CONFIG_AMLOGIC_UART=y
 CONFIG_AMLOGIC_SERIAL_MESON_CONSOLE=y
@@ -237,6 +249,7 @@ CONFIG_AMLOGIC_GX_CLK=y
 CONFIG_AMLOGIC_CRYPTO=y
 CONFIG_AMLOGIC_CRYPTO_DMA=y
 CONFIG_AMLOGIC_INPUT=y
+CONFIG_AMLOGIC_AVIN_DETECT=y
 CONFIG_AMLOGIC_INPUT_KEYBOARD=y
 CONFIG_AMLOGIC_ADC_KEYPADS=y
 CONFIG_AMLOGIC_GPIO_KEY=y
@@ -345,11 +358,15 @@ CONFIG_AMLOGIC_PCIE=y
 CONFIG_AMLOGIC_IRBLASTER=y
 CONFIG_AMLOGIC_IIO=y
 CONFIG_AMLOGIC_SARADC=y
+CONFIG_AMLOGIC_DDR_TOOL=y
+CONFIG_AMLOGIC_DDR_BANDWIDTH=y
 CONFIG_AMLOGIC_TEE=y
 CONFIG_AMLOGIC_GPIO_IRQ=y
 CONFIG_AMLOGIC_ATV_DEMOD=y
 CONFIG_AMLOGIC_DEBUG=y
 CONFIG_AMLOGIC_DEBUG_LOCKUP=y
+CONFIG_AMLOGIC_BATTERY_DUMMY=y
+CONFIG_AMLOGIC_CHARGER_DUMMY=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -378,8 +395,10 @@ CONFIG_DM_CRYPT=y
 CONFIG_DM_VERITY=y
 CONFIG_DM_VERITY_HASH_PREFETCH_MIN_SIZE=1
 CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_VERITY_AVB=y
 CONFIG_DM_ANDROID_VERITY=y
 CONFIG_NETDEVICES=y
+CONFIG_MACVLAN=y
 CONFIG_TUN=y
 CONFIG_8139CP=y
 CONFIG_8139TOO=y
@@ -426,6 +445,8 @@ CONFIG_SPI_MESON_SPICC=y
 CONFIG_SPI_SPIDEV=y
 CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_PCA953X=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_SUPPLY=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y
@@ -459,6 +480,7 @@ CONFIG_AMLOGIC_SND_SOC_SSM3525=y
 CONFIG_AMLOGIC_SND_SOC_SSM3515=y
 CONFIG_AMLOGIC_SND_SOC_TAS575X=y
 CONFIG_AMLOGIC_SND_SOC_AD82584F=y
+CONFIG_AMLOGIC_SND_SOC_CS42528=y
 CONFIG_AMLOGIC_SND_SOC=y
 CONFIG_AMLOGIC_SND_SOC_MESON=y
 CONFIG_AMLOGIC_SND_SOC_AUGE=y
@@ -488,7 +510,7 @@ CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_CONFIGFS_F_MIDI=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
-CONFIG_MMC_ARMMMCI=y
+#CONFIG_MMC_ARMMMCI=y   is no set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
@@ -565,7 +587,7 @@ CONFIG_PRINTK_TIME=y
 CONFIG_DEBUG_INFO=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_LOCKUP_DETECTOR=y
-CONFIG_WQ_WATCHDOG=y
+#CONFIG_WQ_WATCHDOG=y  is no set
 CONFIG_PANIC_TIMEOUT=5
 CONFIG_PANIC_ON_RT_THROTTLING=y
 CONFIG_SCHEDSTATS=y
@@ -575,6 +597,7 @@ CONFIG_DEBUG_ATOMIC_SLEEP=y
 CONFIG_FTRACE_SYSCALLS=y
 CONFIG_STACK_TRACER=y
 CONFIG_FUNCTION_PROFILER=y
+CONFIG_DEBUG_SET_MODULE_RONX=y
 CONFIG_SECURITY_DMESG_RESTRICT=y
 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y

diff --git a/drivers/amlogic/ddr_tool/ddr_bandwidth.c b/drivers/amlogic/ddr_tool/ddr_bandwidth.c
index dd6771c..132773c 100644 (file)
--- a/drivers/amlogic/ddr_tool/ddr_bandwidth.c
+++ b/drivers/amlogic/ddr_tool/ddr_bandwidth.c
@@ -168,7 +168,7 @@ static ssize_t bandwidth_show(struct class *cla,
                        aml_db->total_bandwidth, percent, rem);
 
        for (i = 0; i < aml_db->channels; i++) {
-               s += sprintf(buf + s, "Channel %ld, bandwidth:%8d KB/s\n",
+               s += sprintf(buf + s, "Channel %zu, bandwidth:%8d KB/s\n",
                                i, aml_db->bandwidth[i]);
        }
        return s;

diff --git a/drivers/amlogic/ddr_tool/dmc_g12.c b/drivers/amlogic/ddr_tool/dmc_g12.c
index a8db417..e5097a5 100644 (file)
--- a/drivers/amlogic/ddr_tool/dmc_g12.c
+++ b/drivers/amlogic/ddr_tool/dmc_g12.c
@@ -70,7 +70,7 @@ static size_t g12_dmc_dump_reg(char *buf)
        sz += sprintf(buf + sz, "DMC_SEC_STATUS:%lx\n", val);
        for (i = 0; i < 4; i++) {
                val = dmc_rw(DMC_VIO_ADDR0 + (i << 2), 0, DMC_READ);
-               sz += sprintf(buf + sz, "DMC_VIO_ADDR%ld:%lx\n", i, val);
+               sz += sprintf(buf + sz, "DMC_VIO_ADDR%zu:%lx\n", i, val);
        }
 
        return sz;

diff --git a/drivers/amlogic/ddr_tool/dmc_gx.c b/drivers/amlogic/ddr_tool/dmc_gx.c
index c5d0941..e0b1203 100644 (file)
--- a/drivers/amlogic/ddr_tool/dmc_gx.c
+++ b/drivers/amlogic/ddr_tool/dmc_gx.c
@@ -74,7 +74,7 @@ static size_t gx_dmc_dump_reg(char *buf)
        sz += sprintf(buf + sz, "DMC_SEC_STATUS:%lx\n", val);
        for (i = 0; i < 8; i++) {
                val = dmc_rw(DMC_VIO_ADDR0 + (i << 2), 0, DMC_READ);
-               sz += sprintf(buf + sz, "DMC_VIO_ADDR%ld:%lx\n", i, val);
+               sz += sprintf(buf + sz, "DMC_VIO_ADDR%zu:%lx\n", i, val);
        }
 
        return sz;