summaryrefslogtreecommitdiffstats
path: root/conf/machine
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2013-06-04 23:15:41 -0400
committerDenys Dmytriyenko <denys@ti.com>2013-06-05 11:55:22 -0400
commit88bdf2e3d90fe03e6c7b26067e5649a8d546ae9e (patch)
tree7b97d2f88c6e64658ee5c423db5c16143985b805 /conf/machine
parent64b76e0915b2dfbc989002567bebc5080351ff22 (diff)
downloadmeta-ti-88bdf2e3d90fe03e6c7b26067e5649a8d546ae9e.tar.gz
u-boot-dra7xx: add latest u-boot from the integration branch
While the code is being pulled from ti-u-boot integration tree, J6/DRA7xx bring up is being done from a separate branch that does not include all the commits made for am335x. Hence, until those branches are merged with the mainline and unified in a single recipe, a separate recipe just for DRA7xx makes more sense. This recipe should eventually go away and unified under u-boot-ti-staging one. Signed-off-by: Denys Dmytriyenko <denys@ti.com> Acked-by: Chase Maupin <chase.maupin@ti.com>
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/dra7xx-evm.conf7
1 files changed, 5 insertions, 2 deletions
diff --git a/conf/machine/dra7xx-evm.conf b/conf/machine/dra7xx-evm.conf
index d968d3b3..5897a5fe 100644
--- a/conf/machine/dra7xx-evm.conf
+++ b/conf/machine/dra7xx-evm.conf
@@ -8,6 +8,11 @@ IMAGE_FSTYPES += "ubi tar.gz"
8 8
9SERIAL_CONSOLE = "115200 ttyO0" 9SERIAL_CONSOLE = "115200 ttyO0"
10 10
11PREFERRED_PROVIDER_virtual/bootloader = "u-boot-dra7xx"
12PREFERRED_PROVIDER_u-boot = "u-boot-dra7xx"
13
14UBOOT_MACHINE = "dra7xx_evm_config"
15
11# UBI information. Note that this is board and kernel specific. Changes 16# UBI information. Note that this is board and kernel specific. Changes
12# in your kernel port may require changes in these variables. For more 17# in your kernel port may require changes in these variables. For more
13# details about this board please see 18# details about this board please see
@@ -29,8 +34,6 @@ MKUBIFS_ARGS = "-F -m 2048 -e 126976 -c 3836"
29# UBI: VID header offset: 2048 (aligned 2048) 34# UBI: VID header offset: 2048 (aligned 2048)
30UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048" 35UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512 -O 2048"
31 36
32UBOOT_MACHINE = "dra7xx_evm_config"
33
34# Currently removing the sgx machine feature because there is no SGX package 37# Currently removing the sgx machine feature because there is no SGX package
35# available for omap5 38# available for omap5
36MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen" 39MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 screen touchscreen"