Merge "[Feature][R306EL-BA][task-view-1886][module] Hardware removal of 32k crystal, software adaptation modifications"
diff --git a/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/build/config.mk b/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/build/config.mk
new file mode 100755
index 0000000..9d6142f
--- /dev/null
+++ b/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/build/config.mk
@@ -0,0 +1,84 @@
+############################################################################
+#
+# Makefile -- Top level linux makefile.
+#
+############################################################################
+
+export CONFIG_WIFI_MODULE=realtek
+export CONFIG_WIFI_FUNCTION=apsta
+#export CONFIG_WIFI_SINGLEAP=yes
+
+export CONFIG_SIGN_IMAGE=yes
+export CONFIG_USE_WEBUI=yes
+export CONFIG_USE_WEBUI_SSL=yes
+#export CONFIG_USE_WEBUI_SECURITY=yes
+export CONFIG_MMI_LCD=no
+export CONFIG_WEBUI_TYPE := CPE
+
+# rootfs type
+export ROOT_FS_TYPE=jffs2
+#only for ubifs partition rootfs size (MB),È¥µôСÊýµã²¿·Ö
+#export ROOTFS_SIZE=22
+
+#userdata type
+export USERDATA_FS_TYPE=jffs2
+#only for ubifs partition userdata size (MB),È¥µôСÊýµã²¿·Ö
+#export USERDATA_SIZE=84
+#libstdc++.so.6 for fota_dm app
+export USE_LIBSTDCPP := no
+
+# pagesize 2K and block size 128K default
+export PAGESIZE=0x800
+export ERASEBLOCK=0x20000
+
+# yes is debug mode,other value is release mode.
+export GLOBAL_DEBUG=no
+
+# custom macro for lib and app
+CUSTOM_MACRO += -DAPP_OS_LINUX=1
+CUSTOM_MACRO += -DAPP_OS_TYPE=APP_OS_LINUX
+CUSTOM_MACRO += -DFOTA_RB_DL
+
+CUSTOM_MACRO += -DPRODUCT_MIFI_CPE=0
+CUSTOM_MACRO += -DPRODUCT_PHONE=1
+CUSTOM_MACRO += -DPRODUCT_DATACARD=2
+CUSTOM_MACRO += -DPRODUCT_TYPE=PRODUCT_MIFI_CPE
+CUSTOM_MACRO += -DPRODUCT_NOT_USE_RTC
+
+ifeq ($(CONFIG_MMI_LCD),no)
+CUSTOM_MACRO += -DDISABLE_LCD
+endif
+CUSTOM_MACRO += -DHAVE_MODEM_IN_CORE
+#CUSTOM_MACRO += -D_USE_BL
+CUSTOM_MACRO += -D_USE_VOLTE
+export _APP_AUDIO_TYPE_=slic_le96xx
+ifeq ($(_APP_AUDIO_TYPE_),slic_le96xx)
+CUSTOM_MACRO += -D_CPE_AUDIO_PRJ
+else
+CUSTOM_MACRO += -D_USE_CODEC_TI3100
+endif
+# fotaÉý¼¶°üÏÂÔØÍêÊÇ·ñÐèÒªÓû§È·ÈϺóÔÙÉý¼¶¿ª¹Ø
+export ENABLE_FOTA_UPG_USR_CONFIRM=yes
+
+# fotaÉý¼¶°üÏÂÔØÍêÊÇ·ñÐèÒª¸úAT CTRL½»»¥
+export ENABLE_FOTA_AT_MSG=yes
+
+# fotaÖÜÆÚ¼ì²âRTC¼ÆʱÆôÓÿª¹Ø
+export FOTA_POLLING_USE_RTC=no
+
+#fotaÏÂÔØ¿âʹÓùãÉý(gs)\ redbend (rb)
+export ENABLE_FOTA_DM_LIB=gs
+
+#enable new call module
+export ENABLE_NEW_CC=no
+ifeq ($(ENABLE_NEW_CC),yes)
+CUSTOM_MACRO += -DUSE_NEW_CC
+endif
+#¿ØÖÆATCTLÏÂphoneĿ¼ÖеĴúÂëÊÇ·ñ²ÎÓë±àÒë
+export ENABLE_PHONECODE_IN_ATCTL=yes
+
+#¿ØÖÆÊÇ·ñʹÓûìÒô
+export USE_MIXDATA_SUPPORT=no
+
+#ÎļþÑéÇ©¿ª¹Ø
+#export VERIFY_APP_IN_KERNEL := yes
diff --git a/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/config/normal/config.linux b/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/config/normal/config.linux
index 5a60617..cf4121e 100755
--- a/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/config/normal/config.linux
+++ b/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/config/normal/config.linux
@@ -1386,6 +1386,7 @@
# CONFIG_THERMAL is not set
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_CORE=y
+CONFIG_WATCHDOG_RESTART=y
# CONFIG_WATCHDOG_NOWAYOUT is not set
#
@@ -2095,4 +2096,4 @@
CONFIG_SLIC_TW=y
CONFIG_CP_USE_SOFT_DTMF_DETECT=y
CONFIG_VOICE_DRV=y
-# CONFIG_VOICE_BUFFER_DRV is not set
\ No newline at end of file
+# CONFIG_VOICE_BUFFER_DRV is not set
diff --git a/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/config/recovery/config.linux b/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/config/recovery/config.linux
index 9652c27..d468d87 100755
--- a/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/config/recovery/config.linux
+++ b/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/config/recovery/config.linux
@@ -792,7 +792,10 @@
# CONFIG_CHARGER_SMB347 is not set
# CONFIG_HWMON is not set
# CONFIG_THERMAL is not set
-# CONFIG_WATCHDOG is not set
+# CONFIG_WATCHDOG is set
+CONFIG_WATCHDOG_RESTART=y
+CONFIG_WATCHDOG=y
+CONFIG_ZX29_WATCHDOG=y
CONFIG_SSB_POSSIBLE=y
#
diff --git a/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/fs/normal/rootfs/etc/rc b/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/fs/normal/rootfs/etc/rc
index 86e58a4..e73ba8f 100755
--- a/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/fs/normal/rootfs/etc/rc
+++ b/lynq/R306_MTN/ap/project/zx297520v3/prj_cpe/fs/normal/rootfs/etc/rc
@@ -217,7 +217,7 @@
chmod 640 /etc/shadow
#mkdir -p /system/bin
#ln -s /bin/busybox /system/bin/sh
-
+echo 123 > /sys/power/wake_lock
# apps start
#internet.sh
#zte_mainctrl &
diff --git a/lynq/R306_MTN/boot/prj/zx297520v3/cpe/config/uboot/include/config_defaults.h b/lynq/R306_MTN/boot/prj/zx297520v3/cpe/config/uboot/include/config_defaults.h
new file mode 100755
index 0000000..7c2cfcb
--- /dev/null
+++ b/lynq/R306_MTN/boot/prj/zx297520v3/cpe/config/uboot/include/config_defaults.h
@@ -0,0 +1,26 @@
+/*
+ * config_defaults.h - sane defaults for everyone
+ *
+ * Copyright (c) 2009 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#ifndef _CONFIG_DEFAULTS_H_
+#define _CONFIG_DEFAULTS_H_
+
+#define ZX_RM_WDT_RESTART 1
+#define CONFIG_I2S0_TO_32K
+
+/* Support bootm-ing different OSes */
+#define CONFIG_BOOTM_LINUX 1
+#define CONFIG_GZIP 1
+#define CONFIG_ZLIB 1
+#define ZX_RM_WDT_RESTART 0
+
+#define CONFIG_JFFS2_LZO
+#define CONFIG_SYS_JFFS2_SORT_FRAGMENTS
+#define CONFIG_SYS_JFFS2_SORT_FRAGMENTS_DIR
+#define CONFIG_ZX297520V3E_CPE
+
+#endif