configs/rtl8721csm/tls_test: update defconfig and add SAMSUNG header …

…definition in Make.defs 1. Add binary version config 2. re-partition the flash for system_data 3. update defconfig with latest Kconfigs 4. add MAKE_SAMSUNG_HEADER definition in Make.defs Signed-off-by: sunghan-chang <[email protected]>
Samsung · Mar 10, 2021 · b293a24 · b293a24
1 parent c114610
commit b293a24
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 48 deletions.
diff --git a/build/configs/rtl8721csm/tls_test/Make.defs b/build/configs/rtl8721csm/tls_test/Make.defs
@@ -210,6 +210,13 @@ define MAKE_BOARD_SPECIFIC_BIN
   $(TOPDIR)/../build/configs/rtl8721csm/rtl8721csm_make_bin.sh
 endef
 
+KERNEL_BINARY_PATH='$(TOPDIR)/../build/output/bin/km0_km4_image2.bin'
+SECURE_HEADER_SIZE=32
+
+define MAKE_SAMSUNG_HEADER
+  $(TOPDIR)/../os/tools/mksamsungheader.py ${KERNEL_BINARY_PATH} kernel ${SECURE_HEADER_SIZE}
+endef
+
 define DOWNLOAD
   $(TOPDIR)/../build/configs/rtl8721csm/rtl8721csm_download.sh $(1) $(2) $(3) $(4) $(5) $(6)
 endef
diff --git a/build/configs/rtl8721csm/tls_test/defconfig b/build/configs/rtl8721csm/tls_test/defconfig
@@ -23,6 +23,7 @@ CONFIG_TOOLS_DIR="../tools"
 CONFIG_BUILD_FLAT=y
 # CONFIG_APP_BINARY_SEPARATION is not set
 # CONFIG_BUILD_2PASS is not set
+CONFIG_BINARY_VERSION=200204
 
 #
 # Binary Output Formats
@@ -130,6 +131,11 @@ CONFIG_RTL8721D_SERIAL_FIFO=y
 #
 CONFIG_AMEBAD_WIFI=y
 
+#
+# Realtek RTL8721D BLE Support
+#
+# CONFIG_AMEBAD_BLE is not set
+
 #
 # Realtek RTL8721D TrustZone Support
 #
@@ -233,7 +239,7 @@ CONFIG_AMEBAD_FLASH_PAGE_SIZE=256
 CONFIG_AMEBAD_FLASH_BLOCK_SIZE=4096
 CONFIG_AMEBAD_AUTOMOUNT=y
 CONFIG_AMEBAD_AUTOMOUNT_USERFS=y
-CONFIG_AMEBAD_AUTOMOUNT_USERFS_DEVNAME="/dev/smart0p5"
+CONFIG_AMEBAD_AUTOMOUNT_USERFS_DEVNAME="/dev/smart0p7"
 CONFIG_AMEBAD_AUTOMOUNT_USERFS_MOUNTPOINT="/mnt"
 CONFIG_ARCH_BOARD_HAVE_FLASH=y
 
@@ -242,9 +248,9 @@ CONFIG_ARCH_BOARD_HAVE_FLASH=y
 #
 CONFIG_FLASH_PARTITION=y
 CONFIG_FLASH_MINOR=0
-CONFIG_FLASH_PART_SIZE="16,8,16,472,1792,1792,1048,"
-CONFIG_FLASH_PART_TYPE="none,none,none,none,kernel,kernel,smartfs,"
-CONFIG_FLASH_PART_NAME="km0_bl,km4_bl,reserved,ss,kernel,kernel,userfs,"
+CONFIG_FLASH_PART_SIZE="16,8,16,472,8,1792,1792,1048,"
+CONFIG_FLASH_PART_TYPE="none,none,none,none,none,kernel,kernel,smartfs,"
+CONFIG_FLASH_PART_NAME="km0_bl,km4_bl,reserved,ss,system_data,kernel,kernel,userfs,"
 # CONFIG_ARCH_BOARD_HAVE_SECOND_FLASH is not set
 
 #
@@ -403,7 +409,7 @@ CONFIG_GPIO=y
 CONFIG_TIMER=y
 # CONFIG_MMINFO is not set
 # CONFIG_ANALOG is not set
-# CONFIG_DRIVERS_KERNEL_TEST is not set
+# CONFIG_DRIVERS_OS_API_TEST is not set
 # CONFIG_NETDEVICES is not set
 CONFIG_PIPES=y
 CONFIG_DEV_PIPE_SIZE=1024
