From 2d90099a021fac6360d21f3f1e07a7c97a4f11e9 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 12 Jun 2014 12:14:16 -0500
Subject: [PATCH] hwpack: updates bones

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 hwpack/am335x-bone-serial.conf | 8 ++++++--
 hwpack/am335x-bone-video.conf  | 8 ++++++--
 hwpack/am335x-boneblack.conf   | 7 ++++++-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/hwpack/am335x-bone-serial.conf b/hwpack/am335x-bone-serial.conf
index 78471d4..ae1cd48 100644
--- a/hwpack/am335x-bone-serial.conf
+++ b/hwpack/am335x-bone-serial.conf
@@ -34,10 +34,14 @@ conf_uboot_use_uenvcmd=1
 #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"
+
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
 kernel_subarch="omap-psp"
 kernel_repo="STABLE"
+#kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -46,14 +50,14 @@ conf_zreladdr="0x80008000"
 conf_loadaddr="0x82000000"
 conf_fdtaddr="0x88000000"
 conf_initrdaddr="0x88080000"
-conf_fdtfile="am335x-bone.dtb"
 need_am335x_firmware=1
 
+SYSTEM="serial"
+
 SERIAL="ttyO0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
 SERIAL_MODE=1
-USE_KMS=1
 
 conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
 #
diff --git a/hwpack/am335x-bone-video.conf b/hwpack/am335x-bone-video.conf
index 55dce12..221c27a 100644
--- a/hwpack/am335x-bone-video.conf
+++ b/hwpack/am335x-bone-video.conf
@@ -34,10 +34,14 @@ conf_uboot_use_uenvcmd=1
 #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"
+
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
 kernel_subarch="omap-psp"
 kernel_repo="STABLE"
+#kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -46,13 +50,13 @@ conf_zreladdr="0x80008000"
 conf_loadaddr="0x82000000"
 conf_fdtaddr="0x88000000"
 conf_initrdaddr="0x88080000"
-conf_fdtfile="am335x-bone.dtb"
 need_am335x_firmware=1
 
+SYSTEM="video"
+
 SERIAL="ttyO0"
 SERIAL_CONSOLE="${SERIAL},115200n8"
 
-#SERIAL_MODE=1
 USE_KMS=1
 
 conf_note="Note: During the install use a 5Volt DC power supply as USB does not always provide enough power. If board locks up on boot run [sudo ifconfig usb0 up] on host."
diff --git a/hwpack/am335x-boneblack.conf b/hwpack/am335x-boneblack.conf
index 261566b..960f3d4 100644
--- a/hwpack/am335x-boneblack.conf
+++ b/hwpack/am335x-boneblack.conf
@@ -34,10 +34,14 @@ conf_uboot_use_uenvcmd=1
 #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"
+
 #Kernel:
 #https://rcn-ee.net/deb/wheezy-armhf/LATEST-omap-psp
 kernel_subarch="omap-psp"
 kernel_repo="STABLE"
+#kernel_repo="TESTING"
 
 usbnet_mem=
 
@@ -46,9 +50,10 @@ conf_zreladdr="0x80008000"
 conf_loadaddr="0x82000000"
 conf_fdtaddr="0x88000000"
 conf_initrdaddr="0x88080000"
-conf_fdtfile="am335x-boneblack.dtb"
 need_am335x_firmware=1
 
+SYSTEM="video"
+
 SERIAL="ttyO0"
 SERIAL_CONSOLE="${SERIAL},115200n8"