From 0604d38b6e3b0b086e73312230cb8c4363691363 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 25 Jul 2014 09:43:24 -0500
Subject: [PATCH] hwpack: wandboard-quad: enable conf_smart_uboot

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/wandboard-dual.conf |  1 +
 hwpack/wandboard-quad.conf | 37 +++----------------------------------
 hwpack/wandboard-solo.conf |  1 +
 3 files changed, 5 insertions(+), 34 deletions(-)

diff --git a/hwpack/wandboard-dual.conf b/hwpack/wandboard-dual.conf
index 8458081..2c8ccdd 100644
--- a/hwpack/wandboard-dual.conf
+++ b/hwpack/wandboard-dual.conf
@@ -23,6 +23,7 @@ conf_smart_uboot="enable"
 kernel_subarch="armv7"
 kernel_repo="STABLE"
 #kernel_repo="TESTING"
+dtb=
 usbnet_mem=
 need_wandboard_firmware=1
 
diff --git a/hwpack/wandboard-quad.conf b/hwpack/wandboard-quad.conf
index 4758ba1..0395e5f 100644
--- a/hwpack/wandboard-quad.conf
+++ b/hwpack/wandboard-quad.conf
@@ -16,50 +16,19 @@ unset spl_name
 boot_name="u-boot.imx"
 
 #Bootloader: u-boot features:
-
-#CONFIG_CMD_BOOTZ
-#bootz & zImage
-conf_uboot_CONFIG_CMD_BOOTZ=1
-
-#CONFIG_SUPPORT_RAW_INITRD
-#allows booting un-mkimage wrapped initrds
-conf_uboot_CONFIG_SUPPORT_RAW_INITRD=1
-
-#CONFIG_CMD_FS_GENERIC
-#allows using "load" over "fatload"/"ext2load"
-conf_uboot_CONFIG_CMD_FS_GENERIC=1
-
-#uenvcmd avaiable?
-conf_uboot_use_uenvcmd=1
-#conf_uboot_no_uenvcmd="loaduimage"
-
-#can the bootloader auto detect the device: (*.dtb)?
-uboot_fdt_auto_detection=1
-
-#with mainline u-boot, the variable for the *.dtb file can vary
-uboot_fdt_variable_name="fdt_file"
+conf_smart_uboot="enable"
 
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-armv7
 kernel_subarch="armv7"
 kernel_repo="STABLE"
 #kernel_repo="TESTING"
-
+dtb=
 usbnet_mem=
-
-#Kernel: Bootloader Settings:
-conf_zreladdr="0x10008000"
-conf_loadaddr="0x12000000"
-conf_fdtaddr="0x11000000"
-#initrdaddr = loadaddr + 10(mb) * 10 0000 = 0x12A0 0000 (10MB)
-conf_initrdaddr="0x12A00000"
 need_wandboard_firmware=1
 
-SYSTEM="video"
-
 SERIAL="ttymxc0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-di_kms_mode=enable
-drm_device_identifier="HDMI-A-1"
 drm_read_edid_broken="enable"
+drm_device_identifier="HDMI-A-1"
diff --git a/hwpack/wandboard-solo.conf b/hwpack/wandboard-solo.conf
index 5508d93..dce83cd 100644
--- a/hwpack/wandboard-solo.conf
+++ b/hwpack/wandboard-solo.conf
@@ -23,6 +23,7 @@ conf_smart_uboot="enable"
 kernel_subarch="armv7"
 kernel_repo="STABLE"
 #kernel_repo="TESTING"
+dtb=
 usbnet_mem=
 need_wandboard_firmware=1