@@ -551,6 +557,38 @@ CONFIG_NET_IP_FRAG=y
 CONFIG_NET_IP_REASSEMBLY=y
 CONFIG_NET_IPV4_REASS_MAX_PBUFS=60
 CONFIG_NET_IPV4_REASS_MAXAGE=5
+CONFIG_NET_ICMP=y
+CONFIG_NET_ICMP_TTL=255
+# CONFIG_NET_BROADCAST_PING is not set
+# CONFIG_NET_MULTICAST_PING4 is not set
+CONFIG_NET_LWIP_IGMP=y
+CONFIG_NET_LWIP_MEMP_NUM_IGMP_GROUP=8
+CONFIG_NET_ARP=y
+CONFIG_NET_ARP_TABLESIZE=10
+CONFIG_NET_ARP_QUEUEING=y
+CONFIG_NET_ETHARP_TRUST_IP_MAC=y
+CONFIG_NET_ETH_PAD_SIZE=0
+# CONFIG_NET_ARP_STATIC_ENTRIES is not set
+CONFIG_NET_UDP=y
+# CONFIG_NET_NETBUF_RECVINFO is not set
+CONFIG_NET_UDP_TTL=255
+# CONFIG_NET_UDPLITE is not set
+CONFIG_NET_TCP=y
+CONFIG_NET_TCP_TTL=255
+CONFIG_NET_TCP_WND=58400
+CONFIG_NET_TCP_MAXRTX=12
+CONFIG_NET_TCP_SYNMAXRTX=6
+CONFIG_NET_TCP_QUEUE_OOSEQ=y
+CONFIG_NET_TCP_MSS=1460
+CONFIG_NET_TCP_CALCULATE_EFF_SEND_MSS=y
+CONFIG_NET_TCP_SND_BUF=29200
+CONFIG_NET_TCP_SND_QUEUELEN=80
+CONFIG_NET_TCP_OOSEQ_MAX_BYTES=0
+CONFIG_NET_TCP_OOSEQ_MAX_PBUFS=0
+# CONFIG_NET_TCP_LISTEN_BACKLOG is not set
+CONFIG_NET_TCP_OVERSIZE=1460
+# CONFIG_NET_TCP_TIMESTAMPS is not set
+CONFIG_NET_TCP_WND_UPDATE_THRESHOLD=29200
 CONFIG_NET_IPv6=y
 CONFIG_NET_IPv6_NUM_ADDRESSES=3
 # CONFIG_NET_IPv6_FORWARD is not set
@@ -563,25 +601,8 @@ CONFIG_NET_IPv6_DUP_DETECT_ATTEMPTS=1
 # CONFIG_NET_IPv6_PMTU_FOR_MULTICAST is not set
 
 #
-# Socket support
+# Neighbor Discovery (RFC 4861)
 #
-CONFIG_NET_SOCKET=y
-CONFIG_NBSDSOCKET_DESCRIPTORS=20
-CONFIG_NET_TCP_KEEPALIVE=y
-CONFIG_NET_RAW=y
-# CONFIG_NET_SOCKET_OPTION_BROADCAST is not set
-# CONFIG_NET_RANDOMIZE_INITIAL_LOCAL_PORTS is not set
-CONFIG_NET_SO_SNDTIMEO=y
-CONFIG_NET_SO_RCVTIMEO=y
-CONFIG_NET_SO_RCVBUF=y
-CONFIG_NET_SO_REUSE=y
-# CONFIG_NET_SO_REUSE_RXTOALL is not set
-CONFIG_NET_ARP=y
-CONFIG_NET_ARP_TABLESIZE=10
-CONFIG_NET_ARP_QUEUEING=y
-CONFIG_NET_ETHARP_TRUST_IP_MAC=y
-CONFIG_NET_ETH_PAD_SIZE=0
-# CONFIG_NET_ARP_STATIC_ENTRIES is not set
 CONFIG_NET_IPv6_ND=y
 CONFIG_NET_IPv6_ND_QUEUEING=y
 CONFIG_NET_IPv6_ND_QUEUE=20
@@ -598,38 +619,33 @@ CONFIG_NET_IPv6_ND_DELAY_FIRST_PROBE_TIME=5000
 CONFIG_NET_IPv6_ND_ALLOW_RA_UPDATES=y
 CONFIG_NET_IPv6_ND_TCP_REACHABILITY_HINTS=y
 CONFIG_NET_IPv6_ND_RDNSS_MAX_DNS_SERVERS=0
