u-boot: v2017.07-rc2

Signed-off-by: Robert Nelson <[email protected]>

v2017.07-rc2/0001-at91sam9x5ek-uEnv.txt-bootz-n-fixes.patch

@@ -0,0 +1,98 @@
+From ace7d46ba55c9b49359ef81c48631b12e7b68fd0 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <[email protected]>
+Date: Fri, 9 Jun 2017 14:49:55 -0500
+Subject: [PATCH] at91sam9x5ek: uEnv.txt, bootz, n fixes
+
+Signed-off-by: Robert Nelson <[email protected]>
+---
+ configs/at91sam9x5ek_mmc_defconfig |  3 ++
+ include/configs/at91sam9x5ek.h     | 58 ++++++++++++++++++++++++++++++--------
+ 2 files changed, 49 insertions(+), 12 deletions(-)
+
+diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig
+index fbe11ef6cd..411a1dc630 100644
+--- a/configs/at91sam9x5ek_mmc_defconfig
++++ b/configs/at91sam9x5ek_mmc_defconfig
+@@ -21,7 +21,10 @@ CONFIG_CMD_USB=y
+ # CONFIG_CMD_SETEXPR is not set
+ CONFIG_CMD_DHCP=y
+ CONFIG_CMD_PING=y
++CONFIG_CMD_EXT2=y
++CONFIG_CMD_EXT4=y
+ CONFIG_CMD_FAT=y
++CONFIG_CMD_FS_GENERIC=y
+ CONFIG_CMD_UBI=y
+ CONFIG_OF_CONTROL=y
+ CONFIG_DM=y
+diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h
+index fd2dbed137..3514e7fb22 100644
+--- a/include/configs/at91sam9x5ek.h
++++ b/include/configs/at91sam9x5ek.h
+@@ -154,18 +154,52 @@
+ #endif
+
+ #ifdef CONFIG_SYS_USE_MMC
+-#define CONFIG_BOOTARGS		"mem=128M console=ttyS0,115200 " \
+-				"mtdparts=atmel_nand:" \
+-				"8M(bootstrap/uboot/kernel)ro,-(rootfs) " \
+-				"root=/dev/mmcblk0p2 " \
+-				"rw rootfstype=ext4 rootwait"
+-#else
+-#define CONFIG_BOOTARGS							\
+-	"console=ttyS0,115200 earlyprintk "				\
+-	"mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,"		\
+-	"256k(env),256k(env_redundant),256k(spare),"			\
+-	"512k(dtb),6M(kernel)ro,-(rootfs) "				\
+-	"rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw"
++#define CONFIG_SUPPORT_RAW_INITRD
++#define CONFIG_EXTRA_ENV_SETTINGS \
++	"initrd_high=0xffffffff\0" \
++	"fdt_high=0xffffffff\0" \
++	"loadaddr=0x22000000\0" \
++	"fdtaddr=0x27FF0000\0" \
++	"fdtfile=/dtbs/at91sam9g25ek.dtb\0" \
++	"console=ttyS0,115200n8\0" \
++	"optargs=\0" \
++	"video=\0" \
++	"mmcdev=0\0" \
++	"mmcpart=1\0" \
++	"mmcroot=/dev/mmcblk0p2 ro\0" \
++	"mmcrootfstype=ext4 rootwait\0" \
++	"mmcargs=setenv bootargs console=${console} " \
++		"${optargs} " \
++		"root=${mmcroot} " \
++		"rootfstype=${mmcrootfstype} " \
++		"video=${video}\0" \
++	"loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \
++	"importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
++		"env import -t ${loadaddr} ${filesize}\0" \
++	"loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
++	"loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdtaddr} ${fdtfile}\0" \
++	"mmcboot=echo Booting from mmc ...; " \
++		"run mmcargs; " \
++		"bootz ${loadaddr} - ${fdtaddr}\0"
++
++#define CONFIG_BOOTCOMMAND \
++	"mmc dev ${mmcdev};" \
++	"if mmc rescan; then " \
++		"echo SD/MMC found on device ${mmcdev};" \
++		"if run loadbootenv; then " \
++			"run importbootenv;" \
++		"fi;" \
++		"echo Checking if uenvcmd is set ...;" \
++		"if test -n $uenvcmd; then " \
++			"echo Running uenvcmd ...;" \
++			"run uenvcmd;" \
++		"fi;" \
++		"echo Running default loadzimage ...;" \
++		"if run loadzimage; then " \
++			"run loadfdt;" \
++			"run mmcboot;" \
++		"fi;" \
++	"fi;"
+ #endif
+
+ #define CONFIG_SYS_CBSIZE	256
+-- 
+2.11.0
+

v2017.07-rc2/0001-de0_nano-fixes.patch

@@ -0,0 +1,34 @@
+From 79057410fbc162d86a5ed9d210c8a4a775b49ca5 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <[email protected]>
+Date: Mon, 8 May 2017 15:26:20 -0500
+Subject: [PATCH] de0_nano fixes
+
+Signed-off-by: Robert Nelson <[email protected]>
+---
+ configs/socfpga_de0_nano_soc_defconfig | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configs/socfpga_de0_nano_soc_defconfig b/configs/socfpga_de0_nano_soc_defconfig
+index 0697e2ec37..3992658924 100644
+--- a/configs/socfpga_de0_nano_soc_defconfig
++++ b/configs/socfpga_de0_nano_soc_defconfig
+@@ -8,7 +8,7 @@ CONFIG_FIT=y
+ CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+ CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
+ CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
+-CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_nano_soc.dtb"
++CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_sockit.dtb"
+ CONFIG_VERSION_VARIABLE=y
+ # CONFIG_DISPLAY_BOARDINFO is not set
+ CONFIG_SPL=y
+@@ -21,6 +21,7 @@ CONFIG_CMD_ASKENV=y
+ CONFIG_CMD_GREPENV=y
+ # CONFIG_CMD_FLASH is not set
+ CONFIG_CMD_MMC=y
++CONFIG_CMD_PART=y
+ CONFIG_CMD_SF=y
+ CONFIG_CMD_SPI=y
+ CONFIG_CMD_I2C=y
+-- 
+2.11.0
+

