am335x: use am335x_boneblack_defconfig for non-dt

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

v2016.09-rc2/0001-am335x_evm-uEnv.txt-bootz-n-fixes.patch

@@ -1,6 +1,6 @@
-From 1a74eb99eb54dac04c31ed7d035da9dd15b8abbd Mon Sep 17 00:00:00 2001
+From 17f4667428ba8c1a6feb8c85bc1dac7ea634b620 Mon Sep 17 00:00:00 2001
 From: Robert Nelson <robertcnelson@gmail.com>
-Date: Fri, 9 Sep 2016 13:51:01 -0500
+Date: Fri, 9 Sep 2016 16:24:33 -0500
 Subject: [PATCH] am335x_evm: uEnv.txt, bootz, n fixes
 
 Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
@@ -18,10 +18,11 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  board/ti/am335x/board.c                        |  47 ++++-
  board/ti/am335x/board.h                        |  15 ++
  board/ti/am335x/mux.c                          |   9 +-
+ configs/am335x_boneblack_defconfig             |   1 -
  configs/am335x_evm_defconfig                   |  11 +-
- include/configs/am335x_evm.h                   |  74 +++++--
+ include/configs/am335x_evm.h                   |  73 +++++--
  include/configs/ti_armv7_common.h              | 265 ++++++++++++++++++++++++-
- 16 files changed, 793 insertions(+), 122 deletions(-)
+ 17 files changed, 792 insertions(+), 123 deletions(-)
  create mode 100644 arch/arm/dts/am335x-bone-common_mii.dtsi
  create mode 100644 arch/arm/dts/am335x-bone-common_rgmii.dtsi
  create mode 100644 arch/arm/dts/am335x-boneblack-emmc-overlay.dts
@@ -773,6 +774,18 @@ index 8afa5f9..aef5806 100644
  		configure_module_pin_mux(mmc0_pin_mux);
  #if defined(CONFIG_NAND) && defined(CONFIG_EMMC_BOOT)
  		configure_module_pin_mux(nand_pin_mux);
+diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig
+index d310e0b..be5080f 100644
+--- a/configs/am335x_boneblack_defconfig
++++ b/configs/am335x_boneblack_defconfig
+@@ -4,7 +4,6 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000
+ CONFIG_SPL=y
+ CONFIG_SPL_STACK_R=y
+ CONFIG_FIT=y
+-CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
+ CONFIG_HUSH_PARSER=y
+ CONFIG_AUTOBOOT_KEYED=y
+ CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
 diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig
 index 6885230..9073cf2 100644
 --- a/configs/am335x_evm_defconfig
@@ -816,7 +829,7 @@ index 6885230..9073cf2 100644
 +CONFIG_OF_LIST="am335x-bone am335x-boneblack am335x-bonegreen am335x-boneblack-emmc-overlay am335x-sancloud-bbe am335x-vsc8531bbb"
  CONFIG_DM_I2C=y
 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
-index ba4c215..3a202ab 100644
+index ba4c215..7764273 100644
 --- a/include/configs/am335x_evm.h
 +++ b/include/configs/am335x_evm.h
 @@ -17,6 +17,7 @@
@@ -942,7 +955,7 @@ index ba4c215..3a202ab 100644
  	NANDARGS \
  	NETARGS \
  	DFUARGS \
-@@ -311,12 +351,8 @@
+@@ -311,12 +351,7 @@
  #endif
 
  #ifdef CONFIG_USB_MUSB_GADGET
@@ -952,12 +965,11 @@ index ba4c215..3a202ab 100644
 -#define CONFIG_USB_ETH_RNDIS
 -#define CONFIG_USBNET_HOST_ADDR	"de:ad:be:af:00:00"
 -#endif /* CONFIG_DM_ETH */
-+
 +#define CONFIG_USB_FUNCTION_MASS_STORAGE
  #endif /* CONFIG_USB_MUSB_GADGET */
 
  /*
-@@ -456,6 +492,8 @@
+@@ -456,6 +491,8 @@
  #define CONFIG_PHY_GIGE
  #define CONFIG_PHYLIB
  #define CONFIG_PHY_SMSC