Merge and rename u-boot patch directories

2025-07-09 22:49:16 +00:00 · 2016-11-29 14:27:57 +03:00 · 2016-11-29 14:27:57 +03:00 · dddf228325
commit dddf228325
parent 82dbcf0a5d
70 changed files with 28 additions and 4907 deletions
--- a/build-all.sh
+++ b/build-all.sh
@ -121,7 +121,7 @@ for line in "${buildlist[@]}"; do
 		CPUMIN CPUMAX UBOOT_VER KERNEL_VER GOVERNOR BOOTSIZE UBOOT_TOOLCHAIN KERNEL_TOOLCHAIN PACKAGE_LIST_EXCLUDE KERNEL_IMAGE_TYPE \
 		write_uboot_platform family_tweaks setup_write_uboot_platform BOOTSCRIPT UBOOT_FILES LOCALVERSION UBOOT_COMPILER KERNEL_COMPILER \
 		UBOOT_TARGET MODULES MODULES_NEXT MODULES_DEV INITRD_ARCH HAS_UUID_SUPPORT BOOTENV_FILE BOOTDELAY MODULES_BLACKLIST MODULES_BLACKLIST_NEXT \
-		MODULES_BLACKLIST_DEV MOUNT SDCARD buildtext
+		MODULES_BLACKLIST_DEV MOUNT SDCARD BOOTPATCHDIR buildtext

 	read BOARD BRANCH RELEASE BUILD_DESKTOP <<< $line
 	n=$[$n+1]
--- a/common.sh
+++ b/common.sh
@ -32,7 +32,7 @@ compile_uboot()
 	fi
 	cd "$ubootdir"

-	[[ $FORCE_CHECKOUT == yes ]] && advanced_patch "u-boot" "$BOOTDIR-$BRANCH" "$BOARD" "$BOOTDIR-$BRANCH"
+	[[ $FORCE_CHECKOUT == yes ]] && advanced_patch "u-boot" "$BOOTPATCHDIR" "$BOARD" "${LINUXFAMILY}-${BOARD}-${BRANCH}"

 	# create patch for manual source changes
 	[[ $CREATE_PATCHES == yes ]] && userpatch_create "u-boot"
--- a/config/sources/cubox.conf
+++ b/config/sources/cubox.conf
@ -1,7 +1,7 @@
-
 BOOTSOURCE='https://github.com/SolidRun/u-boot-imx6'
 BOOTBRANCH='branch:imx6'
 BOOTDIR='u-boot-cubox'
+BOOTPATCHDIR='u-boot-cubox'
 BOOTSCRIPT="boot-cubox.cmd:boot.cmd"

 UBOOT_NEEDS_GCC='< 5.0'
--- a/config/sources/marvell.conf
+++ b/config/sources/marvell.conf
@ -1,13 +1,16 @@
 BOOTSOURCE='https://github.com/SolidRun/u-boot-armada38x'
 BOOTBRANCH='branch:u-boot-2013.01-15t1-clearfog'
 BOOTDIR='u-boot-armada'
+BOOTPATCHDIR='u-boot-armada'
 BOOTSCRIPT="boot-marvell.cmd:boot.cmd"

 UBOOT_NEEDS_GCC='< 5.0'
 UBOOT_COMPILER="arm-linux-gnueabi-"

+## for SD/eMMC
 UBOOT_TARGET="u-boot.mmc"
-UBOOT_FILES="u-boot.mmc"
+UBOOT_FILES="u-boot.mmc u-boot-uart.mmc"
+
 BOOTENV_FILE='clearfog-default.txt'
 HAS_UUID_SUPPORT=yes

--- a/config/sources/odroidc1.conf
+++ b/config/sources/odroidc1.conf
@ -1,6 +1,7 @@
 BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
 BOOTBRANCH='branch:odroidc-v2011.03'
 BOOTDIR='u-boot-odroidc1'
+BOOTPATCHDIR='u-boot-odroidc1'
 UBOOT_NEEDS_GCC='< 4.9'
 BOOTSCRIPT="boot-odroid-c1.ini:boot.ini"

--- a/config/sources/odroidc2.conf
+++ b/config/sources/odroidc2.conf
@ -1,6 +1,7 @@
 BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
 BOOTBRANCH='branch:odroidc2-v2015.01'
 BOOTDIR='u-boot-odroidc2'
+BOOTPATCHDIR='u-boot-odroidc2'
 UBOOT_NEEDS_GCC='< 5.0'
 UBOOT_TARGET="ARCH=arm"
 BOOTSCRIPT="boot-odroid-c2.ini:boot.ini"
--- a/config/sources/odroidxu4.conf
+++ b/config/sources/odroidxu4.conf
@ -1,4 +1,3 @@
-BOOTDIR='u-boot-odroidxu'
 OFFSET=4

 case $BRANCH in
@ -6,8 +5,10 @@ case $BRANCH in

 	BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
 	BOOTBRANCH='branch:odroidxu3-v2012.07'
-	UBOOT_FILES="sd_fuse/hardkernel/bl1.bin.hardkernel sd_fuse/hardkernel/bl2.bin.hardkernel u-boot.bin sd_fuse/hardkernel/tzsw.bin.hardkernel"
-	BOOTSCRIPT="boot-odroid-xu4-default.ini:boot.ini"
+	UBOOT_FILES='sd_fuse/hardkernel/bl1.bin.hardkernel sd_fuse/hardkernel/bl2.bin.hardkernel u-boot.bin sd_fuse/hardkernel/tzsw.bin.hardkernel'
+	BOOTSCRIPT='boot-odroid-xu4-default.ini:boot.ini'
+	BOOTDIR='u-boot-odroidxu'
+	BOOTPATCHDIR='u-boot-odroidxu4-default'

 	KERNELSOURCE='https://github.com/hardkernel/linux'
 	KERNELBRANCH='branch:odroidxu3-3.10.y'
@ -19,8 +20,10 @@ case $BRANCH in
 	BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
 	BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
 	BOOTCONFIG=odroid-xu3_defconfig
-	UBOOT_FILES="sd_fusing.sh xu4_blobs/bl1.bin.hardkernel xu4_blobs/bl2.bin.hardkernel.1mb_uboot u-boot-dtb.bin xu4_blobs/tzsw.bin.hardkernel"
-	BOOTSCRIPT="boot-odroid-xu4-next.cmd:boot.cmd"
+	UBOOT_FILES='sd_fusing.sh xu4_blobs/bl1.bin.hardkernel xu4_blobs/bl2.bin.hardkernel.1mb_uboot u-boot-dtb.bin xu4_blobs/tzsw.bin.hardkernel'
+	BOOTSCRIPT='boot-odroid-xu4-next.cmd:boot.cmd'
+	BOOTDIR=$MAINLINE_UBOOT_DIR
+	BOOTPATCHDIR='u-boot-odroidxu4-next'
 	BOOTENV_FILE='odroidxu4-next.txt'
 	HAS_UUID_SUPPORT=yes

--- a/config/sources/pine64.conf
+++ b/config/sources/pine64.conf
@ -1,4 +1,3 @@
-
 BOOTSOURCE='https://github.com/zador-blood-stained/u-boot-pine64-armbian.git'
 BOOTDIR='u-boot-pine64'

@ -10,12 +9,14 @@ case $BRANCH in
 	BOOTBRANCH='branch:master'
 	BOOTSCRIPT='boot-pine64-default.cmd:boot.cmd'
 	BOOTENV_FILE='pine64-default.txt'
+	UBOOT_FILES='u-boot-with-dtb.bin pine64-plus.dtb pine64.dtb pine64drm-plus.dtb pine64drm.dtb'
+	BOOTPATCHDIR='u-boot-pine64-default'
+
 	KERNELSOURCE='https://github.com/longsleep/linux-pine64.git'
 	KERNELBRANCH='branch:pine64-hacks-1.2'
 	KERNELDIR='linux-pine64'
 	GOVERNOR=interactive
 	OFFSET=2
-	UBOOT_FILES="u-boot-with-dtb.bin pine64-plus.dtb pine64.dtb pine64drm-plus.dtb pine64drm.dtb"
 	INITRD_ARCH=arm
 	;;

@ -23,6 +24,8 @@ case $BRANCH in
 	BOOTBRANCH='branch:next'
 	BOOTSCRIPT='boot-pine64-next.cmd:boot.cmd'
 	BOOTENV_FILE='pine64-next.txt'
+	BOOTPATCHDIR='u-boot-pine64-dev'
+
 	KERNELSOURCE='https://github.com/Icenowy/linux'
 	KERNELBRANCH='branch:ice-a64-v6.1'
 	KERNELDIR='linux-pine64-dev'
--- a/config/sources/s500.conf
+++ b/config/sources/s500.conf
@ -16,6 +16,7 @@ case $BOARD in
 	BOOTSOURCE='https://github.com/LeMaker/u-boot-actions'
 	BOOTBRANCH='branch:s500-master'
 	BOOTDIR='u-boot-s500'
+	BOOTPATCHDIR='u-boot-s500'
 	UBOOT_FILES="$SRC/lib/bin/s500-bootloader-guitar.bin u-boot-dtb.img"
 	SERIALCON=ttyS3
 	;;
@ -24,6 +25,7 @@ case $BOARD in
 	BOOTSOURCE='https://github.com/xapp-le/u-boot'
 	BOOTBRANCH='branch:merge-20160113'
 	BOOTDIR='u-boot-roseapple'
+	BOOTPATCHDIR='u-boot-roseapple'
 	UBOOT_FILES="$SRC/lib/bin/s500-bootloader-roseapple.bin u-boot-dtb.img"
 	SERIALCON=ttyS2
 	;;
--- a/config/sources/sunxi_common.inc
+++ b/config/sources/sunxi_common.inc
@ -1,9 +1,9 @@
-
 BOOTSOURCE=$MAINLINE_UBOOT_SOURCE
 BOOTDIR=$MAINLINE_UBOOT_DIR
 BOOTBRANCH=$MAINLINE_UBOOT_BRANCH
 BOOTSCRIPT="boot-sunxi.cmd:boot.cmd"
 BOOTENV_FILE='sunxi-default.txt'
+BOOTPATCHDIR="u-boot-sunxi"

 HAS_UUID_SUPPORT=yes
 BOOTDELAY=0
--- a/config/sources/udoo-neo.conf
+++ b/config/sources/udoo-neo.conf
@ -1,5 +1,6 @@
 BOOTSOURCE='https://github.com/UDOOboard/uboot-imx'
 BOOTDIR='u-boot-udoo'
+BOOTPATCHDIR='u-boot-udoo'
 BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"

 case $BOARD in
@ -32,8 +33,6 @@ CPUMIN=392000
 CPUMAX=996000
 GOVERNOR=interactive

-
-
 UBOOT_FILES="SPL u-boot.img"

 write_uboot_platform()
--- a/config/sources/udoo.conf
+++ b/config/sources/udoo.conf
@ -1,5 +1,6 @@
 BOOTSOURCE='https://github.com/UDOOboard/uboot-imx'
 BOOTDIR='u-boot-udoo'
+BOOTPATCHDIR='u-boot-udoo'
 BOOTSCRIPT="boot-$BOARD.cmd:boot.cmd"

 case $BOARD in
@ -32,8 +33,6 @@ CPUMIN=392000
 CPUMAX=996000
 GOVERNOR=interactive

-
-
 UBOOT_FILES="SPL u-boot.img"

 write_uboot_platform()