v2017.07-rc2/0001-ls1021atwr-fixes.patch

@@ -0,0 +1,109 @@
+From d36d1c7b926f123553ad877e5384eba91fa40196 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <[email protected]>
+Date: Fri, 9 Jun 2017 14:51:43 -0500
+Subject: [PATCH] ls1021atwr fixes
+
+Signed-off-by: Robert Nelson <[email protected]>
+---
+ configs/ls1021atwr_sdcard_qspi_defconfig |  4 +++
+ include/configs/ls1021atwr.h             | 43 +++++++++++++++++++++++++++-----
+ 2 files changed, 41 insertions(+), 6 deletions(-)
+
+diff --git a/configs/ls1021atwr_sdcard_qspi_defconfig b/configs/ls1021atwr_sdcard_qspi_defconfig
+index 5ccfc96e9d..2618a58b99 100644
+--- a/configs/ls1021atwr_sdcard_qspi_defconfig
++++ b/configs/ls1021atwr_sdcard_qspi_defconfig
+@@ -6,6 +6,7 @@ CONFIG_SPL_MMC_SUPPORT=y
+ CONFIG_SPL_SERIAL_SUPPORT=y
+ CONFIG_SPL_WATCHDOG_SUPPORT=y
+ CONFIG_VIDEO=y
++CONFIG_DISTRO_DEFAULTS=y
+ CONFIG_DEFAULT_DEVICE_TREE="ls1021a-twr-duart"
+ CONFIG_FIT=y
+ CONFIG_FIT_VERBOSE=y
+@@ -39,7 +40,10 @@ CONFIG_CMD_MII=y
+ CONFIG_CMD_PING=y
+ CONFIG_CMD_BMP=y
+ CONFIG_CMD_EXT2=y
++CONFIG_CMD_EXT4=y
++CONFIG_CMD_EXT4_WRITE=y
+ CONFIG_CMD_FAT=y
++CONFIG_CMD_FS_GENERIC=y
+ # CONFIG_SPL_EFI_PARTITION is not set
+ CONFIG_OF_CONTROL=y
+ CONFIG_DM=y
+diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h
+index 067ef4df93..91bfc22755 100644
+--- a/include/configs/ls1021atwr.h
++++ b/include/configs/ls1021atwr.h
+@@ -7,6 +7,8 @@
+ #ifndef __CONFIG_H
+ #define __CONFIG_H
+
++#include <config_distro_defaults.h>
++
+ #define CONFIG_ARMV7_PSCI_1_0
+
+ #define CONFIG_ARMV7_SECURE_BASE	OCRAM_BASE_S_ADDR
+@@ -135,6 +137,10 @@
+ #define CONFIG_SYS_TEXT_BASE		0x40100000
+ #endif
+
++#ifndef CONFIG_LOADADDR
++#define CONFIG_LOADADDR			0x82000000
++#endif
++
+ #ifndef CONFIG_SYS_TEXT_BASE
+ #define CONFIG_SYS_TEXT_BASE		0x60100000
+ #endif
+@@ -370,16 +376,41 @@
+
+ #ifdef CONFIG_LPUART
+ #define CONFIG_EXTRA_ENV_SETTINGS       \
+-	"bootargs=root=/dev/ram0 rw console=ttyLP0,115200\0" \
+-	"initrd_high=0xffffffff\0"      \
+-	"fdt_high=0xffffffff\0"
++	"console=ttyLP0,115200\0" \
++	"ftdfile=ls1021a-twr.dtb\0" \
++	"initrd_high=0xffffffff\0" \
++	"fdt_high=0xffffffff\0" \
++	"fdt_addr_r=0x8f000000\0" \
++	"fdt_addr=0x8f000000\0" \
++	"findfdt=setenv fdtfile ls1021a-twr.dtb; \0" \
++	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
++	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
++	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
++	BOOTENV
+ #else
+ #define CONFIG_EXTRA_ENV_SETTINGS	\
+-	"bootargs=root=/dev/ram0 rw console=ttyS0,115200\0" \
+-	"initrd_high=0xffffffff\0"      \
+-	"fdt_high=0xffffffff\0"
++	"console=ttyS0,115200\0" \
++	"ftdfile=ls1021a-twr.dtb\0" \
++	"initrd_high=0xffffffff\0" \
++	"fdt_high=0xffffffff\0" \
++	"fdt_addr_r=0x8f000000\0" \
++	"fdt_addr=0x8f000000\0" \
++	"findfdt=setenv fdtfile ls1021a-twr.dtb; \0" \
++	"kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
++	"pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
++	"scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \
++	BOOTENV
+ #endif
+
++#define BOOT_TARGET_DEVICES(func) \
++	func(MMC, mmc, 0)
++
++#define CONFIG_BOOTCOMMAND \
++	   "run findfdt; " \
++	   "run distro_bootcmd"
++
++#include <config_distro_bootcmd.h>
++
+ /*
+  * Miscellaneous configurable options
+  */
+-- 
+2.11.0
+