summaryrefslogtreecommitdiff
path: root/libre-testing
diff options
context:
space:
mode:
Diffstat (limited to 'libre-testing')
-rw-r--r--libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch70
-rw-r--r--libre-testing/uboot4grub-am335x_bone/PKGBUILD6
2 files changed, 47 insertions, 29 deletions
diff --git a/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch b/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch
index 57a22467f..1bd59b27c 100644
--- a/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch
+++ b/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch
@@ -1,6 +1,6 @@
diff -Nur u-boot-2015.04.orig/configs/am335x_evm_defconfig u-boot-2015.04/configs/am335x_evm_defconfig
---- u-boot-2015.04.orig/configs/am335x_evm_defconfig 2015-04-13 14:53:03.000000000 +0000
-+++ u-boot-2015.04/configs/am335x_evm_defconfig 2015-11-07 00:50:04.382344525 +0000
+--- u-boot-2015.04.orig/configs/am335x_evm_defconfig 2015-04-13 11:53:03.000000000 -0300
++++ u-boot-2015.04/configs/am335x_evm_defconfig 2016-02-25 17:57:49.957330489 -0300
@@ -1,7 +1,6 @@
CONFIG_SPL=y
CONFIG_SPL_STACK_R=y
@@ -11,8 +11,8 @@ diff -Nur u-boot-2015.04.orig/configs/am335x_evm_defconfig u-boot-2015.04/config
CONFIG_ARM=y
CONFIG_TARGET_AM335X_EVM=y
diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/include/configs/am335x_evm.h
---- u-boot-2015.04.orig/include/configs/am335x_evm.h 2015-04-13 14:53:03.000000000 +0000
-+++ u-boot-2015.04/include/configs/am335x_evm.h 2015-11-07 00:53:11.785095746 +0000
+--- u-boot-2015.04.orig/include/configs/am335x_evm.h 2015-04-13 11:53:03.000000000 -0300
++++ u-boot-2015.04/include/configs/am335x_evm.h 2016-02-25 18:03:59.944875290 -0300
@@ -17,6 +17,7 @@
#define __CONFIG_AM335X_EVM_H
@@ -31,11 +31,11 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
+
+/* GRUB support */
+#define CONFIG_API
-+#define CONFIG_SYS_MMC_MAX_DEVICE 1
++#define CONFIG_SYS_MMC_MAX_DEVICE 2 /* Max number of 'hosts'/controllers */
#ifdef CONFIG_NAND
#define NANDARGS \
-@@ -70,127 +78,66 @@
+@@ -70,110 +78,81 @@
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
DEFAULT_LINUX_BOOT_ENV \
@@ -44,8 +44,10 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
+ "bootpart=0:1\0" \
"bootdir=/boot\0" \
- "bootfile=zImage\0" \
-- "fdtfile=undefined\0" \
-+ "grubfile=grub/arm-uboot/core.img\0" \
++ "fdtdir=/boot/dtbs\0" \
++ "bootfile=grub/arm-uboot/core.img\0" \
+ "fdtfile=undefined\0" \
++ "rdfile=initramfs-linux.img\0" \
"console=ttyO0,115200n8\0" \
"partitions=" \
"uuid_disk=${uuid_gpt_disk};" \
@@ -122,7 +124,9 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
+ "${cape_enable} " \
+ "root=${root} " \
+ "${cmdline}\0" \
-+ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${grubfile}\0" \
++ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
++ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \
++ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \
+ "mmcboot=usb start;" \
+ "for devtype in mmc usb; do " \
+ "for devnum in 0 1; do " \
@@ -137,6 +141,12 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
+ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \
+ "env import -t ${loadaddr} ${filesize};" \
+ "echo Loaded environment from ${bootdir}/uEnv.txt;" \
++ "if test -n ${cape}; then " \
++ "if test -e ${devtype} ${bootpart} ${fdtdir}/${fdtbase}-${cape}.dtb; then " \
++ "setenv fdtfile ${fdtbase}-${cape}.dtb; " \
++ "fi; " \
++ "echo using: $fdtfile...; " \
++ "fi; " \
+ "echo Checking if uenvcmd is set ...;" \
+ "if test -n ${uenvcmd}; then " \
+ "echo Running uenvcmd ...;" \
@@ -146,8 +156,16 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
+ "gpio set 55;" \
+ "if run loadimage; then " \
+ "run mmcargs;" \
-+ "gpio set 56;" \
-+ "bootm;" \
++ "gpio set 56;" \
++ "bootm;" \
++ "if run loadfdt; then " \
++ "gpio set 57;" \
++ "if run loadrd; then " \
++ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \
++ "else " \
++ "bootz ${loadaddr} - ${fdtaddr};" \
++ "fi;" \
++ "fi;" \
+ "else " \
+ "echo No GRUB found;" \
+ "fi;" \
@@ -178,21 +196,19 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
- "ramboot=echo Booting from ramdisk ...; " \
- "run ramargs; " \
- "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \
-- "findfdt="\
-- "if test $board_name = A335BONE; then " \
-- "setenv fdtfile am335x-bone.dtb; fi; " \
-- "if test $board_name = A335BNLT; then " \
-- "setenv fdtfile am335x-boneblack.dtb; fi; " \
-- "if test $board_name = A33515BB; then " \
-- "setenv fdtfile am335x-evm.dtb; fi; " \
-- "if test $board_name = A335X_SK; then " \
-- "setenv fdtfile am335x-evmsk.dtb; fi; " \
-- "if test $fdtfile = undefined; then " \
-- "echo WARNING: Could not determine device tree to use; fi; \0" \
+ "done;" \
+ "done;\0" \
- NANDARGS \
- DFUARGS
+ "findfdt="\
+ "if test $board_name = A335BONE; then " \
+- "setenv fdtfile am335x-bone.dtb; fi; " \
++ "setenv fdtfile am335x-bone.dtb; setenv fdtbase am335x-bone; fi; " \
+ "if test $board_name = A335BNLT; then " \
+- "setenv fdtfile am335x-boneblack.dtb; fi; " \
++ "setenv fdtfile am335x-boneblack.dtb; setenv fdtbase am335x-boneblack; setenv umsmedia 1; fi; " \
+ "if test $board_name = A33515BB; then " \
+ "setenv fdtfile am335x-evm.dtb; fi; " \
+ "if test $board_name = A335X_SK; then " \
+@@ -185,12 +164,12 @@
#endif
#define CONFIG_BOOTCOMMAND \
@@ -201,14 +217,16 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
- "setenv mmcdev 1; " \
- "setenv bootpart 1:2; " \
+ "gpio set 53;" \
++ "run findfdt;" \
"run mmcboot;" \
- "run nandboot;"
+ "gpio clear 54; gpio clear 55;" \
-+ "gpio set 56"
++ "gpio set 56;" \
++ "gpio set 57"
/* NS16550 Configuration */
#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
-@@ -329,9 +276,8 @@
+@@ -329,9 +308,8 @@
#endif
#ifdef CONFIG_MUSB_GADGET
diff --git a/libre-testing/uboot4grub-am335x_bone/PKGBUILD b/libre-testing/uboot4grub-am335x_bone/PKGBUILD
index ddad11860..7f927f944 100644
--- a/libre-testing/uboot4grub-am335x_bone/PKGBUILD
+++ b/libre-testing/uboot4grub-am335x_bone/PKGBUILD
@@ -5,14 +5,14 @@ buildarch=4
pkgname=uboot4grub-am335x_bone
pkgver=2015.04
-pkgrel=3
+pkgrel=4
pkgdesc="U-Boot with GRUB support for BeagleBone and BeagleBone Black"
arch=('armv7h')
url="http://git.denx.de/u-boot.git/"
depends=('grub-am335x_bone')
conflicts=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts'
'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck'
- 'uboot-beaglebone' 'uboot-am335x_bone')
+ 'uboot-beaglebone' 'uboot-am335x_bone' 'uboot4extlinux-am335x_bone')
makedepends=('bc')
license=('GPL')
install=${pkgname}.install
@@ -20,7 +20,7 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
'0001-parabola-arm-modifications+grub-support.patch'
'uEnv.txt')
md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
- '5123aa48d979d853ce2542dcead2034f'
+ '109779c2b15013d54dc2f576651219e4'
'ccb79775b81654e16fca18825c7f2506')
prepare() {
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-26 20:00:17 +0000