diff mbox

[U-Boot,1/2] sniper: Various boot-related env settings, devicetree support

Message ID 1450866510-19655-1-git-send-email-contact@paulk.fr
State Accepted
Commit 1d3a86640d9877f86ec5be3203799a882cf15a73
Delegated to: Tom Rini
Headers show

Commit Message

Paul Kocialkowski Dec. 23, 2015, 10:28 a.m. UTC 
This adds various env settings for more flexible boot possibilities, including
devicetree support and distro defaults config.

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 include/configs/sniper.h | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

Comments

Tom Rini Jan. 14, 2016, 1:22 p.m. UTC | #1 
On Wed, Dec 23, 2015 at 11:28:29AM +0100, Paul Kocialkowski wrote:

> This adds various env settings for more flexible boot possibilities, including
> devicetree support and distro defaults config.
> 
> Signed-off-by: Paul Kocialkowski <contact@paulk.fr>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 08046b5..a995415 100644
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -126,21 +126,9 @@ 
  */
 
 #define CONFIG_PARTITION_UUIDS
-#define CONFIG_DOS_PARTITION
-#define CONFIG_EFI_PARTITION
-
 #define CONFIG_CMD_PART
 
 /*
- * Filesystems
- */
-
-#define CONFIG_CMD_FS_GENERIC
-#define CONFIG_CMD_EXT2
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_FAT
-
-/*
  * SPL
  */
 
@@ -257,16 +245,24 @@ 
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
 	"kernel_addr_r=0x82000000\0" \
+	"loadaddr=0x82000000\0" \
+	"fdt_addr_r=0x88000000\0" \
+	"fdtaddr=0x88000000\0" \
+	"ramdisk_addr_r=0x88080000\0" \
+	"pxefile_addr_r=0x80100000\0" \
+	"scriptaddr=0x80000000\0" \
+	"bootm_size=0x10000000\0" \
 	"boot_mmc_dev=0\0" \
 	"kernel_mmc_part=3\0" \
 	"recovery_mmc_part=4\0" \
+	"fdtfile=omap3-sniper.dtb\0" \
+	"bootfile=/boot/extlinux/extlinux.conf\0" \
 	"bootargs=console=ttyO2 vram=5M,0x9FA00000 omapfb.vram=0:5M\0"
 
 /*
- * ATAGs / Device Tree
+ * ATAGs
  */
 
-#define CONFIG_OF_LIBFDT
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 #define CONFIG_INITRD_TAG
@@ -278,7 +274,6 @@ 
  */
 
 #define CONFIG_SYS_LOAD_ADDR	0x82000000
-#define CONFIG_BOOTDELAY	1
 
 #define CONFIG_ANDROID_BOOT_IMAGE
 
@@ -299,5 +294,6 @@ 
  */
 
 #include <config_defaults.h>
+#include <config_distro_defaults.h>
 
 #endif