diff options
| -rw-r--r-- | libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch (renamed from libre-testing/uboot-grub-beaglebone/0001-parabola-arm-modifications+grub-support.patch) | 0 | ||||
| -rw-r--r-- | libre-testing/uboot4grub-am335x_bone/PKGBUILD (renamed from libre-testing/uboot-grub-beaglebone/PKGBUILD) | 17 | ||||
| -rw-r--r-- | libre-testing/uboot4grub-am335x_bone/uboot4grub-am335x_bone.install (renamed from libre-testing/uboot-grub-beaglebone/uboot-grub-beaglebone.install) | 8 |
3 files changed, 14 insertions, 11 deletions
diff --git a/libre-testing/uboot-grub-beaglebone/0001-parabola-arm-modifications+grub-support.patch b/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch index 351d31be8..351d31be8 100644 --- a/libre-testing/uboot-grub-beaglebone/0001-parabola-arm-modifications+grub-support.patch +++ b/libre-testing/uboot4grub-am335x_bone/0001-parabola-arm-modifications+grub-support.patch diff --git a/libre-testing/uboot-grub-beaglebone/PKGBUILD b/libre-testing/uboot4grub-am335x_bone/PKGBUILD index 2c884258d..c32adac42 100644 --- a/libre-testing/uboot-grub-beaglebone/PKGBUILD +++ b/libre-testing/uboot4grub-am335x_bone/PKGBUILD @@ -3,13 +3,16 @@ buildarch=4 -pkgname=uboot-grub-beaglebone +pkgname=uboot4grub-am335x_bone pkgver=2015.04 -pkgrel=2 -pkgdesc="U-Boot for BeagleBone and BeagleBone Black adapted for GRUB usage" +pkgrel=1 +pkgdesc="U-Boot with GRUB support for BeagleBone and BeagleBone Black" arch=('armv7h') url="http://git.denx.de/u-boot.git/" -depends=('grub') +depends=('grub-am335x_bone') +replaces=('uboot-beaglebone' 'uboot-grub-beaglebone') +conflicts=('uboot-beaglebone' 'uboot4grub' 'uboot-grub-beaglebone') +provides=('uboot-beaglebone' 'uboot4grub') makedepends=('bc') license=('GPL') install=${pkgname}.install @@ -28,13 +31,13 @@ build() { unset CFLAGS CXXFLAGS LDFLAGS - make distclean + make distclean make am335x_evm_config make } package() { cd u-boot-${pkgver} - mkdir -p "${pkgdir}/boot/${pkgname}" - cp MLO u-boot.img "${pkgdir}/boot/${pkgname}" + mkdir -p "${pkgdir}"/boot + cp MLO u-boot.img "${pkgdir}"/boot } diff --git a/libre-testing/uboot-grub-beaglebone/uboot-grub-beaglebone.install b/libre-testing/uboot4grub-am335x_bone/uboot4grub-am335x_bone.install index ce17d17a9..0ab634efe 100644 --- a/libre-testing/uboot-grub-beaglebone/uboot-grub-beaglebone.install +++ b/libre-testing/uboot4grub-am335x_bone/uboot4grub-am335x_bone.install @@ -1,6 +1,6 @@ flash_instructions() { - echo "# dd if=/boot/uboot-grub-beaglebone/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" - echo "# dd if=/boot/uboot-grub-beaglebone/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k" + echo "# dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" + echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k" echo "# grub-install /dev/mmcblk0" echo "# grub-mkconfig -o /boot/grub/grub.cfg" } @@ -13,8 +13,8 @@ flash_uboot() { echo "Do this now? [y|N]" read -r shouldwe if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then - dd if=/boot/uboot-grub-beaglebone/MLO of=$root count=1 seek=1 conv=notrunc bs=128k - dd if=/boot/uboot-grub-beaglebone/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k + dd if=/boot/MLO of=$root count=1 seek=1 conv=notrunc bs=128k + dd if=/boot/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k grub-install /dev/mmcblk0 grub-mkconfig -o /boot/grub/grub.cfg else |