--- a/patch/u-boot/u-boot-armada-dev/compiler.patch
+++ b/patch/u-boot/u-boot-armada-dev/compiler.patch
@ -1,31 +0,0 @@
-diff --git a/tools/marvell/bin_hdr/base.mk b/tools/marvell/bin_hdr/base.mk
-index 33ecf70..d1ee228 100755
--- a/tools/marvell/bin_hdr/base.mk
-+++ b/tools/marvell/bin_hdr/base.mk
-@@ -208,7 +208,7 @@ CPUOPTS  = -mthumb -mthumb-interwork -march=armv7 -mlittle-endian
- BH_ROOT_DIR  = $(TOPDIR)/tools/marvell/bin_hdr
- INCLUDE      = -I$(BH_ROOT_DIR)/src_ddr -I$(BH_ROOT_DIR)/src_phy/$(BOARD) -I$(BH_ROOT_DIR)/inc/common \
- 	       -I$(BH_ROOT_DIR)/inc/ddr3_soc/$(INCNAME)  -I$(BH_ROOT_DIR)/inc/ddr3_soc/$(BOARD) -I$(BH_ROOT_DIR)/platform/sysEnv/$(BOARD) -I$(TOPDIR)/include -I$(BH_ROOT_DIR)/src_init/$(BOARD)
-HOSTCFLAGS   = -Wall $(INCLUDE)
-+HOSTCFLAGS   = -fno-stack-protector -Wall $(INCLUDE)
- 
- ifeq ($(BIN_HDR_DEBUG),1)
- DEBUG_FLAGS += -g -O0
-@@ -223,7 +223,7 @@ DEBUG_MODE_FLAG = no
- endif
- endif
- 
-CFLAGS   += -Wall $(INCLUDE) $(DEBUG_FLAGS) $(CPUOPTS) -msoft-float -mabi=aapcs
-+CFLAGS   += -fno-stack-protector -Wall $(INCLUDE) $(DEBUG_FLAGS) $(CPUOPTS) -msoft-float -mabi=aapcs
- 
- ifeq ($(BOARD),msys_bc2)
- CFLAGS   += -fPIE -fno-zero-initialized-in-bss -fno-unwind-tables
-@@ -231,7 +231,7 @@ else
- CFLAGS   += -fdata-sections -ffunction-sections
- endif
- 
-EXTRA_LD_FLAGS = -Wl,--gc-sections --entry=_start
-+EXTRA_LD_FLAGS = -fno-stack-protector -Wl,--gc-sections --entry=_start
- 
- ifeq ($(DDRTYPE),ddr4)
- CFLAGS += -DCONFIG_DDR4
--- a/patch/u-boot/u-boot-armada-dev/loading-boot.scr.patch
+++ b/patch/u-boot/u-boot-armada-dev/loading-boot.scr.patch
@ -1,14 +0,0 @@
-diff --git a/board/mv_ebu/a38x/mv_main_a38x.c b/board/mv_ebu/a38x/mv_main_a38x.c
-index 4b43a9c..5489685 100755
--- a/board/mv_ebu/a38x/mv_main_a38x.c
-+++ b/board/mv_ebu/a38x/mv_main_a38x.c
-@@ -679,7 +679,8 @@ void misc_init_r_env(void)
- #if (CONFIG_BOOTDELAY >= 0)
- 	env = getenv("bootcmd");
- 	if (!env)
-		setenv("bootcmd", "tftpboot 0x2000000 $image_name;tftpboot $fdtaddr $fdtfile;"
-+		setenv("bootcmd", "ext4load mmc 0:1 ${script_addr_r} boot/boot.scr;source ${script_addr_r};"
-+		"tftpboot 0x2000000 $image_name;tftpboot $fdtaddr $fdtfile;"
- 		"setenv bootargs $console $nandEcc $mtdparts $bootargs_root nfsroot=$serverip:$rootpath "
- 		"ip=$ipaddr:$serverip$bootargs_end $mvNetConfig video=dovefb:lcd0:$lcd0_params "
- 		"clcd.lcd0_enable=$lcd0_enable clcd.lcd_panel=$lcd_panel; bootz 0x2000000 - $fdtaddr;");
--- a/patch/u-boot/u-boot-armada-dev/slot0=mpci_1=sata.patch.disabled
+++ b/patch/u-boot/u-boot-armada-dev/slot0=mpci_1=sata.patch.disabled
@ -1,12 +0,0 @@
-diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-index 3fb7465..70384a0 100755
--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-+++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-@@ -89,7 +89,7 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] =
- {	/* ClarFog A1 board topology */
- 	{ SATA0,	__3Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
- 	{ SGMII1,	__1_25Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
-#if 1
-+#if 0
- 	{ PEX1,	  	__5Gbps,	PEX_ROOT_COMPLEX_x1,		MV_FALSE,	MV_FALSE },
- #else
--- a/patch/u-boot/u-boot-armada-dev/slot0=sata_1=sata.patch.disabled
+++ b/patch/u-boot/u-boot-armada-dev/slot0=sata_1=sata.patch.disabled
@ -1,20 +0,0 @@
-diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-index 3fb7465..70384a0 100755
--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-+++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-@@ -89,13 +89,13 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] =
- {	/* ClarFog A1 board topology */
- 	{ SATA0,	__3Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
- 	{ SGMII1,	__1_25Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
-#if 1
-+#if 0
- 	{ PEX1,	  	__5Gbps,	PEX_ROOT_COMPLEX_x1,		MV_FALSE,	MV_FALSE },
- #else
- 	{ SATA1,	__3Gbps,	SERDES_DEFAULT_MODE,		MV_TRUE,	MV_FALSE },
- #endif
- 	{ USB3_HOST1,	__5Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
-#if 1
-+#if 0
- 	{ PEX2,	  	__5Gbps,	PEX_ROOT_COMPLEX_x1,		MV_FALSE,	MV_FALSE },
- #else
- 	{ SATA2,	__3Gbps,	SERDES_DEFAULT_MODE,		MV_TRUE,	MV_FALSE },
--- a/patch/u-boot/u-boot-armada-next/compiler.patch
+++ b/patch/u-boot/u-boot-armada-next/compiler.patch
@ -1,31 +0,0 @@
-diff --git a/tools/marvell/bin_hdr/base.mk b/tools/marvell/bin_hdr/base.mk
-index 33ecf70..d1ee228 100755
--- a/tools/marvell/bin_hdr/base.mk
-+++ b/tools/marvell/bin_hdr/base.mk
-@@ -208,7 +208,7 @@ CPUOPTS  = -mthumb -mthumb-interwork -march=armv7 -mlittle-endian
- BH_ROOT_DIR  = $(TOPDIR)/tools/marvell/bin_hdr
- INCLUDE      = -I$(BH_ROOT_DIR)/src_ddr -I$(BH_ROOT_DIR)/src_phy/$(BOARD) -I$(BH_ROOT_DIR)/inc/common \
- 	       -I$(BH_ROOT_DIR)/inc/ddr3_soc/$(INCNAME)  -I$(BH_ROOT_DIR)/inc/ddr3_soc/$(BOARD) -I$(BH_ROOT_DIR)/platform/sysEnv/$(BOARD) -I$(TOPDIR)/include -I$(BH_ROOT_DIR)/src_init/$(BOARD)
-HOSTCFLAGS   = -Wall $(INCLUDE)
-+HOSTCFLAGS   = -fno-stack-protector -Wall $(INCLUDE)
- 
- ifeq ($(BIN_HDR_DEBUG),1)
- DEBUG_FLAGS += -g -O0
-@@ -223,7 +223,7 @@ DEBUG_MODE_FLAG = no
- endif
- endif
- 
-CFLAGS   += -Wall $(INCLUDE) $(DEBUG_FLAGS) $(CPUOPTS) -msoft-float -mabi=aapcs
-+CFLAGS   += -fno-stack-protector -Wall $(INCLUDE) $(DEBUG_FLAGS) $(CPUOPTS) -msoft-float -mabi=aapcs
- 
- ifeq ($(BOARD),msys_bc2)
- CFLAGS   += -fPIE -fno-zero-initialized-in-bss -fno-unwind-tables
-@@ -231,7 +231,7 @@ else
- CFLAGS   += -fdata-sections -ffunction-sections
- endif
- 
-EXTRA_LD_FLAGS = -Wl,--gc-sections --entry=_start
-+EXTRA_LD_FLAGS = -fno-stack-protector -Wl,--gc-sections --entry=_start
- 
- ifeq ($(DDRTYPE),ddr4)
- CFLAGS += -DCONFIG_DDR4
--- a/patch/u-boot/u-boot-armada-next/loading-boot.scr.patch
+++ b/patch/u-boot/u-boot-armada-next/loading-boot.scr.patch
@ -1,14 +0,0 @@
-diff --git a/board/mv_ebu/a38x/mv_main_a38x.c b/board/mv_ebu/a38x/mv_main_a38x.c
-index 4b43a9c..5489685 100755
--- a/board/mv_ebu/a38x/mv_main_a38x.c
-+++ b/board/mv_ebu/a38x/mv_main_a38x.c
-@@ -679,7 +679,8 @@ void misc_init_r_env(void)
- #if (CONFIG_BOOTDELAY >= 0)
- 	env = getenv("bootcmd");
- 	if (!env)
-		setenv("bootcmd", "tftpboot 0x2000000 $image_name;tftpboot $fdtaddr $fdtfile;"
-+		setenv("bootcmd", "ext4load mmc 0:1 ${script_addr_r} boot/boot.scr;source ${script_addr_r};"
-+		"tftpboot 0x2000000 $image_name;tftpboot $fdtaddr $fdtfile;"
- 		"setenv bootargs $console $nandEcc $mtdparts $bootargs_root nfsroot=$serverip:$rootpath "
- 		"ip=$ipaddr:$serverip$bootargs_end $mvNetConfig video=dovefb:lcd0:$lcd0_params "
- 		"clcd.lcd0_enable=$lcd0_enable clcd.lcd_panel=$lcd_panel; bootz 0x2000000 - $fdtaddr;");
--- a/patch/u-boot/u-boot-armada-next/slot0=mpci_1=sata.patch.disabled
+++ b/patch/u-boot/u-boot-armada-next/slot0=mpci_1=sata.patch.disabled
@ -1,12 +0,0 @@
-diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-index 3fb7465..70384a0 100755
--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-+++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-@@ -89,7 +89,7 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] =
- {	/* ClarFog A1 board topology */
- 	{ SATA0,	__3Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
- 	{ SGMII1,	__1_25Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
-#if 1
-+#if 0
- 	{ PEX1,	  	__5Gbps,	PEX_ROOT_COMPLEX_x1,		MV_FALSE,	MV_FALSE },
- #else
--- a/patch/u-boot/u-boot-armada-next/slot0=sata_1=sata.patch.disabled
+++ b/patch/u-boot/u-boot-armada-next/slot0=sata_1=sata.patch.disabled
@ -1,20 +0,0 @@
-diff --git a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-index 3fb7465..70384a0 100755
--- a/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-+++ b/tools/marvell/bin_hdr/src_phy/a38x/mvHighSpeedTopologySpec-38x.c
-@@ -89,13 +89,13 @@ SERDES_MAP CustomerBoardTopologyConfig[][MAX_SERDES_LANES] =
- {	/* ClarFog A1 board topology */
- 	{ SATA0,	__3Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
- 	{ SGMII1,	__1_25Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
-#if 1
-+#if 0
- 	{ PEX1,	  	__5Gbps,	PEX_ROOT_COMPLEX_x1,		MV_FALSE,	MV_FALSE },
- #else
- 	{ SATA1,	__3Gbps,	SERDES_DEFAULT_MODE,		MV_TRUE,	MV_FALSE },
- #endif
- 	{ USB3_HOST1,	__5Gbps,	SERDES_DEFAULT_MODE,		MV_FALSE,	MV_FALSE },
-#if 1
-+#if 0
- 	{ PEX2,	  	__5Gbps,	PEX_ROOT_COMPLEX_x1,		MV_FALSE,	MV_FALSE },
- #else
- 	{ SATA2,	__3Gbps,	SERDES_DEFAULT_MODE,		MV_TRUE,	MV_FALSE },
--- a/patch/u-boot/u-boot-armada-default/compiler.patch
+++ b/patch/u-boot/u-boot-armada-default/compiler.patch
--- a/patch/u-boot/u-boot-armada-default/loading-boot.scr.patch
+++ b/patch/u-boot/u-boot-armada-default/loading-boot.scr.patch
--- a/patch/u-boot/u-boot-armada-default/slot0=mpci_1=sata.patch.disabled
+++ b/patch/u-boot/u-boot-armada-default/slot0=mpci_1=sata.patch.disabled
--- a/patch/u-boot/u-boot-armada-default/slot0=sata_1=sata.patch.disabled
+++ b/patch/u-boot/u-boot-armada-default/slot0=sata_1=sata.patch.disabled
--- a/patch/u-boot/u-boot-cubox-dev/broken_uboot.patch
+++ b/patch/u-boot/u-boot-cubox-dev/broken_uboot.patch
@ -1,100 +0,0 @@
-diff --git a/board/solidrun/mx6_cubox-i/mx6_cubox-i.c b/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
-old mode 100644
-new mode 100755
-index 7c49f4e..6c92c1d
--- a/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
-+++ b/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
-@@ -78,9 +78,85 @@ DECLARE_GLOBAL_DATA_PTR;
- 
- int hb_cuboxi_ = 0; /* 2 is HummingBoard2, 1 is HummingBoard, 0 is CuBox-i */
- 
-+/*
-+ * Check memory range for valid RAM. A simple memory test determines
-+ * the actually available RAM size between addresses `base' and
-+ * `base + maxsize'.
-+ * This algorithm uses value MEM_STRIDE (like 128MByte) steps instead of the one bit right shift
-+ * algorithm originally used in get_ram_size() since a 4GByte memory setup in
-+ * a 32bit architecture forbids addressing all the memory, so right shift
-+ * algorithm that assumes total memory size is exponents of 2 would fail.
-+ */
-+#define MEM_STRIDE 0x04000000
-+static u32 get_ram_size_stride_test(u32 *base, u32 maxsize)
-+{
-+	volatile u32 *addr;
-+	u32            save[64];
-+	u32            cnt;
-+	long           size;
-+	u32		size_tmp;
-+	int            i = 0;
-+	cnt = maxsize;
-+	/* First save the data */
-+	for (cnt = 0; cnt < maxsize; cnt += MEM_STRIDE) {
-+		addr = (volatile u32 *)((u32)base + cnt);	/* pointer arith! */
-+		sync ();
-+		save[i] = *addr;
-+		i++;
-+		sync ();
-+	}
-+	/* First write a signature */
-+	* (volatile u32 *) base = 0x12345678;
-+	for (size_tmp = MEM_STRIDE; size_tmp < (u32)maxsize; size_tmp += MEM_STRIDE) {
-+		long tmp;
-+		* (volatile u32 *)((u32)base + (u32)size_tmp) = (u32)size_tmp;
-+		sync ();
-+		tmp = * (volatile u32 *)((u32)base + (u32)size);
-+		if (tmp == size_tmp) { /* Looks we reached overlapping address */
-+			break;
-+		}
-+	}
-+	/* Resotre the data */
-+	for (cnt = (maxsize - MEM_STRIDE); i > 0; cnt -= MEM_STRIDE) {
-+		i--;
-+		addr = (volatile u32 *)((u32)base + cnt);	/* pointer arith! */
-+		sync ();
-+		* addr = save[i];
-+		sync ();
-+	}
-+	maxsize = size_tmp;
-+
-+	return (maxsize);
-+}
-+
- int dram_init(void)
- {
-	gd->ram_size = imx_ddr_size();
-+	uint cpurev, imxtype;
-+	u32 sdram_size;
-+
-+	cpurev = get_cpu_rev();
-+	imxtype = (cpurev & 0xFF000) >> 12;
-+
-+	switch (imxtype){
-+	case MXC_CPU_MX6SOLO:
-+		sdram_size = 0x20000000;
-+		break;
-+	case MXC_CPU_MX6Q:
-+	{
-+		/* Read first the snoop control unit config register */
-+		u32 scu_config = *(u32 *)(SCU_BASE_ADDR + 0x4);
-+		if ((scu_config & 0x3) == 0x3) /* Quad core */
-+			sdram_size = 0xf0000000;
-+		else /* Dual core */
-+			sdram_size = 0x40000000;
-+		break;
-+	}
-+	case MXC_CPU_MX6DL:
-+	default:
-+		sdram_size = 0x40000000;
-+		break;
-+	}
-+	gd->ram_size = get_ram_size_stride_test((void *)PHYS_SDRAM, sdram_size);
- 
- 	return 0;
- }
-@@ -624,4 +700,4 @@ int board_late_init(void)
- #endif
- 
- 	return 0;
-}
-+}
-\ No newline at end of file
--- a/patch/u-boot/u-boot-cubox-next/broken_uboot.patch
+++ b/patch/u-boot/u-boot-cubox-next/broken_uboot.patch
@ -1,100 +0,0 @@
-diff --git a/board/solidrun/mx6_cubox-i/mx6_cubox-i.c b/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
-old mode 100644
-new mode 100755
-index 7c49f4e..6c92c1d
--- a/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
-+++ b/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
-@@ -78,9 +78,85 @@ DECLARE_GLOBAL_DATA_PTR;
- 
- int hb_cuboxi_ = 0; /* 2 is HummingBoard2, 1 is HummingBoard, 0 is CuBox-i */
- 
-+/*
-+ * Check memory range for valid RAM. A simple memory test determines
-+ * the actually available RAM size between addresses `base' and
-+ * `base + maxsize'.
-+ * This algorithm uses value MEM_STRIDE (like 128MByte) steps instead of the one bit right shift
-+ * algorithm originally used in get_ram_size() since a 4GByte memory setup in
-+ * a 32bit architecture forbids addressing all the memory, so right shift
-+ * algorithm that assumes total memory size is exponents of 2 would fail.
-+ */
-+#define MEM_STRIDE 0x04000000
-+static u32 get_ram_size_stride_test(u32 *base, u32 maxsize)
-+{
-+	volatile u32 *addr;
-+	u32            save[64];
-+	u32            cnt;
-+	long           size;
-+	u32		size_tmp;
-+	int            i = 0;
-+	cnt = maxsize;
-+	/* First save the data */
-+	for (cnt = 0; cnt < maxsize; cnt += MEM_STRIDE) {
-+		addr = (volatile u32 *)((u32)base + cnt);	/* pointer arith! */
-+		sync ();
-+		save[i] = *addr;
-+		i++;
-+		sync ();
-+	}
-+	/* First write a signature */
-+	* (volatile u32 *) base = 0x12345678;
-+	for (size_tmp = MEM_STRIDE; size_tmp < (u32)maxsize; size_tmp += MEM_STRIDE) {
-+		long tmp;
-+		* (volatile u32 *)((u32)base + (u32)size_tmp) = (u32)size_tmp;
-+		sync ();
-+		tmp = * (volatile u32 *)((u32)base + (u32)size);
-+		if (tmp == size_tmp) { /* Looks we reached overlapping address */
-+			break;
-+		}
-+	}
-+	/* Resotre the data */
-+	for (cnt = (maxsize - MEM_STRIDE); i > 0; cnt -= MEM_STRIDE) {
-+		i--;
-+		addr = (volatile u32 *)((u32)base + cnt);	/* pointer arith! */
-+		sync ();
-+		* addr = save[i];
-+		sync ();
-+	}
-+	maxsize = size_tmp;
-+
-+	return (maxsize);
-+}
-+
- int dram_init(void)
- {
-	gd->ram_size = imx_ddr_size();
-+	uint cpurev, imxtype;
-+	u32 sdram_size;
-+
-+	cpurev = get_cpu_rev();
-+	imxtype = (cpurev & 0xFF000) >> 12;
-+
-+	switch (imxtype){
-+	case MXC_CPU_MX6SOLO:
-+		sdram_size = 0x20000000;
-+		break;
-+	case MXC_CPU_MX6Q:
-+	{
-+		/* Read first the snoop control unit config register */
-+		u32 scu_config = *(u32 *)(SCU_BASE_ADDR + 0x4);
-+		if ((scu_config & 0x3) == 0x3) /* Quad core */
-+			sdram_size = 0xf0000000;
-+		else /* Dual core */
-+			sdram_size = 0x40000000;
-+		break;
-+	}
-+	case MXC_CPU_MX6DL:
-+	default:
-+		sdram_size = 0x40000000;
-+		break;
-+	}
-+	gd->ram_size = get_ram_size_stride_test((void *)PHYS_SDRAM, sdram_size);
- 
- 	return 0;
- }
-@@ -624,4 +700,4 @@ int board_late_init(void)
- #endif
- 
- 	return 0;
-}
-+}
-\ No newline at end of file
--- a/patch/u-boot/u-boot-cubox-default/broken_uboot.patch
+++ b/patch/u-boot/u-boot-cubox-default/broken_uboot.patch
--- a/patch/u-boot/u-boot-default/add-h3-hdmi-driver-jernej.patch
+++ b/patch/u-boot/u-boot-default/add-h3-hdmi-driver-jernej.patch
--- a/patch/u-boot/u-boot-dev/add-awsom-uboot.patch
+++ b/patch/u-boot/u-boot-dev/add-awsom-uboot.patch
@ -1,28 +0,0 @@
-===================================================================
--- /dev/null
-+++ u-boot-2015.01/configs/Awsom_defconfig
-@@ -0,0 +1,23 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_MACH_SUN7I=y
-+CONFIG_DRAM_CLK=480
-+CONFIG_DRAM_ZQ=127
-+CONFIG_DRAM_EMR1=4
-+CONFIG_MMC0_CD_PIN="PB9"
-+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SPL=y
-+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-+CONFIG_HUSH_PARSER=y
-+CONFIG_CMD_BOOTZ=y
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_I2C=y
-+CONFIG_DM_ETH=y
-+CONFIG_ETH_DESIGNWARE=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_USB=y
-+CONFIG_DM_USB=y
--- a/patch/u-boot/u-boot-dev/add-h3-hdmi-driver-jernej.patch
+++ b/patch/u-boot/u-boot-dev/add-h3-hdmi-driver-jernej.patch
--- a/patch/u-boot/u-boot-dev/add-lime2-emmc.patch
+++ b/patch/u-boot/u-boot-dev/add-lime2-emmc.patch
@ -1,36 +0,0 @@
-diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
-new file mode 100644
-index 0000000..e41a880
--- /dev/null
-+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
-@@ -0,0 +1,30 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_SPL_I2C_SUPPORT=y
-+CONFIG_MACH_SUN7I=y
-+CONFIG_DRAM_CLK=384
-+CONFIG_MMC0_CD_PIN="PH1"
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-+CONFIG_USB0_VBUS_PIN="PC17"
-+CONFIG_USB0_VBUS_DET="PH5"
-+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2-emmc"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
-+CONFIG_SPL=y
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+CONFIG_CMD_DFU=y
-+CONFIG_CMD_USB_MASS_STORAGE=y
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_DFU_RAM=y
-+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
-+CONFIG_ETH_DESIGNWARE=y
-+CONFIG_AXP_ALDO3_VOLT=2800
-+CONFIG_AXP_ALDO4_VOLT=2800
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_MUSB_GADGET=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_DOWNLOAD=y
-+CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-+CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-+CONFIG_G_DNL_PRODUCT_NUM=0x1010
--- a/patch/u-boot/u-boot-dev/add-missing-h3-boards.patch
+++ b/patch/u-boot/u-boot-dev/add-missing-h3-boards.patch
@ -1,119 +0,0 @@
-diff --git a/configs/FriendlyARM_NanoPi_M1_defconfig b/configs/FriendlyARM_NanoPi_M1_defconfig
-new file mode 100644
-index 0000000..5ba9f9e
--- /dev/null
-+++ b/configs/FriendlyARM_NanoPi_M1_defconfig
-@@ -0,0 +1,14 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_MACH_SUN8I_H3=y
-+CONFIG_DRAM_CLK=624
-+CONFIG_DRAM_ZQ=3881979
-+CONFIG_DRAM_ODT_EN=y
-+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SPL=y
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_SUN8I_EMAC=y
-+CONFIG_USB_EHCI_HCD=y
-diff --git a/configs/FriendlyARM_NanoPi_NEO_defconfig b/configs/FriendlyARM_NanoPi_NEO_defconfig
-new file mode 100644
-index 0000000..4e7f0e4
--- /dev/null
-+++ b/configs/FriendlyARM_NanoPi_NEO_defconfig
-@@ -0,0 +1,15 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_MACH_SUN8I_H3=y
-+CONFIG_DRAM_CLK=408
-+CONFIG_DRAM_ZQ=3881979
-+CONFIG_DRAM_ODT_EN=y
-+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SPL=y
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_SUN8I_EMAC=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_SYS_CLK_FREQ=480000000
-diff --git a/configs/Sinovoip_BPI_M2_plus_defconfig b/configs/Sinovoip_BPI_M2_plus_defconfig
-new file mode 100644
-index 0000000..5ba9f9e
--- /dev/null
-+++ b/configs/Sinovoip_BPI_M2_plus_defconfig
-@@ -0,0 +1,15 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_MACH_SUN8I_H3=y
-+CONFIG_DRAM_CLK=624
-+CONFIG_DRAM_ZQ=3881979
-+CONFIG_DRAM_ODT_EN=y
-+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SPL=y
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_SUN8I_EMAC=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
--- a/configs/orangepi_2_defconfig
-+++ b/configs/orangepi_2_defconfig
-@@ -14,3 +14,4 @@
- CONFIG_SUN8I_EMAC=y
- CONFIG_SY8106A_POWER=y
- CONFIG_USB_EHCI_HCD=y
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-diff --git a/configs/orangepi_zero_defconfig b/configs/orangepi_zero_defconfig
-new file mode 100755
-index 0000000..a62d565
--- /dev/null
-+++ b/configs/orangepi_zero_defconfig
-@@ -0,0 +1,22 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_MACH_SUN8I_H3=y
-+CONFIG_DRAM_CLK=408
-+CONFIG_DRAM_ZQ=3881979
-+CONFIG_DRAM_ODT_EN=y
-+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SPI_FLASH=y
-+CONFIG_SPI_FLASH_WINBOND=y
-+CONFIG_SPL_SPI_FLASH_SUPPORT=y
-+CONFIG_SPL=y
-+CONFIG_SPL_SPI_SUNXI=y
-+CONFIG_SPI_BOOT=y
-+# CONFIG_SPL_SPI_SUPPORT is not set
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_SUN8I_EMAC=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_SYS_CLK_FREQ=480000000
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-diff --git a/configs/FriendlyARM_NanoPi_M1_Plus_defconfig b/configs/FriendlyARM_NanoPi_M1_Plus_defconfig
-new file mode 100644
-index 0000000..5ba9f9e
--- /dev/null
-+++ b/configs/FriendlyARM_NanoPi_M1_Plus_defconfig
-@@ -0,0 +1,15 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_MACH_SUN8I_H3=y
-+CONFIG_DRAM_CLK=576
-+CONFIG_DRAM_ZQ=3881979
-+CONFIG_DRAM_ODT_EN=y
-+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-pc"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SPL=y
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_SUN8I_EMAC=y
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-\ No newline at end of file
--- a/patch/u-boot/u-boot-dev/adjust-h3-dram-frequency.patch
+++ b/patch/u-boot/u-boot-dev/adjust-h3-dram-frequency.patch
@ -1,52 +0,0 @@
-diff --git a/configs/orangepi_lite_defconfig b/configs/orangepi_lite_defconfig
-index a72d506..2c49525 100644
--- a/configs/orangepi_lite_defconfig
-+++ b/configs/orangepi_lite_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN8I_H3=y
-CONFIG_DRAM_CLK=672
-+CONFIG_DRAM_CLK=624
- CONFIG_DRAM_ZQ=3881979
- CONFIG_DRAM_ODT_EN=y
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-lite"
-diff --git a/configs/orangepi_one_defconfig b/configs/orangepi_one_defconfig
-index 5a7aba1..3ba4009 100644
--- a/configs/orangepi_one_defconfig
-+++ b/configs/orangepi_one_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN8I_H3=y
-CONFIG_DRAM_CLK=672
-+CONFIG_DRAM_CLK=624
- CONFIG_DRAM_ZQ=3881979
- CONFIG_DRAM_ODT_EN=y
- CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-orangepi-one"
-diff --git a/configs/orangepi_plus2e_defconfig b/configs/orangepi_plus2e_defconfig
-index 2374f1d..579bc70 100644
--- a/configs/orangepi_plus2e_defconfig
-+++ b/configs/orangepi_plus2e_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN8I_H3=y
-CONFIG_DRAM_CLK=672
-+CONFIG_DRAM_CLK=624
- CONFIG_DRAM_ZQ=3881979
- CONFIG_DRAM_ODT_EN=y
- CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-diff --git a/configs/orangepi_plus_defconfig b/configs/orangepi_plus_defconfig
-index f2ed941..e8219bb 100644
--- a/configs/orangepi_plus_defconfig
-+++ b/configs/orangepi_plus_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN8I_H3=y
-CONFIG_DRAM_CLK=672
-+CONFIG_DRAM_CLK=624
- CONFIG_DRAM_ZQ=3881979
- CONFIG_DRAM_ODT_EN=y
- CONFIG_MMC_SUNXI_SLOT_EXTRA=2
--- a/patch/u-boot/u-boot-dev/disable-usb-keyboards.patch
+++ b/patch/u-boot/u-boot-dev/disable-usb-keyboards.patch
@ -1,12 +0,0 @@
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index e63309a..f443bc7 100644
--- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -659,7 +659,6 @@ config ARCH_SUNXI
- 	select SYS_NS16550
- 	select USB
- 	select USB_STORAGE
-	select USB_KEYBOARD
- 	select USE_TINY_PRINTF
- 
- config TARGET_TS4800
--- a/patch/u-boot/u-boot-dev/fix-h3-rev3-dram-calibration.patch.disabled
+++ b/patch/u-boot/u-boot-dev/fix-h3-rev3-dram-calibration.patch.disabled
@ -1,106 +0,0 @@
-From f0b3ecefb7241c565b6400d2da11fc5c49b570ff Mon Sep 17 00:00:00 2001
-From: Jens Kuske <jenskuske@gmail.com>
-Date: Wed, 21 Sep 2016 16:08:43 +0200
-Subject: [PATCH] sunxi: Fix H3 DRAM impedance calibration on rev. A chips
-
-H3 seems to have a silicon bug breaking the impedance calibration.
-This is currently worked around in software by multiple steps
-combining the results to replace the wrong values.
-
-Revision A chips need a different workaround, which is present in
-the vendor bootloader too, but got overlooked in lack of
-information and affected boards till now.
-This commit adds a simplified version without correction factor,
-which would be 1.00 for all known boards anyway.
-
-Signed-off-by: Jens Kuske <jenskuske@gmail.com>
---
- arch/arm/mach-sunxi/dram_sun8i_h3.c | 67 +++++++++++++++++++++++++------------
- 1 file changed, 46 insertions(+), 21 deletions(-)
-
-diff --git a/arch/arm/mach-sunxi/dram_sun8i_h3.c b/arch/arm/mach-sunxi/dram_sun8i_h3.c
-index 2020d75..b23a46c 100644
--- a/arch/arm/mach-sunxi/dram_sun8i_h3.c
-+++ b/arch/arm/mach-sunxi/dram_sun8i_h3.c
-@@ -217,35 +217,60 @@ static void mctl_zq_calibration(struct dram_para *para)
- 	struct sunxi_mctl_ctl_reg * const mctl_ctl =
- 			(struct sunxi_mctl_ctl_reg *)SUNXI_DRAM_CTL0_BASE;
- 
-	int i;
-	u16 zq_val[6];
-	u8 val;
-+	if ((readl(SUNXI_SRAMC_BASE + 0x24) & 0xff) == 0 &&
-+		(readl(SUNXI_SRAMC_BASE + 0xf0) & 0x1) == 0)
-+	{
-+		u32 reg_val;
- 
-	writel(0x0a0a0a0a, &mctl_ctl->zqdr[2]);
-
-	for (i = 0; i < 6; i++) {
-		u8 zq = (CONFIG_DRAM_ZQ >> (i * 4)) & 0xf;
-
-		writel((zq << 20) | (zq << 16) | (zq << 12) |
-				(zq << 8) | (zq << 4) | (zq << 0),
-				&mctl_ctl->zqcr);
-+		clrsetbits_le32(&mctl_ctl->zqcr, 0xffff,
-+				CONFIG_DRAM_ZQ & 0xffff);
- 
- 		writel(PIR_CLRSR, &mctl_ctl->pir);
- 		mctl_phy_init(PIR_ZCAL);
- 
-		zq_val[i] = readl(&mctl_ctl->zqdr[0]) & 0xff;
-		writel(REPEAT_BYTE(zq_val[i]), &mctl_ctl->zqdr[2]);
-
-		writel(PIR_CLRSR, &mctl_ctl->pir);
-		mctl_phy_init(PIR_ZCAL);
-+		reg_val = readl(&mctl_ctl->zqdr[0]);
-+		reg_val &= (0x1f << 16) | (0x1f << 0);
-+		reg_val |= reg_val << 8;
-+		writel(reg_val, &mctl_ctl->zqdr[0]);
- 
-		val = readl(&mctl_ctl->zqdr[0]) >> 24;
-		zq_val[i] |= bin_to_mgray(mgray_to_bin(val) - 1) << 8;
-+		reg_val = readl(&mctl_ctl->zqdr[1]);
-+		reg_val &= (0x1f << 16) | (0x1f << 0);
-+		reg_val |= reg_val << 8;
-+		writel(reg_val, &mctl_ctl->zqdr[1]);
-+		writel(reg_val, &mctl_ctl->zqdr[2]);
- 	}
-+	else
-+	{
-+		int i;
-+		u16 zq_val[6];
-+		u8 val;
-+
-+		writel(0x0a0a0a0a, &mctl_ctl->zqdr[2]);
-+
-+		for (i = 0; i < 6; i++) {
-+			u8 zq = (CONFIG_DRAM_ZQ >> (i * 4)) & 0xf;
- 
-	writel((zq_val[1] << 16) | zq_val[0], &mctl_ctl->zqdr[0]);
-	writel((zq_val[3] << 16) | zq_val[2], &mctl_ctl->zqdr[1]);
-	writel((zq_val[5] << 16) | zq_val[4], &mctl_ctl->zqdr[2]);
-+			writel((zq << 20) | (zq << 16) | (zq << 12) |
-+					(zq << 8) | (zq << 4) | (zq << 0),
-+					&mctl_ctl->zqcr);
-+
-+			writel(PIR_CLRSR, &mctl_ctl->pir);
-+			mctl_phy_init(PIR_ZCAL);
-+
-+			zq_val[i] = readl(&mctl_ctl->zqdr[0]) & 0xff;
-+			writel(REPEAT_BYTE(zq_val[i]), &mctl_ctl->zqdr[2]);
-+
-+			writel(PIR_CLRSR, &mctl_ctl->pir);
-+			mctl_phy_init(PIR_ZCAL);
-+
-+			val = readl(&mctl_ctl->zqdr[0]) >> 24;
-+			zq_val[i] |= bin_to_mgray(mgray_to_bin(val) - 1) << 8;
-+		}
-+
-+		writel((zq_val[1] << 16) | zq_val[0], &mctl_ctl->zqdr[0]);
-+		writel((zq_val[3] << 16) | zq_val[2], &mctl_ctl->zqdr[1]);
-+		writel((zq_val[5] << 16) | zq_val[4], &mctl_ctl->zqdr[2]);
-+	}
- }
- 
- static void mctl_set_cr(struct dram_para *para)
--- a/patch/u-boot/u-boot-dev/h3-enable-power-led.patch
+++ b/patch/u-boot/u-boot-dev/h3-enable-power-led.patch
@ -1,17 +0,0 @@
-diff --git a/board/sunxi/board.c b/board/sunxi/board.c
-index 3cf3614..89cf7f5 100644
--- a/board/sunxi/board.c
-+++ b/board/sunxi/board.c
-@@ -478,6 +478,11 @@ void sunxi_board_init(void)
- 	int power_failed = 0;
- 	unsigned long ramsize;
- 
-+#ifdef CONFIG_MACH_SUN8I_H3
-+	/* turn on power LED (PL10) on H3 boards */
-+	gpio_direction_output(SUNXI_GPL(10), 1);
-+#endif
-+
- #ifdef CONFIG_SY8106A_POWER
- 	power_failed = sy8106a_set_vout1(CONFIG_SY8106A_VOUT1_VOLT);
- #endif
-
--- a/patch/u-boot/u-boot-dev/u-boot-01-led-support-default-state.patch.disabled
+++ b/patch/u-boot/u-boot-dev/u-boot-01-led-support-default-state.patch.disabled
@ -1,178 +0,0 @@
-diff -Nur a/arch/arm/Kconfig leds/arch/arm/Kconfig
--- a/arch/arm/Kconfig	2016-09-12 16:05:51.000000000 +0200
-+++ leds/arch/arm/Kconfig	2016-09-21 19:17:56.246729135 +0200
-@@ -651,6 +651,8 @@
- 	select DM_KEYBOARD
- 	select DM_SERIAL
- 	select DM_USB
-+	select LED
-+	select LED_GPIO
- 	select OF_BOARD_SETUP
- 	select OF_CONTROL
- 	select OF_SEPARATE
-diff -Nur a/board/sunxi/board.c leds/board/sunxi/board.c
--- a/board/sunxi/board.c	2016-09-12 16:05:51.000000000 +0200
-+++ leds/board/sunxi/board.c	2016-09-21 19:14:16.236727224 +0200
-@@ -29,6 +29,7 @@
- #include <asm/io.h>
- #include <crc.h>
- #include <environment.h>
-+#include <led.h>
- #include <libfdt.h>
- #include <nand.h>
- #include <net.h>
-@@ -682,6 +683,12 @@
- {
- 	__maybe_unused int ret;
- 
-+#ifdef CONFIG_LED
-+	ret = led_set_default_states();
-+	if (ret)
-+		return ret;
-+#endif
-+
- 	setenv("fel_booted", NULL);
- 	setenv("fel_scriptaddr", NULL);
- 	/* determine if we are running in FEL mode */
-diff -Nur a/drivers/led/led_gpio.c leds/drivers/led/led_gpio.c
--- a/drivers/led/led_gpio.c	2016-09-12 16:05:51.000000000 +0200
-+++ leds/drivers/led/led_gpio.c	2016-09-21 19:14:16.236727224 +0200
-@@ -67,6 +67,7 @@
- 	     node = fdt_next_subnode(blob, node)) {
- 		struct led_uclass_plat *uc_plat;
- 		const char *label;
-+		const char *state;
- 
- 		label = fdt_getprop(blob, node, "label", NULL);
- 		if (!label) {
-@@ -74,6 +75,7 @@
- 			      fdt_get_name(blob, node, NULL));
- 			return -EINVAL;
- 		}
-+		state = fdt_getprop(blob, node, "default-state", NULL);
- 		ret = device_bind_driver_to_node(parent, "gpio_led",
- 						 fdt_get_name(blob, node, NULL),
- 						 node, &dev);
-@@ -81,6 +83,15 @@
- 			return ret;
- 		uc_plat = dev_get_uclass_platdata(dev);
- 		uc_plat->label = label;
-+		if (state) {
-+			if(!strcmp(state, "on"))
-+				uc_plat->default_state = LED_STATE_ON;
-+			else if(!strcmp(state, "keep"))
-+				uc_plat->default_state = LED_STATE_KEEP;
-+			else
-+				uc_plat->default_state = LED_STATE_OFF;
-+		} else
-+			uc_plat->default_state = LED_STATE_OFF;
- 	}
- 
- 	return 0;
-diff -Nur a/drivers/led/led-uclass.c leds/drivers/led/led-uclass.c
--- a/drivers/led/led-uclass.c	2016-09-12 16:05:51.000000000 +0200
-+++ leds/drivers/led/led-uclass.c	2016-09-21 19:14:16.236727224 +0200
-@@ -12,6 +12,21 @@
- #include <dm/root.h>
- #include <dm/uclass-internal.h>
- 
-+int led_autoset(struct udevice *dev)
-+{
-+	struct led_uclass_plat *uc_pdata;
-+	int ret = 0;
-+
-+	uc_pdata = dev_get_uclass_platdata(dev);
-+	if (!uc_pdata->label)
-+		return -EMEDIUMTYPE;
-+
-+	if (uc_pdata->default_state != LED_STATE_KEEP)
-+		ret = led_set_on(dev, uc_pdata->default_state == LED_STATE_ON);
-+
-+	return ret;
-+}
-+
- int led_get_by_label(const char *label, struct udevice **devp)
- {
- 	struct udevice *dev;
-@@ -32,6 +47,26 @@
- 	return -ENODEV;
- }
- 
-+int led_set_default_states(void)
-+{
-+	struct udevice *dev;
-+	struct uclass *uc;
-+	int ret;
-+
-+	ret = uclass_get(UCLASS_LED, &uc);
-+	if (ret)
-+		return ret;
-+	for (uclass_first_device(UCLASS_LED, &dev);
-+	     dev;
-+	     uclass_next_device(&dev)) {
-+		ret = led_autoset(dev);
-+		if (ret == -EMEDIUMTYPE || ret == -ENOSYS)
-+			ret = 0;
-+	}
-+
-+	return ret;
-+}
-+
- int led_set_on(struct udevice *dev, int on)
- {
- 	struct led_ops *ops = led_get_ops(dev);
-diff -Nur a/include/led.h leds/include/led.h
--- a/include/led.h	2016-09-12 16:05:51.000000000 +0200
-+++ leds/include/led.h	2016-09-21 19:14:16.236727224 +0200
-@@ -8,6 +8,14 @@
- #ifndef __LED_H
- #define __LED_H
- 
-+/* LED default states
-+ */
-+enum led_default_state {
-+	LED_STATE_OFF,
-+	LED_STATE_ON,
-+	LED_STATE_KEEP
-+};
-+
- /**
-  * struct led_uclass_plat - Platform data the uclass stores about each device
-  *
-@@ -15,6 +23,7 @@
-  */
- struct led_uclass_plat {
- 	const char *label;
-+	enum led_default_state default_state;
- };
- 
- struct led_ops {
-@@ -31,6 +40,14 @@
- #define led_get_ops(dev)	((struct led_ops *)(dev)->driver->ops)
- 
- /**
-+ * led_autoset() - set the state of an LED according to fdt
-+ *
-+ * @dev:	LED device to set
-+ * @return 0 if OK, -ve on error
-+ */
-+int led_autoset(struct udevice *dev);
-+
-+/**
-  * led_get_by_label() - Find an LED device by label
-  *
-  * @label:	LED label to look up
-@@ -40,6 +57,13 @@
- int led_get_by_label(const char *label, struct udevice **devp);
- 
- /**
-+ * led_set_default_states() - set the state of all LEDs according to fdt
-+ *
-+ * @return 0 if OK, -ve on error
-+ */
-+int led_set_default_states(void);
-+
-+/**
-  * led_set_on() - set the state of an LED
-  *
-  * @dev:	LED device to change
--- a/patch/u-boot/u-boot-next/a10_a20_dram-clk.patch
+++ b/patch/u-boot/u-boot-next/a10_a20_dram-clk.patch
@ -1,144 +0,0 @@
-diff --git a/configs/A10-OLinuXino-Lime_defconfig b/configs/A10-OLinuXino-Lime_defconfig
-index 8cb7ac7..8b6c1bd 100644
--- a/configs/A10-OLinuXino-Lime_defconfig
-+++ b/configs/A10-OLinuXino-Lime_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN4I=y
-CONFIG_DRAM_CLK=480
-+CONFIG_DRAM_CLK=384
- CONFIG_DRAM_EMR1=4
- CONFIG_SYS_CLK_FREQ=912000000
- CONFIG_MMC0_CD_PIN="PH1"
-diff --git a/configs/Cubieboard2_defconfig b/configs/Cubieboard2_defconfig
-index 4b9d722..0ed969f 100644
--- a/configs/Cubieboard2_defconfig
-+++ b/configs/Cubieboard2_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=480
-+CONFIG_DRAM_CLK=432
- CONFIG_MMC0_CD_PIN="PH1"
- CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-diff --git a/configs/Cubieboard_defconfig b/configs/Cubieboard_defconfig
-old mode 100644
-new mode 100755
-index c884115..1380aba
--- a/configs/Cubieboard_defconfig
-+++ b/configs/Cubieboard_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN4I=y
-CONFIG_DRAM_CLK=480
-+CONFIG_DRAM_CLK=432
- CONFIG_MMC0_CD_PIN="PH1"
- CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-cubieboard"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-diff --git a/configs/Linksprite_pcDuino3_defconfig b/configs/Linksprite_pcDuino3_defconfig
-index c3f0421..d45e160 100644
--- a/configs/Linksprite_pcDuino3_defconfig
-+++ b/configs/Linksprite_pcDuino3_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=480
-+CONFIG_DRAM_CLK=408
- CONFIG_DRAM_ZQ=122
- CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-pcduino3"
- # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-diff --git a/configs/Bananapi_defconfig b/configs/Bananapi_defconfig
-old mode 100644
-new mode 100755
-index d9b1bd6..21428c9
--- a/configs/Bananapi_defconfig
-+++ b/configs/Bananapi_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=432
-+CONFIG_DRAM_CLK=384
- CONFIG_VIDEO_COMPOSITE=y
- CONFIG_GMAC_TX_DELAY=3
- CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-bananapi"
-diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig
-old mode 100644
-new mode 100755
-index 496c20e..46cff9d
--- a/configs/Bananapro_defconfig
-+++ b/configs/Bananapro_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=432
-+CONFIG_DRAM_CLK=384
- CONFIG_USB1_VBUS_PIN="PH0"
- CONFIG_USB2_VBUS_PIN="PH1"
- CONFIG_VIDEO_COMPOSITE=y
-diff --git a/configs/Cubietruck_defconfig b/configs/Cubietruck_defconfig
-old mode 100644
-new mode 100755
-index 4e25392..7e6437f
--- a/configs/Cubietruck_defconfig
-+++ b/configs/Cubietruck_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=432
-+CONFIG_DRAM_CLK=384
- CONFIG_MMC0_CD_PIN="PH1"
- CONFIG_USB0_VBUS_PIN="PH17"
- CONFIG_USB0_VBUS_DET="PH22"
-diff --git a/configs/Lamobo_R1_defconfig b/configs/Lamobo_R1_defconfig
-old mode 100644
-new mode 100755
-index d2111c6..3cad09d
--- a/configs/Lamobo_R1_defconfig
-+++ b/configs/Lamobo_R1_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=432
-+CONFIG_DRAM_CLK=384
- CONFIG_MMC0_CD_PIN="PH10"
- CONFIG_GMAC_TX_DELAY=4
- CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-lamobo-r1"
-diff --git a/configs/Orangepi_defconfig b/configs/Orangepi_defconfig
-old mode 100644
-new mode 100755
-index 00c671b..ccf97db
--- a/configs/Orangepi_defconfig
-+++ b/configs/Orangepi_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=432
-+CONFIG_DRAM_CLK=384
- CONFIG_USB1_VBUS_PIN="PH26"
- CONFIG_USB2_VBUS_PIN="PH22"
- CONFIG_VIDEO_VGA=y
-diff --git a/configs/Orangepi_mini_defconfig b/configs/Orangepi_mini_defconfig
-old mode 100644
-new mode 100755
-index a865255..84b4b39
--- a/configs/Orangepi_mini_defconfig
-+++ b/configs/Orangepi_mini_defconfig
-@@ -1,7 +1,7 @@
- CONFIG_ARM=y
- CONFIG_ARCH_SUNXI=y
- CONFIG_MACH_SUN7I=y
-CONFIG_DRAM_CLK=432
-+CONFIG_DRAM_CLK=384
- CONFIG_MMC0_CD_PIN="PH10"
- CONFIG_MMC3_CD_PIN="PH11"
- CONFIG_MMC_SUNXI_SLOT_EXTRA=3
--- a/patch/u-boot/u-boot-next/add-awsom-uboot.patch
+++ b/patch/u-boot/u-boot-next/add-awsom-uboot.patch
@ -1,28 +0,0 @@
-===================================================================
--- /dev/null
-+++ u-boot-2015.01/configs/Awsom_defconfig
-@@ -0,0 +1,23 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_MACH_SUN7I=y
-+CONFIG_DRAM_CLK=480
-+CONFIG_DRAM_ZQ=127
-+CONFIG_DRAM_EMR1=4
-+CONFIG_MMC0_CD_PIN="PB9"
-+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-cubieboard2"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SPL=y
-+CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8),USB_EHCI"
-+CONFIG_HUSH_PARSER=y
-+CONFIG_CMD_BOOTZ=y
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_CMD_DHCP=y
-+CONFIG_CMD_MMC=y
-+CONFIG_CMD_I2C=y
-+CONFIG_DM_ETH=y
-+CONFIG_ETH_DESIGNWARE=y
-+CONFIG_DM_SERIAL=y
-+CONFIG_USB=y
-+CONFIG_DM_USB=y
--- a/patch/u-boot/u-boot-next/add-lime2-emmc.patch
+++ b/patch/u-boot/u-boot-next/add-lime2-emmc.patch
@ -1,36 +0,0 @@
-diff --git a/configs/A20-OLinuXino-Lime2-eMMC_defconfig b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
-new file mode 100644
-index 0000000..e41a880
--- /dev/null
-+++ b/configs/A20-OLinuXino-Lime2-eMMC_defconfig
-@@ -0,0 +1,30 @@
-+CONFIG_ARM=y
-+CONFIG_ARCH_SUNXI=y
-+CONFIG_SPL_I2C_SUPPORT=y
-+CONFIG_MACH_SUN7I=y
-+CONFIG_DRAM_CLK=384
-+CONFIG_MMC0_CD_PIN="PH1"
-+CONFIG_MMC_SUNXI_SLOT_EXTRA=2
-+CONFIG_USB0_VBUS_PIN="PC17"
-+CONFIG_USB0_VBUS_DET="PH5"
-+CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2-emmc"
-+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+CONFIG_SYS_EXTRA_OPTIONS="SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
-+CONFIG_SPL=y
-+# CONFIG_CMD_IMLS is not set
-+# CONFIG_CMD_FLASH is not set
-+CONFIG_CMD_DFU=y
-+CONFIG_CMD_USB_MASS_STORAGE=y
-+# CONFIG_CMD_FPGA is not set
-+CONFIG_DFU_RAM=y
-+CONFIG_RTL8211X_PHY_FORCE_MASTER=y
-+CONFIG_ETH_DESIGNWARE=y
-+CONFIG_AXP_ALDO3_VOLT=2800
-+CONFIG_AXP_ALDO4_VOLT=2800
-+CONFIG_USB_EHCI_HCD=y
-+CONFIG_USB_MUSB_GADGET=y
-+CONFIG_USB_GADGET=y
-+CONFIG_USB_GADGET_DOWNLOAD=y
-+CONFIG_G_DNL_MANUFACTURER="Allwinner Technology"
-+CONFIG_G_DNL_VENDOR_NUM=0x1f3a
-+CONFIG_G_DNL_PRODUCT_NUM=0x1010
--- a/patch/u-boot/u-boot-next/disable-usb-keyboards.patch
+++ b/patch/u-boot/u-boot-next/disable-usb-keyboards.patch
@ -1,12 +0,0 @@
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index e63309a..f443bc7 100644
--- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -659,7 +659,6 @@ config ARCH_SUNXI
- 	select SYS_NS16550
- 	select USB
- 	select USB_STORAGE
-	select USB_KEYBOARD
- 	select USE_TINY_PRINTF
- 
- config TARGET_TS4800
--- a/patch/u-boot/u-boot-next/sunxi-boot-splash.patch.disabled
+++ b/patch/u-boot/u-boot-next/sunxi-boot-splash.patch.disabled
@ -1,42 +0,0 @@
-diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
-old mode 100644
-new mode 100755
-index 3a360ca4..0423c08
--- a/include/config_distro_bootcmd.h
-+++ b/include/config_distro_bootcmd.h
-@@ -186,6 +186,9 @@
- 	BOOTENV_SHARED_SCSI \
- 	BOOTENV_SHARED_IDE \
- 	"boot_prefixes=/ /boot/\0" \
-+	"splashpos=m,m\0" \
-+	"splashimage=66000000\0" \
-+	"loadsplash=ext4load  mmc 0 ${splashimage} /boot/boot.bmp || fatload  mmc 0 ${splashimage} boot.bmp; bmp d ${splashimage}\0" \
- 	"boot_scripts=boot.scr.uimg boot.scr\0" \
- 	"boot_script_dhcp=boot.scr.uimg\0" \
- 	BOOTENV_BOOT_TARGETS \
-@@ -243,7 +245,7 @@
- 		"done\0"
- 
- #ifndef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND "run distro_bootcmd"
-+#define CONFIG_BOOTCOMMAND "run loadsplash; run distro_bootcmd"
- #endif
- 
- #endif  /* _CONFIG_CMD_DISTRO_BOOTCMD_H */
-diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
-old mode 100644
-new mode 100755
-index 2d6b815..33a7b86
--- a/include/configs/sunxi-common.h
-+++ b/include/configs/sunxi-common.h
-@@ -10,6 +10,10 @@
-  * SPDX-License-Identifier:	GPL-2.0+
-  */
- 
-+#define CONFIG_SPLASH_SCREEN
-+#define CONFIG_SPLASH_SCREEN_ALIGN
-+#define CONFIG_CMD_BMP
-+#define CONFIG_VIDEO_BMP_RLE8
- #ifndef _SUNXI_COMMON_CONFIG_H
- #define _SUNXI_COMMON_CONFIG_H
- 
--- a/patch/u-boot/u-boot-next/u-boot-02-support-cheap-mmc.patch.disabled
+++ b/patch/u-boot/u-boot-next/u-boot-02-support-cheap-mmc.patch.disabled
@ -1,12 +0,0 @@
-diff -Nur a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c
--- a/drivers/mmc/sunxi_mmc.c	2016-02-25 10:30:30.000000000 +0800
-+++ b//drivers/mmc/sunxi_mmc.c	2016-02-25 10:46:07.723851155 +0800
-
-@@ -269,6 +269,6 @@	
-	unsigned i;
-	unsigned *buff = (unsigned int *)(reading ? data->dest : data->src);
-	unsigned byte_cnt = data->blocksize * data->blocks;
-	unsigned timeout_msecs = byte_cnt >> 8;
-+	unsigned timeout_msecs = byte_cnt >> 6;
-	if (timeout_msecs < 2000)
-		timeout_msecs = 2000;
--- a/patch/u-boot/u-boot-odroidc1-default/ext4-boot-improvements.patch
+++ b/patch/u-boot/u-boot-odroidc1-default/ext4-boot-improvements.patch
--- a/patch/u-boot/u-boot-odroidc2-default/clean-sdfuse.patch.disabled
+++ b/patch/u-boot/u-boot-odroidc2-default/clean-sdfuse.patch.disabled
@ -1,14 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 27153d8..d37f61f 100644
--- a/Makefile
-+++ b/Makefile
-@@ -1470,7 +1470,8 @@ help:
- 
- # Dummies...
- PHONY += prepare scripts
-prepare: ;
-+prepare: 
-+	@rm -f $(FUSING_FOLDER)/u-boot.bin
- scripts: ;
- 
- endif #ifeq ($(config-targets),1)
--- a/patch/u-boot/u-boot-odroidc2-default/firmware-override-toolchain-version.patch.disabled
+++ b/patch/u-boot/u-boot-odroidc2-default/firmware-override-toolchain-version.patch.disabled
@ -1,25 +0,0 @@
-diff --git a/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile b/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile
-index 865d142..80bb4c9 100644
--- a/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile
-+++ b/arch/arm/cpu/armv8/gxb/firmware/scp_task/Makefile
-@@ -6,7 +6,7 @@ include $(buildtree)/include/autoconf.mk
- include $(buildtree)/.config
- 
- # Select ARMv7-m bare-metal toolchain
-CROSS_COMPILE=arm-none-eabi-
-+override CROSS_COMPILE=arm-none-eabi-
- ASM=$(CROSS_COMPILE)as
- CC=$(CROSS_COMPILE)gcc
- CPP=$(CROSS_COMPILE)cpp
-@@ -67,7 +67,10 @@ OBJS += lib/delay.o
- 
- OBJS := $(OBJS:%=$(obj)/%)
- 
-all : clean $(obj)/bl301.out $(obj)/bl301.bin
-+all :
-+	$(MAKE) clean
-+	$(MAKE) $(obj)/bl301.out
-+	$(MAKE) $(obj)/bl301.bin
- 
- $(obj)/bl301.bin: $(obj)/bl301.out
- 	@echo "	OBJCOPY $@"
--- a/patch/u-boot/u-boot-odroidc2-default/support-ext4-boot-part.patch
+++ b/patch/u-boot/u-boot-odroidc2-default/support-ext4-boot-part.patch
--- a/patch/u-boot/u-boot-odroidxu-next/odroid-xu4_defconfig.patch
+++ b/patch/u-boot/u-boot-odroidxu-next/odroid-xu4_defconfig.patch
@ -1,687 +0,0 @@
-*** /dev/null	Thu Sep 22 05:30:40 2016
--- test/configs/odroid-xu4_defconfig	Thu Sep 22 06:46:01 2016
-***************
-*** 0 ****
--- 1,682 ----
-+ #
-+ # Automatically generated file; DO NOT EDIT.
-+ # U-Boot 2016.05 Configuration
-+ #
-+ CONFIG_CREATE_ARCH_SYMLINK=y
-+ CONFIG_HAVE_GENERIC_BOARD=y
-+ CONFIG_SYS_GENERIC_BOARD=y
-+ # CONFIG_ARC is not set
-+ CONFIG_ARM=y
-+ # CONFIG_AVR32 is not set
-+ # CONFIG_BLACKFIN is not set
-+ # CONFIG_M68K is not set
-+ # CONFIG_MICROBLAZE is not set
-+ # CONFIG_MIPS is not set
-+ # CONFIG_NDS32 is not set
-+ # CONFIG_NIOS2 is not set
-+ # CONFIG_OPENRISC is not set
-+ # CONFIG_PPC is not set
-+ # CONFIG_SANDBOX is not set
-+ # CONFIG_SH is not set
-+ # CONFIG_SPARC is not set
-+ # CONFIG_X86 is not set
-+ CONFIG_SYS_ARCH="arm"
-+ CONFIG_SYS_CPU="armv7"
-+ CONFIG_SYS_SOC="exynos"
-+ CONFIG_SYS_VENDOR="samsung"
-+ CONFIG_SYS_BOARD="smdk5420"
-+ CONFIG_SYS_CONFIG_NAME="odroid_xu3"
-+ 
-+ #
-+ # ARM architecture
-+ #
-+ CONFIG_HAS_VBAR=y
-+ CONFIG_HAS_THUMB2=y
-+ CONFIG_CPU_V7=y
-+ # CONFIG_SEMIHOSTING is not set
-+ # CONFIG_SYS_L2CACHE_OFF is not set
-+ # CONFIG_ARCH_AT91 is not set
-+ # CONFIG_TARGET_EDB93XX is not set
-+ # CONFIG_TARGET_VCMA9 is not set
-+ # CONFIG_TARGET_SMDK2410 is not set
-+ # CONFIG_TARGET_ASPENITE is not set
-+ # CONFIG_TARGET_GPLUGD is not set
-+ # CONFIG_ARCH_DAVINCI is not set
-+ # CONFIG_KIRKWOOD is not set
-+ # CONFIG_ARCH_MVEBU is not set
-+ # CONFIG_TARGET_DEVKIT3250 is not set
-+ # CONFIG_TARGET_WORK_92105 is not set
-+ # CONFIG_TARGET_MX25PDK is not set
-+ # CONFIG_TARGET_ZMX25 is not set
-+ # CONFIG_TARGET_APF27 is not set
-+ # CONFIG_TARGET_APX4DEVKIT is not set
-+ # CONFIG_TARGET_XFI3 is not set
-+ # CONFIG_TARGET_M28EVK is not set
-+ # CONFIG_TARGET_MX23EVK is not set
-+ # CONFIG_TARGET_MX28EVK is not set
-+ # CONFIG_TARGET_MX23_OLINUXINO is not set
-+ # CONFIG_TARGET_BG0900 is not set
-+ # CONFIG_TARGET_SANSA_FUZE_PLUS is not set
-+ # CONFIG_TARGET_SC_SPS_1 is not set
-+ # CONFIG_ORION5X is not set
-+ # CONFIG_TARGET_SPEAR300 is not set
-+ # CONFIG_TARGET_SPEAR310 is not set
-+ # CONFIG_TARGET_SPEAR320 is not set
-+ # CONFIG_TARGET_SPEAR600 is not set
-+ # CONFIG_TARGET_STV0991 is not set
-+ # CONFIG_TARGET_X600 is not set
-+ # CONFIG_TARGET_IMX31_PHYCORE is not set
-+ # CONFIG_TARGET_MX31ADS is not set
-+ # CONFIG_TARGET_MX31PDK is not set
-+ # CONFIG_TARGET_WOODBURN is not set
-+ # CONFIG_TARGET_WOODBURN_SD is not set
-+ # CONFIG_TARGET_FLEA3 is not set
-+ # CONFIG_TARGET_MX35PDK is not set
-+ # CONFIG_ARCH_BCM283X is not set
-+ # CONFIG_TARGET_VEXPRESS_CA15_TC2 is not set
-+ # CONFIG_TARGET_VEXPRESS_CA5X2 is not set
-+ # CONFIG_TARGET_VEXPRESS_CA9X4 is not set
-+ # CONFIG_TARGET_KWB is not set
-+ # CONFIG_TARGET_TSERIES is not set
-+ # CONFIG_TARGET_CM_T335 is not set
-+ # CONFIG_TARGET_PEPPER is not set
-+ # CONFIG_TARGET_AM335X_IGEP0033 is not set
-+ # CONFIG_TARGET_PCM051 is not set
-+ # CONFIG_TARGET_DRACO is not set
-+ # CONFIG_TARGET_THUBAN is not set
-+ # CONFIG_TARGET_RASTABAN is not set
-+ # CONFIG_TARGET_PXM2 is not set
-+ # CONFIG_TARGET_RUT is not set
-+ # CONFIG_TARGET_PENGWYN is not set
-+ # CONFIG_TARGET_AM335X_BALTOS is not set
-+ # CONFIG_TARGET_AM335X_EVM is not set
-+ # CONFIG_TARGET_AM335X_SL50 is not set
-+ # CONFIG_TARGET_AM43XX_EVM is not set
-+ # CONFIG_TARGET_BAV335X is not set
-+ # CONFIG_TARGET_TI814X_EVM is not set
-+ # CONFIG_TARGET_TI816X_EVM is not set
-+ # CONFIG_TARGET_BCM28155_AP is not set
-+ # CONFIG_TARGET_BCMCYGNUS is not set
-+ # CONFIG_TARGET_BCMNSP is not set
-+ CONFIG_ARCH_EXYNOS=y
-+ # CONFIG_ARCH_S5PC1XX is not set
-+ # CONFIG_ARCH_HIGHBANK is not set
-+ # CONFIG_ARCH_INTEGRATOR is not set
-+ # CONFIG_ARCH_KEYSTONE is not set
-+ # CONFIG_ARCH_MX7 is not set
-+ # CONFIG_ARCH_MX6 is not set
-+ # CONFIG_ARCH_MX5 is not set
-+ # CONFIG_TARGET_M53EVK is not set
-+ # CONFIG_TARGET_MX51EVK is not set
-+ # CONFIG_TARGET_MX53ARD is not set
-+ # CONFIG_TARGET_MX53EVK is not set
-+ # CONFIG_TARGET_MX53LOCO is not set
-+ # CONFIG_TARGET_MX53SMD is not set
-+ # CONFIG_OMAP34XX is not set
-+ # CONFIG_OMAP44XX is not set
-+ # CONFIG_OMAP54XX is not set
-+ # CONFIG_RMOBILE is not set
-+ # CONFIG_ARCH_SNAPDRAGON is not set
-+ # CONFIG_ARCH_SOCFPGA is not set
-+ # CONFIG_TARGET_CM_T43 is not set
-+ # CONFIG_ARCH_SUNXI is not set
-+ # CONFIG_TARGET_TS4800 is not set
-+ # CONFIG_TARGET_VF610TWR is not set
-+ # CONFIG_TARGET_COLIBRI_VF is not set
-+ # CONFIG_TARGET_PCM052 is not set
-+ # CONFIG_ARCH_ZYNQ is not set
-+ # CONFIG_ARCH_ZYNQMP is not set
-+ # CONFIG_TEGRA is not set
-+ # CONFIG_TARGET_VEXPRESS64_AEMV8A is not set
-+ # CONFIG_TARGET_VEXPRESS64_BASE_FVP is not set
-+ # CONFIG_TARGET_VEXPRESS64_BASE_FVP_DRAM is not set
-+ # CONFIG_TARGET_VEXPRESS64_JUNO is not set
-+ # CONFIG_TARGET_LS2080A_EMU is not set
-+ # CONFIG_TARGET_LS2080A_SIMU is not set
-+ # CONFIG_TARGET_LS2080AQDS is not set
-+ # CONFIG_TARGET_LS2080ARDB is not set
-+ # CONFIG_TARGET_HIKEY is not set
-+ # CONFIG_TARGET_LS1021AQDS is not set
-+ # CONFIG_TARGET_LS1021ATWR is not set
-+ # CONFIG_TARGET_LS1043AQDS is not set
-+ # CONFIG_TARGET_LS1043ARDB is not set
-+ # CONFIG_TARGET_H2200 is not set
-+ # CONFIG_TARGET_ZIPITZ2 is not set
-+ # CONFIG_TARGET_COLIBRI_PXA270 is not set
-+ # CONFIG_ARCH_UNIPHIER is not set
-+ # CONFIG_STM32 is not set
-+ # CONFIG_ARCH_ROCKCHIP is not set
-+ # CONFIG_TARGET_THUNDERX_88XX is not set
-+ # CONFIG_TARGET_SMDKV310 is not set
-+ # CONFIG_TARGET_TRATS is not set
-+ # CONFIG_TARGET_S5PC210_UNIVERSAL is not set
-+ # CONFIG_TARGET_ORIGEN is not set
-+ # CONFIG_TARGET_TRATS2 is not set
-+ # CONFIG_TARGET_ODROID is not set
-+ CONFIG_TARGET_ODROID_XU3=y
-+ # CONFIG_TARGET_ARNDALE is not set
-+ # CONFIG_TARGET_SMDK5250 is not set
-+ # CONFIG_TARGET_SNOW is not set
-+ # CONFIG_TARGET_SPRING is not set
-+ # CONFIG_TARGET_SMDK5420 is not set
-+ # CONFIG_TARGET_PEACH_PI is not set
-+ # CONFIG_TARGET_PEACH_PIT is not set
-+ CONFIG_SYS_MALLOC_F_LEN=0x400
-+ CONFIG_SYS_MALLOC_F=y
-+ CONFIG_DM_SERIAL=y
-+ CONFIG_DM_SPI=y
-+ CONFIG_DM_SPI_FLASH=y
-+ CONFIG_DM_I2C=y
-+ CONFIG_DM_GPIO=y
-+ # CONFIG_ARMV7_LPAE is not set
-+ 
-+ #
-+ # ARM debug
-+ #
-+ # CONFIG_DEBUG_LL is not set
-+ CONFIG_DM_KEYBOARD=y
-+ CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
-+ # CONFIG_I8042_KEYB is not set
-+ 
-+ #
-+ # General setup
-+ #
-+ CONFIG_LOCALVERSION=""
-+ CONFIG_LOCALVERSION_AUTO=y
-+ CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-+ CONFIG_EXPERT=y
-+ # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-+ 
-+ #
-+ # Boot images
-+ #
-+ CONFIG_FIT=y
-+ # CONFIG_FIT_VERBOSE is not set
-+ # CONFIG_FIT_SIGNATURE is not set
-+ CONFIG_FIT_BEST_MATCH=y
-+ # CONFIG_OF_BOARD_SETUP is not set
-+ # CONFIG_OF_SYSTEM_SETUP is not set
-+ # CONFIG_OF_STDOUT_VIA_ALIAS is not set
-+ CONFIG_SYS_EXTRA_OPTIONS=""
-+ # CONFIG_SPL_LOAD_FIT is not set
-+ 
-+ #
-+ # Boot timing
-+ #
-+ # CONFIG_BOOTSTAGE is not set
-+ CONFIG_BOOTSTAGE_USER_COUNT=20
-+ CONFIG_BOOTSTAGE_STASH_ADDR=0
-+ CONFIG_BOOTSTAGE_STASH_SIZE=4096
-+ # CONFIG_CONSOLE_RECORD is not set
-+ 
-+ #
-+ # Command line interface
-+ #
-+ CONFIG_CMDLINE=y
-+ CONFIG_HUSH_PARSER=y
-+ CONFIG_SYS_HUSH_PARSER=y
-+ CONFIG_SYS_PROMPT="ODROID-XU4 # "
-+ 
-+ #
-+ # Autoboot options
-+ #
-+ CONFIG_AUTOBOOT_KEYED=y
-+ CONFIG_AUTOBOOT_PROMPT="Autoboot in %d seconds, press <ESC> to stop\n"
-+ # CONFIG_AUTOBOOT_ENCRYPTION is not set
-+ CONFIG_AUTOBOOT_DELAY_STR=""
-+ CONFIG_AUTOBOOT_STOP_STR="\x1b"
-+ # CONFIG_AUTOBOOT_KEYED_CTRLC is not set
-+ 
-+ #
-+ # Commands
-+ #
-+ 
-+ #
-+ # Info commands
-+ #
-+ CONFIG_CMD_BDI=y
-+ CONFIG_CMD_CONSOLE=y
-+ # CONFIG_CMD_CPU is not set
-+ # CONFIG_CMD_LICENSE is not set
-+ 
-+ #
-+ # Boot commands
-+ #
-+ CONFIG_CMD_BOOTD=y
-+ CONFIG_CMD_BOOTM=y
-+ CONFIG_CMD_BOOTZ=y
-+ CONFIG_CMD_BOOTEFI=y
-+ CONFIG_CMD_ELF=y
-+ CONFIG_CMD_FDT=y
-+ CONFIG_CMD_GO=y
-+ CONFIG_CMD_RUN=y
-+ CONFIG_CMD_IMI=y
-+ # CONFIG_CMD_IMLS is not set
-+ CONFIG_CMD_XIMG=y
-+ 
-+ #
-+ # Environment commands
-+ #
-+ # CONFIG_CMD_ASKENV is not set
-+ CONFIG_CMD_EXPORTENV=y
-+ CONFIG_CMD_IMPORTENV=y
-+ CONFIG_CMD_EDITENV=y
-+ # CONFIG_CMD_GREPENV is not set
-+ CONFIG_CMD_SAVEENV=y
-+ CONFIG_CMD_ENV_EXISTS=y
-+ 
-+ #
-+ # Memory commands
-+ #
-+ CONFIG_CMD_MEMORY=y
-+ CONFIG_CMD_CRC32=y
-+ # CONFIG_LOOPW is not set
-+ # CONFIG_CMD_MEMTEST is not set
-+ # CONFIG_CMD_MX_CYCLIC is not set
-+ # CONFIG_CMD_MEMINFO is not set
-+ 
-+ #
-+ # Device access commands
-+ #
-+ CONFIG_CMD_DM=y
-+ # CONFIG_CMD_DEMO is not set
-+ CONFIG_CMD_LOADB=y
-+ CONFIG_CMD_LOADS=y
-+ CONFIG_CMD_FLASH=y
-+ # CONFIG_CMD_ARMFLASH is not set
-+ CONFIG_CMD_MMC=y
-+ # CONFIG_CMD_NAND is not set
-+ # CONFIG_CMD_SF is not set
-+ # CONFIG_CMD_SPI is not set
-+ CONFIG_CMD_I2C=y
-+ CONFIG_CMD_USB=y
-+ CONFIG_CMD_DFU=y
-+ CONFIG_CMD_USB_MASS_STORAGE=y
-+ CONFIG_CMD_FPGA=y
-+ CONFIG_CMD_GPIO=y
-+ 
-+ #
-+ # Shell scripting commands
-+ #
-+ CONFIG_CMD_ECHO=y
-+ CONFIG_CMD_ITEST=y
-+ CONFIG_CMD_SOURCE=y
-+ # CONFIG_CMD_SETEXPR is not set
-+ 
-+ #
-+ # Network commands
-+ #
-+ CONFIG_CMD_NET=y
-+ # CONFIG_CMD_TFTPPUT is not set
-+ # CONFIG_CMD_TFTPSRV is not set
-+ # CONFIG_CMD_RARP is not set
-+ CONFIG_CMD_DHCP=y
-+ CONFIG_CMD_NFS=y
-+ CONFIG_CMD_MII=y
-+ CONFIG_CMD_PING=y
-+ # CONFIG_CMD_CDP is not set
-+ # CONFIG_CMD_SNTP is not set
-+ # CONFIG_CMD_DNS is not set
-+ # CONFIG_CMD_LINK_LOCAL is not set
-+ 
-+ #
-+ # Misc commands
-+ #
-+ CONFIG_CMD_CACHE=y
-+ CONFIG_CMD_TIME=y
-+ CONFIG_CMD_MISC=y
-+ # CONFIG_CMD_TIMER is not set
-+ 
-+ #
-+ # Power commands
-+ #
-+ CONFIG_CMD_PMIC=y
-+ # CONFIG_CMD_REGULATOR is not set
-+ 
-+ #
-+ # Security commands
-+ #
-+ 
-+ #
-+ # Filesystem commands
-+ #
-+ CONFIG_CMD_EXT2=y
-+ CONFIG_CMD_EXT4=y
-+ CONFIG_CMD_EXT4_WRITE=y
-+ CONFIG_CMD_FAT=y
-+ CONFIG_CMD_FS_GENERIC=y
-+ CONFIG_SUPPORT_OF_CONTROL=y
-+ 
-+ #
-+ # Device Tree Control
-+ #
-+ CONFIG_OF_CONTROL=y
-+ CONFIG_OF_SEPARATE=y
-+ # CONFIG_OF_EMBED is not set
-+ CONFIG_NET=y
-+ # CONFIG_NET_RANDOM_ETHADDR is not set
-+ # CONFIG_NETCONSOLE is not set
-+ CONFIG_NET_TFTP_VARS=y
-+ 
-+ #
-+ # Device Drivers
-+ #
-+ 
-+ #
-+ # Generic Driver Options
-+ #
-+ CONFIG_DM=y
-+ CONFIG_DM_WARN=y
-+ CONFIG_DM_DEVICE_REMOVE=y
-+ CONFIG_DM_STDIO=y
-+ CONFIG_DM_SEQ_ALIAS=y
-+ # CONFIG_SPL_DM_SEQ_ALIAS is not set
-+ # CONFIG_REGMAP is not set
-+ # CONFIG_SPL_REGMAP is not set
-+ # CONFIG_DEVRES is not set
-+ CONFIG_SIMPLE_BUS=y
-+ CONFIG_OF_TRANSLATE=y
-+ CONFIG_ADC=y
-+ CONFIG_ADC_EXYNOS=y
-+ # CONFIG_ADC_SANDBOX is not set
-+ # CONFIG_BLK is not set
-+ CONFIG_DISK=y
-+ # CONFIG_BLOCK_CACHE is not set
-+ 
-+ #
-+ # Clock
-+ #
-+ # CONFIG_CLK is not set
-+ # CONFIG_CPU is not set
-+ 
-+ #
-+ # Hardware crypto devices
-+ #
-+ # CONFIG_FSL_CAAM is not set
-+ 
-+ #
-+ # Demo for driver model
-+ #
-+ # CONFIG_DM_DEMO is not set
-+ 
-+ #
-+ # DFU support
-+ #
-+ # CONFIG_DFU_TFTP is not set
-+ 
-+ #
-+ # DMA Support
-+ #
-+ # CONFIG_DMA is not set
-+ # CONFIG_TI_EDMA3 is not set
-+ 
-+ #
-+ # GPIO Support
-+ #
-+ # CONFIG_ALTERA_PIO is not set
-+ # CONFIG_DWAPB_GPIO is not set
-+ # CONFIG_ATMEL_PIO4 is not set
-+ # CONFIG_INTEL_BROADWELL_GPIO is not set
-+ # CONFIG_LPC32XX_GPIO is not set
-+ # CONFIG_MSM_GPIO is not set
-+ # CONFIG_ROCKCHIP_GPIO is not set
-+ # CONFIG_VYBRID_GPIO is not set
-+ 
-+ #
-+ # I2C support
-+ #
-+ CONFIG_DM_I2C_COMPAT=y
-+ # CONFIG_DM_I2C_GPIO is not set
-+ # CONFIG_SYS_I2C_INTEL is not set
-+ # CONFIG_SYS_I2C_ROCKCHIP is not set
-+ # CONFIG_I2C_MUX is not set
-+ # CONFIG_CROS_EC_KEYB is not set
-+ 
-+ #
-+ # LED Support
-+ #
-+ # CONFIG_LED is not set
-+ 
-+ #
-+ # Memory Controller drivers
-+ #
-+ 
-+ #
-+ # Multifunction device drivers
-+ #
-+ # CONFIG_MISC is not set
-+ # CONFIG_CROS_EC is not set
-+ # CONFIG_FSL_SEC_MON is not set
-+ # CONFIG_MXC_OCOTP is not set
-+ # CONFIG_PWRSEQ is not set
-+ # CONFIG_PCA9551_LED is not set
-+ # CONFIG_RESET is not set
-+ # CONFIG_WINBOND_W83627 is not set
-+ 
-+ #
-+ # MMC Host controller Support
-+ #
-+ # CONFIG_DM_MMC is not set
-+ 
-+ #
-+ # MTD Support
-+ #
-+ # CONFIG_MTD is not set
-+ 
-+ #
-+ # NAND Device Support
-+ #
-+ # CONFIG_NAND_DENALI is not set
-+ # CONFIG_NAND_VF610_NFC is not set
-+ # CONFIG_NAND_PXA3XX is not set
-+ # CONFIG_NAND_ARASAN is not set
-+ 
-+ #
-+ # Generic NAND options
-+ #
-+ 
-+ #
-+ # SPI Flash Support
-+ #
-+ # CONFIG_SPI_FLASH is not set
-+ # CONFIG_DM_ETH is not set
-+ # CONFIG_PHYLIB is not set
-+ # CONFIG_NETDEVICES is not set
-+ 
-+ #
-+ # PCI
-+ #
-+ # CONFIG_DM_PCI is not set
-+ 
-+ #
-+ # Pin controllers
-+ #
-+ # CONFIG_PINCTRL is not set
-+ 
-+ #
-+ # Power
-+ #
-+ CONFIG_DM_PMIC=y
-+ CONFIG_PMIC_CHILDREN=y
-+ CONFIG_SPL_PMIC_CHILDREN=y
-+ # CONFIG_PMIC_ACT8846 is not set
-+ # CONFIG_DM_PMIC_PFUZE100 is not set
-+ # CONFIG_DM_PMIC_MAX77686 is not set
-+ # CONFIG_PMIC_PM8916 is not set
-+ # CONFIG_PMIC_RK808 is not set
-+ CONFIG_PMIC_S2MPS11=y
-+ # CONFIG_DM_PMIC_SANDBOX is not set
-+ # CONFIG_PMIC_S5M8767 is not set
-+ # CONFIG_PMIC_TPS65090 is not set
-+ CONFIG_DM_REGULATOR=y
-+ # CONFIG_SPL_DM_REGULATOR is not set
-+ # CONFIG_DM_REGULATOR_FIXED is not set
-+ # CONFIG_DM_PWM is not set
-+ # CONFIG_RAM is not set
-+ 
-+ #
-+ # Remote Processor drivers
-+ #
-+ 
-+ #
-+ # Real Time Clock
-+ #
-+ # CONFIG_DM_RTC is not set
-+ 
-+ #
-+ # Serial drivers
-+ #
-+ CONFIG_REQUIRE_SERIAL_CONSOLE=y
-+ CONFIG_SERIAL_PRESENT=y
-+ CONFIG_SPL_SERIAL_PRESENT=y
-+ # CONFIG_DEBUG_UART is not set
-+ # CONFIG_DEBUG_UART_SKIP_INIT is not set
-+ # CONFIG_ALTERA_JTAG_UART is not set
-+ # CONFIG_ALTERA_UART is not set
-+ # CONFIG_FSL_LPUART is not set
-+ # CONFIG_SYS_NS16550 is not set
-+ # CONFIG_MSM_SERIAL is not set
-+ 
-+ #
-+ # Sound support
-+ #
-+ # CONFIG_SOUND is not set
-+ 
-+ #
-+ # SPI Support
-+ #
-+ # CONFIG_ALTERA_SPI is not set
-+ # CONFIG_CADENCE_QSPI is not set
-+ # CONFIG_DESIGNWARE_SPI is not set
-+ # CONFIG_EXYNOS_SPI is not set
-+ # CONFIG_FSL_DSPI is not set
-+ # CONFIG_FSL_QSPI is not set
-+ # CONFIG_ICH_SPI is not set
-+ # CONFIG_ROCKCHIP_SPI is not set
-+ # CONFIG_TEGRA114_SPI is not set
-+ # CONFIG_TEGRA20_SFLASH is not set
-+ # CONFIG_TEGRA20_SLINK is not set
-+ # CONFIG_TEGRA210_QSPI is not set
-+ # CONFIG_XILINX_SPI is not set
-+ # CONFIG_OMAP3_SPI is not set
-+ # CONFIG_FSL_ESPI is not set
-+ # CONFIG_TI_QSPI is not set
-+ 
-+ #
-+ # SPMI support
-+ #
-+ # CONFIG_SPMI is not set
-+ # CONFIG_DM_THERMAL is not set
-+ 
-+ #
-+ # Timer Support
-+ #
-+ # CONFIG_TIMER is not set
-+ 
-+ #
-+ # TPM support
-+ #
-+ CONFIG_USB=y
-+ CONFIG_DM_USB=y
-+ 
-+ #
-+ # USB Host Controller Drivers
-+ #
-+ # CONFIG_USB_XHCI_HCD is not set
-+ # CONFIG_USB_XHCI is not set
-+ # CONFIG_USB_OHCI_GENERIC is not set
-+ # CONFIG_USB_EHCI_HCD is not set
-+ # CONFIG_USB_EHCI is not set
-+ CONFIG_USB_DWC3=y
-+ # CONFIG_USB_DWC3_HOST is not set
-+ CONFIG_USB_DWC3_GADGET=y
-+ 
-+ #
-+ # Platform Glue Driver Support
-+ #
-+ # CONFIG_USB_DWC3_OMAP is not set
-+ 
-+ #
-+ # PHY Subsystem
-+ #
-+ # CONFIG_USB_DWC3_PHY_OMAP is not set
-+ CONFIG_USB_DWC3_PHY_SAMSUNG=y
-+ 
-+ #
-+ # MUSB Controller Driver
-+ #
-+ # CONFIG_USB_MUSB_HOST is not set
-+ # CONFIG_USB_MUSB_GADGET is not set
-+ 
-+ #
-+ # ULPI drivers
-+ #
-+ 
-+ #
-+ # USB peripherals
-+ #
-+ # CONFIG_USB_STORAGE is not set
-+ # CONFIG_USB_KEYBOARD is not set
-+ CONFIG_USB_GADGET=y
-+ # CONFIG_USB_GADGET_ATMEL_USBA is not set
-+ # CONFIG_USB_GADGET_DWC2_OTG is not set
-+ # CONFIG_CI_UDC is not set
-+ CONFIG_USB_GADGET_VBUS_DRAW=2
-+ CONFIG_USB_GADGET_DUALSPEED=y
-+ CONFIG_USB_GADGET_DOWNLOAD=y
-+ CONFIG_G_DNL_MANUFACTURER="Samsung"
-+ CONFIG_G_DNL_VENDOR_NUM=0x04e8
-+ CONFIG_G_DNL_PRODUCT_NUM=0x6601
-+ 
-+ #
-+ # Graphics support
-+ #
-+ # CONFIG_DM_VIDEO is not set
-+ 
-+ #
-+ # TrueType Fonts
-+ #
-+ # CONFIG_VIDEO_VESA is not set
-+ # CONFIG_VIDEO_LCD_ANX9804 is not set
-+ # CONFIG_VIDEO_LCD_SSD2828 is not set
-+ # CONFIG_VIDEO_MVEBU is not set
-+ # CONFIG_I2C_EDID is not set
-+ # CONFIG_DISPLAY is not set
-+ # CONFIG_VIDEO_TEGRA20 is not set
-+ # CONFIG_VIDEO_BRIDGE is not set
-+ # CONFIG_PHYS_TO_BUS is not set
-+ 
-+ #
-+ # File systems
-+ #
-+ 
-+ #
-+ # Library routines
-+ #
-+ # CONFIG_CC_OPTIMIZE_LIBS_FOR_SPEED is not set
-+ CONFIG_HAVE_PRIVATE_LIBGCC=y
-+ # CONFIG_USE_PRIVATE_LIBGCC is not set
-+ CONFIG_SYS_HZ=1000
-+ # CONFIG_USE_TINY_PRINTF is not set
-+ CONFIG_REGEX=y
-+ # CONFIG_LIB_RAND is not set
-+ # CONFIG_CMD_DHRYSTONE is not set
-+ # CONFIG_RSA is not set
-+ # CONFIG_TPM is not set
-+ 
-+ #
-+ # Hashing Support
-+ #
-+ # CONFIG_SHA1 is not set
-+ # CONFIG_SHA256 is not set
-+ # CONFIG_SHA_HW_ACCEL is not set
-+ 
-+ #
-+ # Compression Support
-+ #
-+ # CONFIG_LZ4 is not set
-+ CONFIG_ERRNO_STR=y
-+ CONFIG_OF_LIBFDT=y
-+ # CONFIG_SPL_OF_LIBFDT is not set
-+ CONFIG_EFI_LOADER=y
-+ # CONFIG_UNIT_TEST is not set
--- a/patch/u-boot/u-boot-odroidxu4-default/enable-ext4.patch
+++ b/patch/u-boot/u-boot-odroidxu4-default/enable-ext4.patch
--- a/patch/u-boot/u-boot-odroidxu4-default/ext4-boot-improvements.patch
+++ b/patch/u-boot/u-boot-odroidxu4-default/ext4-boot-improvements.patch
--- a/patch/u-boot/u-boot-odroidxu4-default/ext4-fixes-pr-28.patch
+++ b/patch/u-boot/u-boot-odroidxu4-default/ext4-fixes-pr-28.patch
--- a/patch/u-boot/u-boot-odroidxu4-next/xu4_blobs.patch
+++ b/patch/u-boot/u-boot-odroidxu4-next/xu4_blobs.patch
--- a/patch/u-boot/u-boot-odroidxu4-next/xu4_sd_fusing.patch
+++ b/patch/u-boot/u-boot-odroidxu4-next/xu4_sd_fusing.patch
--- a/patch/u-boot/u-boot-roseapple-default/ext4-boot-support.patch
+++ b/patch/u-boot/u-boot-roseapple-default/ext4-boot-support.patch
--- a/patch/u-boot/u-boot-s500-default/ext4-boot-support.patch
+++ b/patch/u-boot/u-boot-s500-default/ext4-boot-support.patch
--- a/patch/u-boot/u-boot-default/a10_a20_dram-clk.patch
+++ b/patch/u-boot/u-boot-default/a10_a20_dram-clk.patch
--- a/patch/u-boot/u-boot-default/add-awsom-uboot.patch
+++ b/patch/u-boot/u-boot-default/add-awsom-uboot.patch
--- a/patch/u-boot/u-boot-default/add-lime2-emmc.patch
+++ b/patch/u-boot/u-boot-default/add-lime2-emmc.patch
--- a/patch/u-boot/u-boot-default/add-missing-h3-boards.patch
+++ b/patch/u-boot/u-boot-default/add-missing-h3-boards.patch
--- a/patch/u-boot/u-boot-default/adjust-h3-dram-frequency.patch
+++ b/patch/u-boot/u-boot-default/adjust-h3-dram-frequency.patch
--- a/patch/u-boot/u-boot-default/cubieboard1.patch
+++ b/patch/u-boot/u-boot-default/cubieboard1.patch
@ -10,5 +10,5 @@ index c884115..a45fbb0
 # CONFIG_CMD_FPGA is not set
 +CONFIG_CMD_GPIO=y
 +CONFIG_AXP_ALDO3_VOLT=2800
-+CONFIG_AXP_ALDO4_VOLT=2800  
+CONFIG_AXP_ALDO4_VOLT=2800
 CONFIG_USB_EHCI_HCD=y
--- a/patch/u-boot/u-boot-default/disable-usb-keyboards.patch
+++ b/patch/u-boot/u-boot-default/disable-usb-keyboards.patch
--- a/patch/u-boot/u-boot-default/fix-h3-rev3-dram-calibration.patch.disabled
+++ b/patch/u-boot/u-boot-default/fix-h3-rev3-dram-calibration.patch.disabled
--- a/patch/u-boot/u-boot-default/h3-enable-power-led.patch
+++ b/patch/u-boot/u-boot-default/h3-enable-power-led.patch
--- a/patch/u-boot/u-boot-default/sunxi-boot-splash.patch
+++ b/patch/u-boot/u-boot-default/sunxi-boot-splash.patch
--- a/patch/u-boot/u-boot-default/u-boot-01-led-support-default-state.patch.disabled
+++ b/patch/u-boot/u-boot-default/u-boot-01-led-support-default-state.patch.disabled
--- a/patch/u-boot/u-boot-default/u-boot-02-support-cheap-mmc.patch.disabled
+++ b/patch/u-boot/u-boot-default/u-boot-02-support-cheap-mmc.patch.disabled
--- a/patch/u-boot/u-boot-sunxi/u-boot-set-safe-axi_apb-clock-dividers.patch
+++ b/patch/u-boot/u-boot-sunxi/u-boot-set-safe-axi_apb-clock-dividers.patch
--- a/patch/u-boot/u-boot-udoo-default/neo-2015.04-u-boot.patch
+++ b/patch/u-boot/u-boot-udoo-default/neo-2015.04-u-boot.patch
--- a/patch/u-boot/u-boot-udoo-default/udoo-2015-u-boot.patch
+++ b/patch/u-boot/u-boot-udoo-default/udoo-2015-u-boot.patch