arm: enable AMLOGIC_MODIRY config

PD#165213:

This change can use some amlogic optimize on arm32

Change-Id: Ic364baab21431e83d9b224d0d6c58913404aed3c
Signed-off-by: tao zeng <tao.zeng@amlogic.com>

diff --git a/arch/arm/configs/meson32_defconfig b/arch/arm/configs/meson32_defconfig
index cd9c3a0..0364cf8 100644 (file)
--- a/arch/arm/configs/meson32_defconfig
+++ b/arch/arm/configs/meson32_defconfig
@@ -164,6 +164,7 @@ CONFIG_CFG80211=y
 CONFIG_MAC80211=y
 CONFIG_RFKILL=y
 CONFIG_AMLOGIC_DRIVER=y
+CONFIG_AMLOGIC_MODIFY=y
 CONFIG_AMLOGIC_CPUFREQ=y
 CONFIG_AMLOGIC_UART=y
 CONFIG_AMLOGIC_SERIAL_MESON_CONSOLE=y

diff --git a/drivers/amlogic/memory_ext/page_trace.c b/drivers/amlogic/memory_ext/page_trace.c
index 95be8ea..2f4e2bc 100644 (file)
--- a/drivers/amlogic/memory_ext/page_trace.c
+++ b/drivers/amlogic/memory_ext/page_trace.c
@@ -186,7 +186,9 @@ static void push_ip(struct page_trace *base, struct page_trace *ip)
                base[i] = base[i - 1];
 
        /* debug check */
+#if DEBUG_PAGE_TRACE
        check_trace_valid(base);
+#endif
        end = (((unsigned long)trace_buffer) + ptrace_size);
        WARN_ON((unsigned long)(base + trace_step - 1) >= end);
 

diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c
index d74821b..d943cc2 100644 (file)
--- a/drivers/of/of_reserved_mem.c
+++ b/drivers/of/of_reserved_mem.c
@@ -156,8 +156,10 @@ static int __init __reserved_mem_alloc_size(unsigned long node,
                                                       &prop);
 
                #ifdef CONFIG_AMLOGIC_MODIFY
+               #ifdef CONFIG_PHYS_ADDR_T_64BIT
                        pr_info("%s, start:%llx, end:%llx, len:%llx\n",
                                __func__, start, end, end - start);
+               #endif
                #endif /* CONFIG_AMLOGIC_MODIFY */
                        ret = early_init_dt_alloc_reserved_memory_arch(size,
                                        align, start, end, nomap, &base);