Conntrack modules

.gitattributes

@@ -0,0 +1,3 @@
+# Auto detect text files and perform LF normalization
+*      text=auto
+*.sh   text eol=lf

Makefile

@@ -7,7 +7,7 @@ CROSS_COMPILE=arm-linux-gnueabihf-
 OUTPUT_DIR=$(CURDIR)/output
 BUILD_PATH=$(CURDIR)/build
 ROOTFS=$(CURDIR)/rootfs.img
-Q=
+Q=@
 J=$(shell expr `grep ^processor /proc/cpuinfo  | wc -l` \* 2)
 
 include chosen_board.mk
@@ -26,7 +26,7 @@ clean:
 	rm -rf $(BUILD_PATH)
 
 ## patch
-patch: linux-sunxi/.git
+patch: linux-sunxi/.git u-boot-sunxi/.git
 	$(Q)$(CURDIR)/apply_patch.sh
 	$(Q)rm -f $(K_DOT_CONFIG)
 
@@ -100,15 +100,16 @@ endif
 libs: cedarx-libs/.git
 
 update:
-	$(Q)git stash
-	$(Q)git pull --rebase
-	$(Q)git submodule -q init 
-	$(Q)git submodule -q foreach git stash save -q --include-untracked "make update stash"
-	-$(Q)git submodule -q foreach git fetch -q
-	-$(Q)git submodule -q foreach "git rebase origin HEAD || :"
-	-$(Q)git submodule -q foreach "git stash pop -q || :"
-	-$(Q)git stash pop -q
-	$(Q)git submodule status
+	$(Q)git pull
+#	$(Q)git stash
+#	$(Q)git pull --rebase
+#	$(Q)git submodule -q init 
+#	$(Q)git submodule -q foreach git stash save -q --include-untracked "make update stash"
+#	-$(Q)git submodule -q foreach git fetch -q
+#	-$(Q)git submodule -q foreach "git rebase origin HEAD || :"
+#	-$(Q)git submodule -q foreach "git stash pop -q || :"
+#	-$(Q)git stash pop -q
+#	$(Q)git submodule status
 
 %/.git:
 	$(Q)git submodule init

allwinner-tools/livesuit/a20/default/env.cfg

@@ -8,8 +8,8 @@ mmc_root=/dev/mmcblk0p7
 init=/init
 loglevel=8
 #set kernel cmdline if boot.img or recovery.img has no cmdline we will use this
-setargs_nand=setenv bootargs console=${console} root=${nand_root} init=${init} loglevel=${loglevel} partitions=${partitions}
-setargs_mmc=setenv bootargs console=${console} root=${mmc_root} init=${init} loglevel=${loglevel} partitions=${partitions}
+setargs_nand=setenv bootargs coherent_pool=2M console=${console} root=${nand_root} init=${init} loglevel=${loglevel} partitions=${partitions}
+setargs_mmc=setenv bootargs coherent_pool=2M console=${console} root=${mmc_root} init=${init} loglevel=${loglevel} partitions=${partitions}
 #nand command syntax: sunxi_flash read address partition_name read_bytes
 #0x40007800 = 0x40008000(kernel entry) - 0x800(boot.img header 2k)
 #boot_normal=sunxi_flash read 40007800 boot;boota 40007800

allwinner-tools/livesuit/a20/default/sys_partition.fex

@@ -42,7 +42,7 @@ size = 16384
 ;------------------------------>mmcblk0p5/nandb
 [partition]
     name         = env
-    size         = 4096
+    size         = 32768
     downloadfile = "env.fex"
     verify       = 1
 ;------------------------------>mmcblk0p6/nandc
@@ -52,12 +52,3 @@ size = 16384
     downloadfile = "boot.fex"
     verify       = 1
 
-[partition]
-    name         = rootfs
-    size         = 3686400
-    downloadfile = "rootfs.fex"
-    verify       = 1
-
-[partition]
-    name         = private
-    size         = 4096

allwinner-tools/livesuit/a20/mod_update/script_parse

@@ -240,8 +240,8 @@ def check_part_name_valid(name):
 def check_part_size_valid(size):
     if not size.isdigit():
         return (False, "invalid partition size, must be decimal base digit, unit: 512Bytes")
-#    if int(size) % 32768:
-#        return (False, "invalid partition size, must 16MB align, unit: 512Bytes")
+    if int(size) % 32768:
+        return (False, "invalid partition size, must 16MB align, unit: 512Bytes")
     return (True, "valid")
 
 def check_part_keydata_valid(keydata):
@@ -318,7 +318,7 @@ def check_part_config(conf_lines):
             if int(value) % 16384:
                 error_msg("L%d: %s" % (i+1, line))
                 error_msg("invalid partition size, must 16MB align, unit: KB")
-                #return False
+                return False
 
         elif cmp(mainkey, "partition_start") == 0:
             error_msg("L%d: %s" % (i+1, line))

allwinner-tools/livesuit/a20/wboot/bootfs/boot.ini

@@ -3,6 +3,7 @@ start_os_name = linux
 timeout       = -1
 display_device= 0
 display_mode  = 0
+erase_flash=1
 
 
 [linux]

allwinner-tools/livesuit/default/sys_config_linux.fex

@@ -8,8 +8,8 @@ pid =0x02000000
 sid =0x02000100
 bid =0x80
 
-eraseflag   = 0
-jtag        = 1
+eraseflag   = 1
+jtag        = 0
 
 
 [fex_misc]
@@ -62,23 +62,15 @@ num     = 4
     class_name  = DISK
     name        = env
     size_hi     = 0
-    size_lo     = 2048
+    size_lo     = 32768
     user_type   = 0
     ro          = 0
 
 [partition2]
     class_name  = DISK
     name        = boot
     size_hi     = 0
-    size_lo     = 16384
-    user_type   = 0
-    ro          = 0
-
-[partition3]
-    class_name  = DISK
-    name        = rootfs
-    size_hi     = 0
-    size_lo     = 1843200
+    size_lo     = 32768
     user_type   = 0
     ro          = 0
 
@@ -120,8 +112,3 @@ part_name   = boot
 pkt_name    = KERNEL_000000000
 encrypt     = 0
 
-[download3]
-part_name   = rootfs
-pkt_name    = ROOTFS_000000000
-encrypt     = 0
-

configure

@@ -41,9 +41,13 @@ generate_board_mk() {
 		EOT
 		;;
 	a20)
+		KERNEL_CONFIG=sun7i${android:+_nuclear}_defconfig
+		if [ -f patch/linux-sunxi/arch/arm/configs/${board}_defconfig ]; then
+			KERNEL_CONFIG=${board}_defconfig
+		fi
 		cat <<-EOT
 		MACH=sun7i
-		KERNEL_CONFIG=sun7i${android:+_nuclear}_defconfig
+		KERNEL_CONFIG=${KERNEL_CONFIG}
 		EOT
 		;;
 	*)