beaglebone-uboot: switch to a working version (2014.07).

This commit is contained in:
Juan RP 2014-12-05 08:23:00 +01:00
parent 1cf551582b
commit f76844f7a0
2 changed files with 38 additions and 30 deletions

View file

@ -1,21 +1,29 @@
--- include/configs/am335x_evm.h.orig 2014-12-05 05:14:09.200354837 +0100
+++ include/configs/am335x_evm.h 2014-12-05 05:32:28.909069021 +0100
@@ -18,6 +18,8 @@
--- include/configs/am335x_evm.h 2014-07-14 11:16:45.000000000 -0600
+++ include/configs/am335x_evm.h 2014-08-10 18:40:55.817027322 -0600
@@ -17,6 +17,7 @@
#define __CONFIG_AM335X_EVM_H
#include <configs/ti_am335x_common.h>
+#define CONFIG_SUPPORT_RAW_INITRD
+
#ifndef CONFIG_SPL_BUILD
# define CONFIG_FIT
# define CONFIG_TIMESTAMP
@@ -78,15 +80,17 @@
@@ -74,6 +75,8 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+
+
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
@@ -81,15 +84,17 @@
"bootpart=0:2\0" \
"bootdir=/boot\0" \
"bootfile=zImage\0" \
+ "fdtdir=/boot/dtbs\0" \
"fdtfile=undefined\0" \
+ "rdfile=initramfs.img\0" \
+ "rdfile=initramfs-linux.img\0" \
"console=ttyO0,115200n8\0" \
"partitions=" \
"uuid_disk=${uuid_gpt_disk};" \
@ -29,7 +37,7 @@
"rootpath=/export/rootfs\0" \
"nfsopts=nolock\0" \
"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
@@ -95,8 +99,7 @@
@@ -98,8 +103,7 @@
"ramrootfstype=ext2\0" \
"mmcargs=setenv bootargs console=${console} " \
"${optargs} " \
@ -39,7 +47,7 @@
"spiroot=/dev/mtdblock4 rw\0" \
"spirootfstype=jffs2\0" \
"spisrcaddr=0xe0000\0" \
@@ -122,41 +125,43 @@
@@ -122,37 +126,43 @@
"${optargs} " \
"root=${ramroot} " \
"rootfstype=${ramrootfstype}\0" \
@ -66,14 +74,11 @@
"if mmc rescan; then " \
+ "gpio set 54;" \
"echo SD/MMC found on device ${mmcdev};" \
- "if run loadbootscript; then " \
- "run bootscript;" \
- "else " \
"if run loadbootenv; then " \
"if run loadbootenv; then " \
+ "gpio set 55;" \
"echo Loaded environment from ${bootenv};" \
"run importbootenv;" \
"fi;" \
"echo Loaded environment from ${bootenv};" \
"run importbootenv;" \
"fi;" \
+ "if test -n $cape; then " \
+ "if test -e mmc ${bootpart} ${fdtdir}/$fdtbase-$cape.dtb; then " \
+ "setenv fdtfile $fdtbase-$cape.dtb; " \
@ -81,13 +86,13 @@
+ "echo using: $fdtfile...; " \
+ "fi; " \
+ "echo Checking if uenvcmd is set ...;" \
"if test -n $uenvcmd; then " \
"if test -n $uenvcmd; then " \
+ "gpio set 56; " \
"echo Running uenvcmd ...;" \
"run uenvcmd;" \
"fi;" \
"if run loadimage; then " \
- "run mmcloados;" \
"echo Running uenvcmd ...;" \
"run uenvcmd;" \
"fi;" \
"if run loadimage; then " \
- "run mmcloados;" \
+ "if run loadfdt; then " \
+ "run mmcargs;" \
+ "if run loadramdisk; then " \
@ -98,15 +103,17 @@
+ "else " \
+ "echo Kernel found, but no device tree found;" \
+ "fi;" \
"fi;" \
- "fi ;" \
"fi;" \
+ "echo No kernel found;"\
"fi;\0" \
"spiboot=echo Booting from spi ...; " \
"run spiargs; " \
@@ -175,26 +180,42 @@
@@ -169,28 +179,44 @@
"ramboot=echo Booting from ramdisk ...; " \
"run ramargs; " \
"bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
"findfdt="\
- "findfdt="\
+ "findfdt=" \
"if test $board_name = A335BONE; then " \
- "setenv fdtfile am335x-bone.dtb; fi; " \
+ "setenv fdtfile am335x-bone.dtb; setenv fdtbase am335x-bone; fi; " \

View file

@ -1,7 +1,8 @@
# Template file for 'beaglebone-uboot'
pkgname=beaglebone-uboot
version=2014.10
revision=2
reverts=2014.10_2
version=2014.07
revision=1
wrksrc="u-boot-${version}"
hostmakedepends="bc"
short_desc="Beaglebone and BeagleBone Black U-Boot loader"
@ -9,7 +10,7 @@ maintainer="Juan RP <xtraeme@gmail.com>"
license="GPL-2"
homepage="http://www.denx.de/wiki/U-Boot/WebHome"
distfiles="http://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"
checksum=d3b132a7a9b3f3182b7aad71c2dfbd4fc15bea83e12c76134eb3ffefc07d1c71
checksum=b4f83b8db325c21671a997198ec3a373e2e00dde2fcf17be9b9afd7cfd727f56
only_for_archs="armv7l"