-CONFIG_NET_UDP=y
-# CONFIG_NET_NETBUF_RECVINFO is not set
-CONFIG_NET_UDP_TTL=255
-# CONFIG_NET_UDPLITE is not set
-CONFIG_NET_TCP=y
-CONFIG_NET_TCP_TTL=255
-CONFIG_NET_TCP_WND=58400
-CONFIG_NET_TCP_MAXRTX=12
-CONFIG_NET_TCP_SYNMAXRTX=6
-CONFIG_NET_TCP_QUEUE_OOSEQ=y
-CONFIG_NET_TCP_MSS=1460
-CONFIG_NET_TCP_CALCULATE_EFF_SEND_MSS=y
-CONFIG_NET_TCP_SND_BUF=29200
-CONFIG_NET_TCP_SND_QUEUELEN=80
-# CONFIG_NET_TCP_LISTEN_BACKLOG is not set
-CONFIG_NET_TCP_OVERSIZE=1460
-# CONFIG_NET_TCP_TIMESTAMPS is not set
-CONFIG_NET_TCP_WND_UPDATE_THRESHOLD=29200
-CONFIG_NET_ICMP=y
-CONFIG_NET_ICMP_TTL=255
-# CONFIG_NET_BROADCAST_PING is not set
-# CONFIG_NET_MULTICAST_PING4 is not set
+
+#
+# ICMPv6 (RFC 4443)
+#
 CONFIG_NET_IPv6_ICMP=y
 CONFIG_NET_IPv6_ICMP_DATASIZE=8
 CONFIG_NET_IPv6_ICMP_HL=255
 # CONFIG_NET_MULTICAST_PING6 is not set
-CONFIG_NET_LWIP_IGMP=y
-CONFIG_NET_LWIP_MEMP_NUM_IGMP_GROUP=8
 CONFIG_NET_IPv6_MLD=y
 CONFIG_NET_IPv6_MLD_GROUP=4
 # CONFIG_NET_IPv6_DHCP is not set
 
+#
+# Socket support
+#
+CONFIG_NET_SOCKET=y
+CONFIG_NBSDSOCKET_DESCRIPTORS=20
+CONFIG_NET_TCP_KEEPALIVE=y
+CONFIG_NET_RAW=y
+# CONFIG_NET_SOCKET_OPTION_BROADCAST is not set
+# CONFIG_NET_RANDOMIZE_INITIAL_LOCAL_PORTS is not set
+CONFIG_NET_SO_SNDTIMEO=y
+CONFIG_NET_SO_RCVTIMEO=y
+CONFIG_NET_SO_RCVBUF=y
+CONFIG_NET_SO_REUSE=y
+# CONFIG_NET_SO_REUSE_RXTOALL is not set
+
 #
 # LWIP Mailbox Configurations
 #
@@ -790,6 +806,7 @@ CONFIG_WIFIMGR_STA_IFNAME="wlan0"
 #
 CONFIG_NETUTILS_NETLIB=y
 CONFIG_NET_NETMON=y
+CONFIG_NETUTILS_STATS_DISPLAY_TOOL=y
 
 #
 # Network Manager
@@ -1111,6 +1128,7 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_SYSCALL_PERFORMANCE is not set
 # CONFIG_EXAMPLES_TLS_BENCHMARK is not set
 CONFIG_EXAMPLES_TLS_SECLINK=y
+CONFIG_EXAMPLES_TLS_SECLINK_PROGNAME="tls_seclink"
 CONFIG_TLS_SECLINK_USE_FRT_TIMER=y
 CONFIG_TLS_SECLINK_FRT_TIMER_PATH="/dev/timer0"
 CONFIG_TLS_SECLINK_DEBUG=y
@@ -1145,13 +1163,14 @@ CONFIG_EXAMPLES_WIFIMANAGER_TEST=y
 # Shell
 #
 CONFIG_TASH=y
-CONFIG_TASH_MAX_COMMANDS=132
 CONFIG_TASH_MAX_STORE_COMMANDS=10
 # CONFIG_TASH_USLEEP is not set
+# CONFIG_TASH_REBOOT is not set
 # CONFIG_TASH_COMMAND_INTERFACE is not set
 CONFIG_TASH_CMDTASK_STACKSIZE=4096
 CONFIG_TASH_CMDTASK_PRIORITY=100
 # CONFIG_TASH_SCRIPT is not set
+# CONFIG_SECURED_TASH is not set
 
 #
 # System Libraries and Add-Ons